From 0d7d167dcfd456c1f8695448f885989661e712c8 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 19 Jan 2015 00:42:03 +0000
Subject: [PATCH] Create "About" tab and bump version.
---
app/src/main/res/layout/main.xml | 381 +++++++++++++++++++++++++++--------------------------
1 files changed, 194 insertions(+), 187 deletions(-)
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index d31e456..c9d38c6 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -1,195 +1,202 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_margin="10dp"
- android:orientation="vertical">
-
- <SeekBar
- android:id="@+id/BidSlider"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:indeterminate="false"
- android:max="7" />
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:weightSum="1">
+ android:orientation="vertical">
+
+ <SeekBar
+ android:id="@+id/BidSlider"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:indeterminate="false"
+ android:max="7" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:weightSum="1">
+
+ <TextView
+ android:id="@+id/BidText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_weight="0.25"
+ android:text="0"
+ android:textAlignment="center"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <ToggleButton
+ android:id="@+id/MinorSuitsToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.25"
+ android:checked="true"
+ android:text="@string/minor_suits"
+ android:textOff="@string/minor_suits"
+ android:textOn="@string/minor_suits" />
+
+ <ToggleButton
+ android:id="@+id/MajorSuitsToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.25"
+ android:checked="false"
+ android:text="@string/major_suits"
+ android:textOff="@string/major_suits"
+ android:textOn="@string/major_suits" />
+
+ <ToggleButton
+ android:id="@+id/NoTrumpToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.25"
+ android:checked="false"
+ android:text="@string/no_trump"
+ android:textOff="@string/no_trump"
+ android:textOn="@string/no_trump" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ToggleButton
+ android:id="@+id/ContractToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:checked="true"
+ android:text="@string/bid_normal"
+ android:textOff="@string/bid_normal"
+ android:textOn="@string/bid_normal" />
+
+ <ToggleButton
+ android:id="@+id/DoubleToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:checked="false"
+ android:text="@string/bid_double"
+ android:textOff="@string/bid_double"
+ android:textOn="@string/bid_double" />
+
+ <ToggleButton
+ android:id="@+id/RedoubleToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:checked="false"
+ android:text="@string/bid_redouble"
+ android:textOff="@string/bid_redouble"
+ android:textOn="@string/bid_redouble" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ToggleButton
+ android:id="@+id/NNToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:checked="true"
+ android:text="@string/non_non"
+ android:textOff="@string/non_non"
+ android:textOn="@string/non_non" />
+
+ <ToggleButton
+ android:id="@+id/NVToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:checked="false"
+ android:text="@string/non_vul"
+ android:textOff="@string/non_vul"
+ android:textOn="@string/non_vul" />
+
+ <ToggleButton
+ android:id="@+id/VNToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:checked="false"
+ android:text="@string/vul_non"
+ android:textOff="@string/vul_non"
+ android:textOn="@string/vul_non" />
+
+ <ToggleButton
+ android:id="@+id/VVToggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:checked="false"
+ android:text="@string/vul_vul"
+ android:textOff="@string/vul_vul"
+ android:textOn="@string/vul_vul" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/PCText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="10dp"
+ android:layout_marginRight="10dp"
+ android:labelFor="@+id/PCInput"
+ android:text="@string/pc"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <EditText
+ android:id="@+id/PCInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ems="4"
+ android:inputType="number" />
+
+ <TextView
+ android:id="@+id/TricksText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="10dp"
+ android:layout_marginLeft="20dp"
+ android:layout_marginRight="10dp"
+ android:layout_marginStart="20dp"
+ android:labelFor="@+id/TricksInput"
+ android:text="@string/tricks"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <EditText
+ android:id="@+id/TricksInput"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ems="4"
+ android:inputType="number" />
+ </LinearLayout>
<TextView
- android:id="@+id/BidText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="0.25"
- android:text="0"
- android:textAlignment="gravity"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <ToggleButton
- android:id="@+id/MinorSuitsToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0.25"
- android:checked="true"
- android:text="@string/minor_suits"
- android:textOff="@string/minor_suits"
- android:textOn="@string/minor_suits" />
-
- <ToggleButton
- android:id="@+id/MajorSuitsToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0.25"
- android:checked="false"
- android:text="@string/major_suits"
- android:textOff="@string/major_suits"
- android:textOn="@string/major_suits" />
-
- <ToggleButton
- android:id="@+id/NoTrumpToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="0.25"
- android:checked="false"
- android:text="@string/no_trump"
- android:textOff="@string/no_trump"
- android:textOn="@string/no_trump" />
+ android:id="@+id/ResultsText"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="10dp"
+ android:text="@string/enter_data"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ToggleButton
- android:id="@+id/ContractToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:checked="true"
- android:text="@string/bid_normal"
- android:textOff="@string/bid_normal"
- android:textOn="@string/bid_normal" />
-
- <ToggleButton
- android:id="@+id/DoubleToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:checked="false"
- android:text="@string/bid_double"
- android:textOff="@string/bid_double"
- android:textOn="@string/bid_double" />
-
- <ToggleButton
- android:id="@+id/RedoubleToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:checked="false"
- android:text="@string/bid_redouble"
- android:textOff="@string/bid_redouble"
- android:textOn="@string/bid_redouble" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ToggleButton
- android:id="@+id/NNToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:checked="true"
- android:text="@string/before_before"
- android:textOff="@string/before_before"
- android:textOn="@string/before_before" />
-
- <ToggleButton
- android:id="@+id/NVToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:checked="false"
- android:text="@string/before_after"
- android:textOff="@string/before_after"
- android:textOn="@string/before_after" />
-
- <ToggleButton
- android:id="@+id/VNToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:checked="false"
- android:text="@string/after_before"
- android:textOff="@string/after_before"
- android:textOn="@string/after_before" />
-
- <ToggleButton
- android:id="@+id/VVToggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:checked="false"
- android:text="@string/after_after"
- android:textOff="@string/after_after"
- android:textOn="@string/after_after" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/PCText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="10dp"
- android:labelFor="@+id/PCInput"
- android:text="@string/pc"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <EditText
- android:id="@+id/PCInput"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ems="4"
- android:inputType="number" />
-
- <Space
- android:layout_width="20dp"
- android:layout_height="wrap_content" />
-
- <TextView
- android:id="@+id/TricksText"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="10dp"
- android:labelFor="@+id/TricksInput"
- android:text="@string/tricks"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <EditText
- android:id="@+id/TricksInput"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ems="4"
- android:inputType="number" />
- </LinearLayout>
-
- <TextView
- android:id="@+id/ResultsText"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="10dp"
- android:text="@string/enter_data"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-</LinearLayout>
-
+</ScrollView>
--
Gitblit v1.9.1