From 60b1b4234a2da1826c2b4a6ddcd22f480185e696 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 15 Oct 2012 17:01:08 +0400
Subject: implement sync lastread position sharing

---
 res/layout-land/fragment_comics_list.xml    | 2 +-
 res/layout-sw600dp/activity_main.xml        | 2 +-
 res/layout-sw600dp/activity_view_comic.xml  | 2 +-
 res/layout-sw600dp/fragment_comics_list.xml | 2 +-
 res/layout/chooser_list.xml                 | 2 +-
 res/layout/fragment_comics_list.xml         | 2 +-
 res/menu/activity_view_comic.xml            | 4 ++++
 res/values/strings.xml                      | 8 ++++++++
 res/xml/preferences.xml                     | 8 ++++++++
 9 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/layout-land/fragment_comics_list.xml b/res/layout-land/fragment_comics_list.xml
index fcacb20..e4999c8 100644
--- a/res/layout-land/fragment_comics_list.xml
+++ b/res/layout-land/fragment_comics_list.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="No comic arhives found." />
+            android:text="@string/error_no_comic_arhives_found_" />
 
     </LinearLayout>
 
diff --git a/res/layout-sw600dp/activity_main.xml b/res/layout-sw600dp/activity_main.xml
index 3799552..3e0dc88 100644
--- a/res/layout-sw600dp/activity_main.xml
+++ b/res/layout-sw600dp/activity_main.xml
@@ -16,6 +16,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:text="TextView" />
+        android:text="" />
   
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/activity_view_comic.xml b/res/layout-sw600dp/activity_view_comic.xml
index 28dc950..b32c9d7 100644
--- a/res/layout-sw600dp/activity_view_comic.xml
+++ b/res/layout-sw600dp/activity_view_comic.xml
@@ -16,6 +16,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        android:text="TextView" />
+        android:text="" />
   
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/fragment_comics_list.xml b/res/layout-sw600dp/fragment_comics_list.xml
index fcacb20..e4999c8 100644
--- a/res/layout-sw600dp/fragment_comics_list.xml
+++ b/res/layout-sw600dp/fragment_comics_list.xml
@@ -27,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="No comic arhives found." />
+            android:text="@string/error_no_comic_arhives_found_" />
 
     </LinearLayout>
 
diff --git a/res/layout/chooser_list.xml b/res/layout/chooser_list.xml
index 53d28cd..b66982a 100644
--- a/res/layout/chooser_list.xml
+++ b/res/layout/chooser_list.xml
@@ -8,7 +8,7 @@
    		android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="1"/>
-   <Button android:text="Choose"
+   <Button android:text="@string/choose"
    		android:id="@+id/btnChoose"
    		android:layout_width="fill_parent"
    		android:layout_height="wrap_content"/>
diff --git a/res/layout/fragment_comics_list.xml b/res/layout/fragment_comics_list.xml
index dd358ab..ee744a8 100644
--- a/res/layout/fragment_comics_list.xml
+++ b/res/layout/fragment_comics_list.xml
@@ -26,7 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="No comic arhives found." />
+            android:text="@string/error_no_comic_arhives_found_" />
 
     </LinearLayout>
 
diff --git a/res/menu/activity_view_comic.xml b/res/menu/activity_view_comic.xml
index 07bc560..898dc01 100644
--- a/res/menu/activity_view_comic.xml
+++ b/res/menu/activity_view_comic.xml
@@ -8,6 +8,10 @@
         android:title="@string/menu_go_location"
         android:showAsAction="never" />
 
+    <item android:id="@+id/menu_sync_location"
+        android:title="@string/menu_sync_location"
+        android:showAsAction="never" />
+    
     <item android:id="@+id/menu_share"
         android:title="@string/menu_share"
         android:icon="@android:drawable/ic_menu_share"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index adadd3a..cbb3db9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,4 +35,12 @@
     <string name="error_could_not_read_folder_contents_">Could not read folder contents.</string>
     <string name="picker_choose">Choose %1$s</string>
     <string name="dialog_location_page_number">%1$d of %2$d</string>
+    <string name="sync_server_has_further_page">You are currently on page %1$d. Furthest read page stored on the server is %2$d. Open it instead?</string>
+    <string name="dialog_open_page">Open page</string>
+    <string name="menu_sync_location">Sync to last page read</string>
+    <string name="share_comic">Share comic</string>
+    <string name="choose">Choose</string>
+    <string name="error_no_comic_arhives_found_">No comic arhives found.</string>
+    <string name="prefs_use_position_sync">Sync last read page</string>
+    <string name="prefs_use_position_sync_summary">Requires at least one Google account on the device. No personally identifiable information is sent.</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5ccf40b..b91609c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -7,6 +7,14 @@
             android:hint="@string/comics_directory_default"
             android:title="@string/prefs_comics_directory" >
         </Preference>
+        
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="use_position_sync"
+            android:title="@string/prefs_use_position_sync" 
+            android:summary="@string/prefs_use_position_sync_summary" 
+            />
+        
     </PreferenceCategory>
         	
     <PreferenceCategory android:title="@string/prefs_reading" android:key="prefs_reading">
-- 
cgit v1.2.3