Merge pull request #81 from krzdabrowski/renovate/minor-and-patch-cha…

…nges Update dependencies for minor & patch changes
krzdabrowski · Sep 5, 2024 · fea180d · fea180d
2 parents a0e1858 + ad62965
commit fea180d
Show file tree

Hide file tree

Showing 20 changed files with 93 additions and 157 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -52,6 +52,12 @@ ktlint_standard_no-blank-line-in-list = disabled
 # Set signature body expression wrapping to default (even if default, it is required for multiline-expression-wrapping)
 ktlint_function_signature_body_expression_wrapping = default
 
+# Ignore forcing one-line classes into multiple lines
+ktlint_standard_class-signature = disabled
+
+# Ignore putting every dot-chain in the same line as closing parenthesis
+ktlint_standard_chain-method-continuation = disabled
+
 
 [*.md]
 trim_trailing_whitespace = false

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -39,10 +39,6 @@ android {
         }
     }
 
-    composeCompiler {
-        enableStrongSkippingMode = true
-    }
-
     kotlin {
         jvmToolchain(17)
     }

diff --git a/app/src/main/java/eu/krzdabrowski/starter/database/DatabaseModule.kt b/app/src/main/java/eu/krzdabrowski/starter/database/DatabaseModule.kt
@@ -20,17 +20,13 @@ internal object DatabaseModule {
     @Provides
     fun provideAppDatabase(
         @ApplicationContext context: Context,
-    ): AppDatabase {
-        return Room.databaseBuilder(
-            context,
-            AppDatabase::class.java,
-            APP_DATABASE_NAME,
-        ).build()
-    }
+    ): AppDatabase = Room.databaseBuilder(
+        context,
+        AppDatabase::class.java,
+        APP_DATABASE_NAME,
+    ).build()
 
     @Singleton
     @Provides
-    fun provideRocketDao(database: AppDatabase): RocketDao {
-        return database.rocketDao()
-    }
+    fun provideRocketDao(database: AppDatabase): RocketDao = database.rocketDao()
 }
diff --git a/basic-feature/build.gradle.kts b/basic-feature/build.gradle.kts
@@ -34,16 +34,13 @@ android {
         }
     }
 
-    composeCompiler {
-        enableStrongSkippingMode = true
-    }
-
     kotlin {
         jvmToolchain(17)
 
         compilerOptions {
             freeCompilerArgs.addAll(
-                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
+                "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
             )
         }
     }

diff --git a/...eature/src/androidTest/java/eu/krzdabrowski/starter/basicfeature/data/FakeRocketModule.kt b/...eature/src/androidTest/java/eu/krzdabrowski/starter/basicfeature/data/FakeRocketModule.kt
@@ -18,18 +18,14 @@ import kotlinx.coroutines.flow.flowOf
 internal object FakeRocketModule {
 
     @Provides
-    fun provideFakeGetRocketsUseCase(): GetRocketsUseCase {
-        return GetRocketsUseCase {
-            flowOf(
-                Result.success(generateTestRocketsFromDomain()),
-            )
-        }
+    fun provideFakeGetRocketsUseCase(): GetRocketsUseCase = GetRocketsUseCase {
+        flowOf(
+            Result.success(generateTestRocketsFromDomain()),
+        )
     }
 
     @Provides
-    fun provideNoopRefreshRocketsUseCase(): RefreshRocketsUseCase {
-        return RefreshRocketsUseCase {
-            resultOf { }
-        }
+    fun provideNoopRefreshRocketsUseCase(): RefreshRocketsUseCase = RefreshRocketsUseCase {
+        resultOf { }
     }
 }
diff --git a/basic-feature/src/main/java/eu/krzdabrowski/starter/basicfeature/data/di/RocketModule.kt b/basic-feature/src/main/java/eu/krzdabrowski/starter/basicfeature/data/di/RocketModule.kt
@@ -21,22 +21,16 @@ internal object RocketModule {
 
     @Provides
     @Singleton
-    fun provideRocketApi(retrofit: Retrofit): RocketApi {
-        return retrofit.create(RocketApi::class.java)
-    }
+    fun provideRocketApi(retrofit: Retrofit): RocketApi = retrofit.create(RocketApi::class.java)
 
     @Provides
-    fun provideGetRocketsUseCase(rocketRepository: RocketRepository): GetRocketsUseCase {
-        return GetRocketsUseCase {
-            getRockets(rocketRepository)
-        }
+    fun provideGetRocketsUseCase(rocketRepository: RocketRepository): GetRocketsUseCase = GetRocketsUseCase {
+        getRockets(rocketRepository)
     }
 
     @Provides
-    fun provideRefreshRocketsUseCase(rocketRepository: RocketRepository): RefreshRocketsUseCase {
-        return RefreshRocketsUseCase {
-            refreshRockets(rocketRepository)
-        }
+    fun provideRefreshRocketsUseCase(rocketRepository: RocketRepository): RefreshRocketsUseCase = RefreshRocketsUseCase {
+        refreshRockets(rocketRepository)
     }
 
     @Module

diff --git a/...rc/main/java/eu/krzdabrowski/starter/basicfeature/data/repository/RocketRepositoryImpl.kt b/...rc/main/java/eu/krzdabrowski/starter/basicfeature/data/repository/RocketRepositoryImpl.kt
@@ -16,18 +16,15 @@ class RocketRepositoryImpl @Inject constructor(
     private val rocketDao: RocketDao,
 ) : RocketRepository {
 
-    override fun getRockets(): Flow<List<Rocket>> {
-        return rocketDao
-            .getRockets()
-            .map { rocketsCached ->
-                rocketsCached.map { it.toDomainModel() }
-            }
-            .onEach { rockets ->
-                if (rockets.isEmpty()) {
-                    refreshRockets()
-                }
+    override fun getRockets(): Flow<List<Rocket>> = rocketDao.getRockets()
+        .map { rocketsCached ->
+            rocketsCached.map { it.toDomainModel() }
+        }
+        .onEach { rockets ->
+            if (rockets.isEmpty()) {
+                refreshRockets()
             }
-    }
+        }
 
     override suspend fun refreshRockets() {
         rocketApi

diff --git a/...re/src/main/java/eu/krzdabrowski/starter/basicfeature/domain/usecase/GetRocketsUseCase.kt b/...re/src/main/java/eu/krzdabrowski/starter/basicfeature/domain/usecase/GetRocketsUseCase.kt
@@ -28,6 +28,7 @@ fun getRockets(rocketRepository: RocketRepository): Flow<Result<List<Rocket>>> =
             false
         }
     }
-    .catch { // for other than IOException but it will stop collecting Flow
+    .catch {
+        // for other than IOException but it will stop collecting Flow
         emit(Result.failure(it)) // also catch does re-throw CancellationException
     }
diff --git a/...ature/src/main/java/eu/krzdabrowski/starter/basicfeature/presentation/RocketsViewModel.kt b/...ature/src/main/java/eu/krzdabrowski/starter/basicfeature/presentation/RocketsViewModel.kt
@@ -13,6 +13,7 @@ import eu.krzdabrowski.starter.basicfeature.presentation.RocketsUiState.PartialS
 import eu.krzdabrowski.starter.basicfeature.presentation.RocketsUiState.PartialState.Loading
 import eu.krzdabrowski.starter.basicfeature.presentation.mapper.toPresentationModel
 import eu.krzdabrowski.starter.core.presentation.mvi.BaseViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
@@ -22,6 +23,8 @@ import javax.inject.Inject
 private const val HTTP_PREFIX = "http"
 private const val HTTPS_PREFIX = "https"
 
+private const val ROCKETS_REFRESH_FAILURE_INDICATOR_DURATION_IN_MILLIS = 500L // to make refresh indicator visible for a while
+
 @HiltViewModel
 class RocketsViewModel @Inject constructor(
     private val getRocketsUseCase: GetRocketsUseCase,
@@ -81,6 +84,7 @@ class RocketsViewModel @Inject constructor(
     private fun refreshRockets(): Flow<PartialState> = flow<PartialState> {
         refreshRocketsUseCase()
             .onFailure {
+                delay(ROCKETS_REFRESH_FAILURE_INDICATOR_DURATION_IN_MILLIS)
                 emit(Error(it))
             }
     }.onStart {

diff --git a/...c/main/java/eu/krzdabrowski/starter/basicfeature/presentation/composable/RocketsScreen.kt b/...c/main/java/eu/krzdabrowski/starter/basicfeature/presentation/composable/RocketsScreen.kt
@@ -1,20 +1,15 @@
 package eu.krzdabrowski.starter.basicfeature.presentation.composable
 
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.pulltorefresh.PullToRefreshContainer
-import androidx.compose.material3.pulltorefresh.PullToRefreshState
-import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -47,21 +42,14 @@ internal fun RocketsScreen(
     onIntent: (RocketsIntent) -> Unit,
 ) {
     val snackbarHostState = remember { SnackbarHostState() }
-    val pullToRefreshState = rememberPullToRefreshState()
-
-    HandlePullToRefresh(
-        pullState = pullToRefreshState,
-        uiState = uiState,
-        onIntent = onIntent,
-    )
 
     Scaffold(
         snackbarHost = { SnackbarHost(snackbarHostState) },
     ) { paddingValues ->
-        Box(
-            modifier = Modifier
-                .padding(paddingValues)
-                .nestedScroll(pullToRefreshState.nestedScrollConnection),
+        PullToRefreshBox(
+            modifier = Modifier.padding(paddingValues),
+            isRefreshing = uiState.isLoading,
+            onRefresh = { onIntent(RefreshRockets) },
         ) {
             if (uiState.rockets.isNotEmpty()) {
                 RocketsAvailableContent(
@@ -74,31 +62,6 @@ internal fun RocketsScreen(
                     uiState = uiState,
                 )
             }
-
-            PullToRefreshContainer(
-                state = pullToRefreshState,
-                modifier = Modifier
-                    .align(Alignment.TopCenter),
-            )
-        }
-    }
-}
-
-@Composable
-private fun HandlePullToRefresh(
-    pullState: PullToRefreshState,
-    uiState: RocketsUiState,
-    onIntent: (RocketsIntent) -> Unit,
-) {
-    if (pullState.isRefreshing) {
-        LaunchedEffect(onIntent) {
-            onIntent(RefreshRockets)
-        }
-    }
-
-    if (uiState.isLoading.not()) {
-        LaunchedEffect(true) {
-            pullState.endRefresh()
         }
     }
 }

diff --git a/...e/src/test/java/eu/krzdabrowski/starter/basicfeature/presentation/RocketsViewModelTest.kt b/...e/src/test/java/eu/krzdabrowski/starter/basicfeature/presentation/RocketsViewModelTest.kt
@@ -149,6 +149,8 @@ class RocketsViewModelTest {
 
         // Then
         objectUnderTest.uiState.test {
+            skipItems(1) // Loading-Refreshing state
+
             val actualItem = awaitItem()
 
             assertTrue(actualItem.isError)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -34,10 +34,6 @@ android {
         }
     }
 
-    composeCompiler {
-        enableStrongSkippingMode = true
-    }
-
     kotlin {
         jvmToolchain(17)
 

diff --git a/core/src/androidTest/java/eu/krzdabrowski/starter/core/utils/HiltTestRunner.kt b/core/src/androidTest/java/eu/krzdabrowski/starter/core/utils/HiltTestRunner.kt
@@ -11,7 +11,5 @@ class HiltTestRunner : AndroidJUnitRunner() {
         cl: ClassLoader?,
         name: String?,
         context: Context?,
-    ): Application {
-        return super.newApplication(cl, HiltTestApplication::class.java.name, context)
-    }
+    ): Application = super.newApplication(cl, HiltTestApplication::class.java.name, context)
 }
diff --git a/core/src/main/java/eu/krzdabrowski/starter/core/coroutines/CoroutinesFlowConcurrency.kt b/core/src/main/java/eu/krzdabrowski/starter/core/coroutines/CoroutinesFlowConcurrency.kt
@@ -118,7 +118,8 @@ internal fun <T, R> Flow<T>.flatMapConcurrently(
                         semaphore.release()
                     }
                 }
-                exceptionWasThrownEarlier.invokeOnCompletion { thrown -> // should never be null
+                exceptionWasThrownEarlier.invokeOnCompletion { thrown ->
+                    // should never be null
                     // don't nest CancellationExceptions arbitrarily deep
                     evalTransform.cancel(thrown!!.asCancellation())
 

diff --git a/core/src/main/java/eu/krzdabrowski/starter/core/network/NetworkModule.kt b/core/src/main/java/eu/krzdabrowski/starter/core/network/NetworkModule.kt
@@ -23,28 +23,24 @@ internal object NetworkModule {
 
     @Provides
     @Named(INTERCEPTOR_LOGGING_NAME)
-    fun provideHttpLoggingInterceptor(): Interceptor {
-        return if (BuildConfig.DEBUG) {
-            HttpLoggingInterceptor().apply {
-                level = HttpLoggingInterceptor.Level.BODY
-            }
-        } else {
-            noOpInterceptor()
+    fun provideHttpLoggingInterceptor(): Interceptor = if (BuildConfig.DEBUG) {
+        HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BODY
         }
+    } else {
+        noOpInterceptor()
     }
 
     @Provides
     @Singleton
     fun provideOkHttpClient(
         @Named(INTERCEPTOR_LOGGING_NAME) loggingInterceptor: Interceptor,
-    ): OkHttpClient {
-        return OkHttpClient
-            .Builder()
-            .apply {
-                addNetworkInterceptor(loggingInterceptor)
-            }
-            .build()
-    }
+    ): OkHttpClient = OkHttpClient
+        .Builder()
+        .apply {
+            addNetworkInterceptor(loggingInterceptor)
+        }
+        .build()
 
     @Provides
     @Singleton
@@ -62,9 +58,7 @@ internal object NetworkModule {
             .build()
     }
 
-    private fun noOpInterceptor(): Interceptor {
-        return Interceptor { chain ->
-            chain.proceed(chain.request())
-        }
+    private fun noOpInterceptor(): Interceptor = Interceptor { chain ->
+        chain.proceed(chain.request())
     }
 }
diff --git a/core/src/main/java/eu/krzdabrowski/starter/core/utils/ExtensionsFlowLifecycle.kt b/core/src/main/java/eu/krzdabrowski/starter/core/utils/ExtensionsFlowLifecycle.kt
@@ -3,9 +3,9 @@ package eu.krzdabrowski.starter.core.utils
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.flowWithLifecycle
 import kotlinx.coroutines.flow.Flow
 

diff --git a/core/src/main/java/eu/krzdabrowski/starter/core/utils/ExtensionsResult.kt b/core/src/main/java/eu/krzdabrowski/starter/core/utils/ExtensionsResult.kt
@@ -11,14 +11,12 @@ import kotlinx.coroutines.TimeoutCancellationException
  *
  * Cancellation exceptions need to be rethrown. See https://github.com/Kotlin/kotlinx.coroutines/issues/1814.
  */
-inline fun <R> resultOf(block: () -> R): Result<R> {
-    return try {
-        Result.success(block())
-    } catch (t: TimeoutCancellationException) {
-        Result.failure(t)
-    } catch (c: CancellationException) {
-        throw c
-    } catch (e: Exception) {
-        Result.failure(e)
-    }
+inline fun <R> resultOf(block: () -> R): Result<R> = try {
+    Result.success(block())
+} catch (t: TimeoutCancellationException) {
+    Result.failure(t)
+} catch (c: CancellationException) {
+    throw c
+} catch (e: Exception) {
+    Result.failure(e)
 }