Update to Jetpack Compose 1.1.0-beta02

This commit is contained in:
2021-11-08 22:29:11 +02:00
parent 4f76b20937
commit c2da2b8ad4
6 changed files with 60 additions and 8 deletions
+8
View File
@@ -7,6 +7,7 @@ plugins {
kotlin("kapt") kotlin("kapt")
id("dagger.hilt.android.plugin") id("dagger.hilt.android.plugin")
id("kotlin-android") id("kotlin-android")
id("com.google.devtools.ksp") version "1.5.31-1.0.0"
} }
kapt { kapt {
@@ -142,6 +143,12 @@ dependencies {
implementation(Libs.code_scanner) implementation(Libs.code_scanner)
implementation(Libs.ComposeDestination.core)
ksp(Libs.ComposeDestination.ksp)
implementation(Libs.flowredux)
implementation(Libs.flowredux_dsl)
testImplementation(Libs.turbine) testImplementation(Libs.turbine)
androidTestImplementation(Libs.turbine) androidTestImplementation(Libs.turbine)
@@ -149,3 +156,4 @@ dependencies {
testImplementation(Libs.junit5_android_test_core) testImplementation(Libs.junit5_android_test_core)
androidTestRuntimeOnly(Libs.junit5_android_test_runner) androidTestRuntimeOnly(Libs.junit5_android_test_runner)
} }
@@ -10,14 +10,32 @@ import com.ericampire.android.androidstudycase.domain.usecase.FindRecentLottieFi
import com.ericampire.android.androidstudycase.util.Result import com.ericampire.android.androidstudycase.util.Result
import com.ericampire.android.androidstudycase.util.data import com.ericampire.android.androidstudycase.util.data
import com.ericampire.android.androidstudycase.util.mvi.BViewModel import com.ericampire.android.androidstudycase.util.mvi.BViewModel
import com.freeletics.flowredux.dsl.FlowReduxStateMachine
import dagger.assisted.Assisted import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject import dagger.assisted.AssistedInject
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@OptIn(FlowPreview::class, kotlinx.coroutines.ExperimentalCoroutinesApi::class)
class Explore(
private val findPopularLottieFileUseCase: FindPopularLottieFileUseCase,
private val findRecentLottieFileUseCase: FindRecentLottieFileUseCase,
private val findFeaturedLottieFileUseCase: FindFeaturedLottieFileUseCase
) : FlowReduxStateMachine<ExploreState, ExploreAction>(initialState = ExploreState.LoadingState) {
init {
spec {
inState<ExploreState.LoadingState> {
//onEnter()
}
}
}
}
class ExploreViewModel @AssistedInject constructor( class ExploreViewModel @AssistedInject constructor(
@Assisted initialState: ExploreViewState, @Assisted initialState: ExploreViewState,
private val findPopularLottieFileUseCase: FindPopularLottieFileUseCase, private val findPopularLottieFileUseCase: FindPopularLottieFileUseCase,
@@ -8,3 +8,9 @@ import com.ericampire.android.androidstudycase.domain.entity.Lottiefile
data class ExploreViewState( data class ExploreViewState(
val files: Async<List<Lottiefile>> = Uninitialized, val files: Async<List<Lottiefile>> = Uninitialized,
) : MavericksState ) : MavericksState
sealed interface ExploreState {
object LoadingState : ExploreState
data class ContentState(val file: List<Lottiefile>) : ExploreState
data class ErrorState(val cause: Throwable) : ExploreState
}
+8
View File
@@ -164,6 +164,14 @@ object Libs {
const val junit5_android_test_core = "de.mannodermaus.junit5:android-test-core:_" const val junit5_android_test_core = "de.mannodermaus.junit5:android-test-core:_"
const val junit5_android_test_runner = "de.mannodermaus.junit5:android-test-runner:_" const val junit5_android_test_runner = "de.mannodermaus.junit5:android-test-runner:_"
const val flowredux = "com.freeletics.flowredux:flowredux:_"
const val flowredux_dsl = "com.freeletics.flowredux:dsl:_"
object ComposeDestination {
const val core = "io.github.raamcosta.compose-destinations:core:_"
const val ksp = "io.github.raamcosta.compose-destinations:ksp:_"
}
const val mvi_kotlin_core = "com.arkivanov.mvikotlin:mvikotlin:_" const val mvi_kotlin_core = "com.arkivanov.mvikotlin:mvikotlin:_"
const val mvi_kotlin_main = "com.arkivanov.mvikotlin:mvikotlin-main:_" const val mvi_kotlin_main = "com.arkivanov.mvikotlin:mvikotlin-main:_"
const val mvi_kotlin_logging = "com.arkivanov.mvikotlin:mvikotlin-logging:_" const val mvi_kotlin_logging = "com.arkivanov.mvikotlin:mvikotlin-logging:_"
+1 -1
View File
@@ -1,6 +1,6 @@
#Mon Aug 16 12:05:52 CAT 2021 #Mon Aug 16 12:05:52 CAT 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
+18 -6
View File
@@ -34,25 +34,25 @@ version.androidx.preference=1.1.1
version.androidx.appcompat=1.3.0 version.androidx.appcompat=1.3.0
## unused ## unused
version.androidx.compose.compiler=1.1.0-beta01 version.androidx.compose.compiler=1.1.0-beta02
## unused ## unused
version.androidx.compose.material-icons-extended=1.1.0-beta01 version.androidx.compose.material-icons-extended=1.1.0-beta02
## unused ## unused
version.androidx.compose.material=1.1.0-beta01 version.androidx.compose.material=1.1.0-beta02
## unused ## unused
version.androidx.compose.runtime=1.1.0-beta01 version.androidx.compose.runtime=1.1.0-beta02
## unused ## unused
version.google.accompanist=0.20.0 version.google.accompanist=0.20.0
## unused ## unused
version.androidx.compose.ui=1.1.0-beta01 version.androidx.compose.ui=1.1.0-beta02
## unused ## unused
version.androidx.compose.ui-viewbinding=1.1.0-beta01 version.androidx.compose.ui-viewbinding=1.1.0-beta02
## unused ## unused
version.androidx.core=1.5.0 version.androidx.core=1.5.0
@@ -207,3 +207,15 @@ version.com.arkivanov.mvikotlin..mvikotlin-logging=2.0.4
## unused ## unused
version.com.arkivanov.mvikotlin..mvikotlin-extensions-coroutines=2.0.4 version.com.arkivanov.mvikotlin..mvikotlin-extensions-coroutines=2.0.4
## unused
version.com.freeletics.flowredux..flowredux=0.10.0
## unused
version.com.freeletics.flowredux..dsl=0.10.0
## unused
version.io.github.raamcosta.compose-destinations..core=0.9.1-beta
## unused
version.io.github.raamcosta.compose-destinations..ksp=0.9.1-beta