Add animations

5 files changed, 37 insertions, 4 deletions

diff --git a/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefColorPicker.kt b/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefColorPicker.kt
index 9917ffb..2ec0a34 100644
--- a/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefColorPicker.kt
+++ b/library/src/main/kotlin/ca/allanwang/kau/kpref/items/KPrefColorPicker.kt
@@ -58,13 +58,12 @@ class KPrefColorPicker(val builder: KPrefColorContract) : KPrefItemBase<Int>(bui
      * Default implementation of [KPrefColorContract]
      */
     class KPrefColorBuilder(attributes: CoreAttributeContract,
-                            titleRes: Int,
+                            override var titleRes: Int,
                             getter: () -> Int,
                             setter: (value: Int) -> Unit
     ) : KPrefColorContract, BaseContract<Int> by BaseBuilder<Int>(attributes, titleRes, getter, setter),
             ColorContract by ColorBuilder() {
         override var showPreview: Boolean = true
-        override var titleRes: Int = -1
     }
 
     override fun getType(): Int = R.id.kau_item_pref_color_picker
diff --git a/library/src/main/res/values/styles_animations.xml b/library/src/main/res/values/styles_animations.xml
new file mode 100644
index 0000000..a991132
--- /dev/null
+++ b/library/src/main/res/values/styles_animations.xml
@@ -0,0 +1,30 @@
+<resources>
+
+    <style name="KauSlideIn" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/kau_slide_in_right</item>
+        <item name="android:activityCloseEnterAnimation">@anim/kau_slide_in_right</item>
+        <item name="android:taskOpenEnterAnimation">@anim/kau_slide_in_right</item>
+        <item name="android:taskCloseEnterAnimation">@anim/kau_slide_in_right</item>
+        <item name="android:taskToFrontEnterAnimation">@anim/kau_slide_in_right</item>
+        <item name="android:windowEnterAnimation">@anim/kau_slide_in_right</item>
+    </style>
+
+    <style name="KauSlideInSlideOut" parent="@style/KauSlideIn">
+        <item name="android:activityOpenExitAnimation">@anim/kau_slide_out_right</item>
+        <item name="android:activityCloseExitAnimation">@anim/kau_slide_out_right</item>
+        <item name="android:taskOpenExitAnimation">@anim/kau_slide_out_right</item>
+        <item name="android:taskCloseExitAnimation">@anim/kau_slide_out_right</item>
+        <item name="android:taskToFrontExitAnimation">@anim/kau_slide_out_right</item>
+        <item name="android:windowExitAnimation">@anim/kau_slide_out_right</item>
+    </style>
+
+    <style name="KauSlideInFadeOut" parent="@style/KauSlideIn">
+        <item name="android:activityOpenExitAnimation">@anim/kau_fade_out</item>
+        <item name="android:activityCloseExitAnimation">@anim/kau_fade_out</item>
+        <item name="android:taskOpenExitAnimation">@anim/kau_fade_out</item>
+        <item name="android:taskCloseExitAnimation">@anim/kau_fade_out</item>
+        <item name="android:taskToFrontExitAnimation">@anim/kau_fade_out</item>
+        <item name="android:windowExitAnimation">@anim/kau_fade_out</item>
+    </style>
+
+</resources>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 03ca52c..b8b54bf 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         </activity>
         <activity
             android:name=".AnimActivity"
-            android:theme="@style/Theme.AppCompat" />
+            android:theme="@style/AppTheme.Slide" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
index cb7c082..a03857a 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/MainActivity.kt
@@ -102,7 +102,7 @@ class MainActivity : KPrefActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.action_settings -> startActivitySlideIn(AnimActivity::class.java, clearStack = true)
+            R.id.action_settings -> startActivity(AnimActivity::class.java, clearStack = true)
             else -> return super.onOptionsItemSelected(item)
         }
         return true
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index ac2f9c8..781424d 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -16,4 +16,8 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="AppTheme.Slide" parent="AppTheme">
+        <item name="android:windowAnimationStyle">@style/KauSlideInSlideOut</item>
+    </style>
+
 </resources>