Repository: incubator-taverna-mobile Updated Branches: refs/heads/master c4f188fe5 -> 03f68fd8b (forced update)
Fix: Improvements in UsageActivity UI for different screens 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/03f68fd8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/03f68fd8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/03f68fd8 Branch: refs/heads/master Commit: 03f68fd8b795d87487d018795156490ff39282da Parents: bfad0f0 Author: Hitesh Gautam <[email protected]> Authored: Sat Apr 28 21:11:47 2018 +0530 Committer: Hitesh Gautam <[email protected]> Committed: Tue May 22 13:22:06 2018 +0530 ---------------------------------------------------------------------- app/src/main/res/drawable/download.jpg | Bin app/src/main/res/layout/activity_tutorial.xml | 2 +- app/src/main/res/layout/activity_usage.xml | 113 +++++++++++-------- .../res/layout/fragment_detail_workflow.xml | 44 ++++---- app/src/main/res/layout/fragment_login.xml | 6 +- app/src/main/res/layout/item_announcement.xml | 8 +- app/src/main/res/values/dimens.xml | 80 ++++++------- app/src/main/res/values/strings.xml | 4 +- 8 files changed, 136 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/app/src/main/res/drawable/download.jpg ---------------------------------------------------------------------- diff --git a/app/src/main/res/drawable/download.jpg b/app/src/main/res/drawable/download.jpg old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/app/src/main/res/layout/activity_tutorial.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml index 8a392cb..22d59ff 100644 --- a/app/src/main/res/layout/activity_tutorial.xml +++ b/app/src/main/res/layout/activity_tutorial.xml @@ -38,7 +38,7 @@ limitations under the License. <View android:layout_width="match_parent" - android:layout_height="@dimen/tutorialView_height" + android:layout_height="@dimen/tutorial_view_height" android:alpha=".5" android:layout_above="@id/layoutDots" android:background="@android:color/white" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/app/src/main/res/layout/activity_usage.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/activity_usage.xml b/app/src/main/res/layout/activity_usage.xml index dd06e5d..02b9541 100644 --- a/app/src/main/res/layout/activity_usage.xml +++ b/app/src/main/res/layout/activity_usage.xml @@ -33,145 +33,160 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:padding="@dimen/usageLinearLayoutPadding"> + android:orientation="vertical"> <android.support.v7.widget.CardView android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/usageCardViewPaddingBotton"> + android:layout_height="wrap_content" + android:paddingBottom="@dimen/usage_card_view_padding_bottom" + android:layout_marginRight="@dimen/usage_card_view_padding_bottom" + android:layout_marginLeft="@dimen/usage_card_view_padding_bottom" + android:layout_marginTop="@dimen/usage_card_view_padding_bottom" + > <TextView - android:id="@+id/usage_login_title" + android:id="@+id/text_login_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:paddingTop="@dimen/cardTitleTopPadding" + android:paddingTop="@dimen/card_title_top_padding" android:text="@string/usage_intro" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/colorPrimaryDark" - android:textSize="@dimen/usageCardTitleTextSize" /> + android:textSize="@dimen/usage_card_title_text_size" /> <TextView - android:id="@+id/usage_login_content" + android:id="@+id/text_login_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/usageCardContentMarginTop" + android:layout_marginTop="@dimen/usage_card_content_margin_top" android:fontFamily="sans-serif-condensed" - android:paddingBottom="@dimen/usageContentPaddingBottom" - android:paddingLeft="@dimen/usageContentPaddingLeft" - android:paddingRight="@dimen/usageContentPaddingRight" + android:paddingBottom="@dimen/usage_content_padding_bottom" + android:paddingLeft="@dimen/usage_content_padding_left" + android:paddingRight="@dimen/usage_content_padding_right" android:text="@string/usage_login_accounts" android:textColor="@color/colorBlack" - android:textSize="@dimen/usageContentTextSize" /> + android:textSize="@dimen/usage_content_text_size" /> </android.support.v7.widget.CardView> <Space android:layout_width="match_parent" - android:layout_height="@dimen/usageCardSpaceHeight" /> + android:layout_height="@dimen/usage_card_space_height" /> <android.support.v7.widget.CardView android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/usageCardViewPaddingBotton"> + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/usage_card_view_padding_bottom" + android:layout_marginLeft="@dimen/usage_card_view_padding_bottom" + android:paddingBottom="@dimen/usage_card_view_padding_bottom"> <TextView - android:id="@+id/usage_dashboard_title" + android:id="@+id/text_dashboard_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:paddingTop="@dimen/cardTitleTopPadding" + android:paddingTop="@dimen/card_title_top_padding" android:text="@string/usage_dashboard" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/colorPrimaryDark" - android:textSize="@dimen/usageCardTitleTextSize" /> + android:textSize="@dimen/usage_card_title_text_size" /> <TextView - android:id="@+id/usage_dashboard_content" + android:id="@+id/text_dashboard_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/usageCardContentMarginTop" + android:layout_marginTop="@dimen/usage_card_content_margin_top" android:fontFamily="sans-serif-condensed" - android:paddingBottom="@dimen/usageContentPaddingBottom" - android:paddingLeft="@dimen/usageContentPaddingLeft" - android:paddingRight="@dimen/usageContentPaddingRight" + android:paddingBottom="@dimen/usage_content_padding_bottom" + android:paddingLeft="@dimen/usage_content_padding_left" + android:paddingRight="@dimen/usage_content_padding_right" android:text="@string/usage_dashboard_Text" android:textColor="@color/colorBlack" - android:textSize="@dimen/usageContentTextSize" /> + android:textSize="@dimen/usage_content_text_size" /> </android.support.v7.widget.CardView> <Space android:layout_width="match_parent" - android:layout_height="@dimen/usageCardSpaceHeight" /> + android:layout_height="@dimen/usage_card_space_height" /> <android.support.v7.widget.CardView android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/usageCardViewPaddingBotton"> + android:layout_height="wrap_content" + android:layout_marginRight="@dimen/usage_card_view_padding_bottom" + android:layout_marginLeft="@dimen/usage_card_view_padding_bottom" + android:paddingBottom="@dimen/usage_card_view_padding_bottom"> <TextView - android:id="@+id/usage_menu_title" + android:id="@+id/text_menu_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:paddingTop="@dimen/cardTitleTopPadding" + android:paddingTop="@dimen/card_title_top_padding" android:text="@string/usage_menus" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/colorPrimaryDark" - android:textSize="@dimen/usageCardTitleTextSize" /> + android:textSize="@dimen/usage_card_title_text_size" /> <TextView - android:id="@+id/menu_content" + android:id="@+id/text_menu_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/usageCardContentMarginTop" + android:layout_marginTop="@dimen/usage_card_content_margin_top" android:fontFamily="sans-serif-condensed" - android:paddingBottom="@dimen/usageContentPaddingBottom" - android:paddingLeft="@dimen/usageContentPaddingLeft" - android:paddingRight="@dimen/usageContentPaddingRight" + android:paddingBottom="@dimen/usage_content_padding_bottom" + android:paddingLeft="@dimen/usage_content_padding_left" + android:paddingRight="@dimen/usage_content_padding_right" android:text="@string/usage_menu_Text" android:textColor="@color/colorBlack" - android:textSize="@dimen/usageContentTextSize" /> + android:textSize="@dimen/usage_content_text_size" /> </android.support.v7.widget.CardView> <Space android:layout_width="match_parent" - android:layout_height="@dimen/usageCardSpaceHeight" /> + android:layout_height="@dimen/usage_card_space_height" /> <android.support.v7.widget.CardView android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/usageCardViewPaddingBotton"> + android:layout_height="wrap_content" + android:paddingBottom="@dimen/usage_card_view_padding_bottom" + android:layout_marginRight="@dimen/usage_card_view_padding_bottom" + android:layout_marginLeft="@dimen/usage_card_view_padding_bottom"> <TextView - android:id="@+id/workflow_title" + android:id="@+id/text_workflow_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:paddingTop="@dimen/cardTitleTopPadding" + android:paddingTop="@dimen/card_title_top_padding" android:text="@string/usage_detail" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/colorPrimaryDark" - android:textSize="@dimen/usageCardTitleTextSize" /> + android:textSize="@dimen/usage_card_title_text_size" /> <TextView - android:id="@+id/workflow_content" + android:id="@+id/text_workflow_description" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/usageCardContentMarginTop" + android:layout_marginTop="@dimen/usage_card_content_margin_top" android:fontFamily="sans-serif-condensed" - android:paddingBottom="@dimen/usageContentPaddingLeft" - android:paddingLeft="@dimen/usageContentPaddingRight" - android:paddingRight="@dimen/usageContentPaddingRight" + android:paddingBottom="@dimen/usage_content_padding_left" + android:paddingLeft="@dimen/usage_content_padding_right" + android:paddingRight="@dimen/usage_content_padding_right" android:text="@string/usage_detail_text" android:textColor="@color/colorBlack" - android:textSize="@dimen/usageContentTextSize" /> + android:textSize="@dimen/usage_content_text_size" /> </android.support.v7.widget.CardView> + + <Space + android:layout_width="match_parent" + android:layout_height="@dimen/usage_card_space_height" /> + </LinearLayout> + </android.support.v4.widget.NestedScrollView> </LinearLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/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 1c94c49..76335c0 100644 --- a/app/src/main/res/layout/fragment_detail_workflow.xml +++ b/app/src/main/res/layout/fragment_detail_workflow.xml @@ -49,7 +49,7 @@ <ImageView android:id="@+id/ivWorkflowImage" android:layout_width="match_parent" - android:layout_height="@dimen/ivWorkflowImage_height" + android:layout_height="@dimen/iv_workflow_image_height" android:scaleType="fitCenter" android:src="@mipmap/ic_launcher"/> @@ -60,41 +60,41 @@ <android.support.design.widget.FloatingActionButton android:id="@+id/ivFav" - android:layout_width="@dimen/ivFav_width" - android:layout_height="@dimen/ivFav_height" + android:layout_width="@dimen/iv_fav_width" + android:layout_height="@dimen/iv_fav_height" android:layout_gravity="right" - android:layout_marginRight="@dimen/ivFav_marginRight" - android:layout_marginTop="@dimen/ivFav_marginTop" + android:layout_marginRight="@dimen/iv_fav_margin_right" + android:layout_marginTop="@dimen/iv_fav_margin_top" android:backgroundTint="@color/colorPrimaryDark" - app:borderWidth="@dimen/ivFav_borderWidth" + app:borderWidth="@dimen/iv_fav_border_width" android:src="@drawable/ic_star_border_black_24dp"/> <TextView android:id="@+id/tvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/tvTitle_padding" + android:padding="@dimen/tv_title_padding" android:textColor="@android:color/black" - android:textSize="@dimen/tvTitle_textSize"/> + android:textSize="@dimen/tv_title_text_size"/> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/LinearLayout_margin_top" + android:layout_marginTop="@dimen/linear_layout_margin_top" android:orientation="horizontal"> <ImageView android:id="@+id/ivUploader" - android:layout_width="@dimen/ivUploader_width" - android:layout_height="@dimen/ivUploader_height" - android:paddingLeft="@dimen/ivUploader_paddingLeft" + android:layout_width="@dimen/iv_uploader_width" + android:layout_height="@dimen/iv_uploader_height" + android:paddingLeft="@dimen/iv_uploader_padding_left" android:src="@mipmap/ic_launcher"/> <RelativeLayout - android:layout_width="@dimen/relLay2_width" - android:layout_height="@dimen/relLay2_height" - android:layout_marginLeft="@dimen/relLay2_marginLeft" - android:layout_marginStart="@dimen/relLay2_marginStart" + android:layout_width="@dimen/rel_lay2_width" + android:layout_height="@dimen/rel_lay2_height" + android:layout_marginLeft="@dimen/rel_lay2_margin_left" + android:layout_marginStart="@dimen/rel_lay2_margin_start" android:layout_weight="1"> <TextView @@ -102,7 +102,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/black" - android:textSize="@dimen/tvUploaderName_textSize"/> + android:textSize="@dimen/tv_uploader_name_text_size"/> <TextView android:id="@+id/tvDate" @@ -117,10 +117,10 @@ android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:paddingEnd="@dimen/tvType_paddingEnd" - android:paddingLeft="@dimen/tvType_paddingLeft" - android:paddingRight="@dimen/tvType_paddingRight" - android:paddingStart="@dimen/tvType_paddingStart"/> + android:paddingEnd="@dimen/tv_type_padding_end" + android:paddingLeft="@dimen/tv_type_padding_left" + android:paddingRight="@dimen/tv_type_padding_right" + android:paddingStart="@dimen/tv_type_padding_start"/> </RelativeLayout> </LinearLayout> @@ -136,7 +136,7 @@ android:id="@+id/tvDescription" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="@dimen/tvDescription_padding" + android:padding="@dimen/tv_description_padding" /> </LinearLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/app/src/main/res/layout/fragment_login.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 6f9956c..bb3b9b4 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -46,7 +46,7 @@ android:layout_below="@+id/logo" android:typeface="serif" android:layout_centerHorizontal="true" - android:layout_marginTop="@dimen/appName_text_margin" + android:layout_marginTop="@dimen/app_name_text_margin" android:text="@string/app_name" android:textSize="@dimen/text_size" /> @@ -128,8 +128,8 @@ android:layout_height="@dimen/login_height" android:textColor="@color/white" android:background="@drawable/login_button" - android:layout_marginBottom="@dimen/loginButton_marginBottom" - android:layout_marginTop="@dimen/loginButton_marginTop" + android:layout_marginBottom="@dimen/login_button_margin_bottom" + android:layout_marginTop="@dimen/login_button_margin_top" android:contentDescription="@string/login_button_description" android:text="@string/bLogin" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/app/src/main/res/layout/item_announcement.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/item_announcement.xml b/app/src/main/res/layout/item_announcement.xml index a5dd5d6..7e7b0cd 100644 --- a/app/src/main/res/layout/item_announcement.xml +++ b/app/src/main/res/layout/item_announcement.xml @@ -21,10 +21,10 @@ android:id="@+id/cv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/announcementCardMarginVertical" - android:layout_marginLeft="@dimen/announcementCardMarginHorizontal" - android:layout_marginRight="@dimen/announcementCardMarginHorizontal" - android:layout_marginTop="@dimen/announcementCardMarginVertical" + android:layout_marginBottom="@dimen/announcement_card_margin_vertical" + android:layout_marginLeft="@dimen/announcement_card_margin_horizontal" + android:layout_marginRight="@dimen/announcement_card_margin_horizontal" + android:layout_marginTop="@dimen/announcement_card_margin_vertical" app:cardCornerRadius="2dp" app:cardElevation="2pt"> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/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 b9512c5..b498a8f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -17,50 +17,50 @@ limitations under the License. <dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen> <dimen name="app_bar_top_padding">0dp</dimen> - <dimen name="cardMarginHorizontal">10dp</dimen> - <dimen name="cardMarginVertical">8dp</dimen> + <dimen name="card_margin_horizontal">10dp</dimen> + <dimen name="card_margin_vertical">8dp</dimen> <!--Announcement Card margin--> - <dimen name="announcementCardMarginHorizontal">5dp</dimen> - <dimen name="announcementCardMarginVertical">4dp</dimen> + <dimen name="announcement_card_margin_horizontal">5dp</dimen> + <dimen name="announcement_card_margin_vertical">4dp</dimen> <!--Usage Activity Layout Dimens--> - <dimen name="usageCardTitleTextSize">25sp</dimen> - <dimen name="cardTitleTopPadding">3sp</dimen> - <dimen name="usageCardContentMarginTop">45sp</dimen> - <dimen name="usageContentPaddingBottom">10sp</dimen> - <dimen name="usageContentPaddingLeft">10sp</dimen> - <dimen name="usageContentPaddingRight">10sp</dimen> - <dimen name="usageContentTextSize">13sp</dimen> - <dimen name="usageLinearLayoutPadding">10sp</dimen> - <dimen name="usageCardViewPaddingBotton">10sp</dimen> - <dimen name="usageCardSpaceHeight">10sp</dimen> + <dimen name="usage_card_title_text_size">25sp</dimen> + <dimen name="card_title_top_padding">3sp</dimen> + <dimen name="usage_card_content_margin_top">45sp</dimen> + <dimen name="usage_content_padding_bottom">10sp</dimen> + <dimen name="usage_content_padding_left">10sp</dimen> + <dimen name="usage_content_padding_right">10sp</dimen> + <dimen name="usage_content_text_size">13sp</dimen> + <dimen name="usage_linear_layout_padding">10sp</dimen> + <dimen name="usage_card_view_padding_bottom">10sp</dimen> + <dimen name="usage_card_space_height">10sp</dimen> <!--Fragment Detail Workflow Dimens--> - <dimen name="ivWorkflowImage_height">300dp</dimen> + <dimen name="iv_workflow_image_height">300dp</dimen> <dimen name="view_height">1sp</dimen> - <dimen name="ivFav_width">55dp</dimen> - <dimen name="ivFav_height">55dp</dimen> - <dimen name="ivFav_marginRight">16dp</dimen> - <dimen name="ivFav_marginTop">-27dp</dimen> - <dimen name="ivFav_borderWidth">0sp</dimen> - <dimen name="tvTitle_padding">10sp</dimen> - <dimen name="tvTitle_textSize">20sp</dimen> - <dimen name="LinearLayout_margin_top">5sp</dimen> - <dimen name="ivUploader_width">50sp</dimen> - <dimen name="ivUploader_height">50sp</dimen> - <dimen name="ivUploader_paddingLeft">10sp</dimen> - <dimen name="relLay2_width">0sp</dimen> - <dimen name="relLay2_height">50sp</dimen> - <dimen name="relLay2_marginLeft">10sp</dimen> - <dimen name="relLay2_marginStart">10sp</dimen> - <dimen name="tvUploaderName_textSize">18sp</dimen> - <dimen name="tvType_paddingEnd">10sp</dimen> - <dimen name="tvType_paddingLeft">0sp</dimen> - <dimen name="tvType_paddingRight">10sp</dimen> - <dimen name="tvType_paddingStart">0sp</dimen> + <dimen name="iv_fav_width">55dp</dimen> + <dimen name="iv_fav_height">55dp</dimen> + <dimen name="iv_fav_margin_right">16dp</dimen> + <dimen name="iv_fav_margin_top">-27dp</dimen> + <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="linear_layout_margin_top">5sp</dimen> + <dimen name="iv_uploader_width">50sp</dimen> + <dimen name="iv_uploader_height">50sp</dimen> + <dimen name="iv_uploader_padding_left">10sp</dimen> + <dimen name="rel_lay2_width">0sp</dimen> + <dimen name="rel_lay2_height">50sp</dimen> + <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_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="tvDescription_padding">5sp</dimen> + <dimen name="tv_description_padding">5sp</dimen> <dimen name="navigation_drawer_width">240dp</dimen> <dimen name="item_offset">3dp</dimen> @@ -74,9 +74,9 @@ limitations under the License. <dimen name="my_experiment_logo_height">50dp</dimen> <dimen name="login_text_size">20sp</dimen> <dimen name="input_layout_email_margin">20dp</dimen> - <dimen name="loginButton_marginBottom">8dp</dimen> - <dimen name="loginButton_marginTop">10dp</dimen> - <dimen name="appName_text_margin">12dp</dimen> + <dimen name="login_button_margin_bottom">8dp</dimen> + <dimen name="login_button_margin_top">10dp</dimen> + <dimen name="app_name_text_margin">12dp</dimen> <dimen name="title_text_size">40sp</dimen> <dimen name="logo_margin_top">40dp</dimen> <dimen name="disc_text_size">5dp</dimen> @@ -103,6 +103,6 @@ limitations under the License. <dimen name="slide_desc">16dp</dimen> <dimen name="desc_padding">40dp</dimen> <dimen name="margin_top">20dp</dimen> - <dimen name="tutorialView_height">1dp</dimen> + <dimen name="tutorial_view_height">1dp</dimen> </resources> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/03f68fd8/app/src/main/res/values/strings.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9739e25..31c6f08 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -143,14 +143,14 @@ limitations under the License. allows one to quickly return to the workflow streams page from any screen. The \'Open Workflow\' item allows users to pick a valid workflow from external storage and run it against a Taverna Server through a Taverna Player. Settings allow user to configure player - accounts and portal urls. Logout allows users to log-out of the app + accounts and portal urls. Logout allows users to log-out of the app. </string> <string name="usage_detail">Usage | Workfow Detail</string> <string name="usage_detail_text">The details screen allows users to run particular worklows and provides detailed information about the workflows. Workflows can also be downloaded from here. Workflows can also be marked from this screen which would save much more data for offline use than on the dashboard screen. This screen also provides a set of runs for the - workflow from other users + workflow from other users. </string> <string name="runid_text">Workflow Run ID:</string>
