[All] Update to Compose 1.0.0-alpha07

Owl/app/build.gradle

@@ -91,4 +91,5 @@ dependencies {
     implementation Libs.AndroidX.Compose.tooling
 
     implementation Libs.Accompanist.coil
+    implementation Libs.Accompanist.insets
 }

Owl/app/src/main/java/com/example/owl/ui/OwlApp.kt

@@ -27,8 +27,8 @@ import com.example.owl.ui.courses.Courses
 import com.example.owl.ui.onboarding.Onboarding
 import com.example.owl.ui.utils.AmbientBackDispatcher
 import com.example.owl.ui.utils.Navigator
-import com.example.owl.ui.utils.ProvideDisplayInsets
 import com.example.owl.ui.utils.ProvideImageLoader
+import dev.chrisbanes.accompanist.insets.ProvideWindowInsets
 
 @Composable
 fun OwlApp(backDispatcher: OnBackPressedDispatcher) {
@@ -41,7 +41,7 @@ fun OwlApp(backDispatcher: OnBackPressedDispatcher) {
     val actions = remember(navigator) { Actions(navigator) }
 
     Providers(AmbientBackDispatcher provides backDispatcher) {
-        ProvideDisplayInsets {
+        ProvideWindowInsets {
             ProvideImageLoader {
                 Crossfade(navigator.current) { destination ->
                     when (destination) {

Owl/app/src/main/java/com/example/owl/ui/common/CourseListItem.kt

@@ -16,7 +16,6 @@
 
 package com.example.owl.ui.common
 
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -30,6 +29,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.OndemandVideo
 import androidx.compose.runtime.Composable

Owl/app/src/main/java/com/example/owl/ui/course/CourseDetails.kt

@@ -20,7 +20,6 @@ import androidx.compose.animation.animate
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.ScrollableColumn
 import androidx.compose.foundation.ScrollableRow
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -36,15 +35,16 @@ import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredSize
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.AmbientEmphasisLevels
+import androidx.compose.material.AmbientContentAlpha
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Divider
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.FractionalThreshold
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ProvideEmphasis
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.contentColorFor
 import androidx.compose.material.icons.Icons
@@ -56,13 +56,14 @@ import androidx.compose.material.primarySurface
 import androidx.compose.material.rememberSwipeableState
 import androidx.compose.material.swipeable
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Providers
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.WithConstraints
 import androidx.compose.ui.drawLayer
 import androidx.compose.ui.gesture.scrollorientationlocking.Orientation
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.WithConstraints
 import androidx.compose.ui.platform.DensityAmbient
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -81,14 +82,14 @@ import com.example.owl.ui.common.OutlinedAvatar
 import com.example.owl.ui.theme.BlueTheme
 import com.example.owl.ui.theme.PinkTheme
 import com.example.owl.ui.theme.pink500
-import com.example.owl.ui.utils.AmbientInsets
 import com.example.owl.ui.utils.NetworkImage
 import com.example.owl.ui.utils.backHandler
 import com.example.owl.ui.utils.lerp
-import com.example.owl.ui.utils.navigationBarsPadding
 import com.example.owl.ui.utils.scrim
-import com.example.owl.ui.utils.statusBarsPadding
-import com.example.owl.ui.utils.toPaddingValues
+import dev.chrisbanes.accompanist.insets.AmbientWindowInsets
+import dev.chrisbanes.accompanist.insets.navigationBarsPadding
+import dev.chrisbanes.accompanist.insets.statusBarsPadding
+import dev.chrisbanes.accompanist.insets.toPaddingValues
 
 private val FabSize = 56.dp
 private const val ExpandedSheetAlpha = 0.96f
@@ -227,7 +228,7 @@ private fun CourseDescriptionBody(course: Course) {
             .padding(horizontal = 16.dp)
     )
     Spacer(modifier = Modifier.preferredHeight(16.dp))
-    ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
+    Providers(AmbientContentAlpha provides ContentAlpha.medium) {
         Text(
             text = stringResource(id = R.string.course_desc),
             style = MaterialTheme.typography.body1,
@@ -246,7 +247,7 @@ private fun CourseDescriptionBody(course: Course) {
             .fillMaxWidth()
             .padding(16.dp)
     )
-    ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
+    Providers(AmbientContentAlpha provides ContentAlpha.medium) {
         Text(
             text = stringResource(id = R.string.needs),
             style = MaterialTheme.typography.body1,
@@ -320,7 +321,7 @@ private fun LessonsSheet(
 ) {
     // Use the fraction that the sheet is open to drive the transformation from FAB -> Sheet
     val fabSize = with(DensityAmbient.current) { FabSize.toPx() }
-    val fabSheetHeight = fabSize + AmbientInsets.current.systemBars.bottom
+    val fabSheetHeight = fabSize + AmbientWindowInsets.current.systemBars.bottom
     val offsetX = lerp(width - fabSize, 0f, 0f, 0.15f, openFraction)
     val offsetY = lerp(height - fabSheetHeight, 0f, openFraction)
     val tlCorner = lerp(fabSize, 0f, 0f, 0.15f, openFraction)
@@ -388,7 +389,7 @@ private fun Lessons(
             }
             ScrollableColumn(
                 scrollState = scroll,
-                contentPadding = AmbientInsets.current.systemBars.toPaddingValues(
+                contentPadding = AmbientWindowInsets.current.systemBars.toPaddingValues(
                     top = false
                 )
             ) {
@@ -442,7 +443,7 @@ private fun Lesson(lesson: Lesson) {
                 maxLines = 2,
                 overflow = TextOverflow.Ellipsis
             )
-            ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
+            Providers(AmbientContentAlpha provides ContentAlpha.medium) {
                 Row(
                     modifier = Modifier.padding(top = 4.dp),
                     verticalAlignment = Alignment.CenterVertically

Owl/app/src/main/java/com/example/owl/ui/courses/Courses.kt

@@ -18,17 +18,17 @@ package com.example.owl.ui.courses
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import androidx.compose.foundation.AmbientContentColor
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
+import androidx.compose.material.AmbientContentColor
 import androidx.compose.material.BottomNavigation
 import androidx.compose.material.BottomNavigationItem
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccountCircle
@@ -45,8 +45,8 @@ import com.example.owl.R
 import com.example.owl.model.courses
 import com.example.owl.model.topics
 import com.example.owl.ui.theme.BlueTheme
-import com.example.owl.ui.utils.navigationBarsHeightPlus
-import com.example.owl.ui.utils.navigationBarsPadding
+import dev.chrisbanes.accompanist.insets.navigationBarsHeight
+import dev.chrisbanes.accompanist.insets.navigationBarsPadding
 
 @Composable
 fun Courses(selectCourse: (Long) -> Unit) {
@@ -57,7 +57,7 @@ fun Courses(selectCourse: (Long) -> Unit) {
             backgroundColor = MaterialTheme.colors.primarySurface,
             bottomBar = {
                 BottomNavigation(
-                    Modifier.navigationBarsHeightPlus(56.dp)
+                    Modifier.navigationBarsHeight(additional = 56.dp)
                 ) {
                     tabs.forEach { tab ->
                         BottomNavigationItem(

Owl/app/src/main/java/com/example/owl/ui/courses/FeaturedCourses.kt

@@ -17,7 +17,6 @@
 package com.example.owl.ui.courses
 
 import androidx.compose.foundation.ScrollableColumn
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.ConstraintLayout
 import androidx.compose.foundation.layout.ExperimentalLayout
@@ -28,11 +27,12 @@ import androidx.compose.material.AmbientElevationOverlay
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.OndemandVideo
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Layout
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -43,7 +43,7 @@ import com.example.owl.ui.common.OutlinedAvatar
 import com.example.owl.ui.theme.BlueTheme
 import com.example.owl.ui.theme.OwlTheme
 import com.example.owl.ui.utils.NetworkImage
-import com.example.owl.ui.utils.statusBarsPadding
+import dev.chrisbanes.accompanist.insets.statusBarsPadding
 import kotlin.math.ceil
 
 @Composable

Owl/app/src/main/java/com/example/owl/ui/courses/MyCourses.kt

@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredWidth
-import androidx.compose.foundation.lazy.ExperimentalLazyDsl
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
@@ -32,9 +31,8 @@ import com.example.owl.model.Course
 import com.example.owl.model.courses
 import com.example.owl.ui.common.CourseListItem
 import com.example.owl.ui.theme.BlueTheme
-import com.example.owl.ui.utils.statusBarsHeight
+import dev.chrisbanes.accompanist.insets.statusBarsHeight
 
-@OptIn(ExperimentalLazyDsl::class)
 @Composable
 fun MyCourses(
     courses: List<Course>,

Owl/app/src/main/java/com/example/owl/ui/courses/SearchCourses.kt

@@ -16,18 +16,19 @@
 
 package com.example.owl.ui.courses
 
-import androidx.compose.foundation.BaseTextField
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.ScrollableColumn
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.material.AmbientContentColor
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.AccountCircle
@@ -44,7 +45,7 @@ import com.example.owl.R
 import com.example.owl.model.Topic
 import com.example.owl.model.topics
 import com.example.owl.ui.theme.BlueTheme
-import com.example.owl.ui.utils.statusBarsPadding
+import dev.chrisbanes.accompanist.insets.statusBarsPadding
 
 @Composable
 fun SearchCourses(
@@ -102,10 +103,14 @@ private fun AppBar(
                 .align(Alignment.CenterVertically)
         )
         // TODO hint
-        BaseTextField(
+        BasicTextField(
             value = searchTerm,
             onValueChange = updateSearchTerm,
-            textStyle = MaterialTheme.typography.subtitle1,
+            textStyle = MaterialTheme.typography.subtitle1.copy(
+                color = AmbientContentColor.current
+            ),
+            maxLines = 1,
+            cursorColor = AmbientContentColor.current,
             modifier = Modifier
                 .weight(1f)
                 .align(Alignment.CenterVertically)

Owl/app/src/main/java/com/example/owl/ui/onboarding/Onboarding.kt

@@ -21,7 +21,6 @@ import androidx.compose.animation.core.FloatPropKey
 import androidx.compose.animation.core.transitionDefinition
 import androidx.compose.animation.transition
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -37,26 +36,28 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.toggleable
 import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.material.AmbientEmphasisLevels
+import androidx.compose.material.AmbientContentAlpha
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ProvideEmphasis
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Done
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.rounded.Explore
 import androidx.compose.material.primarySurface
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Providers
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Layout
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.drawLayer
+import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
@@ -69,8 +70,8 @@ import com.example.owl.ui.theme.OwlTheme
 import com.example.owl.ui.theme.YellowTheme
 import com.example.owl.ui.theme.pink500
 import com.example.owl.ui.utils.NetworkImage
-import com.example.owl.ui.utils.navigationBarsPadding
-import com.example.owl.ui.utils.statusBarsPadding
+import dev.chrisbanes.accompanist.insets.navigationBarsPadding
+import dev.chrisbanes.accompanist.insets.statusBarsPadding
 import kotlin.math.max
 
 @Composable
@@ -94,17 +95,15 @@ fun Onboarding(onboardingComplete: () -> Unit) {
                     .navigationBarsPadding()
                     .padding(innerPadding)
             ) {
-                ProvideEmphasis(AmbientEmphasisLevels.current.high) {
-                    Text(
-                        text = stringResource(R.string.choose_topics_that_interest_you),
-                        style = MaterialTheme.typography.h4,
-                        textAlign = TextAlign.End,
-                        modifier = Modifier.padding(
-                            horizontal = 16.dp,
-                            vertical = 32.dp
-                        )
+                Text(
+                    text = stringResource(R.string.choose_topics_that_interest_you),
+                    style = MaterialTheme.typography.h4,
+                    textAlign = TextAlign.End,
+                    modifier = Modifier.padding(
+                        horizontal = 16.dp,
+                        vertical = 32.dp
                     )
-                }
+                )
                 TopicsGrid(
                     modifier = Modifier
                         .weight(1f)
@@ -129,13 +128,11 @@ private fun AppBar() {
             asset = vectorResource(id = OwlTheme.images.lockupLogo),
             modifier = Modifier.padding(16.dp)
         )
-        ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.high) {
-            IconButton(
-                modifier = Modifier.padding(16.dp),
-                onClick = { /* todo */ }
-            ) {
-                Icon(Icons.Filled.Settings)
-            }
+        IconButton(
+            modifier = Modifier.padding(16.dp),
+            onClick = { /* todo */ }
+        ) {
+            Icon(Icons.Filled.Settings)
         }
     }
 }
@@ -221,7 +218,7 @@ private fun TopicChip(topic: Topic) {
                     )
                 )
                 Row(verticalAlignment = Alignment.CenterVertically) {
-                    ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
+                    Providers(AmbientContentAlpha provides ContentAlpha.medium) {
                         Icon(
                             asset = vectorResource(R.drawable.ic_grain),
                             modifier = Modifier