new: view pager in trackable activity

6 files changed, 164 insertions, 110 deletions

diff --git a/main/res/layout/cacheview.xml b/main/res/layout/cacheview.xml
index b13fc95..89d7152 100644
--- a/main/res/layout/cacheview.xml
+++ b/main/res/layout/cacheview.xml
@@ -21,9 +21,9 @@
         <ImageView

             android:id="@+id/defaultNavigation"

             style="@style/action_bar_action"

+            android:longClickable="true"

             android:onClick="startDefaultNavigation"

-            android:src="@drawable/actionbar_compass_dark"

-            android:longClickable="true" />

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

 

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

 

diff --git a/main/res/layout/trackable_activity.xml b/main/res/layout/trackable_activity.xml
new file mode 100644
index 0000000..fe61409
--- /dev/null
+++ b/main/res/layout/trackable_activity.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+    xmlns:app="http://schemas.android.com/apk/res/cgeo.geocaching"

+    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="goManual"

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

+    </LinearLayout>

+

+    <android.support.v4.view.ViewPager

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

+        android:layout_width="fill_parent"

+        android:layout_height="0dp"

+        android:layout_weight="1" />

+

+    <com.viewpagerindicator.TitlePageIndicator

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

+        android:layout_width="fill_parent"

+        android:layout_height="wrap_content"

+        android:background="@drawable/actionbar_background"

+        app:footerColor="#ff888888"

+        app:footerIndicatorHeight="3dp"

+        app:footerIndicatorStyle="underline"

+        app:textSize="16dp" />

+

+</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/trackable_detail.xml b/main/res/layout/trackable_detail.xml
deleted file mode 100644
index 4fc34a5..0000000
--- a/main/res/layout/trackable_detail.xml
+++ /dev/null
@@ -1,108 +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:orientation="vertical"
-		android:background="?background_color" >
-	<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:src="@drawable/actionbar_manual"
-				android:onClick="goManual" />
-	</LinearLayout>
-	<ScrollView android:id="@+id/details_list_box"
-			android:visibility="gone"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:padding="4dip"
-			android:orientation="vertical" >
-		<LinearLayout
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical" >
-			<LinearLayout android:id="@+id/details_list"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:orientation="vertical" >
-			</LinearLayout>
-			<LinearLayout android:id="@+id/goal_box"
-					android:visibility="gone"
-					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/trackable_goal" />
-				</RelativeLayout>
-				<TextView android:id="@+id/goal"
-						android:visibility="gone"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="10dip"
-						android:textSize="14dip"
-						android:textColor="?text_color"
-						android:linksClickable="true"
-						android:textColorLink="?text_color_link" />
-			</LinearLayout>
-			<LinearLayout android:id="@+id/details_box"
-					android:visibility="gone"
-					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/trackable_details" />
-				</RelativeLayout>
-				<TextView android:id="@+id/details"
-						android:visibility="gone"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_marginBottom="10dip"
-						android:textSize="14dip"
-						android:textColor="?text_color"
-						android:linksClickable="true"
-						android:textColorLink="?text_color_link" />
-			</LinearLayout>
-			<LinearLayout android:id="@+id/image_box"
-					android:visibility="gone"
-					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/trackable_image" />
-				</RelativeLayout>
-				<LinearLayout android:id="@+id/image"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:layout_marginTop="24dip"
-						android:padding="3dip"
-						android:orientation="vertical" >
-				</LinearLayout>
-			</LinearLayout>
-			<LinearLayout android:id="@+id/log_box"
-					android:visibility="gone"
-					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_logs" />
-				</RelativeLayout>
-				<LinearLayout android:id="@+id/log_list"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:orientation="vertical">
-				</LinearLayout>
-			</LinearLayout>
-		</LinearLayout>
-	</ScrollView>
-</LinearLayout>
diff --git a/main/res/layout/trackable_details_view.xml b/main/res/layout/trackable_details_view.xml
new file mode 100644
index 0000000..7213171
--- /dev/null
+++ b/main/res/layout/trackable_details_view.xml
@@ -0,0 +1,103 @@
+<?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:id="@+id/details_list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/goal_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/trackable_goal" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/goal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dip"
+                android:linksClickable="true"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/details_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/trackable_details" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/details"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dip"
+                android:linksClickable="true"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14dip"
+                android:visibility="gone" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/image_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/trackable_image" />
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/image"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dip"
+                android:orientation="vertical"
+                android:padding="3dip" >
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/layout/trackable_logs_view.xml b/main/res/layout/trackable_logs_view.xml
new file mode 100644
index 0000000..697afad
--- /dev/null
+++ b/main/res/layout/trackable_logs_view.xml
@@ -0,0 +1,15 @@
+<?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:id="@+id/log_list"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index be7c1ec..774a926 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -84,6 +84,7 @@
     · Edit cache type filter by clicking on filter bar\n

     · Support for searching opencaching.nl caches\n

     · Inverse sorting of cache lists (hit the same menu again)\n

+    · view pager in trackable activity\n

     \n

     <b>Bugfixing:</b>\n

     · Final flag icon lost when updating cache with self defined final\n