new: split about page into view pager page

7 files changed, 335 insertions, 311 deletions

diff --git a/main/res/layout/about_activity.xml b/main/res/layout/about_activity.xml
deleted file mode 100644
index 4afb8a6..0000000
--- a/main/res/layout/about_activity.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?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:background="?background_color"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar" />
-
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        android:padding="4dip" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_marginTop="10dip"
-                android:orientation="vertical" >
-
-                <ImageView
-                    android:layout_width="200dip"
-                    android:layout_height="200dip"
-                    android:layout_gravity="center"
-                    android:layout_margin="10dip"
-                    android:gravity="center"
-                    android:scaleType="fitXY"
-                    android:src="@drawable/cgeo_logo" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginRight="10dip"
-                    android:layout_marginTop="5dip"
-                    android:text="@string/quote"
-                    android:textColor="?text_color"
-                    android:textSize="14sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="right"
-                    android:layout_marginBottom="5dip"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginRight="10dip"
-                    android:text="@string/powered_by"
-                    android:textColor="?text_color"
-                    android:textSize="14sp" />
-            </LinearLayout>
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/about_version" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/about_version_string"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:textColor="?text_color"
-                android:textIsSelectable="true"
-                android:textSize="14sp"
-                android:textStyle="bold" />
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/about_donate" />
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dip"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal" >
-
-                <Button
-                    style="@style/button_full"
-                    android:id="@+id/donate"
-                    android:layout_width="280dip"
-                    android:lines="2"
-                    android:singleLine="false"
-                    android:text="@string/about_donation_more" />
-            </LinearLayout>
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/about_detail" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/faq"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/faq"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/support"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/support"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/website"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/website"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/facebook"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/facebook"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/twitter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/twitter"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/nutshellmanual"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/nutshellmanual"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/market"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/market"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/about_changelog" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/changelog_master"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_margin="7dip"
-                android:linksClickable="true"
-                android:paddingLeft="3dip"
-                android:text="@string/changelog_master"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/changelog_release"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_margin="7dip"
-                android:linksClickable="true"
-                android:paddingLeft="3dip"
-                android:text="@string/changelog_release"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="12sp" />
-
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/about_contributors" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/contributors"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_margin="7dip"
-                android:linksClickable="true"
-                android:paddingLeft="3dip"
-                android:text="@string/contributors"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-            
-            <RelativeLayout style="@style/separator_horizontal_layout" >
-
-                <View style="@style/separator_horizontal" />
-
-                <TextView
-                    style="@style/separator_horizontal_headline"
-                    android:text="@string/about_license" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/license"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginBottom="5dip"
-                android:layout_marginLeft="10dip"
-                android:layout_marginRight="10dip"
-                android:clickable="true"
-                android:focusable="true"
-                android:linksClickable="false"
-                android:text="@string/about_apache_license"
-                android:textColor="?text_color"
-                android:textColorLink="?text_color_link"
-                android:textSize="14sp" />
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
diff --git a/main/res/layout/about_changes_page.xml b/main/res/layout/about_changes_page.xml
new file mode 100644
index 0000000..544d338
--- /dev/null
+++ b/main/res/layout/about_changes_page.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="4dip" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/changelog_master"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_margin="7dip"
+            android:linksClickable="true"
+            android:paddingLeft="3dip"
+            android:text="@string/changelog_master"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/changelog_release"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_margin="7dip"
+            android:linksClickable="true"
+            android:paddingLeft="3dip"
+            android:text="@string/changelog_release"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="12sp" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/about_contributors_page.xml b/main/res/layout/about_contributors_page.xml
new file mode 100644
index 0000000..9a0955e
--- /dev/null
+++ b/main/res/layout/about_contributors_page.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="4dip" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/contributors"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_margin="7dip"
+            android:linksClickable="true"
+            android:paddingLeft="3dip"
+            android:text="@string/contributors"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/about_help_page.xml b/main/res/layout/about_help_page.xml
new file mode 100644
index 0000000..8444094
--- /dev/null
+++ b/main/res/layout/about_help_page.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="4dip" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/faq"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/faq"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/nutshellmanual"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/nutshellmanual"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/website"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/website"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/facebook"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/facebook"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/twitter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/twitter"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/support"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/support"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/market"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/market"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/about_license_page.xml b/main/res/layout/about_license_page.xml
new file mode 100644
index 0000000..b33f0f9
--- /dev/null
+++ b/main/res/layout/about_license_page.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="4dip" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/license"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:linksClickable="false"
+            android:text="@string/about_apache_license"
+            android:textColor="?text_color"
+            android:textColorLink="?text_color_link"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/license_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_margin="7dip"
+            android:paddingLeft="3dip"
+            android:text="@null"
+            android:textColor="?text_color"
+            android:textSize="10sp"
+            tools:ignore="SmallSp" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/about_version_page.xml b/main/res/layout/about_version_page.xml
new file mode 100644
index 0000000..80630e4
--- /dev/null
+++ b/main/res/layout/about_version_page.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="4dip" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginTop="10dip"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:layout_width="200dip"
+                android:layout_height="200dip"
+                android:layout_gravity="center"
+                android:layout_margin="10dip"
+                android:gravity="center"
+                android:scaleType="fitXY"
+                android:src="@drawable/cgeo_logo" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginTop="5dip"
+                android:text="@string/quote"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:text="@string/powered_by"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <RelativeLayout style="@style/separator_horizontal_layout" >
+
+            <View style="@style/separator_horizontal" />
+
+            <TextView
+                style="@style/separator_horizontal_headline"
+                android:text="@string/about_version" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/about_version_string"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:textColor="?text_color"
+            android:textIsSelectable="true"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <RelativeLayout style="@style/separator_horizontal_layout" >
+
+            <View style="@style/separator_horizontal" />
+
+            <TextView
+                style="@style/separator_horizontal_headline"
+                android:text="@string/about_donate" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dip"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/donate"
+                style="@style/button_full"
+                android:layout_width="280dip"
+                android:lines="2"
+                android:singleLine="false"
+                android:text="@string/about_donation_more" />
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/viewpager_activity.xml
index 14120e0..14120e0 100644
--- a/main/res/layout/trackable_activity.xml
+++ b/main/res/layout/viewpager_activity.xml