diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt index 163bc80c..28e1ea16 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt +++ b/app/phone/src/main/java/dev/jdtech/jellyfin/MainActivity.kt @@ -4,6 +4,9 @@ import android.os.Bundle import android.view.View import androidx.activity.viewModels 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.NavGraph import androidx.navigation.fragment.NavHostFragment @@ -45,6 +48,21 @@ class MainActivity : AppCompatActivity() { scheduleUserDataSync() applyTheme() 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) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 33ed80aa..2f3b28bc 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,10 +4,10 @@ object Versions { const val appCode = 25 const val appName = "0.14.2" - const val compileSdk = 34 - const val buildTools = "34.0.0" + const val compileSdk = 35 + const val buildTools = "35.0.0" const val minSdk = 28 - const val targetSdk = 34 + const val targetSdk = 35 val java = JavaVersion.VERSION_17