styling fixes

diff --git a/Widgets/res/layout-v14/list_item_base.xml b/Widgets/res/layout-v14/list_item_base.xml
index 1eadb69..ded1e0b 100644 (file)
--- a/Widgets/res/layout-v14/list_item_base.xml
+++ b/Widgets/res/layout-v14/list_item_base.xml
@@ -10,7 +10,7 @@
         android:layout_width="48dp"
         android:layout_height="32dp"
         android:layout_gravity="center_vertical"
-        android:layout_margin="2dp"
+        android:layout_margin="@dimen/section_padding"
         android:scaleType="fitCenter" >
     </ImageView>
 
@@ -39,8 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp"
+        android:layout_margin="@dimen/section_padding"
         android:focusable="false"
         android:focusableInTouchMode="false" />
 

diff --git a/Widgets/res/layout/list_content_header.xml b/Widgets/res/layout/list_content_header.xml
index 7f797b6..4128455 100644 (file)
--- a/Widgets/res/layout/list_content_header.xml
+++ b/Widgets/res/layout/list_content_header.xml
@@ -3,8 +3,7 @@
     style="@android:style/TextAppearance.Medium.Inverse"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:background="@color/holo_blue_light"
     android:paddingBottom="2dip"
     android:paddingLeft="8dip"
-    android:paddingTop="2dip"
-        android:background="@color/holo_blue_light"
-/>
+    android:paddingTop="2dip" />

diff --git a/Widgets/res/layout/list_fragment.xml b/Widgets/res/layout/list_fragment.xml
index 59ca3f7..6e6ab27 100644 (file)
--- a/Widgets/res/layout/list_fragment.xml
+++ b/Widgets/res/layout/list_fragment.xml
@@ -15,10 +15,10 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="1"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin" />
+        android:paddingBottom="@dimen/list_vertical_margin"
+        android:paddingLeft="@dimen/list_horizontal_margin"
+        android:paddingRight="@dimen/list_horizontal_margin"
+        android:paddingTop="@dimen/list_vertical_margin" />
 
     <TextView
         android:id="@+id/empty"

diff --git a/Widgets/res/layout/list_item.xml b/Widgets/res/layout/list_item.xml
index 5deda8f..64bf459 100644 (file)
--- a/Widgets/res/layout/list_item.xml
+++ b/Widgets/res/layout/list_item.xml
@@ -5,5 +5,6 @@
     android:minHeight="64dp"
     android:orientation="horizontal" >
 
-  <include layout="@layout/list_item_base" />
+    <include layout="@layout/list_item_base" />
+
 </LinearLayout>
\ No newline at end of file

diff --git a/Widgets/res/layout/list_item_base.xml b/Widgets/res/layout/list_item_base.xml
index c40d445..722f0a9 100644 (file)
--- a/Widgets/res/layout/list_item_base.xml
+++ b/Widgets/res/layout/list_item_base.xml
@@ -6,7 +6,7 @@
         android:layout_width="48dp"
         android:layout_height="32dp"
         android:layout_gravity="center_vertical"
-        android:layout_margin="2dp"
+        android:layout_margin="@dimen/section_padding"
         android:scaleType="fitCenter" >
     </ImageView>
 
@@ -21,14 +21,12 @@
             android:id="@+id/title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textColor="@android:color/primary_text_dark"
             android:textSize="18sp" />
 
         <TextView
             android:id="@+id/summary"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textColor="@android:color/secondary_text_dark"
             android:textSize="12sp" />
     </LinearLayout>
 
@@ -37,8 +35,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp"
+        android:layout_margin="@dimen/section_padding"
         android:focusable="false"
         android:focusableInTouchMode="false" />
 

diff --git a/Widgets/res/values-large/dimens.xml b/Widgets/res/values-large/dimens.xml
new file mode 100644 (file)
index 0000000..5a46a2f
--- /dev/null
+++ b/Widgets/res/values-large/dimens.xml
@@ -0,0 +1,8 @@
+<resources>
+    <dimen name="content_padding">4dp</dimen>
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">4dp</dimen>
+    
+    <dimen name="list_horizontal_margin">@dimen/activity_horizontal_margin</dimen>
+    <dimen name="list_vertical_margin">@dimen/activity_vertical_margin</dimen>
+</resources>
\ No newline at end of file

diff --git a/Widgets/res/values-sw600dp/dimens.xml b/Widgets/res/values-sw600dp/dimens.xml
index 1ba777d..de42810 100644 (file)
--- a/Widgets/res/values-sw600dp/dimens.xml
+++ b/Widgets/res/values-sw600dp/dimens.xml
@@ -4,5 +4,9 @@
          Customize dimensions originally defined in res/values/dimens.xml (such as
          screen margins) for sw600dp devices (e.g. 7" tablets) here.
     -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="section_padding">12dp</dimen>
 
 </resources>
\ No newline at end of file

diff --git a/Widgets/res/values-sw720dp-land/dimens.xml b/Widgets/res/values-sw720dp-land/dimens.xml
index 70d6948..074b279 100644 (file)
--- a/Widgets/res/values-sw720dp-land/dimens.xml
+++ b/Widgets/res/values-sw720dp-land/dimens.xml
@@ -5,5 +5,6 @@
          screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
     -->
     <dimen name="activity_horizontal_margin">128dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
     
 </resources>
\ No newline at end of file

diff --git a/Widgets/res/values-sw720dp/dimens.xml b/Widgets/res/values-sw720dp/dimens.xml
index ab79ef5..c648af7 100644 (file)
--- a/Widgets/res/values-sw720dp/dimens.xml
+++ b/Widgets/res/values-sw720dp/dimens.xml
@@ -5,5 +5,6 @@
          screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
     -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
-
+    <dimen name="section_padding">16dp</dimen>
+    
 </resources>
\ No newline at end of file

diff --git a/Widgets/res/values/color.xml b/Widgets/res/values/color.xml
index 6caa2f9..bc1b0ea 100644 (file)
--- a/Widgets/res/values/color.xml
+++ b/Widgets/res/values/color.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <color name="holo_blue_light">#ff33b5e5</color>
-               <color name="holo_blue_dark">#ff0099cc</color>
-               <color name="holo_blue_bright">#ff00ddff</color>
-    
+    <color name="holo_blue_dark">#ff0099cc</color>
+    <color name="holo_blue_bright">#ff00ddff</color>
     <color name="list_content_background">#f1f1f1</color>
-               
+    <color name="holo_red_light">#ffff4444</color>
+    <color name="holo_red_dark">#ffcc0000</color>
+
 </resources>
\ No newline at end of file

diff --git a/Widgets/res/values/dimens.xml b/Widgets/res/values/dimens.xml
index 0073dc9..f2a9f4a 100644 (file)
--- a/Widgets/res/values/dimens.xml
+++ b/Widgets/res/values/dimens.xml
@@ -5,4 +5,9 @@
     <dimen name="activity_vertical_margin">16dp</dimen>
 
     <item type="dimen" name="golden_ratio">1.6180339887498948482</item>
+    <dimen name="content_padding">0dp</dimen>
+    <dimen name="section_padding">4dp</dimen>
+    
+    <dimen name="list_horizontal_margin">0dp</dimen>
+    <dimen name="list_vertical_margin">0dp</dimen>
 </resources>
\ No newline at end of file

diff --git a/Widgets/src/com/koushikdutta/widgets/BetterListFragment.java b/Widgets/src/com/koushikdutta/widgets/BetterListFragment.java
index 63e9c02..c0e1ca1 100644 (file)
--- a/Widgets/src/com/koushikdutta/widgets/BetterListFragment.java
+++ b/Widgets/src/com/koushikdutta/widgets/BetterListFragment.java
@@ -26,8 +26,8 @@ public class BetterListFragment extends Fragment {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        float hor = getResources().getDimension(R.dimen.activity_horizontal_margin);
-        float ver = getResources().getDimension(R.dimen.activity_vertical_margin);
+        float hor = getResources().getDimension(R.dimen.list_horizontal_margin);
+        float ver = getResources().getDimension(R.dimen.list_vertical_margin);
         mListView.setPadding((int)hor, (int)ver, (int)hor, (int)ver);
     }
     

diff --git a/Widgets/src/com/koushikdutta/widgets/ListContentAdapter.java b/Widgets/src/com/koushikdutta/widgets/ListContentAdapter.java
deleted file mode 100644 (file)
index ac484b5..0000000
--- a/Widgets/src/com/koushikdutta/widgets/ListContentAdapter.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.koushikdutta.widgets;
-
-import android.support.v4.app.Fragment;
-
-public interface ListContentAdapter {
-    public Fragment getFragment(ListItem listItem, Fragment convertFragment);
-}

diff --git a/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java b/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java
index 26357c9..ed6e011 100644 (file)
--- a/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java
+++ b/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java
@@ -4,8 +4,6 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
@@ -21,8 +19,8 @@ public class ListContentFragment extends BetterListFragment {
     }
     
     private void setPadding() {
-        float hor = getResources().getDimension(R.dimen.activity_horizontal_margin);
-        float ver = getResources().getDimension(R.dimen.activity_vertical_margin);
+        float hor = getResources().getDimension(R.dimen.list_horizontal_margin);
+        float ver = getResources().getDimension(R.dimen.list_vertical_margin);
         getListView().setPadding(0, 0, 0, 0);
         mContainer.setPadding((int)hor, (int)ver, (int)hor, (int)ver);
     }

diff --git a/WidgetsSample/gen/com/koushikdutta/widgets/R.java b/WidgetsSample/gen/com/koushikdutta/widgets/R.java
index 36b03a9..05ab5fa 100644 (file)
--- a/WidgetsSample/gen/com/koushikdutta/widgets/R.java
+++ b/WidgetsSample/gen/com/koushikdutta/widgets/R.java
@@ -22,9 +22,11 @@ public final class R {
                public static final int listview = 0x7f080004;
        }
        public static final class color {
+               public static final int holo_red_light = 0x7f040004;
+               public static final int list_content_background = 0x7f040003;
                public static final int holo_blue_bright = 0x7f040002;
                public static final int holo_blue_light = 0x7f040000;
-               public static final int list_content_background = 0x7f040003;
+               public static final int holo_red_dark = 0x7f040005;
                public static final int holo_blue_dark = 0x7f040001;
        }
        public static final class layout {
@@ -41,8 +43,12 @@ public final class R {
                public static final int list_content_left = 0x7f020004;
        }
        public static final class dimen {
+               public static final int list_horizontal_margin = 0x7f050005;
                public static final int golden_ratio = 0x7f050002;
                public static final int activity_vertical_margin = 0x7f050001;
+               public static final int content_padding = 0x7f050003;
+               public static final int list_vertical_margin = 0x7f050006;
                public static final int activity_horizontal_margin = 0x7f050000;
+               public static final int section_padding = 0x7f050004;
        }
 }

diff --git a/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java b/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java
index 9c34385..a5dd061 100644 (file)
--- a/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java
+++ b/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java
@@ -14,12 +14,18 @@ public final class R {
         public static final int holo_blue_bright=0x7f040002;
         public static final int holo_blue_dark=0x7f040001;
         public static final int holo_blue_light=0x7f040000;
+        public static final int holo_red_dark=0x7f040005;
+        public static final int holo_red_light=0x7f040004;
         public static final int list_content_background=0x7f040003;
     }
     public static final class dimen {
         /**  Default screen margins, per the Android Design guidelines. 
 
          Customize dimensions originally defined in res/values/dimens.xml (such as
+         screen margins) for sw600dp devices (e.g. 7" tablets) here.
+    
+
+         Customize dimensions originally defined in res/values/dimens.xml (such as
          screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
     
 
@@ -29,7 +35,11 @@ public final class R {
          */
         public static final int activity_horizontal_margin=0x7f050000;
         public static final int activity_vertical_margin=0x7f050001;
+        public static final int content_padding=0x7f050003;
         public static final int golden_ratio=0x7f050002;
+        public static final int list_horizontal_margin=0x7f050005;
+        public static final int list_vertical_margin=0x7f050006;
+        public static final int section_padding=0x7f050004;
     }
     public static final class drawable {
         public static final int box=0x7f020000;