fix ugly comics backgrounds on 4.4

9 files changed, 66 insertions, 45 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7e669f..1783597 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

     package="org.fox.ttcomics"

-    android:versionCode="44"

-    android:versionName="1.10" >

+    android:versionCode="45"

+    android:versionName="1.11" >

 

     <uses-sdk

         android:minSdkVersion="8"

diff --git a/res/drawable/border.xml b/res/drawable/border.xml
deleted file mode 100644
index 9d30b95..0000000
--- a/res/drawable/border.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item>

-		<shape xmlns:android="http://schemas.android.com/apk/res/android">

-		<solid android:color="#ffffff" />

-		<stroke android:width="1dp" android:color="#33b5e5" />

-		<padding android:left="1dp" android:top="1dp" android:right="1dp"

-		    android:bottom="1dp" />

-		</shape>

-	</item>

-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/border_folder.xml b/res/drawable/border_folder.xml
deleted file mode 100644
index a1b114f..0000000
--- a/res/drawable/border_folder.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item>

-		<shape xmlns:android="http://schemas.android.com/apk/res/android">

-		<solid android:color="#ffffff" />

-		<stroke android:width="1dp" android:color="#99cc00" />

-		<padding android:left="1dp" android:top="1dp" android:right="1dp"

-		    android:bottom="1dp" />

-		</shape>

-	</item>

-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/comic_tile.xml b/res/drawable/comic_tile.xml
new file mode 100644
index 0000000..428e246
--- /dev/null
+++ b/res/drawable/comic_tile.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#33b5e5" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+    

+    <!--  <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#e0e0e0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item> -->

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#ffffff" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ No newline at end of file
diff --git a/res/drawable/comic_tile_folder.xml b/res/drawable/comic_tile_folder.xml
new file mode 100644
index 0000000..2cd13b5
--- /dev/null
+++ b/res/drawable/comic_tile_folder.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

+

+    <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#99cc00" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+    

+    <!--  <item>

+        <shape android:shape="rectangle" >

+            <solid android:color="#e0e0e0" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item> -->

+

+    <item

+        android:bottom="2dp">

+        <shape android:shape="rectangle" >

+            <solid android:color="#ffffff" />

+            <corners android:radius="2dp"/>

+        </shape>

+    </item>

+

+</layer-list>
\ 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 0f33ea0..8392a17 100644
--- a/res/layout-sw600dp/comics_grid_row.xml
+++ b/res/layout-sw600dp/comics_grid_row.xml
@@ -14,14 +14,13 @@
         android:layout_height="160dp"

         android:layout_gravity="center_horizontal"

         android:layout_weight="0"

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

+        android:background="@drawable/comic_tile"

         android:padding="6dp" >

 

         <ImageView

             android:id="@+id/thumbnail"

             android:layout_width="match_parent"

         	android:layout_height="match_parent"        	            

-            android:background="@drawable/border"

             android:padding="4dp"

             android:scaleType="centerInside"

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

diff --git a/res/layout/comics_grid_row.xml b/res/layout/comics_grid_row.xml
index 2dbe6de..f021a3f 100644
--- a/res/layout/comics_grid_row.xml
+++ b/res/layout/comics_grid_row.xml
@@ -14,16 +14,15 @@
         android:layout_height="160dp"

         android:layout_gravity="center_horizontal"

         android:layout_weight="0"

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

+        android:background="@drawable/comic_tile"

         android:padding="6dp" >

 

         <ImageView

             android:id="@+id/thumbnail"

             android:layout_width="match_parent"

         	android:layout_height="match_parent"        	            

-            android:background="@drawable/border"

-            android:padding="4dp"

             android:scaleType="centerInside"

+            android:padding="4dp"

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

 

         <ImageView

diff --git a/res/layout/comics_list_row.xml b/res/layout/comics_list_row.xml
index 9f3fa8a..5d529f8 100644
--- a/res/layout/comics_list_row.xml
+++ b/res/layout/comics_list_row.xml
@@ -8,11 +8,11 @@
     android:padding="4dp" >

 

     <FrameLayout

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

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

         android:layout_width="48dp"

         android:layout_height="48dp"

         android:layout_weight="0"

-        android:background="@drawable/border"

+        android:background="@drawable/comic_tile"

         android:padding="2dp" >

 

         <ImageView

@@ -20,6 +20,7 @@
             android:layout_width="match_parent"

             android:layout_height="match_parent"

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

+            android:padding="2dp"

             android:scaleType="centerInside"

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

     </FrameLayout>

diff --git a/src/org/fox/ttcomics/ComicListFragment.java b/src/org/fox/ttcomics/ComicListFragment.java
index e0feacb..31dbf19 100644
--- a/src/org/fox/ttcomics/ComicListFragment.java
+++ b/src/org/fox/ttcomics/ComicListFragment.java
@@ -152,25 +152,17 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 			ImageView thumbnail = (ImageView) v.findViewById(R.id.thumbnail);

 			

 			if (thumbnail != null) {

-				View imageholder = v.findViewById(R.id.listimageholder);

+				View imageholder = v.findViewById(R.id.imageholder);

 				

 				int padding = dpToPx(2);

-				

-				if (size == SIZE_DIR) {					

-					if (isList && imageholder != null) {

-						imageholder.setBackgroundResource(R.drawable.border_folder);

-						imageholder.setPadding(padding, padding, padding, padding);

-					} else {

-						thumbnail.setBackgroundResource(R.drawable.border_folder);

-					}

 

-				} else {

-					

-					if (isList && imageholder != null) {

-						imageholder.setBackgroundResource(R.drawable.border);

+				if (imageholder != null) {

+					if (size == SIZE_DIR) {					

+						imageholder.setBackgroundResource(R.drawable.comic_tile_folder);

 						imageholder.setPadding(padding, padding, padding, padding);

 					} else {

-						thumbnail.setBackgroundResource(R.drawable.border);

+						imageholder.setBackgroundResource(R.drawable.comic_tile);

+						imageholder.setPadding(padding, padding, padding, padding);

 					}

 				}