You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2015/07/13 14:54:24 UTC
[06/34] incubator-taverna-mobile git commit: update brand reference
update brand reference
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/40c00964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/40c00964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/40c00964
Branch: refs/heads/master
Commit: 40c00964a8585d48e550fd20cfbcb1c1a2fd5c56
Parents: 0a32ce9
Author: larrytech7 <la...@gmail.com>
Authored: Thu Jul 2 02:07:28 2015 +0100
Committer: larrytech7 <la...@gmail.com>
Committed: Thu Jul 2 02:07:28 2015 +0100
----------------------------------------------------------------------
app/src/main/res/layout/fragment_login.xml | 8 ++------
app/src/main/res/layout/fragment_navigation_drawer.xml | 2 +-
app/src/main/res/values/strings.xml | 6 +++---
app/src/main/res/xml/pref_general.xml | 13 ++++++++-----
4 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/40c00964/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 ad52491..38e1e5f 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -139,13 +139,9 @@ limitations under the License.
android:text="@string/brand"
android:id="@+id/textView7"
android:paddingTop="20dp"
- android:textSize="20dp" />
+ android:textSize="20dp"
+ android:gravity="center|center_horizontal" />
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/imageView3"
- android:src="@mipmap/ic_poweredby" />
</LinearLayout>
</LinearLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/40c00964/app/src/main/res/layout/fragment_navigation_drawer.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
index 2a01c28..90ddd3a 100644
--- a/app/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -58,7 +58,7 @@ limitations under the License.
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/completebrand"
android:id="@+id/textView8"
- android:hint="@string/completebrand"
+ android:hint="@string/brand"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp" />
</LinearLayout>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/40c00964/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 3bf6202..cd8c074 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,7 +17,7 @@ limitations under the License.
<string name="hello_world"> Empty </string>
<string name="action_settings">Settings</string>
<string name="title_activity_flash_screen">Taverna Mobile</string>
- <string name="brand">Powered By</string>
+ <string name="brand">Powered By MyExperiment</string>
<string-array name="menus">
<item >Usage</item>
<item>Quit</item>
@@ -89,10 +89,10 @@ limitations under the License.
View, run and download workflows at a convenience on your android mobile<br/>
device. \n\n <br/><b>Developed at Apache Taverna and Powered by MyExperiment</b><br/></string>
<string name="playerconfig">Configure Player Account</string>
- <string name="playerconfig_summary">Set username/password used to login to Taverna player portal</string>
+ <string name="playerconfig_summary">Username used to login to Taverna player portal</string>
<string name="playeruser">Username/email</string>
<string name="playerpass">Password</string>
<string name="myexperimenttitle">Configure MyExperiment Account</string>
- <string name="myexperimentsummary">Set username/password used to login to MyExperiment</string>
+ <string name="myexperimentsummary">Username used to login to MyExperiment</string>
</resources>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/40c00964/app/src/main/res/xml/pref_general.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index aebc297..ab27a47 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -30,12 +30,12 @@
android:maxLines="1" />
<PreferenceCategory
android:icon="@drawable/gear_icon"
- android:summary="@string/playerconfig_summary"
android:title="@string/playerconfig">
<EditTextPreference
android:key="pref_user"
android:title="@string/playeruser"
- android:summary="@string/pref_server_des"
+ android:icon="@mipmap/icuserprofiles"
+ android:summary="@string/playerconfig_summary"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textEmailAddress|textPersonName"
@@ -44,7 +44,8 @@
<EditTextPreference
android:key="pref_password"
android:title="@string/playerpass"
- android:summary="@string/pref_server_des"
+ android:icon="@android:drawable/ic_secure"
+ android:summary="Taverna Player Password"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textPassword"
@@ -58,7 +59,8 @@
<EditTextPreference
android:key="myexperimentuser"
android:title="@string/playeruser"
- android:summary="@string/pref_server_des"
+ android:icon="@mipmap/icuserprofiles"
+ android:summary="@string/myexperimentsummary"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textEmailAddress|textPersonName"
@@ -67,7 +69,8 @@
<EditTextPreference
android:key="myexperimentpass"
android:title="@string/playerpass"
- android:summary="@string/pref_server_des"
+ android:icon="@android:drawable/ic_secure"
+ android:summary="Myexperiment password"
android:defaultValue="default"
android:selectAllOnFocus="true"
android:inputType="textPassword"