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 2016/10/13 13:28:59 UTC
[08/10] incubator-taverna-mobile git commit: Better layout for
licence view
Better layout for licence view
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/1f600d1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/1f600d1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/1f600d1a
Branch: refs/heads/master
Commit: 1f600d1a95e832cdb9256ee958e48a32e7f52ab3
Parents: 94ba319
Author: Ian Dunlop <ia...@manchester.ac.uk>
Authored: Wed Oct 12 17:29:45 2016 +0100
Committer: Ian Dunlop <ia...@manchester.ac.uk>
Committed: Wed Oct 12 17:29:45 2016 +0100
----------------------------------------------------------------------
app/src/main/res/layout/fragment_licence.xml | 98 ++++++++++++++++-------
app/src/main/res/values/strings.xml | 2 +
2 files changed, 71 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1f600d1a/app/src/main/res/layout/fragment_licence.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_licence.xml b/app/src/main/res/layout/fragment_licence.xml
index a155813..4d08d88 100644
--- a/app/src/main/res/layout/fragment_licence.xml
+++ b/app/src/main/res/layout/fragment_licence.xml
@@ -1,39 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:card_view="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/card_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_marginBottom="@dimen/announcementCardMarginVertical"
+ android:layout_marginRight="@dimen/announcementCardMarginHorizontal"
+ android:layout_marginTop="@dimen/announcementCardMarginVertical"
+ android:paddingBottom="5dp"
+ card_view:cardCornerRadius="2dp"
+ card_view:cardElevation="2pt">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<TextView
android:id="@+id/licence_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/text_margin"
android:layout_gravity="center_horizontal"
- android:textAppearance="?attr/textAppearanceListItem" />
-<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_weight="1">
- <TextView
- android:id="@+id/licence_version"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/text_margin"
- android:layout_weight="50"
- android:layout_gravity="left"
- android:gravity="left"
- android:textAppearance="?attr/textAppearanceListItem" />
+ android:textAppearance="?attr/textAppearanceListItem"
+ android:textStyle="bold"
+ android:paddingBottom="5dp"/>
- <TextView
- android:id="@+id/licence_licence"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/text_margin"
- android:layout_weight="50"
- android:layout_gravity="right"
- android:gravity="right"
- android:textAppearance="?attr/textAppearanceListItem" />
-</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="horizontal"
+ android:paddingLeft="10dp">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/licence_version_text_holder"
+ android:text="@string/os_licence_version_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?attr/textAppearanceListItem"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+ <TextView
+ android:id="@+id/licence_version"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?attr/textAppearanceListItem" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/licence_licence_text_holder"
+ android:text="@string/os_licence_licence_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?attr/textAppearanceListItem"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/licence_licence"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?attr/textAppearanceListItem" />
+ </LinearLayout>
+
+ </LinearLayout>
+ </LinearLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/1f600d1a/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 d58fe29..0769dde 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
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="app_name">Taverna Mobile</string>
<string name="hello_world">Empty</string>