diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt index 485bbda93..fe99bc7db 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.kt @@ -26,7 +26,6 @@ import org.isoron.uhabits.R import org.isoron.uhabits.activities.AndroidThemeSwitcher import org.isoron.uhabits.core.models.PaletteColor import org.isoron.uhabits.databinding.SettingsActivityBinding -import org.isoron.uhabits.utils.applyBottomInset import org.isoron.uhabits.utils.applyRootViewInsets import org.isoron.uhabits.utils.setupToolbar @@ -45,7 +44,6 @@ class SettingsActivity : AppCompatActivity() { theme = themeSwitcher.currentTheme ) binding.root.applyRootViewInsets() - binding.root.applyBottomInset() setContentView(binding.root) } } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt index ecf26b06a..ea8ec11c5 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt @@ -26,11 +26,14 @@ import android.net.Uri import android.os.Bundle import android.provider.Settings import android.util.Log +import android.view.LayoutInflater import android.view.View +import android.view.ViewGroup import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceFragmentCompat +import androidx.recyclerview.widget.RecyclerView import org.isoron.uhabits.HabitsApplication import org.isoron.uhabits.R import org.isoron.uhabits.activities.habits.list.RESULT_BUG_REPORT @@ -44,6 +47,7 @@ import org.isoron.uhabits.core.utils.DateUtils.Companion.getLongWeekdayNames import org.isoron.uhabits.notifications.AndroidNotificationTray.Companion.createAndroidNotificationChannel import org.isoron.uhabits.notifications.RingtoneManager import org.isoron.uhabits.utils.StyledResources +import org.isoron.uhabits.utils.applyBottomInset import org.isoron.uhabits.utils.startActivitySafely import org.isoron.uhabits.widgets.WidgetUpdater import java.util.Calendar @@ -94,6 +98,15 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis super.onViewCreated(view, savedInstanceState) } + override fun onCreateRecyclerView( + inflater: LayoutInflater?, + parent: ViewGroup?, + savedInstanceState: Bundle?, + ): RecyclerView? { + return super.onCreateRecyclerView(inflater, parent, savedInstanceState) + .also { it.applyBottomInset() } + } + override fun onPreferenceTreeClick(preference: Preference): Boolean { val key = preference.key ?: return false when (key) { diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml index 08a42d6dc..3868a7843 100644 --- a/uhabits-android/src/main/res/values/styles.xml +++ b/uhabits-android/src/main/res/values/styles.xml @@ -160,7 +160,7 @@