Repository: incubator-taverna-mobile Updated Branches: refs/heads/master 207362ed4 -> e52cffad1
DashboardActivity Improvements Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/e52cffad Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/e52cffad Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/e52cffad Branch: refs/heads/master Commit: e52cffad1d0b61c07e10898fb4ae11a637feb64c Parents: 207362e Author: Hitesh Gautam <gautam31.hit...@gmail.com> Authored: Wed Jul 11 14:17:52 2018 +0530 Committer: Hitesh Gautam <gautam31.hit...@gmail.com> Committed: Thu Jul 12 16:07:11 2018 +0530 ---------------------------------------------------------------------- .../main/res/layout/item_workflow_dashboard.xml | 126 ++++++++++--------- app/src/main/res/values/dimens.xml | 15 +++ 2 files changed, 81 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e52cffad/app/src/main/res/layout/item_workflow_dashboard.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/item_workflow_dashboard.xml b/app/src/main/res/layout/item_workflow_dashboard.xml index ba9f46b..a9699d6 100644 --- a/app/src/main/res/layout/item_workflow_dashboard.xml +++ b/app/src/main/res/layout/item_workflow_dashboard.xml @@ -20,76 +20,82 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" - android:layout_margin="5dp" - android:layout_height="250dp" - app:cardCornerRadius="5dp" - app:cardElevation="1dp"> + android:layout_margin="@dimen/workflow_card_margin" + android:layout_height="@dimen/workflow_card_height" + app:cardCornerRadius="@dimen/workflow_card_corner_radius" + app:cardElevation="@dimen/workflow_card_elevation"> + <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <ImageView - android:id="@+id/ivWorkflowImage" - android:layout_width="match_parent" - android:layout_height="300dp" - android:scaleType="center" - android:src="@drawable/placeholder"/> - <TextView - android:background="@color/black_background" - android:id="@+id/tvUploader" + android:id="@+id/ivWorkflowImage" + android:layout_width="match_parent" + android:layout_height="@dimen/workflow_image_height" + android:scaleType="center" + android:src="@drawable/placeholder"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_alignParentBottom="true"> + + <TextView + android:id="@+id/tvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignBottom="@id/ivWorkflowImage" - android:text="Uploader" - android:paddingLeft="10dp" - android:paddingStart="10dp" - android:paddingRight="0dp" - android:paddingEnd="0dp" - android:paddingBottom="5dp" - android:textSize="14sp" - android:textColor="@android:color/white"/> - <TextView + android:text="type" + android:textSize="@dimen/workflow_title_text_size" + android:textColor="@android:color/white" + android:background="@color/black_background" + android:padding="@dimen/workflow_title_text_padding" + android:textStyle="bold" + /> + + <TextView android:background="@color/black_background" android:id="@+id/tvDate" - android:layout_above="@id/tvUploader" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="date" - android:paddingLeft="10dp" - android:paddingStart="10dp" - android:paddingRight="0dp" - android:paddingEnd="0dp" - android:paddingBottom="5dp" - android:textSize="14sp" - android:textColor="@android:color/white"/> - <TextView - android:background="@color/black_background" - android:id="@+id/tvType" - android:layout_above="@id/tvDate" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="type" - android:paddingLeft="10dp" - android:paddingStart="10dp" - android:paddingRight="0dp" - android:paddingEnd="0dp" - android:paddingBottom="5dp" - android:textSize="16sp" - android:textColor="@android:color/white"/> - <TextView - android:background="@color/black_background" - android:id="@+id/tvTitle" - android:layout_above="@id/tvType" + android:textSize="@dimen/workflow_date_text_size" + android:textColor="@android:color/white" + android:paddingLeft="@dimen/workflow_date_padding_left" + /> + + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="type" - android:paddingLeft="10dp" - android:paddingStart="10dp" - android:paddingRight="0dp" - android:paddingEnd="0dp" - android:paddingBottom="5dp" - android:singleLine="true" - android:ellipsize="end" - android:textSize="18sp" - android:textColor="@android:color/white"/> + android:orientation="horizontal"> + + <TextView + android:id="@+id/tvUploader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Uploader" + android:textSize="@dimen/workflow_uploader_name_text_size" + android:textColor="@android:color/white" + android:background="@color/black_background" + android:layout_weight="1" + android:padding="@dimen/workflow_uploader_name_padding"/> + + <TextView + android:id="@+id/tvType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@color/black_background" + android:text="type" + android:textSize="@dimen/workflow_type_name_text_size" + android:textColor="@android:color/white" + android:layout_weight="1" + android:gravity="right" + android:padding="@dimen/workflow_type_padding"/> + + </LinearLayout> + </LinearLayout> </RelativeLayout> + </android.support.v7.widget.CardView> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/e52cffad/app/src/main/res/values/dimens.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 8bb61d4..416cf31 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -19,6 +19,21 @@ limitations under the License. <dimen name="app_bar_top_padding">0dp</dimen> <dimen name="card_margin_horizontal">10dp</dimen> <dimen name="card_margin_vertical">8dp</dimen> + + <!--Workflow Card Dimens--> + <dimen name="workflow_card_margin">5dp</dimen> + <dimen name="workflow_card_height">200dp</dimen> + <dimen name="workflow_card_corner_radius">5dp</dimen> + <dimen name="workflow_card_elevation">1dp</dimen> + <dimen name="workflow_image_height">250dp</dimen> + <dimen name="workflow_title_text_size">16sp</dimen> + <dimen name="workflow_title_text_padding">3dp</dimen> + <dimen name="workflow_date_text_size">16sp</dimen> + <dimen name="workflow_date_padding_left">3dp</dimen> + <dimen name="workflow_uploader_name_text_size">14sp</dimen> + <dimen name="workflow_uploader_name_padding">3dp</dimen> + <dimen name="workflow_type_name_text_size">14sp</dimen> + <dimen name="workflow_type_padding">3dp</dimen> <!--Announcement Card margin--> <dimen name="announcement_card_margin_horizontal">5dp</dimen>