Merge branch 'main' into jetcaster/all_form_factors

Author: arriolac

Crane/gradle/libs.versions.toml

@@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.2.0"
 androidx-benchmark-junit4 = "1.2.1"
-androidx-compose-bom = "2024.03.00"
+androidx-compose-bom = "2024.04.00"
 androidx-constraintlayout = "1.0.1"
-androidx-corektx = "1.13.0-beta01"
+androidx-corektx = "1.13.0-rc01"
 androidx-glance = "1.0.0"
 androidx-lifecycle-compose = "2.7.0"
 androidx-lifecycle-runtime-compose = "2.7.0"
@@ -21,7 +21,7 @@ androidx-test = "1.5.0"
 androidx-test-espresso = "3.5.1"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-ext-truth = "1.5.0"
-androidx-window = "1.3.0-alpha03"
+androidx-window = "1.3.0-beta01"
 androidxHiltNavigationCompose = "1.1.0"
 androix-test-uiautomator = "2.2.0"
 coil = "2.4.0"
@@ -45,7 +45,7 @@ material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
-robolectric = "4.11.1"
+robolectric = "4.12.1"
 rome = "1.18.0"
 room = "2.6.0"
 secrets = "2.0.1"

JetLagged/gradle/libs.versions.toml

@@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.2.0"
 androidx-benchmark-junit4 = "1.2.1"
-androidx-compose-bom = "2024.03.00"
+androidx-compose-bom = "2024.04.00"
 androidx-constraintlayout = "1.0.1"
-androidx-corektx = "1.13.0-beta01"
+androidx-corektx = "1.13.0-rc01"
 androidx-glance = "1.0.0"
 androidx-lifecycle-compose = "2.7.0"
 androidx-lifecycle-runtime-compose = "2.7.0"
@@ -21,7 +21,7 @@ androidx-test = "1.5.0"
 androidx-test-espresso = "3.5.1"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-ext-truth = "1.5.0"
-androidx-window = "1.3.0-alpha03"
+androidx-window = "1.3.0-beta01"
 androidxHiltNavigationCompose = "1.1.0"
 androix-test-uiautomator = "2.2.0"
 coil = "2.4.0"
@@ -45,7 +45,7 @@ material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
-robolectric = "4.11.1"
+robolectric = "4.12.1"
 rome = "1.18.0"
 room = "2.6.0"
 secrets = "2.0.1"

JetNews/gradle/libs.versions.toml

@@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.2.0"
 androidx-benchmark-junit4 = "1.2.1"
-androidx-compose-bom = "2024.03.00"
+androidx-compose-bom = "2024.04.00"
 androidx-constraintlayout = "1.0.1"
-androidx-corektx = "1.13.0-beta01"
+androidx-corektx = "1.13.0-rc01"
 androidx-glance = "1.0.0"
 androidx-lifecycle-compose = "2.7.0"
 androidx-lifecycle-runtime-compose = "2.7.0"
@@ -21,7 +21,7 @@ androidx-test = "1.5.0"
 androidx-test-espresso = "3.5.1"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-ext-truth = "1.5.0"
-androidx-window = "1.3.0-alpha03"
+androidx-window = "1.3.0-beta01"
 androidxHiltNavigationCompose = "1.1.0"
 androix-test-uiautomator = "2.2.0"
 coil = "2.4.0"
@@ -45,7 +45,7 @@ material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
-robolectric = "4.11.1"
+robolectric = "4.12.1"
 rome = "1.18.0"
 room = "2.6.0"
 secrets = "2.0.1"

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt

@@ -31,14 +31,12 @@ import androidx.compose.foundation.layout.PaddingValues
 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.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -386,10 +384,7 @@ private fun HomeScreen(
     val coroutineScope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
     HomeScreenBackground(
-        modifier = modifier
-            .windowInsetsPadding(
-                WindowInsets.systemBars.only(WindowInsetsSides.Horizontal)
-            )
+        modifier = modifier.windowInsetsPadding(WindowInsets.navigationBars)
     ) {
         Scaffold(
             topBar = {

Jetcaster/gradle/libs.versions.toml

@@ -9,10 +9,10 @@ androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.2.3"
 androidx-benchmark-junit4 = "1.2.3"
-androidx-compose-bom = "2024.03.00"
+androidx-compose-bom = "2024.04.00"
 androidx-compose-material3-adaptive = "1.0.0-alpha10"
 androidx-constraintlayout = "1.0.1"
-androidx-corektx = "1.13.0-beta01"
+androidx-corektx = "1.13.0-rc01"
 androidx-glance = "1.0.0"
 androidx-lifecycle-runtime = "2.7.0"
 androidx-lifecycle-compose = "2.7.0"
@@ -25,7 +25,7 @@ androidx-test-ext-junit = "1.1.5"
 androidx-test-ext-truth = "1.5.0"
 androidx-tv-foundation = "1.0.0-alpha10"
 androidx-tv-material = "1.0.0-alpha10"
-androidx-window = "1.3.0-alpha03"
+androidx-window = "1.3.0-beta01"
 androidxHiltNavigationCompose = "1.2.0"
 androix-test-uiautomator = "2.3.0"
 coil = "2.5.0"
@@ -49,7 +49,7 @@ material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.12.0"
-robolectric = "4.11.1"
+robolectric = "4.12.1"
 rome = "1.18.0"
 room = "2.6.1"
 secrets = "2.0.1"

Jetchat/gradle/libs.versions.toml

@@ -9,9 +9,9 @@ androidx-activity-compose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-benchmark = "1.2.0"
 androidx-benchmark-junit4 = "1.2.1"
-androidx-compose-bom = "2024.03.00"
+androidx-compose-bom = "2024.04.00"
 androidx-constraintlayout = "1.0.1"
-androidx-corektx = "1.13.0-beta01"
+androidx-corektx = "1.13.0-rc01"
 androidx-glance = "1.0.0"
 androidx-lifecycle-compose = "2.7.0"
 androidx-lifecycle-runtime-compose = "2.7.0"
@@ -21,7 +21,7 @@ androidx-test = "1.5.0"
 androidx-test-espresso = "3.5.1"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-ext-truth = "1.5.0"
-androidx-window = "1.3.0-alpha03"
+androidx-window = "1.3.0-beta01"
 androidxHiltNavigationCompose = "1.1.0"
 androix-test-uiautomator = "2.2.0"
 coil = "2.4.0"
@@ -45,7 +45,7 @@ material = "1.11.0"
 # @keep
 minSdk = "21"
 okhttp = "4.11.0"
-robolectric = "4.11.1"
+robolectric = "4.12.1"
 rome = "1.18.0"
 room = "2.6.0"
 secrets = "2.0.1"

Jetsnack/app/build.gradle.kts

@@ -121,4 +121,5 @@ dependencies {
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.kotlinx.coroutines.test)
     androidTestImplementation(libs.androidx.compose.ui.test)
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
 }

Jetsnack/app/src/androidTest/java/com/example/jetsnack/AppTest.kt

@@ -20,9 +20,7 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import com.example.jetsnack.ui.JetsnackApp
 import com.example.jetsnack.ui.MainActivity
-import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
@@ -31,13 +29,6 @@ class AppTest {
     @get:Rule
     val composeTestRule = createAndroidComposeRule<MainActivity>()
 
-    @Before
-    fun setUp() {
-        composeTestRule.setContent {
-            JetsnackApp()
-        }
-    }
-
     @Test
     fun app_launches() {
         // Check app launches at the correct destination