You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by sa...@apache.org on 2016/10/31 20:11:17 UTC
[3/4] incubator-taverna-mobile git commit: remove hardcode sting and
order the navigation menu items
remove hardcode sting and order the navigation menu items
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/d44a9960
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/d44a9960
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/d44a9960
Branch: refs/heads/master
Commit: d44a9960db5e752926eb6ddf84c54160b8df244c
Parents: d4072b5
Author: Sagar <ku...@gmail.com>
Authored: Mon Oct 31 23:47:25 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Mon Oct 31 23:47:25 2016 +0530
----------------------------------------------------------------------
app/src/main/res/menu/drawer_view.xml | 30 +++++++++++++++++-------------
app/src/main/res/values/strings.xml | 16 ++++++++++++----
2 files changed, 29 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d44a9960/app/src/main/res/menu/drawer_view.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/menu/drawer_view.xml b/app/src/main/res/menu/drawer_view.xml
index bfe9105..cc87881 100644
--- a/app/src/main/res/menu/drawer_view.xml
+++ b/app/src/main/res/menu/drawer_view.xml
@@ -21,39 +21,43 @@
<item
android:id="@+id/nav_workflows"
android:icon="@drawable/ic_dashboard_home_web"
- android:title="All Workflows"/>
+ android:title="@string/title_nav_all_workflows"/>
<item
android:id="@+id/nav_my_workflows"
android:icon="@drawable/ic_dashboard_home_web"
- android:title="@string/my_workflows"/>
+ android:title="@string/title_nav_my_workflows"/>
<item
android:id="@+id/nav_favourite_workflow"
android:icon="@drawable/ic_star_black_24dp"
- android:title="Favourite Workflows"/>
- <item
- android:id="@+id/nav_usage"
- android:icon="@drawable/ic_usage_web"
- android:title="Usage"/>
+ android:title="@string/title_nav_favourite_workflows"/>
+
<item
android:id="@+id/nav_announcement"
android:icon="@drawable/ic_announcement_black_24dp"
- android:title="Announcement"/>
+ android:title="@string/title_nav_all_workflows"/>
+ </group>
+ <item
+ android:id="@+id/nav_usage"
+ android:icon="@drawable/ic_usage_web"
+ android:title="@string/title_nav_usage"/>
<item
android:id="@+id/nav_about"
android:icon="@drawable/ic_about_web"
- android:title="About"/>
+ android:title="@string/title_nav_about"/>
+ <group android:checkableBehavior="single">
<item
android:id="@+id/os_licences"
android:icon="@drawable/ic_about_web"
- android:title="@string/os_licences"/>
+ android:title="@string/title_nav_os_licences"/>
+ </group>
<item
android:id="@+id/nav_settings"
android:icon="@drawable/ic_setting_workflows_web"
- android:title="Settings"/>
+ android:title="@string/title_nav_settings"/>
<item
android:id="@+id/nav_logout"
android:icon="@drawable/ic_logout_web"
- android:title="Logout"/>
- </group>
+ android:title="@string/tiitle_nav_logout"/>
+
</menu>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/d44a9960/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 be96d13..df67989 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@ limitations under the License.
<resources>
<string name="os_licence_version_text">Version:</string>
<string name="os_licence_licence_text">Licence:</string>
- <string name="os_licences">Licence info</string>
+ <string name="title_nav_os_licences">Licence info</string>
<string name="app_name">Taverna Mobile</string>
<string name="hello_world">Empty</string>
<string name="action_settings">Settings</string>
@@ -40,12 +40,11 @@ limitations under the License.
<string name="failed_to_fetch_announcement">Failed to fetch announcement</string>
<string name="ok">OK</string>
- <string name="title_favorite">Favorites</string>
+
<string name="title_explore">Workflows</string>
<string name="title_usage">Usage</string>
<string name="title_about">About</string>
<string name="title_exit">Logout</string>
- <string name="title_openworkflow">Open Workflow</string>
<string name="menu_search">Search</string>
<string name="action_example">Example action</string>
@@ -163,7 +162,7 @@ limitations under the License.
<string name="login_button_description">Login Button</string>
<string name="err_login_email">Enter valid email</string>
<string name="err_login_password">Enter valid password</string>
- <string name="my_workflows">My Workflows</string>
+ <string name="title_nav_my_workflows">My Workflows</string>
<string name="no_my_workflow">You have not created any workflow yet !!!!!</string>
<string name="error_vaild_credential">Please enter valid credential</string>
<string name="t2_workflow_type">Taverna 2</string>
@@ -202,5 +201,14 @@ limitations under the License.
<string name="pref_server_title">Configure Taverna Server </string>
<string name="pref_server_des">Configure a different Taverna Server for the app</string>
+ <!--Navigation drawer title info-->
+ <string name="title_nav_all_workflows">All Workflows</string>
+ <string name="title_nav_favourite_workflows">Favourite Workflows</string>
+ <string name="title_nav_announcement">Announcement</string>
+ <string name="title_nav_settings">Settings</string>
+ <string name="tiitle_nav_logout">Logout</string>
+ <string name="title_nav_usage">Usage</string>
+ <string name="title_nav_about">About</string>
+
<!-- Strings related to Settings -->
</resources>