UI updates

20 files changed, 72 insertions, 69 deletions

diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_refresh_light.png
index 67de12d..bb9d855 100644
--- a/res/drawable-hdpi/ic_action_search.png
+++ b/res/drawable-hdpi/ic_refresh_light.png
diff --git a/res/drawable-hdpi/ic_search_light.png b/res/drawable-hdpi/ic_search_light.png
new file mode 100644
index 0000000..f12e005
--- /dev/null
+++ b/res/drawable-hdpi/ic_search_light.png
diff --git a/res/drawable-hdpi/ic_settings.png b/res/drawable-hdpi/ic_settings.png
new file mode 100644
index 0000000..3e4580e
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings.png
diff --git a/res/drawable-hdpi/ic_share_light.png b/res/drawable-hdpi/ic_share_light.png
new file mode 100644
index 0000000..c329f58
--- /dev/null
+++ b/res/drawable-hdpi/ic_share_light.png
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
deleted file mode 100644
index 134d549..0000000
--- a/res/drawable-mdpi/ic_action_search.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_refresh_light.png
index d699c6b..a7fdc0d 100644
--- a/res/drawable-xhdpi/ic_action_search.png
+++ b/res/drawable-xhdpi/ic_refresh_light.png
diff --git a/res/drawable-xhdpi/ic_search_light.png b/res/drawable-xhdpi/ic_search_light.png
new file mode 100644
index 0000000..3549f84
--- /dev/null
+++ b/res/drawable-xhdpi/ic_search_light.png
diff --git a/res/drawable-xhdpi/ic_settings.png b/res/drawable-xhdpi/ic_settings.png
new file mode 100644
index 0000000..09b0148
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings.png
diff --git a/res/drawable-xhdpi/ic_share_light.png b/res/drawable-xhdpi/ic_share_light.png
new file mode 100644
index 0000000..15549b0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_share_light.png
diff --git a/res/layout-land/fragment_comics_list.xml b/res/layout-land/fragment_comics_list.xml
index e4999c8..9752e65 100644
--- a/res/layout-land/fragment_comics_list.xml
+++ b/res/layout-land/fragment_comics_list.xml
@@ -3,13 +3,12 @@
     android:id="@+id/FrameLayout4"

     android:layout_width="fill_parent"

     android:layout_height="fill_parent" >

-


+

     <GridView

         android:id="@+id/comics_grid"

         android:layout_width="match_parent"

         android:layout_height="match_parent"

         android:numColumns="3" >

-

     </GridView>

 

     <LinearLayout

@@ -19,16 +18,12 @@
         android:layout_gravity="center"

         android:orientation="vertical" >

 

-

-

-

         <TextView

             android:id="@+id/textView1"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_gravity="center"

             android:text="@string/error_no_comic_arhives_found_" />

-

     </LinearLayout>

 

 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/comics_grid_row.xml b/res/layout-sw600dp/comics_grid_row.xml
index 2e6d183..5fe9406 100644
--- a/res/layout-sw600dp/comics_grid_row.xml
+++ b/res/layout-sw600dp/comics_grid_row.xml
@@ -7,18 +7,25 @@
     android:gravity="center_vertical"

     android:orientation="vertical"

     android:padding="4dp" >

-


-    <ImageView

-        android:id="@+id/thumbnail"

-        android:layout_width="160dp"

-        android:layout_height="160dp"

-        android:padding="8dp"

-        android:layout_gravity="center_horizontal"

-        android:layout_weight="0"

-        android:background="@drawable/border"

-        android:scaleType="centerInside"

-        android:src="@drawable/ic_launcher" />

-



+

+   <FrameLayout

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

+       android:layout_width="160dp"

+       android:layout_height="160dp"

+       android:layout_gravity="center_horizontal"

+       android:layout_weight="0"

+       android:background="@android:drawable/toast_frame"

+       android:padding="8dp" >

+

+        <ImageView

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

+            android:layout_width="match_parent"

+        	android:layout_height="match_parent"            

+            android:background="@android:color/white"

+            android:scaleType="centerInside"

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

+    </FrameLayout>

+

     <LinearLayout

         android:id="@+id/linearLayout4"

         android:layout_width="match_parent"

@@ -26,7 +33,7 @@
         android:layout_weight="0"

         android:gravity="center_horizontal"

         android:orientation="vertical" >

-







+

         <TextView

             android:id="@+id/file_name"

             android:layout_width="wrap_content"

@@ -42,7 +49,7 @@
             android:layout_width="128dp"

             android:layout_height="wrap_content"

             android:layout_weight="1" />

-





+

         <TextView

             android:id="@+id/file_progress_info"

             android:layout_width="wrap_content"

@@ -51,7 +58,6 @@
             android:gravity="right"

             android:text="12 of 325"

             android:textSize="12dp" />

-

     </LinearLayout>

 

 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/comics_grid_row.xml b/res/layout/comics_grid_row.xml
index cadd2c7..cd2c6d9 100644
--- a/res/layout/comics_grid_row.xml
+++ b/res/layout/comics_grid_row.xml
@@ -7,33 +7,40 @@
     android:gravity="center_vertical"

     android:orientation="vertical"

     android:padding="4dp" >

-




-    <ImageView

-        android:id="@+id/thumbnail"

-        android:padding="4dp"

-        android:layout_width="128dp"

-        android:layout_height="128dp"

+

+    <FrameLayout

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

+        android:layout_width="160dp"

+        android:layout_height="160dp"

         android:layout_gravity="center_horizontal"

         android:layout_weight="0"

-        android:background="@drawable/border"

-        android:scaleType="centerInside"

-        android:src="@drawable/ic_launcher" />

-




+        android:background="@android:drawable/toast_frame"

+        android:padding="8dp" >

+

+        <ImageView

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

+            android:layout_width="match_parent"

+        	android:layout_height="match_parent"            

+            android:background="@android:color/white"

+            android:scaleType="centerInside"

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

+    </FrameLayout>

+

     <LinearLayout

         android:id="@+id/linearLayout4"

         android:layout_width="match_parent"

         android:layout_height="wrap_content"

         android:gravity="center_horizontal"

         android:orientation="vertical" >

-




+

         <TextView

             android:id="@+id/file_name"

             android:layout_width="wrap_content"

             android:layout_height="wrap_content"

             android:layout_weight="1"

-            android:text="Comic_1980.cbz"

             android:ellipsize="middle"

             android:singleLine="true"

+            android:text="Comic_1980.cbz"

             android:textSize="11dp" />

 

         <ProgressBar

@@ -42,7 +49,7 @@
             android:layout_width="96dp"

             android:layout_height="wrap_content"

             android:layout_weight="1" />

-


+

         <TextView

             android:id="@+id/file_progress_info"

             android:layout_width="wrap_content"

@@ -51,7 +58,6 @@
             android:gravity="right"

             android:text="12 of 325"

             android:textSize="8dp" />

-

     </LinearLayout>

 

 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/comics_list_row.xml b/res/layout/comics_list_row.xml
index f1730bb..9bd0951 100644
--- a/res/layout/comics_list_row.xml
+++ b/res/layout/comics_list_row.xml
@@ -4,27 +4,34 @@
     android:layout_width="match_parent"

     android:layout_height="?android:attr/listPreferredItemHeight"

     android:gravity="center_vertical"

-    android:padding="4dp"    

-    android:orientation="horizontal" >

+    android:orientation="horizontal"

+    android:padding="4dp" >

 

-    <ImageView

-        android:id="@+id/thumbnail"

-        android:padding="4dp"

-        android:layout_weight="0"

+    <FrameLayout

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

         android:layout_width="48dp"

         android:layout_height="48dp"

-        android:background="@drawable/border"

-        android:scaleType="centerInside"

-        android:src="@drawable/ic_launcher" />

+        android:layout_weight="0"

+        android:background="@android:drawable/toast_frame"

+        android:padding="8dp" >

+

+        <ImageView

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

+            android:layout_width="match_parent"

+            android:layout_height="match_parent"

+            android:background="@android:color/white"

+            android:scaleType="centerInside"

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

+    </FrameLayout>

 

     <LinearLayout

         android:id="@+id/linearLayout5"

-		android:paddingLeft="4dp"        

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:layout_weight="1"

-        android:orientation="vertical" >

-


+        android:orientation="vertical"

+        android:paddingLeft="4dp" >

+

         <LinearLayout

             android:id="@+id/linearLayout4"

             android:layout_width="match_parent"

@@ -47,13 +54,12 @@
                 android:gravity="right"

                 android:text="12 of 325" />

         </LinearLayout>

-


+

         <ProgressBar

             android:id="@+id/file_progress_bar"

             style="?android:attr/progressBarStyleHorizontal"

             android:layout_width="match_parent"

             android:layout_height="wrap_content" />

-

     </LinearLayout>

 

 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_comic.xml b/res/layout/fragment_comic.xml
index e125bd7..cfc54b3 100644
--- a/res/layout/fragment_comic.xml
+++ b/res/layout/fragment_comic.xml
@@ -8,7 +8,7 @@
         android:id="@+id/comic_image"

         android:layout_width="match_parent"

         android:layout_height="match_parent" />

-










+

     <TextView

         android:id="@+id/comic_page"

         android:layout_width="wrap_content"

diff --git a/res/menu/activity_main.xml b/res/menu/activity_main.xml
index a58cc1b..a81f334 100644
--- a/res/menu/activity_main.xml
+++ b/res/menu/activity_main.xml
@@ -1,11 +1,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/menu_rescan"
         android:title="@string/menu_rescan"
-        android:icon="@android:drawable/ic_menu_rotate" 
+        android:icon="@drawable/ic_refresh_light" 
         android:showAsAction="ifRoom" />
         
     <item android:id="@+id/menu_settings"
         android:title="@string/menu_settings"
+        android:icon="@drawable/ic_settings"
         android:orderInCategory="100"
-        android:showAsAction="never" />
+        android:showAsAction="ifRoom" />
 </menu>
diff --git a/res/menu/activity_view_comic.xml b/res/menu/activity_view_comic.xml
index ebef4e1..864cab8 100644
--- a/res/menu/activity_view_comic.xml
+++ b/res/menu/activity_view_comic.xml
@@ -1,6 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/menu_settings"
         android:title="@string/menu_settings"
+        android:icon="@drawable/ic_settings"
         android:orderInCategory="100"
         android:showAsAction="never" />
     
@@ -14,7 +15,7 @@
     
     <item android:id="@+id/menu_share"
         android:title="@string/menu_share"
-        android:icon="@android:drawable/ic_menu_share"
+        android:icon="@drawable/ic_share_light"
         android:showAsAction="ifRoom" />
 
     <item android:id="@+id/menu_toggle_orientation_lock"
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
deleted file mode 100644
index 4c26bfc..0000000
--- a/res/values-v11/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>

-

-    <style name="AppTheme" parent="android:Theme.Holo.Light" />

-    <style name="DarkTheme" parent="android:Theme.Holo" />

-

-</resources>
\ No newline at end of file
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
deleted file mode 100644
index fbce5e3..0000000
--- a/res/values-v14/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>

-

-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar" />

-	<style name="DarkTheme" parent="android:Theme.Holo" />

-	 

-</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7101edf..2b94a10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -53,7 +53,7 @@
     <string name="prefs_clear_sync_data_summary">Removes all remotely stored sync data.</string>

     <string name="open_parent">Open parent</string>

     <string name="prefs_enable_rar_archives">Enable RAR archives</string>

-    <string name="prefs_enable_rar_summary">Using RAR (CBR) files is not recommended because of underlying RAR library issues.</string>

+    <string name="prefs_enable_rar_summary">Using RAR (CBR) files is not recommended because of underlying RAR library issues. If you experience crashes, disable this option, and repack your archives as ZIP.</string>

     <string name="file_unread">Unread (%1$d pages)</string>

     <string name="file_finished">Finished</string>

     <string name="menu_toggle_orientation_lock">(Un)lock orientation</string>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9b6ef46..84df662 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>

 

-    <style name="AppTheme" parent="android:Theme.Light" />

-    <style name="DarkTheme" parent="android:Theme.Black" />

-

+    <style name="AppTheme" parent="Theme.Sherlock.Light.DarkActionBar" />

+	<style name="DarkTheme" parent="Theme.Sherlock" />

+	 

 </resources>
\ No newline at end of file