chore: target SDK 35

This commit is contained in:
Jarne Demeulemeester 2024-07-13 17:12:56 +02:00
parent 1267f9809d
commit 307ce957c2
No known key found for this signature in database
GPG key ID: 1E5C6AFBD622E9F5
2 changed files with 21 additions and 3 deletions

View file

@ -4,6 +4,9 @@ import android.os.Bundle
import android.view.View import android.view.View
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.navigation.NavController import androidx.navigation.NavController
import androidx.navigation.NavGraph import androidx.navigation.NavGraph
import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.NavHostFragment
@ -45,6 +48,21 @@ class MainActivity : AppCompatActivity() {
scheduleUserDataSync() scheduleUserDataSync()
applyTheme() applyTheme()
setupActivity() setupActivity()
// Temp fix insets because SDK 35 enables edge to edge by default. This will probably be removed once we move to compose
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val bars = insets.getInsets(
WindowInsetsCompat.Type.systemBars()
or WindowInsetsCompat.Type.displayCutout()
)
v.updatePadding(
left = bars.left,
top = bars.top,
right = bars.right,
bottom = bars.bottom,
)
WindowInsetsCompat.CONSUMED
}
} }
@OptIn(NavigationUiSaveStateControl::class) @OptIn(NavigationUiSaveStateControl::class)

View file

@ -4,10 +4,10 @@ object Versions {
const val appCode = 25 const val appCode = 25
const val appName = "0.14.2" const val appName = "0.14.2"
const val compileSdk = 34 const val compileSdk = 35
const val buildTools = "34.0.0" const val buildTools = "35.0.0"
const val minSdk = 28 const val minSdk = 28
const val targetSdk = 34 const val targetSdk = 35
val java = JavaVersion.VERSION_17 val java = JavaVersion.VERSION_17