ANDROID-16185 - Update compile and targetSdk to Android 16 (#52)

* ANDROID-16185/update-a16: Update compileSdk and targetSdk from 34 -> 36

* ANDROID-16185/update-a16: Update client :app module

* ANDROID-16185/update-a16: Include a Modifier composable function to provide WindowInsets spaces in portrait and landscape mode

* ANDROID-16185/update-a16: Remove commented lines

* ANDROID-16185/update-a16: Remove unused code

Author: dhonti-axpe

app/build.gradle

@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace "com.telefonica.tweaks.demo"
-    compileSdk 34
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.telefonica.tweaks.demo"
         minSdk 21
-        targetSdk 34
+        targetSdk 36
         versionCode 1
         versionName "1.0"
 

library/build.gradle

@@ -6,11 +6,11 @@ plugins {
 
 android {
     namespace "com.telefonica.tweaks"
-    compileSdk 34
+    compileSdk 36
 
     defaultConfig {
         minSdk 21
-        targetSdk 34
+        targetSdk 36
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

library/src/enabled/java/com/telefonica/tweaks/ui/TweakComponents.kt

@@ -1,5 +1,6 @@
 package com.telefonica.tweaks.ui
 
+import android.content.res.Configuration
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -10,13 +11,19 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.systemGestures
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.layout.windowInsetsTopHeight
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
@@ -57,6 +64,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.SoftwareKeyboardController
@@ -99,12 +107,11 @@ fun TweaksScreen(
             .fillMaxSize()
             .background(TweaksTheme.colors.tweaksBackground)
             .padding(horizontal = 16.dp)
+            .edgeToEdgeInsetsForOrientation()
             .verticalScroll(scrollState),
         verticalArrangement = Arrangement.spacedBy(8.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
-        Spacer(modifier = Modifier.windowInsetsTopHeight(WindowInsets.statusBars))
-
         tweaksGraph.cover?.let {
             TweakGroupBody(
                 tweakGroup = it,
@@ -118,7 +125,6 @@ fun TweaksScreen(
                 text = category.title,
             )
         }
-        Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))
     }
 }
 
@@ -134,6 +140,7 @@ fun TweaksCategoryScreen(
             .fillMaxSize()
             .background(TweaksTheme.colors.tweaksBackground)
             .padding(horizontal = 16.dp)
+            .edgeToEdgeInsetsForOrientation()
             .verticalScroll(scrollState),
         verticalArrangement = Arrangement.spacedBy(8.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
@@ -600,4 +607,22 @@ internal fun TweakButton(
             color = TweaksTheme.colors.tweaksOnPrimary,
         )
     }
+}
+
+@Composable
+fun Modifier.edgeToEdgeInsetsForOrientation(): Modifier {
+    val isLandscape =
+        LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+    val sides =
+        if (isLandscape) WindowInsetsSides.Top + WindowInsetsSides.Horizontal
+        else WindowInsetsSides.Top + WindowInsetsSides.Bottom
+
+    var base = WindowInsets.statusBars
+        .union(WindowInsets.navigationBars)
+        .union(WindowInsets.displayCutout)
+        .union(WindowInsets.systemGestures)
+        .only(sides)
+
+    return this.windowInsetsPadding(base)
 }