aboutsummaryrefslogtreecommitdiff
path: root/about/src
diff options
context:
space:
mode:
Diffstat (limited to 'about/src')
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt22
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt1
-rw-r--r--about/src/main/res/layout/kau_iitem_library.xml1
-rw-r--r--about/src/main/res/transition/kau_about_return_downward.xml49
-rw-r--r--about/src/main/res/transition/kau_about_return_upwards.xml50
-rw-r--r--about/src/main/res/values/strings_about.xml2
-rw-r--r--about/src/main/res/values/styles.xml5
7 files changed, 13 insertions, 117 deletions
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt
index 90dbfd3..b3e3e41 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt
@@ -13,7 +13,8 @@ import android.view.ViewGroup
import ca.allanwang.kau.adapters.FastItemThemedAdapter
import ca.allanwang.kau.adapters.ThemableIItemColors
import ca.allanwang.kau.adapters.ThemableIItemColorsDelegate
-import ca.allanwang.kau.animators.FadeScaleAnimator
+import ca.allanwang.kau.animators.FadeScaleAnimatorAdd
+import ca.allanwang.kau.animators.KauAnimator
import ca.allanwang.kau.iitems.HeaderIItem
import ca.allanwang.kau.ui.widgets.ElasticDragDismissFrameLayout
import ca.allanwang.kau.ui.widgets.InkPageIndicator
@@ -94,12 +95,9 @@ abstract class AboutActivityBase(val rClass: Class<*>?, val configBuilder: Confi
indicator.setViewPager(pager)
draggableFrame.addListener(object : ElasticDragDismissFrameLayout.SystemChromeFader(this) {
override fun onDragDismissed() {
- // if we drag dismiss downward then the default reversal of the enter
- // transition would slide content upward which looks weird. So reverse it.
- if (draggableFrame.translationY > 0) {
- window.returnTransition = TransitionInflater.from(this@AboutActivityBase)
- .inflateTransition(configs.transitionExitReversed)
- }
+ window.returnTransition = TransitionInflater.from(this@AboutActivityBase)
+ .inflateTransition(if (draggableFrame.translationY > 0) configs.transitionExitBottom else configs.transitionExitTop)
+
libRecycler?.stopScroll()
finishAfterTransition()
}
@@ -114,10 +112,9 @@ abstract class AboutActivityBase(val rClass: Class<*>?, val configBuilder: Confi
var cutoutForeground: Int? = null
var libPageTitleRes: Int = -1
var libPageTitle: String? = string(R.string.kau_about_libraries_intro) //This is in the string by default since it's lower priority
- /**
- * Transition to be called if the view is dragged down
- */
- var transitionExitReversed: Int = R.transition.kau_about_return_downward
+
+ var transitionExitTop: Int = R.transition.kau_exit_slide_top
+ var transitionExitBottom: Int = R.transition.kau_exit_slide_bottom
}
/**
@@ -174,8 +171,9 @@ abstract class AboutActivityBase(val rClass: Class<*>?, val configBuilder: Confi
val v = layoutInflater.inflate(R.layout.kau_recycler_detached_background, parent, false)
val recycler = v.findViewById<RecyclerView>(R.id.kau_recycler_detached)
libRecycler = recycler
+ recycler.withMarginDecoration(16, KAU_BOTTOM)
recycler.adapter = libAdapter
- recycler.itemAnimator = FadeScaleAnimator(itemDelayFactor = 0.2f).apply { addDuration = 300; interpolator = AnimHolder.decelerateInterpolator(this@AboutActivityBase) }
+ recycler.itemAnimator = KauAnimator(addAnimator = FadeScaleAnimatorAdd(scaleFactor = 0.7f, itemDelayFactor = 0.2f)).apply { addDuration = 300; interpolator = AnimHolder.decelerateInterpolator(this@AboutActivityBase) }
val background = v.findViewById<View>(R.id.kau_recycler_detached_background)
if (configs.backgroundColor != null) background.setBackgroundColor(configs.backgroundColor!!.colorToForeground())
doAsync {
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt b/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
index b5e2c28..518cd54 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/LibraryIItem.kt
@@ -49,6 +49,7 @@ class LibraryIItem(val lib: Library
with(holder) {
name.text = lib.libraryName
creator.text = lib.author
+ @Suppress("DEPRECATION")
description.text = if (lib.libraryDescription.isBlank()) lib.libraryDescription
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
Html.fromHtml(lib.libraryDescription, Html.FROM_HTML_MODE_LEGACY)
diff --git a/about/src/main/res/layout/kau_iitem_library.xml b/about/src/main/res/layout/kau_iitem_library.xml
index 1c3de5c..3ad4fb4 100644
--- a/about/src/main/res/layout/kau_iitem_library.xml
+++ b/about/src/main/res/layout/kau_iitem_library.xml
@@ -5,7 +5,6 @@
android:id="@+id/lib_item_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/kau_padding_normal"
android:background="?android:selectableItemBackground"
android:clickable="true">
diff --git a/about/src/main/res/transition/kau_about_return_downward.xml b/about/src/main/res/transition/kau_about_return_downward.xml
deleted file mode 100644
index b040b1b..0000000
--- a/about/src/main/res/transition/kau_about_return_downward.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2015 Google Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<transitionSet
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:transitionOrdering="together"
- android:interpolator="@android:interpolator/fast_out_linear_in">
-
- <slide
- android:slideEdge="bottom"
- android:duration="400">
- <targets>
- <target android:excludeId="@android:id/navigationBarBackground" />
- <target android:excludeId="@android:id/statusBarBackground" />
- </targets>
- </slide>
-
- <fade
- android:startDelay="200"
- android:duration="200">
- <targets>
- <target android:targetId="@id/about_indicator" />
- <!--<target android:targetId="@id/libraries_intro" />-->
- <!--<target android:targetId="@id/libs_list_background" />-->
- </targets>
- </fade>
-
- <fade android:duration="400">
- <targets>
- <target android:targetId="@android:id/navigationBarBackground" />
- <target android:targetId="@android:id/statusBarBackground" />
- </targets>
- </fade>
-
-</transitionSet>
diff --git a/about/src/main/res/transition/kau_about_return_upwards.xml b/about/src/main/res/transition/kau_about_return_upwards.xml
deleted file mode 100644
index 64b3f5e..0000000
--- a/about/src/main/res/transition/kau_about_return_upwards.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2015 Google Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<transitionSet
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:transitionOrdering="together"
- android:interpolator="@android:interpolator/fast_out_linear_in">
-
- <slide
- android:slideEdge="top"
- android:duration="400">
- <targets>
- <target android:excludeId="@android:id/navigationBarBackground" />
- <target android:excludeId="@android:id/statusBarBackground" />
- </targets>
- </slide>
-
- <fade
- android:startDelay="200"
- android:duration="200">
- <targets>
- <target android:targetId="@id/about_indicator" />
- <!--<target android:targetId="@id/libraries_intro" />-->
- <!--<target android:targetId="@id/libs_list_background" />-->
-
- </targets>
- </fade>
-
- <fade android:duration="400">
- <targets>
- <target android:targetId="@android:id/navigationBarBackground" />
- <target android:targetId="@android:id/statusBarBackground" />
- </targets>
- </fade>
-
-</transitionSet>
diff --git a/about/src/main/res/values/strings_about.xml b/about/src/main/res/values/strings_about.xml
index 35ffeb2..f538e59 100644
--- a/about/src/main/res/values/strings_about.xml
+++ b/about/src/main/res/values/strings_about.xml
@@ -1,5 +1,5 @@
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ResourceName">
- <string name="library_kau_libraryVersion">1.5</string>
+ <string name="library_kau_libraryVersion">2.1</string>
<string name="define_kau"/>
<!-- Author section -->
diff --git a/about/src/main/res/values/styles.xml b/about/src/main/res/values/styles.xml
index 59b2470..f878950 100644
--- a/about/src/main/res/values/styles.xml
+++ b/about/src/main/res/values/styles.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="Kau.Translucent.About">
- <item name="android:windowEnterTransition">@transition/kau_enter_slide_top</item>
- <item name="android:windowReturnTransition">@transition/kau_about_return_upwards</item>
- </style>
+ <style name="Kau.Translucent.About" parent="Kau.Translucent.SlideTop"/>
</resources> \ No newline at end of file