wip

diff --git a/Widgets/gen/com/koushikdutta/widgets/R.java b/Widgets/gen/com/koushikdutta/widgets/R.java
index f56688e..3160134 100644 (file)
--- a/Widgets/gen/com/koushikdutta/widgets/R.java
+++ b/Widgets/gen/com/koushikdutta/widgets/R.java
@@ -29,6 +29,7 @@ public final class R {
          */
         public static int activity_horizontal_margin=0x7f050000;
         public static int activity_vertical_margin=0x7f050001;
+        public static int golden_ratio=0x7f050002;
     }
     public static final class drawable {
         public static int list_content_left=0x7f020000;

diff --git a/Widgets/res/layout-large/list_content.xml b/Widgets/res/layout-large/list_content.xml
index a83f24f..78637b4 100644 (file)
--- a/Widgets/res/layout-large/list_content.xml
+++ b/Widgets/res/layout-large/list_content.xml
@@ -33,30 +33,37 @@
             android:paddingRight="@dimen/activity_horizontal_margin"
             android:paddingTop="@dimen/activity_vertical_margin" >
 
-            <ListView
-                android:id="@+id/listview"
-                android:layout_width="fill_parent"
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:layout_weight="1.6180339887498948482"
-                android:background="@drawable/list_content_left" />
-
-            <TextView
-                android:id="@+id/empty"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_gravity="center"
                 android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:textAppearance="@android:style/TextAppearance.Medium"
-                android:visibility="gone" />
+                android:background="@drawable/list_content_left"
+                android:orientation="vertical" >
+
+                <ListView
+                    android:id="@+id/listview"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent" />
+
+                <TextView
+                    android:id="@+id/empty"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:paddingBottom="@dimen/activity_horizontal_margin"
+                    android:paddingTop="@dimen/activity_horizontal_margin"
+                    android:textAppearance="@android:style/TextAppearance.Medium"
+                    android:visibility="gone" />
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/content"
-                android:layout_width="fill_parent"
+                android:layout_width="0dp"
                 android:layout_height="fill_parent"
-                android:layout_weight="1"
+                android:layout_weight="@dimen/golden_ratio"
                 android:background="@drawable/list_content_right"
                 android:orientation="vertical" />
         </LinearLayout>

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

diff --git a/Widgets/src/com/koushikdutta/widgets/ActivityBaseFragment.java b/Widgets/src/com/koushikdutta/widgets/ActivityBaseFragment.java
index 10b4815..104f14d 100644 (file)
--- a/Widgets/src/com/koushikdutta/widgets/ActivityBaseFragment.java
+++ b/Widgets/src/com/koushikdutta/widgets/ActivityBaseFragment.java
@@ -246,7 +246,7 @@ public class ActivityBaseFragment extends Fragment {
     TextView mEmpty;
     @Override
     public final View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View ret = inflater.inflate(getListFragmentResource(), null);
+        View ret = inflater.inflate(getListFragmentResource(), container, false);
 
         mTitleContainer = (ViewGroup)ret.findViewById(R.id.title_container);
 

diff --git a/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java b/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java
index eed72e7..0f98ee7 100644 (file)
--- a/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java
+++ b/Widgets/src/com/koushikdutta/widgets/ListContentFragment.java
@@ -48,9 +48,11 @@ public class ListContentFragment extends ActivityBaseFragment {
         Fragment last = mCurrentContent;
         mCurrentContent = content;
         FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-        ft.add(R.id.content, mCurrentContent);
         if (last != null)
-            ft.remove(last);
+            ft.replace(R.id.content, mCurrentContent);
+        else
+            ft.add(R.id.content, mCurrentContent);
+        ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         if (mContainer instanceof ViewSwitcher) {
             ViewSwitcher switcher = (ViewSwitcher)mContainer;
             if (mContent != switcher.getCurrentView())

diff --git a/WidgetsSample/gen/com/koushikdutta/widgets/R.java b/WidgetsSample/gen/com/koushikdutta/widgets/R.java
index e149047..36b03a9 100644 (file)
--- a/WidgetsSample/gen/com/koushikdutta/widgets/R.java
+++ b/WidgetsSample/gen/com/koushikdutta/widgets/R.java
@@ -41,6 +41,7 @@ public final class R {
                public static final int list_content_left = 0x7f020004;
        }
        public static final class dimen {
+               public static final int golden_ratio = 0x7f050002;
                public static final int activity_vertical_margin = 0x7f050001;
                public static final int activity_horizontal_margin = 0x7f050000;
        }

diff --git a/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java b/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java
index d445e17..9c34385 100644 (file)
--- a/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java
+++ b/WidgetsSample/gen/com/koushikdutta/widgets/sample/R.java
@@ -29,6 +29,7 @@ public final class R {
          */
         public static final int activity_horizontal_margin=0x7f050000;
         public static final int activity_vertical_margin=0x7f050001;
+        public static final int golden_ratio=0x7f050002;
     }
     public static final class drawable {
         public static final int box=0x7f020000;