Merge branch 'dev'

nhaarman · Sep 5, 2013 · dd31b8f · dd31b8f
2 parents ad74151 + 9f42e27
commit dd31b8f
Show file tree

Hide file tree

Showing 37 changed files with 768 additions and 944 deletions.
diff --git a/ListViewAnimationsExample.apk b/ListViewAnimationsExample.apk
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Developed By
 -----
 * Niek Haarman
 
-Special thanks
+Special Thanks
 -----
 * Roman Nurik - The ListViewAnimations library uses a modified version of his [SwipeDismissListViewTouchListener][5] to support swipe-to-dismiss.
 * Jake Warthon - To support devices pre-HC (<3.0), a jar file of [NineOldAndroids][2] is included.
@@ -64,7 +64,7 @@ License
  [1]: https://play.google.com/store/apps/details?id=com.haarman.listviewanimations
  [2]: http://nineoldandroids.com/
  [3]: http://en.wikipedia.org/wiki/Decorator_pattern
- [4]: https://github.com/nhaarman/ListViewAnimations/blob/master/com.haarman.listviewanimations-2.3.0.jar?raw=true
+ [4]: https://github.com/nhaarman/ListViewAnimations/blob/master/com.haarman.listviewanimations-2.3.1.jar?raw=true
  [5]: https://gist.github.com/romannurik/2980593
  [6]: https://play.google.com/store/apps/details?id=com.haarman.treinverkeer
  [7]: https://www.twitter.com/niekfct

diff --git a/com.haarman.listviewanimations-2.3.0.jar → com.haarman.listviewanimations-2.3.1.jar b/com.haarman.listviewanimations-2.3.0.jar → com.haarman.listviewanimations-2.3.1.jar
diff --git a/example/AndroidManifest.xml b/example/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.haarman.listviewanimations"
-    android:versionCode="21"
-    android:versionName="2.3.0" >
+    android:versionCode="22"
+    android:versionName="2.3.1" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -20,41 +20,11 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.AnimationInExamplesActivity"
-            android:label="@string/swingin" />
-        <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.StickyListHeadersExample"
-            android:label="@string/stickylistheaders" />
-        <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.SwingBottomInActivity"
-            android:label="@string/bottomin" />
-        <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.SwingBottomRightInActivity"
-            android:label="@string/bottomrightin" />
-        <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.SwingLeftInActivity"
-            android:label="@string/leftin" />
-        <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.SwingRightInActivity"
-            android:label="@string/rightin" />
-        <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.ScaleInActivity"
-            android:label="@string/scalein" />
-        <activity
-            android:name="com.haarman.listviewanimations.animationinexamples.AlphaInActivity"
-            android:label="@string/alphain" />
+            android:name="com.haarman.listviewanimations.appearanceexamples.AppearanceExamplesActivity"
+            android:label="@string/appearance" />
         <activity
             android:name="com.haarman.listviewanimations.GoogleCardsActivity"
             android:label="@string/googlecards" />
-        <activity
-            android:name="com.haarman.listviewanimations.itemmanipulationexamples.contextualundo.ContextualUndoActivity"
-            android:label="@string/contextualundo" />
-        <activity
-            android:name="com.haarman.listviewanimations.itemmanipulationexamples.contextualundo.ContextualUndoWithTimedDeleteAndCountDownActivity"
-            android:label="@string/contextualundotimedcountdown" />
-        <activity
-            android:name="com.haarman.listviewanimations.itemmanipulationexamples.contextualundo.ContextualUndoWithTimedDeleteActivity"
-            android:label="@string/contextualundotimed" />
         <activity
             android:name="com.haarman.listviewanimations.itemmanipulationexamples.ItemManipulationsExamplesActivity"
             android:label="@string/itemmanipulation" />
@@ -68,7 +38,7 @@
             android:name="com.haarman.listviewanimations.GridViewActivity"
             android:label="@string/gridviewexample" />
         <activity
-            android:name="com.haarman.listviewanimations.ExpandableListItemActivity"
+            android:name="com.haarman.listviewanimations.itemmanipulationexamples.ExpandableListItemActivity"
             android:label="@string/expandablelistitemadapter" />
     </application>
 

diff --git a/example/README.txt b/example/README.txt
@@ -0,0 +1 @@
+Note: To be able to build the sample application you will need to add the android-support-v7-appcompat library to the project.
diff --git a/example/libs/android-support-v4.jar b/example/libs/android-support-v4.jar
diff --git a/example/project.properties b/example/project.properties
@@ -12,4 +12,5 @@
 
 # Project target.
 target=Google Inc.:Google APIs:18
-android.library.reference.1=../library
+android.library.reference.1=..\\library
+android.library.reference.2=../../../../../Program Files (x86)/Android SDK/extras/android/support/v7/appcompat
diff --git a/example/res/layout/activity_appearanceexample.xml b/example/res/layout/activity_appearanceexample.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <ListView
+        android:id="@+id/activity_appearanceexample_listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@null" />
+
+    <com.emilsjolander.components.stickylistheaders.StickyListHeadersListView
+        android:id="@+id/activity_appearanceexample_stickylistview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@null" />
+
+</merge>
diff --git a/example/res/layout/activity_examples_animationin.xml b/example/res/layout/activity_examples_animationin.xml
diff --git a/example/res/layout/activity_examples_itemmanipulations.xml b/example/res/layout/activity_examples_itemmanipulations.xml
@@ -29,27 +29,6 @@
             android:onClick="onAnimateRemovalClicked"
             android:text="@string/animateremoval" />
 
-        <Button
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:onClick="onContextualUndoClicked"
-            android:text="@string/contextualundo" />
-
-        <Button
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:onClick="onContextualUndoTimedClicked"
-            android:text="@string/contextualundotimed" />
-
-        <Button
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:onClick="onContextualUndoTimedCountDownClicked"
-            android:text="@string/contextualundotimedcountdown" />
-
         <Button
             android:layout_width="150dp"
             android:layout_height="wrap_content"

diff --git a/example/res/layout/activity_main.xml b/example/res/layout/activity_main.xml
@@ -13,20 +13,22 @@
         android:layout_margin="8dp"
         android:onClick="onGoogleCardsExampleClicked"
         android:text="@string/googlecards" />
-
+    
     <Button
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:onClick="onGridViewExampleClicked"
-        android:text="@string/gridviewexample" />
+        android:text="@string/gridview" />
+
+
 
     <Button
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
-        android:onClick="onSwingInClicked"
-        android:text="@string/swingin" />
+        android:onClick="onAppearanceClicked"
+        android:text="@string/appearance" />
 
     <Button
         android:layout_width="150dp"

diff --git a/example/res/layout/activity_stickylistheaders.xml b/example/res/layout/activity_stickylistheaders.xml
diff --git a/example/res/menu/menu_appearance.xml b/example/res/menu/menu_appearance.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_appearance_sticky"
+        android:checkable="true"
+        android:title="@string/sticky"/>
+
+</menu>
diff --git a/example/res/values-v11/styles.xml b/example/res/values-v11/styles.xml
diff --git a/example/res/values-v14/styles.xml b/example/res/values-v14/styles.xml
diff --git a/example/res/values/strings.xml b/example/res/values/strings.xml
@@ -2,32 +2,24 @@
 
     <string name="app_name">ListViewAnimationsExample</string>
     <string name="menu_github">Github</string>
-    <string name="swingin">Animation in adapters</string>
-    <string name="itemmanipulation">Item manipulation</string>
-    <string name="stickylistheaders">Sticky List Headers</string>
-    <string name="bottomin">Bottom in</string>
-    <string name="rightin">Right in</string>
-    <string name="leftin">Left in</string>
-    <string name="bottomrightin">Bottom right in</string>
-    <string name="scalein">Scale in</string>
-    <string name="alphain">Alpha in</string>
     <string name="googlecards">Google cards example</string>
+    <string name="gridview">GridView example</string>
+    <string name="appearance">Appearance Animation</string>
+    <string name="sticky">Sticky</string>
+    <string name="itemmanipulation">Item Manipulation</string>
     <string name="gridviewexample">GridView example</string>
     <string name="swipedismiss">Swipe to dismiss</string>
     <string name="animateremoval">Animate dismiss</string>
     <string name="removeselected">Remove selected</string>
-    <string name="contextualundo">Contextual undo</string>
-    <string name="contextualundotimedcountdown">Contextual undo with timed delete and count down</string>
-    <string name="contextualundotimed">Contextual undo with timed delete</string>
     <string name="expandablelistitemadapter">Expand list items</string>
     <string name="itemdeleted">Item deleted</string>
     <string name="taptoundo">Tap to undo</string>
     <string name="explainexpand">Tap on cards to expand or collapse them</string>
     <string name="expandorcollapsecard">This is card number %d</string>
 
     <plurals name="countdown_seconds">
-        <item quantity="one">Dismissing in 1 second</item>
-        <item quantity="other">Dismissing in %d seconds</item>
+        <item quantity="one">Dismissing in 1...</item>
+        <item quantity="other">Dismissing in %d...</item>
     </plurals>
 
     <string name="countdown_dismissing">Dismissing</string>

diff --git a/example/res/values/styles.xml b/example/res/values/styles.xml
@@ -1,20 +1,20 @@
-<resources>
-
-    <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Light">
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        -->
-    </style>
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
-    </style>
-
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
 </resources>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Note: To be able to build the sample application you will need to add the android-support-v7-appcompat library to the project.