From aaabd8a20a66417ef233bb94b117b60231ef724c Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 13 Dec 2021 12:01:26 +0530 Subject: [PATCH] Set overScrollMode to never for API lower than S --- .../retromusic/fragments/settings/AbsSettingsFragment.kt | 6 ++++++ .../retromusic/fragments/settings/MainSettingsFragment.kt | 1 + app/src/main/res/layout-land/activity_album_tag_editor.xml | 1 + app/src/main/res/layout-land/fragment_album_details.xml | 1 + app/src/main/res/layout-land/fragment_artist_details.xml | 1 + app/src/main/res/layout-land/fragment_banner_home.xml | 1 + app/src/main/res/layout-land/fragment_home.xml | 1 + app/src/main/res/layout-sw600dp/fragment_playing_queue.xml | 1 + app/src/main/res/layout/activity_album_tag_editor.xml | 3 ++- app/src/main/res/layout/activity_bug_report.xml | 1 + app/src/main/res/layout/activity_donation.xml | 1 + app/src/main/res/layout/activity_song_tag_editor.xml | 1 + app/src/main/res/layout/fragment_about.xml | 1 + app/src/main/res/layout/fragment_album_content.xml | 1 + app/src/main/res/layout/fragment_album_details.xml | 1 + app/src/main/res/layout/fragment_artist_content.xml | 1 + app/src/main/res/layout/fragment_artist_details.xml | 1 + app/src/main/res/layout/fragment_banner_home.xml | 1 + app/src/main/res/layout/fragment_classic_player.xml | 3 ++- app/src/main/res/layout/fragment_folder.xml | 1 + app/src/main/res/layout/fragment_gradient_player.xml | 1 + app/src/main/res/layout/fragment_home.xml | 1 + .../res/layout/fragment_main_activity_recycler_view.xml | 1 + app/src/main/res/layout/fragment_main_recycler.xml | 3 ++- app/src/main/res/layout/fragment_main_settings.xml | 3 ++- app/src/main/res/layout/fragment_player_album_cover.xml | 1 + app/src/main/res/layout/fragment_playing_queue.xml | 1 + app/src/main/res/layout/fragment_playlist_detail.xml | 1 + app/src/main/res/layout/fragment_search.xml | 4 +++- app/src/main/res/layout/home_content.xml | 3 ++- app/src/main/res/layout/section_recycler_view.xml | 1 + app/src/main/res/values-v31/donottranslate.xml | 1 + app/src/main/res/values/donottranslate.xml | 1 + 33 files changed, 45 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt index ab3987a37..87960912e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt @@ -16,6 +16,7 @@ package code.name.monkey.retromusic.fragments.settings import android.graphics.Color import android.graphics.drawable.ColorDrawable +import android.os.Build import android.os.Bundle import android.view.View import android.widget.Toast @@ -25,6 +26,7 @@ import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceManager import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat +import code.name.monkey.retromusic.BuildConfig import code.name.monkey.retromusic.activities.OnThemeChangedListener import code.name.monkey.retromusic.extensions.safeGetBottomInsets import code.name.monkey.retromusic.preferences.* @@ -67,6 +69,10 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) setDivider(ColorDrawable(Color.TRANSPARENT)) + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { + listView.overScrollMode = View.OVER_SCROLL_NEVER + } + // CollapsingToolbarLayout consumes insets and insets are not passed to child views // So we get insets from decor view // https://github.com/material-components/material-components-android/issues/1310 diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt index 5742d2950..722b654ac 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt @@ -15,6 +15,7 @@ package code.name.monkey.retromusic.fragments.settings import android.content.res.ColorStateList +import android.os.Build import android.os.Bundle import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml index 43b99d6aa..e474eec0b 100644 --- a/app/src/main/res/layout-land/activity_album_tag_editor.xml +++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml @@ -53,6 +53,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" + android:overScrollMode="@integer/overScrollMode" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml index 2ab398e4c..7d68937a5 100644 --- a/app/src/main/res/layout-land/fragment_home.xml +++ b/app/src/main/res/layout-land/fragment_home.xml @@ -61,6 +61,7 @@ android:layout_height="match_parent" android:descendantFocusability="beforeDescendants" android:focusableInTouchMode="true" + android:overScrollMode="@integer/overScrollMode" android:transitionGroup="true" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> diff --git a/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml b/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml index bdd18ae3c..7dae61e77 100644 --- a/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml +++ b/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml @@ -42,6 +42,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" + android:overScrollMode="@integer/overScrollMode" android:paddingBottom="96dp" android:scrollbars="none" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml index 5a40e8ee1..e3c4e3745 100755 --- a/app/src/main/res/layout/activity_album_tag_editor.xml +++ b/app/src/main/res/layout/activity_album_tag_editor.xml @@ -26,7 +26,8 @@ android:id="@+id/content" android:layout_width="match_parent" android:layout_height="wrap_content" - app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" + android:overScrollMode="@integer/overScrollMode"> + android:overScrollMode="@integer/overScrollMode" + tools:listitem="@layout/item_list" /> diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index 56b086604..6521a4a0a 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -82,6 +82,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" + android:overScrollMode="@integer/overScrollMode" android:scrollbars="none" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml index ea2e8b1e5..e9aad0649 100644 --- a/app/src/main/res/layout/fragment_gradient_player.xml +++ b/app/src/main/res/layout/fragment_gradient_player.xml @@ -150,6 +150,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:background="?attr/colorSurface" + android:overScrollMode="@integer/overScrollMode" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 618ed3995..1c8cf07d8 100755 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -61,6 +61,7 @@ android:layout_height="wrap_content" android:descendantFocusability="beforeDescendants" android:focusableInTouchMode="true" + android:overScrollMode="@integer/overScrollMode" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> + android:overScrollMode="@integer/overScrollMode" + android:transitionGroup="true" /> + android:layout_height="wrap_content" + android:overScrollMode="@integer/overScrollMode"> diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index b3667fda7..70452fb5a 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -73,7 +73,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="5dp" - android:scrollbarSize="0dp"> + android:scrollbars="none" + android:overScrollMode="@integer/overScrollMode"> diff --git a/app/src/main/res/layout/home_content.xml b/app/src/main/res/layout/home_content.xml index 10f38720b..133954bcf 100644 --- a/app/src/main/res/layout/home_content.xml +++ b/app/src/main/res/layout/home_content.xml @@ -66,7 +66,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:nestedScrollingEnabled="false" - tools:itemCount="10" + android:overScrollMode="@integer/overScrollMode" + tools:itemCount="10" tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager" tools:listitem="@layout/item_album_card" tools:spanCount="3" /> diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml index f554b90dd..5840f9afc 100644 --- a/app/src/main/res/layout/section_recycler_view.xml +++ b/app/src/main/res/layout/section_recycler_view.xml @@ -41,6 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:nestedScrollingEnabled="false" + android:overScrollMode="@integer/overScrollMode" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/clickable_area" diff --git a/app/src/main/res/values-v31/donottranslate.xml b/app/src/main/res/values-v31/donottranslate.xml index f4981725e..f39fb68c1 100644 --- a/app/src/main/res/values-v31/donottranslate.xml +++ b/app/src/main/res/values-v31/donottranslate.xml @@ -4,4 +4,5 @@ true false + 0 \ No newline at end of file diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index eff1e1c7d..8b950ef3e 100755 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -28,4 +28,5 @@ false true + 2 \ No newline at end of file