Repository: incubator-taverna-mobile Updated Branches: refs/heads/master e52cffad1 -> d827f599a
WorkflowDetailFragment 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/7c733556 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7c733556 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7c733556 Branch: refs/heads/master Commit: 7c733556f8136d4422d2dd4568df4b9e9cb1b472 Parents: 207362e Author: Hitesh Gautam <gautam31.hit...@gmail.com> Authored: Wed Jul 11 00:22:50 2018 +0530 Committer: Hitesh Gautam <gautam31.hit...@gmail.com> Committed: Fri Jul 13 00:34:14 2018 +0530 ---------------------------------------------------------------------- .../workflowdetail/WorkflowDetailFragment.java | 4 +- .../res/layout/fragment_detail_workflow.xml | 44 ++++++++++++++------ app/src/main/res/values/dimens.xml | 12 +++++- 3 files changed, 43 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7c733556/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java index 3b4c8a0..c4478dd 100644 --- a/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java +++ b/app/src/main/java/org/apache/taverna/mobile/ui/workflowdetail/WorkflowDetailFragment.java @@ -18,7 +18,6 @@ */ package org.apache.taverna.mobile.ui.workflowdetail; - import android.app.ProgressDialog; import android.content.Intent; import android.os.Bundle; @@ -64,6 +63,7 @@ import javax.inject.Inject; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; +import de.hdodenhof.circleimageview.CircleImageView; public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMvpView { @@ -81,7 +81,7 @@ public class WorkflowDetailFragment extends Fragment implements WorkflowDetailMv TextView title; @BindView(R.id.ivUploader) - ImageView uploaderImage; + CircleImageView uploaderImage; @BindView(R.id.tvUploaderName) TextView uploaderName; http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7c733556/app/src/main/res/layout/fragment_detail_workflow.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_detail_workflow.xml b/app/src/main/res/layout/fragment_detail_workflow.xml index 76335c0..dd984ff 100644 --- a/app/src/main/res/layout/fragment_detail_workflow.xml +++ b/app/src/main/res/layout/fragment_detail_workflow.xml @@ -41,7 +41,7 @@ android:orientation="vertical" android:visibility="gone"> - <LinearLayout + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -56,7 +56,8 @@ <View android:layout_width="match_parent" android:layout_height="@dimen/view_height" - android:background="@color/grey_background"/> + android:background="@color/grey_background" + android:layout_below="@id/ivWorkflowImage"/> <android.support.design.widget.FloatingActionButton android:id="@+id/ivFav" @@ -67,7 +68,10 @@ android:layout_marginTop="@dimen/iv_fav_margin_top" android:backgroundTint="@color/colorPrimaryDark" app:borderWidth="@dimen/iv_fav_border_width" - android:src="@drawable/ic_star_border_black_24dp"/> + android:src="@drawable/ic_star_border_black_24dp" + android:layout_below="@+id/ivWorkflowImage" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> <TextView android:id="@+id/tvTitle" @@ -75,15 +79,20 @@ android:layout_height="wrap_content" android:padding="@dimen/tv_title_padding" android:textColor="@android:color/black" - android:textSize="@dimen/tv_title_text_size"/> + android:textSize="@dimen/tv_title_text_size" + android:textStyle="bold" + android:layout_below="@id/ivWorkflowImage" + android:layout_toLeftOf="@+id/ivFav"/> <LinearLayout + android:id="@+id/ll_uploader_info" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/linear_layout_margin_top" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_below="@id/tvTitle"> - <ImageView + <de.hdodenhof.circleimageview.CircleImageView android:id="@+id/ivUploader" android:layout_width="@dimen/iv_uploader_width" android:layout_height="@dimen/iv_uploader_height" @@ -102,7 +111,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/black" - android:textSize="@dimen/tv_uploader_name_text_size"/> + android:textSize="@dimen/tv_uploader_name_text_size" + android:layout_marginTop="@dimen/tv_uploader_name_margin_top"/> <TextView android:id="@+id/tvDate" @@ -121,16 +131,23 @@ android:paddingLeft="@dimen/tv_type_padding_left" android:paddingRight="@dimen/tv_type_padding_right" android:paddingStart="@dimen/tv_type_padding_start"/> + </RelativeLayout> </LinearLayout> - <LinearLayout + <android.support.v7.widget.CardView android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey_background" android:orientation="vertical" - android:padding="@dimen/linLay2_padding"> + android:padding="@dimen/cv_description_padding" + android:layout_marginTop="@dimen/cv_description_margin_top" + android:layout_marginLeft="@dimen/cv_description_margin_left" + android:layout_marginRight="@dimen/cv_description_margin_right" + android:layout_marginBottom="@dimen/cv_description_margin_bottom" + android:elevation="@dimen/cv_description_elevation" + app:cardCornerRadius="@dimen/cv_description_corner_radius" + android:layout_below="@id/ll_uploader_info"> <WebView android:id="@+id/tvDescription" @@ -138,9 +155,10 @@ android:layout_height="wrap_content" android:padding="@dimen/tv_description_padding" /> - </LinearLayout> - </LinearLayout> + </android.support.v7.widget.CardView> + + </RelativeLayout> </ScrollView> </RelativeLayout> @@ -156,4 +174,4 @@ /> -</android.support.design.widget.CoordinatorLayout> \ No newline at end of file +</android.support.design.widget.CoordinatorLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7c733556/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..f647d02 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -46,6 +46,7 @@ limitations under the License. <dimen name="iv_fav_border_width">0sp</dimen> <dimen name="tv_title_padding">10sp</dimen> <dimen name="tv_title_text_size">20sp</dimen> + <dimen name="tv_title_margin_right">75dp</dimen> <dimen name="linear_layout_margin_top">5sp</dimen> <dimen name="iv_uploader_width">50sp</dimen> <dimen name="iv_uploader_height">50sp</dimen> @@ -55,12 +56,19 @@ limitations under the License. <dimen name="rel_lay2_margin_left">10sp</dimen> <dimen name="rel_lay2_margin_start">10sp</dimen> <dimen name="tv_uploader_name_text_size">18sp</dimen> + <dimen name="tv_uploader_name_margin_top">4dp</dimen> <dimen name="tv_type_padding_end">10sp</dimen> <dimen name="tv_type_padding_left">0sp</dimen> <dimen name="tv_type_padding_right">10sp</dimen> <dimen name="tv_type_padding_start">0sp</dimen> - <dimen name="linLay2_padding">15sp</dimen> - <dimen name="tv_description_padding">5sp</dimen> + <dimen name="cv_description_padding">15sp</dimen> + <dimen name="cv_description_margin_top">5sp</dimen> + <dimen name="cv_description_margin_left">10sp</dimen> + <dimen name="cv_description_margin_right">10sp</dimen> + <dimen name="cv_description_margin_bottom">10sp</dimen> + <dimen name="cv_description_elevation">5sp</dimen> + <dimen name="cv_description_corner_radius">2sp</dimen> + <dimen name="tv_description_padding">15sp</dimen> <dimen name="navigation_drawer_width">240dp</dimen> <dimen name="item_offset">3dp</dimen>