From 6e77a5e94bcc2cfc93485d39d58d569e2c463400 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 24 Feb 2021 23:24:45 +0530 Subject: [PATCH] build: update to Compose 1.0.0-beta01 Signed-off-by: Harsh Shandilya --- .../dev/msfjarvis/lobsters/ui/main/LobstersApp.kt | 4 ++-- .../dev/msfjarvis/lobsters/ui/main/MainActivity.kt | 4 ++-- .../msfjarvis/lobsters/ui/posts/LobstersItem.kt | 4 ++-- buildSrc/src/main/java/Dependencies.kt | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt index 74d659e1..5453ee0a 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt @@ -49,7 +49,7 @@ fun LobstersApp() { } val jumpToIndex: (Int) -> Unit = { coroutineScope.launch { - hottestPostsListState.snapToItemIndex(it) + hottestPostsListState.animateScrollToItem(it) } } @@ -100,7 +100,7 @@ fun LobstersBottomNav( }, label = { Text(stringResource(id = screen.labelRes)) }, selected = currentDestination == screen, - alwaysShowLabels = false, + alwaysShowLabel = false, onClick = { if (screen != currentDestination) { navigateToDestination(screen) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt index 0ffb0ffd..c6b5c0fd 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/MainActivity.kt @@ -3,7 +3,7 @@ package dev.msfjarvis.lobsters.ui.main import android.os.Bundle import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity -import androidx.compose.runtime.Providers +import androidx.compose.runtime.CompositionLocalProvider import dagger.hilt.android.AndroidEntryPoint import dev.msfjarvis.lobsters.ui.theme.LobstersTheme import dev.msfjarvis.lobsters.ui.urllauncher.LocalUrlLauncher @@ -17,7 +17,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - Providers(LocalUrlLauncher provides urlLauncher) { + CompositionLocalProvider(LocalUrlLauncher provides urlLauncher) { LobstersTheme { LobstersApp() } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt index 9537ce38..9f9347e3 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt @@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.requiredWidth import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape @@ -111,7 +111,7 @@ fun LobstersItem( transformations(CircleCropTransformation()) }, modifier = Modifier - .width(30.dp) + .requiredWidth(30.dp) .padding(4.dp) .constrainAs(avatar) { top.linkTo(tags.bottom) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 07b7f536..09988757 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -15,7 +15,7 @@ object Plugins { } object Dependencies { - const val COMPOSE_VERSION = "1.0.0-alpha12" + const val COMPOSE_VERSION = "1.0.0-beta01" object Kotlin { @@ -35,16 +35,16 @@ object Dependencies { object Compose { - const val activity = "androidx.activity:activity-compose:1.3.0-alpha02" + const val activity = "androidx.activity:activity-compose:1.3.0-alpha03" const val compiler = "androidx.compose.compiler:compiler:$COMPOSE_VERSION" const val constraintLayout = - "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha02" + "androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha03" const val foundation = "androidx.compose.foundation:foundation:$COMPOSE_VERSION" const val foundationLayout = "androidx.compose.foundation:foundation-layout:$COMPOSE_VERSION" - const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha01" + const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02" const val material = "androidx.compose.material:material:$COMPOSE_VERSION" - const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha07" - const val paging = "androidx.paging:paging-compose:1.0.0-alpha07" + const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha08" + const val paging = "androidx.paging:paging-compose:1.0.0-alpha08" const val runtime = "androidx.compose.runtime:runtime:$COMPOSE_VERSION" const val ui = "androidx.compose.ui:ui:$COMPOSE_VERSION" const val uiUnit = "androidx.compose.ui:ui-unit:$COMPOSE_VERSION" @@ -66,7 +66,7 @@ object Dependencies { object ThirdParty { - const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.5.1" + const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.6.0" object Moshi {