From 9f84845ada8f57a09a0facd636f9b43821c74d2d Mon Sep 17 00:00:00 2001
From: TwistedUmbrellaX <1173913+AbandonedCart@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:42:33 -0400
Subject: [PATCH] fix: login and navigation < API 23 (#258)
* fix: compensate for old nav (48dp)
* fix: allow login to complete < API 23
---
.../java/ani/dantotsu/home/HomeFragment.kt | 23 +-
.../main/res/layout-land/activity_media.xml | 6 -
.../main/res/layout-v23/activity_media.xml | 497 ++++++++++++++++++
app/src/main/res/layout/activity_media.xml | 7 +-
lint.xml | 5 +
5 files changed, 519 insertions(+), 19 deletions(-)
create mode 100644 app/src/main/res/layout-v23/activity_media.xml
create mode 100644 lint.xml
diff --git a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
index 1f802793..fae3fedf 100644
--- a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
+++ b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
@@ -138,17 +138,20 @@ class HomeFragment : Fragment() {
var reached = false
val duration = ((PrefManager.getVal(PrefName.AnimationSpeed) as Float) * 200).toLong()
- binding.homeScroll.setOnScrollChangeListener { _, _, _, _, _ ->
- if (!binding.homeScroll.canScrollVertically(1)) {
- reached = true
- bottomBar.animate().translationZ(0f).setDuration(duration).start()
- ObjectAnimator.ofFloat(bottomBar, "elevation", 4f, 0f).setDuration(duration)
- .start()
- } else {
- if (reached) {
- bottomBar.animate().translationZ(12f).setDuration(duration).start()
- ObjectAnimator.ofFloat(bottomBar, "elevation", 0f, 4f).setDuration(duration)
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ binding.homeScroll.setOnScrollChangeListener { _, _, _, _, _ ->
+ if (!binding.homeScroll.canScrollVertically(1)) {
+ reached = true
+ bottomBar.animate().translationZ(0f).setDuration(duration).start()
+ ObjectAnimator.ofFloat(bottomBar, "elevation", 4f, 0f).setDuration(duration)
.start()
+ } else {
+ if (reached) {
+ bottomBar.animate().translationZ(12f).setDuration(duration).start()
+ ObjectAnimator.ofFloat(bottomBar, "elevation", 0f, 4f).setDuration(duration)
+ .start()
+ }
}
}
}
diff --git a/app/src/main/res/layout-land/activity_media.xml b/app/src/main/res/layout-land/activity_media.xml
index ae12298a..247c86a9 100644
--- a/app/src/main/res/layout-land/activity_media.xml
+++ b/app/src/main/res/layout-land/activity_media.xml
@@ -24,8 +24,6 @@
app:abb_animationInterpolator="@anim/over_shoot"
app:abb_selectedTabType="text"
app:abb_textAppearance="@style/NavBarText"
-
-
app:itemActiveIndicatorStyle="@style/BottomNavBar"
app:itemIconTint="@color/tab_layout_icon"
app:itemRippleColor="#00000000"
@@ -44,8 +42,6 @@
app:abb_animationInterpolator="@anim/over_shoot"
app:abb_selectedTabType="text"
app:abb_textAppearance="@style/NavBarText"
-
-
app:itemActiveIndicatorStyle="@style/BottomNavBar"
app:itemIconTint="@color/tab_layout_icon"
app:itemRippleColor="#00000000"
@@ -64,8 +60,6 @@
app:abb_animationInterpolator="@anim/over_shoot"
app:abb_selectedTabType="text"
app:abb_textAppearance="@style/NavBarText"
-
-
app:itemActiveIndicatorStyle="@style/BottomNavBar"
app:itemIconTint="@color/tab_layout_icon"
app:itemRippleColor="#00000000"
diff --git a/app/src/main/res/layout-v23/activity_media.xml b/app/src/main/res/layout-v23/activity_media.xml
new file mode 100644
index 00000000..dd6fefbd
--- /dev/null
+++ b/app/src/main/res/layout-v23/activity_media.xml
@@ -0,0 +1,497 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index dd6fefbd..3f7708a6 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -360,12 +360,13 @@
android:id="@+id/mediaTabContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="48dp"
android:orientation="horizontal">
+
+
+
+
\ No newline at end of file