Bump target sdk to 35

Author: jonathanklee

app/build.gradle

@@ -13,7 +13,7 @@ android {
     defaultConfig {
         applicationId "com.klee.sapio"
         minSdk 21
-        targetSdk 34
+        targetSdk 35
         versionCode 61
         versionName "1.8.1"
 

app/src/main/java/com/klee/sapio/ui/view/MainActivity.kt

@@ -6,7 +6,11 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import com.klee.sapio.R
 import com.klee.sapio.databinding.ActivityMainBinding
@@ -29,6 +33,8 @@ class MainActivity : AppCompatActivity() {
 
         displayFragment(FeedFragment())
 
+        handleEdgeToEdgeInsets()
+
         mBinding.bottomNavigation.setOnItemSelectedListener { item ->
             when (item.itemId) {
                 R.id.feed -> displayFragment(FeedFragment())
@@ -43,6 +49,23 @@ class MainActivity : AppCompatActivity() {
         supportFragmentManager.beginTransaction().replace(R.id.fragment_container, fragment).commit()
     }
 
+    private fun handleEdgeToEdgeInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(mBinding.root) { v, windowInsets ->
+            val bars = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()
+                    or WindowInsetsCompat.Type.displayCutout()
+            )
+
+            v.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                bottomMargin = bars.bottom
+                leftMargin = bars.left
+                rightMargin = bars.right
+                topMargin = bars.top
+            }
+
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         val inflater: MenuInflater = menuInflater
         inflater.inflate(R.menu.menu, menu)

app/src/main/java/com/klee/sapio/ui/view/PreferencesFragment.kt

@@ -1,11 +1,35 @@
 package com.klee.sapio.ui.view
 
 import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.preference.PreferenceFragmentCompat
 import com.klee.sapio.R
 
 class PreferencesFragment : PreferenceFragmentCompat()  {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, windowInsets ->
+            val bars = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars()
+                        or WindowInsetsCompat.Type.displayCutout()
+            )
+
+            v.updatePadding(
+                left = bars.left,
+                right = bars.right,
+                top = bars.top,
+                bottom = bars.bottom
+            )
+
+            WindowInsetsCompat.CONSUMED
+        }
+    }
 }