[v1.0.4] Update some versions for new Android Studio Preview's version (#95)

Author: hide-your-code

.idea/kotlinc.xml

@@ -121,7 +121,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = "1.4.0"
     }
 
     packaging {
@@ -136,12 +136,12 @@ dependencies {
     implementation("androidx.activity:activity-compose:1.6.1")
 
     // Compose ui
-    implementation("androidx.compose.ui:ui:1.4.0-alpha04")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.4.0-alpha04")
+    implementation("androidx.compose.ui:ui:1.4.0-alpha05")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.4.0-alpha05")
 
     // Material
-    implementation("androidx.compose.material3:material3:1.1.0-alpha04")
-    implementation("androidx.compose.material:material:1.4.0-alpha04")
+    implementation("androidx.compose.material3:material3:1.1.0-alpha05")
+    implementation("androidx.compose.material:material:1.4.0-alpha05")
 
     // Work manager
     implementation("androidx.work:work-runtime-ktx:2.8.0-rc01")
@@ -187,12 +187,12 @@ dependencies {
     implementation("androidx.navigation:navigation-compose:2.5.3")
 
     // Lifecycle
-    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha04")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha05")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha05")
 
     // ViewModel
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0-alpha04")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha04")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0-alpha05")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-alpha05")
 
     // LiveData
     implementation("androidx.compose.runtime:runtime-livedata:1.4.0-alpha04")
@@ -207,7 +207,7 @@ dependencies {
     implementation("androidx.datastore:datastore-preferences:1.0.0")
 
     // Kotlin reflect
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.0")
 
     // Lottie
     implementation("com.airbnb.android:lottie-compose:5.2.0")
@@ -223,6 +223,6 @@ dependencies {
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.3.3")
 
-    debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-alpha04")
-    debugImplementation("androidx.compose.ui:ui-test-manifest:1.4.0-alpha04")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.4.0-alpha05")
+    debugImplementation("androidx.compose.ui:ui-test-manifest:1.4.0-alpha05")
 }

app/build.gradle.kts

@@ -1,7 +1,6 @@
 package com.minhdtm.example.weapose.presentation.ui.home
 
 import android.Manifest
-import android.annotation.SuppressLint
 import android.content.res.Configuration
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
@@ -10,9 +9,14 @@ import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Menu
 import androidx.compose.material.icons.sharp.LocationOn
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.PullRefreshState
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -36,8 +40,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
-import com.google.accompanist.swiperefresh.SwipeRefresh
-import com.google.accompanist.swiperefresh.SwipeRefreshState
 import com.google.android.gms.maps.model.LatLng
 import com.minhdtm.example.weapose.R
 import com.minhdtm.example.weapose.domain.enums.ActionType
@@ -51,14 +53,21 @@ import com.minhdtm.example.weapose.presentation.ui.WeatherAppState
 import com.minhdtm.example.weapose.presentation.utils.Constants
 import kotlinx.coroutines.flow.collectLatest
 
-@OptIn(ExperimentalPermissionsApi::class)
+@OptIn(ExperimentalPermissionsApi::class, ExperimentalMaterialApi::class)
 @Composable
 fun CurrentWeather(
     appState: WeatherAppState,
     viewModel: CurrentWeatherViewModel = viewModel(),
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
 
+    val pullRefreshState = rememberPullRefreshState(
+        refreshing = state.isRefresh,
+        onRefresh = {
+            viewModel.onRefreshCurrentWeather()
+        },
+    )
+
     val context = LocalContext.current
 
     val locationPermissionState = rememberMultiplePermissionsState(
@@ -132,16 +141,14 @@ fun CurrentWeather(
 
     CurrentWeatherScreen(
         state = state,
+        pullRefreshState = pullRefreshState,
         snackbarHostState = appState.snackbarHost,
         onDrawer = {
             appState.openDrawer()
         },
         onShowSnackbar = {
             appState.showSnackbar(it)
         },
-        onRefresh = {
-            viewModel.onRefreshCurrentWeather()
-        },
         onDismissErrorDialog = {
             viewModel.hideError()
         },
@@ -164,13 +171,12 @@ fun CurrentWeather(
     )
 }
 
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
 @Composable
 fun CurrentWeatherScreen(
     state: CurrentWeatherViewState,
+    pullRefreshState: PullRefreshState,
     snackbarHostState: SnackbarHostState = SnackbarHostState(),
-    onRefresh: () -> Unit = {},
     onDrawer: () -> Unit = {},
     onDismissErrorDialog: () -> Unit = {},
     onShowSnackbar: (message: String) -> Unit = {},
@@ -193,16 +199,17 @@ fun CurrentWeatherScreen(
             )
         },
     ) { _, viewState ->
-        SwipeRefresh(
-            state = SwipeRefreshState(viewState.isRefresh),
-            onRefresh = onRefresh,
-        ) {
-            if (viewState.currentWeather != null) {
+        Box(Modifier.pullRefresh(pullRefreshState)) {
+            viewState.currentWeather?.let {
                 HomeContent(
-                    currentWeather = viewState.currentWeather,
+                    currentWeather = it,
                     listHourly = viewState.listHourlyWeatherToday,
                 )
             }
+
+            PullRefreshIndicator(
+                refreshing = state.isRefresh, state = pullRefreshState, modifier = Modifier.align(Alignment.TopCenter)
+            )
         }
     }
 }
@@ -483,12 +490,16 @@ private fun AppBarPreview() {
     }
 }
 
+@OptIn(ExperimentalMaterialApi::class)
 @Preview(name = "Light", showBackground = true, device = NEXUS_5)
 @Preview(name = "Dark", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES, device = PIXEL_4_XL)
 @Composable
 private fun ScreenPreview() {
     WeaposeTheme {
-        CurrentWeatherScreen(CurrentWeatherViewState())
+        CurrentWeatherScreen(
+            state = CurrentWeatherViewState(),
+            pullRefreshState = rememberPullRefreshState(refreshing = true, onRefresh = {})
+        )
     }
 }
 

app/src/main/java/com/minhdtm/example/weapose/presentation/ui/home/CurrentWeatherScreen.kt

@@ -130,7 +130,7 @@ class CurrentWeatherViewModel @Inject constructor(
             )
         }
 
-        getCurrentWeather(currentLocation)
+        getCurrentLocation()
     }
 
     fun cleanEvent() {

app/src/main/java/com/minhdtm/example/weapose/presentation/ui/home/CurrentWeatherViewModel.kt

@@ -9,9 +9,14 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.KeyboardArrowUp
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.PullRefreshState
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -22,8 +27,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.google.accompanist.swiperefresh.SwipeRefresh
-import com.google.accompanist.swiperefresh.SwipeRefreshState
 import com.google.android.gms.maps.model.LatLng
 import com.minhdtm.example.weapose.R
 import com.minhdtm.example.weapose.presentation.component.WeatherScaffold
@@ -37,12 +40,19 @@ import com.minhdtm.example.weapose.presentation.utils.Constants
 import com.minhdtm.example.weapose.presentation.utils.toUVIndexAttention
 import kotlinx.coroutines.flow.collectLatest
 
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun SevenDaysWeather(
     appState: WeatherAppState,
     viewModel: SevenDaysWeatherViewModel = viewModel(),
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
+    val pullRefreshState = rememberPullRefreshState(
+        refreshing = state.isRefresh,
+        onRefresh = {
+            viewModel.onRefresh()
+        }
+    )
 
     // Get data from back
     LaunchedEffect(true) {
@@ -86,10 +96,9 @@ fun SevenDaysWeather(
     }
 
     SevenDaysWeatherScreen(
-        state = state, snackbarHostState = appState.snackbarHost,
-        onRefresh = {
-            viewModel.onRefresh()
-        },
+        state = state,
+        snackbarHostState = appState.snackbarHost,
+        pullRefreshState = pullRefreshState,
         onDrawer = {
             appState.openDrawer()
         },
@@ -108,12 +117,12 @@ fun SevenDaysWeather(
     )
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
 @Composable
 fun SevenDaysWeatherScreen(
     state: SevenDaysViewState,
     snackbarHostState: SnackbarHostState,
-    onRefresh: () -> Unit = {},
+    pullRefreshState: PullRefreshState,
     onShowSnackbar: (message: String) -> Unit = {},
     onDrawer: () -> Unit = {},
     onNavigateSearch: () -> Unit = {},
@@ -136,15 +145,18 @@ fun SevenDaysWeatherScreen(
         onShowSnackbar = onShowSnackbar,
         onDismissErrorDialog = onDismissDialog,
     ) { _, viewState ->
-        SwipeRefresh(
-            state = SwipeRefreshState(viewState.isRefresh),
-            onRefresh = onRefresh,
-        ) {
+        Box(modifier = Modifier.pullRefresh(pullRefreshState)) {
             ListWeatherDay(
                 modifier = Modifier.fillMaxSize(),
                 list = viewState.listSevenDays,
                 onClickExpandedItem = onClickExpandedItem,
             )
+
+            PullRefreshIndicator(
+                refreshing = state.isRefresh,
+                state = pullRefreshState,
+                modifier = Modifier.align(Alignment.TopCenter),
+            )
         }
     }
 }

app/src/main/java/com/minhdtm/example/weapose/presentation/ui/sevendaysweather/SevenDaysWeatherScreen.kt

@@ -1,8 +1,8 @@
 plugins {
-    id("com.android.application") version "8.1.0-alpha01" apply false
-    id("com.android.library") version "8.1.0-alpha01" apply false
-    id("org.jetbrains.kotlin.android") version "1.7.20" apply false
-    id("org.jetbrains.kotlin.jvm") version "1.7.20" apply false
+    id("com.android.application") version "8.1.0-alpha02" apply false
+    id("com.android.library") version "8.1.0-alpha02" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.0" apply false
+    id("org.jetbrains.kotlin.jvm") version "1.8.0" apply false
     id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") version "2.0.1" apply false
     id("com.google.dagger.hilt.android") version "2.44.2" apply false
 }