#37

The async demo has been rewrote to a simpler form Other refactorings.
openaphid · Dec 28, 2012 · be3545d · be3545d
1 parent 8f9c1ef
commit be3545d
Show file tree

Hide file tree

Showing 18 changed files with 443 additions and 500 deletions.
diff --git a/FlipView/Demo/Aphid-FlipView-Demo.iml b/FlipView/Demo/Aphid-FlipView-Demo.iml
@@ -45,7 +45,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 2.2 Platform" jdkType="Android SDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="Aphid-FlipView-Library" />
     <orderEntry type="module-library">

diff --git a/FlipView/Demo/libs/android-support-v4.jar b/FlipView/Demo/libs/android-support-v4.jar
diff --git a/FlipView/Demo/libs/imageloader-core-1.5.7.jar b/FlipView/Demo/libs/imageloader-core-1.5.7.jar
diff --git a/FlipView/Demo/libs/imageloader_LICENSE.txt b/FlipView/Demo/libs/imageloader_LICENSE.txt
diff --git a/FlipView/Demo/res/layout/complex1.xml b/FlipView/Demo/res/layout/complex1.xml
@@ -18,9 +18,10 @@
 
   <ImageView android:layout_gravity="center_horizontal"
              android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
+             android:layout_height="0dp"
              android:scaleType="centerCrop"
              android:layout_margin="5dp"
+             android:layout_weight="1"
              android:id="@+id/photo"
       />
 

diff --git a/FlipView/Demo/res/layout/xml_layout.xml b/FlipView/Demo/res/layout/xml_layout.xml
@@ -1,8 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.aphidmobile.flip.FlipViewController xmlns:android="http://schemas.android.com/apk/res/android"
+
+<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@android:color/white"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:text="Header" 
+        android:background="@android:color/darker_gray"
+        />
+
+	<com.aphidmobile.flip.FlipViewController
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:id="@+id/flipView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height = "0dp"
+    android:layout_weight="1"
     custom:orientation="horizontal" />
+
+	<TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:text="Footer" 
+        android:background="@android:color/darker_gray"
+        />
+
+</LinearLayout>
+