New: Horizontal scrollable pages for cache-details using a ViewPager.

This moves most of the code from "cgeodetail" into a new class "CacheDetailActivity". Some important parts are rewritten and the code is much more structured.

This closes #83 "Redesign detail-view".

Some minor changes will be added later (e.g. removing old files, improve log-count-display)

13 files changed, 786 insertions, 306 deletions

diff --git a/main/res/drawable-hdpi/pagerindicator_background.9.png b/main/res/drawable-hdpi/pagerindicator_background.9.png
new file mode 100644
index 0000000..2474e5c
--- /dev/null
+++ b/main/res/drawable-hdpi/pagerindicator_background.9.png
diff --git a/main/res/drawable-ldpi/pagerindicator_background.9.png b/main/res/drawable-ldpi/pagerindicator_background.9.png
new file mode 100644
index 0000000..d9f91d6
--- /dev/null
+++ b/main/res/drawable-ldpi/pagerindicator_background.9.png
diff --git a/main/res/drawable/pagerindicator_background.9.png b/main/res/drawable/pagerindicator_background.9.png
new file mode 100644
index 0000000..697675b
--- /dev/null
+++ b/main/res/drawable/pagerindicator_background.9.png
diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
new file mode 100644
index 0000000..05df377
--- /dev/null
+++ b/main/res/layout/cacheview.xml
@@ -0,0 +1,56 @@
+<?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" >

+

+    <LinearLayout style="@style/action_bar" >

+

+        <ImageView

+            style="@style/action_bar_action"

+            android:onClick="goHome" />

+

+        <View style="@style/action_bar_separator" />

+

+        <TextView style="@style/action_bar_title" />

+

+        <View style="@style/action_bar_separator" />

+

+        <ImageView

+            style="@style/action_bar_action"

+            android:onClick="startCompassNavigation"

+            android:src="@drawable/actionbar_compass" />

+

+        <View style="@style/action_bar_separator" />

+

+        <ImageView

+            style="@style/action_bar_action"

+            android:onClick="goManual"

+            android:src="@drawable/actionbar_manual" />

+    </LinearLayout>

+

+    <android.support.v4.view.ViewPager

+        android:id="@+id/viewpager"

+        android:layout_width="fill_parent"

+        android:layout_height="wrap_content"

+        android:layout_weight="1" />

+

+    <RelativeLayout style="@style/pager_indicator" >

+

+        <TextView

+            android:id="@+id/indicator_prev"

+            style="@style/pager_indicator.side"

+            android:layout_alignParentLeft="true" />

+

+        <TextView

+            android:id="@+id/indicator_current"

+            style="@style/pager_indicator.title" />

+

+        <TextView

+            android:id="@+id/indicator_next"

+            style="@style/pager_indicator.side"

+            android:layout_alignParentRight="true" />

+    </RelativeLayout>

+

+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_description.xml b/main/res/layout/cacheview_description.xml
new file mode 100644
index 0000000..12abe7e
--- /dev/null
+++ b/main/res/layout/cacheview_description.xml
@@ -0,0 +1,160 @@
+<?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" >

+

+    <LinearLayout

+        android:layout_width="fill_parent"

+        android:layout_height="fill_parent"

+        android:orientation="vertical"

+        android:padding="4dip" >

+

+        <!-- Short description -->

+

+        <TextView

+            android:id="@+id/shortdesc"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:layout_marginBottom="12dip"

+            android:linksClickable="true"

+            android:textColor="?text_color"

+            android:textColorLink="?text_color_link"

+            android:textSize="14dip"

+            android:visibility="gone" />

+

+        <!-- Long description -->

+

+        <TextView

+            android:id="@+id/longdesc"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:layout_marginBottom="12dip"

+            android:linksClickable="true"

+            android:textColor="?text_color"

+            android:textColorLink="?text_color_link"

+            android:textSize="14dip"

+            android:visibility="gone" />

+

+        <Button

+            android:id="@+id/show_description"

+            style="@style/button"

+            android:text="@string/cache_description_long"

+            android:visibility="gone" />

+

+        <RelativeLayout

+            android:id="@+id/loading"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:visibility="gone" >

+

+            <ProgressBar

+                style="@android:style/Widget.ProgressBar.Large.Inverse"

+                android:layout_width="76dip"

+                android:layout_height="76dip"

+                android:layout_centerInParent="true"

+                android:gravity="center"

+                android:indeterminate="true" />

+        </RelativeLayout>

+

+        <!-- Attributes box -->

+

+        <LinearLayout

+            android:id="@+id/attributes_box"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical"

+            android:visibility="gone" >

+

+            <RelativeLayout style="@style/separator_horizontal_layout" >

+

+                <View style="@style/separator_horizontal" />

+

+                <TextView

+                    style="@style/separator_horizontal_headline"

+                    android:text="@string/cache_attributes" />

+            </RelativeLayout>

+            <!-- innerbox is only needed to define the paddings easily -->

+

+            <LinearLayout

+                android:id="@+id/attributes_innerbox"

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content"

+                android:orientation="vertical"

+                android:paddingLeft="6dp"

+                android:paddingRight="6dp" />

+        </LinearLayout>

+

+        <!-- Hint and spoiler-images box -->

+

+        <LinearLayout

+            android:id="@+id/hint_box"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:layout_marginBottom="12dip"

+            android:orientation="vertical"

+            android:visibility="gone" >

+

+            <RelativeLayout style="@style/separator_horizontal_layout" >

+

+                <View style="@style/separator_horizontal" />

+

+                <TextView

+                    style="@style/separator_horizontal_headline"

+                    android:text="@string/cache_hint" />

+            </RelativeLayout>

+

+            <TextView

+                android:id="@+id/hint"

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content"

+                android:layout_gravity="left"

+                android:linksClickable="true"

+                android:textColor="?text_color"

+                android:textColorLink="?text_color_link"

+                android:textSize="14dip" />

+

+            <TextView

+                android:id="@+id/hint_spoilerlink"

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content"

+                android:layout_gravity="left"

+                android:layout_marginTop="6dip"

+                android:drawableLeft="?log_img_icon"

+                android:drawablePadding="3dip"

+                android:text="@string/cache_menu_spoilers"

+                android:textColor="?text_color"

+                android:textSize="14dip" />

+        </LinearLayout>

+

+        <!-- Personal note box -->

+

+        <LinearLayout

+            android:id="@+id/personalnote_box"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:layout_marginBottom="12dip"

+            android:orientation="vertical"

+            android:visibility="gone" >

+

+            <RelativeLayout style="@style/separator_horizontal_layout" >

+

+                <View style="@style/separator_horizontal" />

+

+                <TextView

+                    style="@style/separator_horizontal_headline"

+                    android:text="@string/cache_personal_note" />

+            </RelativeLayout>

+

+            <TextView

+                android:id="@+id/personalnote"

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content"

+                android:linksClickable="true"

+                android:textColor="?text_color"

+                android:textColorLink="?text_color_link"

+                android:textSize="14dip"

+                android:visibility="gone" />

+        </LinearLayout>

+    </LinearLayout>

+

+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_details.xml b/main/res/layout/cacheview_details.xml
new file mode 100644
index 0000000..45d067e
--- /dev/null
+++ b/main/res/layout/cacheview_details.xml
@@ -0,0 +1,164 @@
+<?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:scrollbars="none" >

+

+    <LinearLayout

+        android:layout_width="fill_parent"

+        android:layout_height="fill_parent"

+        android:orientation="vertical"

+        android:padding="4dip" >

+

+        <!-- Map preview -->

+

+        <ImageView

+            android:id="@+id/map_preview"

+            android:layout_width="fill_parent"

+            android:layout_height="80dip"

+            android:layout_gravity="center"

+            android:layout_marginBottom="5dip"

+            android:gravity="center"

+            android:scaleType="centerCrop"

+            android:src="@null"

+            android:visibility="gone" />

+

+        <LinearLayout

+            android:id="@+id/details_list"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical" >

+        </LinearLayout>

+

+        <!-- Offline box -->

+

+        <LinearLayout

+            android:id="@+id/offline_box"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical" >

+

+            <RelativeLayout style="@style/separator_horizontal_layout" >

+

+                <View style="@style/separator_horizontal" />

+

+                <TextView

+                    style="@style/separator_horizontal_headline"

+                    android:text="@string/cache_offline" />

+            </RelativeLayout>

+

+            <RelativeLayout

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content" >

+

+                <TextView

+                    android:id="@+id/offline_text"

+                    android:layout_width="fill_parent"

+                    android:layout_height="wrap_content"

+                    android:layout_alignParentLeft="true"

+                    android:layout_gravity="left"

+                    android:layout_marginLeft="6dip"

+                    android:layout_marginRight="130dip"

+                    android:paddingRight="3dip"

+                    android:textColor="?text_color"

+                    android:textSize="14dip" />

+

+                <Button

+                    android:id="@+id/offline_refresh"

+                    style="@style/button_small"

+                    android:layout_width="60dip"

+                    android:layout_alignParentRight="true"

+                    android:layout_marginRight="71dip"

+                    android:text="@string/cache_offline_refresh"

+                    android:visibility="gone" />

+

+                <Button

+                    android:id="@+id/offline_store"

+                    style="@style/button_small"

+                    android:layout_width="60dip"

+                    android:layout_alignParentRight="true"

+                    android:text="@string/cache_offline_store" />

+            </RelativeLayout>

+        </LinearLayout>

+

+        <!-- Watchlist box -->

+

+        <LinearLayout

+            android:id="@+id/watchlist_box"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical" >

+

+            <RelativeLayout style="@style/separator_horizontal_layout" >

+

+                <View style="@style/separator_horizontal" />

+

+                <TextView

+                    style="@style/separator_horizontal_headline"

+                    android:text="@string/cache_watchlist" />

+            </RelativeLayout>

+

+            <RelativeLayout

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content" >

+

+                <TextView

+                    android:id="@+id/watchlist_text"

+                    android:layout_width="fill_parent"

+                    android:layout_height="wrap_content"

+                    android:layout_alignParentLeft="true"

+                    android:layout_gravity="left"

+                    android:layout_marginLeft="6dip"

+                    android:layout_marginRight="130dip"

+                    android:paddingRight="3dip"

+                    android:textColor="?text_color"

+                    android:textSize="14dip" />

+

+                <Button

+                    android:id="@+id/add_to_watchlist"

+                    style="@style/button_small"

+                    android:layout_alignParentRight="true"

+                    android:text="@string/cache_watchlist_add"

+                    android:visibility="gone" />

+

+                <Button

+                    android:id="@+id/remove_from_watchlist"

+                    style="@style/button_small"

+                    android:layout_alignParentRight="true"

+                    android:text="@string/cache_watchlist_remove"

+                    android:visibility="gone" />

+            </RelativeLayout>

+        </LinearLayout>

+

+        <!-- License Box -->

+

+        <LinearLayout

+            android:id="@+id/license_box"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical"

+            android:visibility="gone" >

+

+            <RelativeLayout style="@style/separator_horizontal_layout" >

+

+                <View style="@style/separator_horizontal" />

+

+                <TextView

+                    style="@style/separator_horizontal_headline"

+                    android:text="@string/cache_license" />

+            </RelativeLayout>

+

+            <TextView

+                android:id="@+id/license"

+                android:layout_width="fill_parent"

+                android:layout_height="wrap_content"

+                android:layout_gravity="left"

+                android:linksClickable="true"

+                android:padding="3dip"

+                android:textColor="?text_color"

+                android:textColorLink="?text_color_link"

+                android:textSize="14dip" />

+        </LinearLayout>

+    </LinearLayout>

+

+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_inventory.xml b/main/res/layout/cacheview_inventory.xml
new file mode 100644
index 0000000..9effe8c
--- /dev/null
+++ b/main/res/layout/cacheview_inventory.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>

+<ListView xmlns:android="http://schemas.android.com/apk/res/android"

+    android:layout_width="fill_parent"

+    android:layout_height="fill_parent" >

+
</ListView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_logs.xml b/main/res/layout/cacheview_logs.xml
new file mode 100644
index 0000000..d7babb9
--- /dev/null
+++ b/main/res/layout/cacheview_logs.xml
@@ -0,0 +1,28 @@
+<?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" >

+

+    <LinearLayout

+        android:layout_width="fill_parent"

+        android:layout_height="fill_parent"

+        android:orientation="vertical"

+        android:padding="4dip" >

+

+        <TextView

+            android:id="@+id/log_count"

+            android:layout_width="wrap_content"

+            android:layout_height="wrap_content"

+            android:layout_marginBottom="12dip"

+            android:textColor="?text_color"

+            android:textSize="14dip" />

+

+        <LinearLayout

+            android:id="@+id/log_list"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical" >

+        </LinearLayout>

+    </LinearLayout>

+

+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/cacheview_waypoints.xml b/main/res/layout/cacheview_waypoints.xml
new file mode 100644
index 0000000..35e4948
--- /dev/null
+++ b/main/res/layout/cacheview_waypoints.xml
@@ -0,0 +1,25 @@
+<?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" >

+

+    <LinearLayout

+        android:layout_width="fill_parent"

+        android:layout_height="fill_parent"

+        android:orientation="vertical"

+        android:padding="4dip" >

+

+        <LinearLayout

+            android:id="@+id/waypoints"

+            android:layout_width="fill_parent"

+            android:layout_height="wrap_content"

+            android:orientation="vertical" >

+        </LinearLayout>

+

+        <Button

+            android:id="@+id/add_waypoint"

+            style="@style/button"

+            android:text="@string/cache_waypoints_add" />

+    </LinearLayout>

+

+</ScrollView>
\ No newline at end of file
diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml
index 187d4cb..e6d7bba 100644
--- a/main/res/values/attrs.xml
+++ b/main/res/values/attrs.xml
@@ -17,6 +17,7 @@
   <attr name="background_color_notice" format="color" />
   <attr name="background_color_transparent" format="color" />
   <attr name="separator_color" format="color" />
+  <attr name="text_color_pagerindicator" format="color" />
 
   <!-- drawables -->
   <attr name="button" format="integer" />
diff --git a/main/res/values/colors.xml b/main/res/values/colors.xml
index 169f319..91fb6a5 100644
--- a/main/res/values/colors.xml
+++ b/main/res/values/colors.xml
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <color name="just_white">#FFFFFFFF</color>
-  <color name="just_black">#FF000000</color>
-  <color name="background_dark">#FF000000</color>
-  <color name="background_light">#FFFFFFFF</color>
-  <color name="background_dark_notice">#FF191919</color>
-  <color name="background_light_notice">#FFDFDFDF</color>
-  <color name="background_dark_transparent">#44000000</color>
-  <color name="background_light_transparent">#44FFFFFF</color>
-  <color name="owncache_background_dark">#FF222222</color>
-  <color name="owncache_background_light">#FFDDDDDD</color>
-  <color name="separator_dark">#44FFFFFF</color>
-  <color name="separator_light">#44000000</color>
-  <color name="text_icon">#FFFFFFFF</color>
-  <color name="text_dark">#FFFFFFFF</color>
-  <color name="text_light">#FF000000</color>
-  <color name="text_headline_dark">#88FFFFFF</color>
-  <color name="text_headline_light">#88000000</color>
-  <color name="text_grey_dark">#AAFFFFFF</color>
-  <color name="text_grey_light">#AA000000</color>
-  <color name="text_hint_dark">#44FFFFFF</color>
-  <color name="text_hint_light">#44000000</color>
-  <color name="link">#FF00C0FF</color>
-  <color name="button_enabled">#FF000000</color>
-  <color name="button_disabled">#66000000</color>
-</resources>
+
+    <color name="just_white">#FFFFFFFF</color>
+    <color name="just_black">#FF000000</color>
+    <color name="background_dark">#FF000000</color>
+    <color name="background_light">#FFFFFFFF</color>
+    <color name="background_dark_notice">#FF191919</color>
+    <color name="background_light_notice">#FFDFDFDF</color>
+    <color name="background_dark_transparent">#44000000</color>
+    <color name="background_light_transparent">#44FFFFFF</color>
+    <color name="owncache_background_dark">#FF222222</color>
+    <color name="owncache_background_light">#FFDDDDDD</color>
+    <color name="separator_dark">#44FFFFFF</color>
+    <color name="separator_light">#44000000</color>
+    <color name="text_icon">#FFFFFFFF</color>
+    <color name="text_dark">#FFFFFFFF</color>
+    <color name="text_light">#FF000000</color>
+    <color name="text_headline_dark">#88FFFFFF</color>
+    <color name="text_headline_light">#88000000</color>
+    <color name="text_grey_dark">#AAFFFFFF</color>
+    <color name="text_grey_light">#AA000000</color>
+    <color name="text_hint_dark">#44FFFFFF</color>
+    <color name="text_hint_light">#44000000</color>
+    <color name="link">#FF00C0FF</color>
+    <color name="button_enabled">#FF000000</color>
+    <color name="button_disabled">#66000000</color>
+    <color name="text_pagerindicator">#FFFFFFFF</color>
+    <color name="text_pagerindicator_sides">#88FFFFFF</color>
+
+</resources>
\ No newline at end of file
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index 06c5c43..58b404f 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -1,305 +1,340 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<!-- system definitions -->
-	<style name="cgeo" parent="android:Theme.NoTitleBar">
-	</style>
 
-	<style name="button" parent="@android:style/Widget.Button">
-		<item name="android:padding">6dip</item>
-		<item name="android:lines">1</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">22dip</item>
-		<item name="android:textColor">?text_color</item>
-		<item name="android:background">?button</item>
-		<item name="android:focusable">true</item>
-		<item name="android:clickable">true</item>
-		<item name="android:gravity">center</item>
-	</style>
+    <!-- system definitions -->
+    <style name="cgeo" parent="android:Theme.NoTitleBar"></style>
 
-	<style name="edittext" parent="@android:style/Widget.EditText">
-		<item name="android:padding">6dip</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:autoText">true</item>
-		<item name="android:textSize">22dip</item>
-		<item name="android:textColor">?text_color</item>
-		<item name="android:textColorHint">?text_color_hint</item>
-		<item name="android:background">?input</item>
-		<item name="android:focusable">true</item>
-		<item name="android:gravity">top|left</item>
-		<item name="android:capitalize">none</item>
-	</style>
+    <style name="button" parent="@android:style/Widget.Button">
+        <item name="android:padding">6dip</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">22dip</item>
+        <item name="android:textColor">?text_color</item>
+        <item name="android:background">?button</item>
+        <item name="android:focusable">true</item>
+        <item name="android:clickable">true</item>
+        <item name="android:gravity">center</item>
+    </style>
 
-<!-- own definitions -->
-<!-- actionbar -->
-	<style name="action_bar">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">@dimen/actionbar_height</item>
-		<item name="android:orientation">horizontal</item>
-		<item name="android:background">@drawable/actionbar_background</item>
-		<item name="android:gravity">center</item>
-	</style>
+    <style name="edittext" parent="@android:style/Widget.EditText">
+        <item name="android:padding">6dip</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:autoText">true</item>
+        <item name="android:textSize">22dip</item>
+        <item name="android:textColor">?text_color</item>
+        <item name="android:textColorHint">?text_color_hint</item>
+        <item name="android:background">?input</item>
+        <item name="android:focusable">true</item>
+        <item name="android:gravity">top|left</item>
+        <item name="android:capitalize">none</item>
+    </style>
 
-	<style name="action_bar_icon_cgeo">
-		<item name="android:layout_width">@dimen/actionbar_height</item>
-		<item name="android:layout_height">@dimen/actionbar_height</item>
-		<item name="android:padding">4dip</item>
-		<item name="android:scaleType">center</item>
-		<item name="android:focusable">true</item>
-		<item name="android:src">@drawable/actionbar_cgeo</item>
-		<item name="android:background">@drawable/actionbar_button</item>
-	</style>
+    <!-- own definitions -->
+    <!-- actionbar -->
+    <style name="action_bar">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">@dimen/actionbar_height</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:background">@drawable/actionbar_background</item>
+        <item name="android:gravity">center</item>
+    </style>
 
-	<style name="action_bar_action">
-		<item name="android:layout_width">@dimen/actionbar_height</item>
-		<item name="android:layout_height">@dimen/actionbar_height</item>
-		<item name="android:padding">2dip</item>
-		<item name="android:scaleType">center</item>
-		<item name="android:focusable">true</item>
-		<item name="android:src">@drawable/actionbar_home</item>
-		<item name="android:background">@drawable/actionbar_button</item>
-	</style>
+    <style name="action_bar_icon_cgeo">
+        <item name="android:layout_width">@dimen/actionbar_height</item>
+        <item name="android:layout_height">@dimen/actionbar_height</item>
+        <item name="android:padding">4dip</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:focusable">true</item>
+        <item name="android:src">@drawable/actionbar_cgeo</item>
+        <item name="android:background">@drawable/actionbar_button</item>
+    </style>
 
-	<style name="action_bar_separator">
-		<item name="android:layout_width">@dimen/actionbar_separator_width</item>
-		<item name="android:layout_height">@dimen/actionbar_separator_height</item>
-		<item name="android:background">@drawable/actionbar_separator</item>
-	</style>
+    <style name="action_bar_action">
+        <item name="android:layout_width">@dimen/actionbar_height</item>
+        <item name="android:layout_height">@dimen/actionbar_height</item>
+        <item name="android:padding">2dip</item>
+        <item name="android:scaleType">center</item>
+        <item name="android:focusable">true</item>
+        <item name="android:src">@drawable/actionbar_home</item>
+        <item name="android:background">@drawable/actionbar_button</item>
+    </style>
 
-	<style name="action_bar_progress" parent="@android:style/Widget.ProgressBar.Small">
-		<item name="android:id">@id/actionbar_progress</item>
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginLeft">15dip</item>
-		<item name="android:layout_marginRight">15dip</item>
-		<item name="android:indeterminate">true</item>
-	</style>
+    <style name="action_bar_separator">
+        <item name="android:layout_width">@dimen/actionbar_separator_width</item>
+        <item name="android:layout_height">@dimen/actionbar_separator_height</item>
+        <item name="android:background">@drawable/actionbar_separator</item>
+    </style>
 
-	<style name="action_bar_title">
-		<item name="android:id">@id/actionbar_title</item>
-		<item name="android:layout_width">0dip</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_weight">1</item>
-		<item name="android:paddingLeft">6dip</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:lines">1</item>
-		<item name="android:textSize">20dip</item>
-		<item name="android:textColor">@color/just_white</item>
-		<item name="android:text">c:geo</item>
-	</style>
+    <style name="action_bar_progress" parent="@android:style/Widget.ProgressBar.Small">
+        <item name="android:id">@id/actionbar_progress</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">15dip</item>
+        <item name="android:layout_marginRight">15dip</item>
+        <item name="android:indeterminate">true</item>
+    </style>
 
-<!-- button: full width -->
-	<style name="button">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginLeft">10dip</item>
-		<item name="android:layout_marginRight">10dip</item>
-		<item name="android:layout_marginBottom">5dip</item>
-	</style>
+    <style name="action_bar_title">
+        <item name="android:id">@id/actionbar_title</item>
+        <item name="android:layout_width">0dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:paddingLeft">6dip</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:lines">1</item>
+        <item name="android:textSize">20dip</item>
+        <item name="android:textColor">@color/just_white</item>
+        <item name="android:text">c:geo</item>
+    </style>
 
-<!-- button: small -->
-	<style name="button_small">
-		<item name="android:layout_width">125dip</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_gravity">right</item>
-		<item name="android:layout_marginLeft">6dip</item>
-		<item name="android:layout_marginRight">6dip</item>
-		<item name="android:layout_marginTop">3dip</item>
-		<item name="android:layout_marginBottom">3dip</item>
-		<item name="android:padding">3dip</item>
-		<item name="android:textSize">14dip</item>
-	</style>
+    <!-- button: full width -->
+    <style name="button">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">10dip</item>
+        <item name="android:layout_marginRight">10dip</item>
+        <item name="android:layout_marginBottom">5dip</item>
+    </style>
 
-<!-- edittext -->
-	<style name="edittext">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginLeft">10dip</item>
-		<item name="android:layout_marginRight">10dip</item>
-		<item name="android:layout_marginBottom">5dip</item>
-	</style>
+    <!-- button: small -->
+    <style name="button_small">
+        <item name="android:layout_width">125dip</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">right</item>
+        <item name="android:layout_marginLeft">6dip</item>
+        <item name="android:layout_marginRight">6dip</item>
+        <item name="android:layout_marginTop">3dip</item>
+        <item name="android:layout_marginBottom">3dip</item>
+        <item name="android:padding">3dip</item>
+        <item name="android:textSize">14dip</item>
+    </style>
 
-	<style name="edittext_dialog">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginLeft">10dip</item>
-		<item name="android:layout_marginRight">10dip</item>
-		<item name="android:layout_marginBottom">5dip</item>
-		<item name="android:textColor">@color/text_dark</item>
-		<item name="android:textColorHint">@color/text_hint_dark</item>
-		<item name="android:background">@drawable/input_bcg_dark</item>
-	</style>
+    <!-- edittext -->
+    <style name="edittext">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">10dip</item>
+        <item name="android:layout_marginRight">10dip</item>
+        <item name="android:layout_marginBottom">5dip</item>
+    </style>
 
-<!-- mainscreen icon -->
-	<style name="icon_mainscreen">
-		<item name="android:layout_width">48dip</item>
-		<item name="android:layout_height">48dip</item>
-		<item name="android:layout_gravity">center_horizontal</item>
-		<item name="android:gravity">center</item>
-		<item name="android:layout_margin">4dip</item>
-		<item name="android:focusable">true</item>
-	</style>
+    <style name="edittext_dialog">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">10dip</item>
+        <item name="android:layout_marginRight">10dip</item>
+        <item name="android:layout_marginBottom">5dip</item>
+        <item name="android:textColor">@color/text_dark</item>
+        <item name="android:textColorHint">@color/text_hint_dark</item>
+        <item name="android:background">@drawable/input_bcg_dark</item>
+    </style>
 
-	<style name="icon_mainscreen_text">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_gravity">center_horizontal</item>
-		<item name="android:gravity">center</item>
-		<item name="android:paddingTop">1dip</item>
-		<item name="android:paddingBottom">1dip</item>
-		<item name="android:paddingLeft">5dip</item>
-		<item name="android:paddingRight">5dip</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:lines">1</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">13dip</item>
-		<item name="android:textColor">@color/text_icon</item>
-		<item name="android:background">@drawable/icon_bcg</item>
-	</style>
+    <!-- mainscreen icon -->
+    <style name="icon_mainscreen">
+        <item name="android:layout_width">48dip</item>
+        <item name="android:layout_height">48dip</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_margin">4dip</item>
+        <item name="android:focusable">true</item>
+    </style>
 
-	<style name="icon_mainscreen_count">
-		<item name="android:visibility">gone</item>
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_gravity">center_horizontal</item>
-		<item name="android:layout_alignParentTop">true</item>
-		<item name="android:layout_alignParentRight">true</item>
-		<item name="android:layout_marginRight">4dip</item>
-		<item name="android:layout_marginLeft">4dip</item>
-		<item name="android:gravity">center</item>
-		<item name="android:paddingTop">2dip</item>
-		<item name="android:paddingBottom">2dip</item>
-		<item name="android:paddingLeft">5dip</item>
-		<item name="android:paddingRight">5dip</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:lines">1</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">11dip</item>
-		<item name="android:textColor">@color/just_white</item>
-		<item name="android:background">@drawable/count_bcg</item>
-		<item name="android:text"></item>
-	</style>
+    <style name="icon_mainscreen_text">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingTop">1dip</item>
+        <item name="android:paddingBottom">1dip</item>
+        <item name="android:paddingLeft">5dip</item>
+        <item name="android:paddingRight">5dip</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:lines">1</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">13dip</item>
+        <item name="android:textColor">@color/text_icon</item>
+        <item name="android:background">@drawable/icon_bcg</item>
+    </style>
 
-<!-- current location -->
-	<style name="location_current">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:gravity">center_horizontal</item>
-		<item name="android:paddingLeft">5dip</item>
-		<item name="android:paddingRight">5dip</item>
-		<item name="android:lines">1</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">14dip</item>
-		<item name="android:textColor">@color/text_icon</item>
-		<item name="android:background">@drawable/icon_bcg</item>
-	</style>
+    <style name="icon_mainscreen_count">
+        <item name="android:visibility">gone</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_marginRight">4dip</item>
+        <item name="android:layout_marginLeft">4dip</item>
+        <item name="android:gravity">center</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">2dip</item>
+        <item name="android:paddingLeft">5dip</item>
+        <item name="android:paddingRight">5dip</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:lines">1</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">11dip</item>
+        <item name="android:textColor">@color/just_white</item>
+        <item name="android:background">@drawable/count_bcg</item>
+        <item name="android:text"></item>
+    </style>
 
-	<style name="location_current_type">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_alignParentBottom">true</item>
-		<item name="android:layout_alignParentRight">true</item>
-		<item name="android:layout_gravity">right</item>
-		<item name="android:paddingLeft">3dip</item>
-		<item name="android:paddingRight">3dip</item>
-		<item name="android:lines">1</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">12dip</item>
-		<item name="android:textColor">@color/text_dark</item>
-	</style>
+    <!-- current location -->
+    <style name="location_current">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:paddingLeft">5dip</item>
+        <item name="android:paddingRight">5dip</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">14dip</item>
+        <item name="android:textColor">@color/text_icon</item>
+        <item name="android:background">@drawable/icon_bcg</item>
+    </style>
 
-	<style name="location_current_accuracy">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_alignParentBottom">true</item>
-		<item name="android:layout_centerHorizontal">true</item>
-		<item name="android:layout_gravity">right</item>
-		<item name="android:paddingLeft">3dip</item>
-		<item name="android:paddingRight">3dip</item>
-		<item name="android:lines">1</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">12dip</item>
-		<item name="android:textColor">@color/text_dark</item>
-	</style>
+    <style name="location_current_type">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_gravity">right</item>
+        <item name="android:paddingLeft">3dip</item>
+        <item name="android:paddingRight">3dip</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">12dip</item>
+        <item name="android:textColor">@color/text_dark</item>
+    </style>
 
-	<style name="location_current_satellites">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_alignParentBottom">true</item>
-		<item name="android:layout_alignParentLeft">true</item>
-		<item name="android:layout_gravity">left</item>
-		<item name="android:paddingLeft">3dip</item>
-		<item name="android:paddingRight">3dip</item>
-		<item name="android:lines">1</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">12dip</item>
-		<item name="android:textColor">@color/text_dark</item>
-	</style>
+    <style name="location_current_accuracy">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_centerHorizontal">true</item>
+        <item name="android:layout_gravity">right</item>
+        <item name="android:paddingLeft">3dip</item>
+        <item name="android:paddingRight">3dip</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">12dip</item>
+        <item name="android:textColor">@color/text_dark</item>
+    </style>
 
-<!-- separators -->
-	<style name="separator_horizontal">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">1dip</item>
-		<item name="android:layout_centerInParent">true</item>
-		<item name="android:background">?separator_color</item>
-	</style>
+    <style name="location_current_satellites">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentBottom">true</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_gravity">left</item>
+        <item name="android:paddingLeft">3dip</item>
+        <item name="android:paddingRight">3dip</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">12dip</item>
+        <item name="android:textColor">@color/text_dark</item>
+    </style>
 
-	<style name="separator_horizontal_layout">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginTop">2dip</item>
-		<item name="android:layout_marginBottom">2dip</item>
-	</style>
+    <!-- separators -->
+    <style name="separator_horizontal">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">1dip</item>
+        <item name="android:layout_centerInParent">true</item>
+        <item name="android:background">?separator_color</item>
+    </style>
 
-	<style name="separator_horizontal_headline">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_alignParentLeft">true</item>
-		<item name="android:layout_marginLeft">15dip</item>
-		<item name="android:padding">3dip</item>
-		<item name="android:lines">1</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:textSize">22dip</item>
-		<item name="android:textColor">?text_color_headline</item>
-		<item name="android:background">?background_color</item>
-	</style>
-	
-<!-- filter bar -->
-	<style name="filter_bar">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:orientation">horizontal</item>
-		<item name="android:background">@drawable/filter_bar_background</item>
-		<item name="android:gravity">center_vertical</item>
-	</style>
-	
-	<style name="filter_bar_image">
-		<item name="android:layout_width">30dp</item>
-		<item name="android:layout_height">30dp</item>
-		<item name="android:padding">6dp</item>
-		<item name="android:scaleType">fitCenter</item>
-	</style>
-	
-	<style name="filter_bar_text">
-		<item name="android:layout_width">wrap_content</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:singleLine">true</item>
-		<item name="android:scrollHorizontally">true</item>
-		<item name="android:ellipsize">marquee</item>
-		<item name="android:lines">1</item>
-		<item name="android:textColor">@android:color/white</item>
-	</style>
-</resources>
+    <style name="separator_horizontal_layout">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">2dip</item>
+        <item name="android:layout_marginBottom">2dip</item>
+    </style>
+
+    <style name="separator_horizontal_headline">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_alignParentLeft">true</item>
+        <item name="android:layout_marginLeft">15dip</item>
+        <item name="android:padding">3dip</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:textSize">22dip</item>
+        <item name="android:textColor">?text_color_headline</item>
+        <item name="android:background">?background_color</item>
+    </style>
+
+    <!-- filter bar -->
+    <style name="filter_bar">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:background">@drawable/filter_bar_background</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="filter_bar_image">
+        <item name="android:layout_width">30dp</item>
+        <item name="android:layout_height">30dp</item>
+        <item name="android:padding">6dp</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+
+    <style name="filter_bar_text">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:lines">1</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <!-- pager -->
+    <style name="pager_indicator">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">@drawable/pagerindicator_background</item>
+    </style>
+
+    <style name="pager_indicator.title">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_margin">5dip</item>
+        <item name="android:layout_centerInParent">true</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">16dip</item>
+        <item name="android:textColor">@color/text_pagerindicator</item>
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="pager_indicator.side">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_margin">1dip</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:lines">1</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:textSize">12dip</item>
+        <item name="android:textColor">@color/text_pagerindicator_sides</item>
+        <item name="android:background">@null</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml
index ba07eb2..8b8c914 100644
--- a/main/res/values/themes.xml
+++ b/main/res/values/themes.xml
@@ -31,6 +31,7 @@
 		<item name="text_color_grey">@color/text_grey_dark</item>
 		<item name="text_color_hint">@color/text_hint_dark</item>
 		<item name="text_color_link">@color/link</item>
+        <item name="text_color_pagerindicator">@color/text_pagerindicator</item>
 		<item name="button_color_enabled">@color/button_enabled</item>
 		<item name="button_color_disabled">@color/button_disabled</item>
 		<item name="background_color">@color/background_dark</item>
@@ -63,6 +64,7 @@
 		<item name="text_color_grey">@color/text_grey_light</item>
 		<item name="text_color_hint">@color/text_hint_light</item>
 		<item name="text_color_link">@color/link</item>
+        <item name="text_color_pagerindicator">@color/text_pagerindicator</item>
 		<item name="button_color_enabled">@color/button_enabled</item>
 		<item name="button_color_disabled">@color/button_disabled</item>
 		<item name="background_color">@color/background_light</item>