From 9832aed0ea96312e59ed75c788a1b843f1947a7e Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 17 Jun 2017 15:20:42 -0700
Subject: Add animations

---
 .../allanwang/kau/kpref/items/KPrefColorPicker.kt  |  3 +--
 library/src/main/res/values/styles_animations.xml  | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 library/src/main/res/values/styles_animations.xml

(limited to 'library/src/main')

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>
-- 
cgit v1.2.3