From c1eb30e83758f6160afab1c1b8732f34fda3dcb9 Mon Sep 17 00:00:00 2001
From: Sad Ellie <openthiswhitedoor@gmail.com>
Date: Thu, 21 Apr 2022 21:41:43 +0300
Subject: [PATCH] Dependencies bump Now using PaddingValue from Scaffold

---
 app/build.gradle                                          | 4 ++--
 .../java/com/sadellie/unitto/screens/about/AboutScreen.kt | 4 ++--
 .../java/com/sadellie/unitto/screens/main/MainScreen.kt   | 8 +++++---
 .../sadellie/unitto/screens/setttings/SettingsScreen.kt   | 4 ++--
 build.gradle                                              | 4 ++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bb137d34..05ce078c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -109,10 +109,10 @@ dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation 'androidx.navigation:navigation-compose:2.5.0-alpha04'
+    implementation 'androidx.navigation:navigation-compose:2.5.0-beta01'
 
     // Material Design 3
-    implementation "androidx.compose.material3:material3:1.0.0-alpha09"
+    implementation "androidx.compose.material3:material3:1.0.0-alpha10"
 
     // Hilt and navigation
     implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
diff --git a/app/src/main/java/com/sadellie/unitto/screens/about/AboutScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/about/AboutScreen.kt
index 328eff60..d4d93662 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/about/AboutScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/about/AboutScreen.kt
@@ -58,9 +58,9 @@ fun AboutScreen(
                 scrollBehavior = scrollBehavior
             )
         },
-    ) {
+    ) { padding ->
         LazyColumn(
-            Modifier.padding(horizontal = 16.dp),
+            Modifier.padding(padding).padding(horizontal = 16.dp),
             verticalArrangement = Arrangement.spacedBy(16.dp),
             contentPadding = PaddingValues(vertical = 16.dp)
         ) {
diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
index 3a9cb05e..d118e172 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
@@ -53,8 +53,9 @@ fun MainScreen(
                     .centerAlignedTopAppBarColors(containerColor = Color.Transparent)
             )
         },
-        content = {
+        content = { padding ->
             PortraitMainScreenContent(
+                modifier = Modifier.padding(padding),
                 unitFrom = viewModel.unitFrom,
                 unitTo = viewModel.unitTo,
                 portrait = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT,
@@ -72,6 +73,7 @@ fun MainScreen(
 
 @Composable
 private fun PortraitMainScreenContent(
+    modifier: Modifier,
     unitFrom: AbstractUnit,
     unitTo: AbstractUnit,
     portrait: Boolean = true,
@@ -85,7 +87,7 @@ private fun PortraitMainScreenContent(
 ) {
     if (portrait) {
         Column(
-            Modifier
+            modifier
                 .fillMaxSize()
                 .padding(8.dp),
             verticalArrangement = Arrangement.spacedBy(24.dp)
@@ -117,7 +119,7 @@ private fun PortraitMainScreenContent(
         }
     } else {
         Row(
-            Modifier
+            modifier
                 .fillMaxSize()
                 .padding(8.dp),
             horizontalArrangement = Arrangement.spacedBy(8.dp)
diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
index 512cbf9f..29827ec8 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
@@ -61,9 +61,9 @@ fun SettingsScreen(
                 scrollBehavior = scrollBehavior
             )
         },
-        content = {
+        content = { padding ->
             LazyColumn(
-                Modifier.fillMaxHeight()
+                Modifier.padding(padding).fillMaxHeight()
             ) {
                 item {
                     Column {
diff --git a/build.gradle b/build.gradle
index b03aaefc..cd37c211 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_version = '1.2.0-alpha07'
+        compose_version = '1.2.0-alpha08'
     }
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.1.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1'
 
         // Google services