File tree Expand file tree Collapse file tree 8 files changed +11
-14
lines changed
androidApp/src/main/java/com/example/fruitties/android
shared/src/commonMain/kotlin/com/example/fruitties Expand file tree Collapse file tree 8 files changed +11
-14
lines changed Original file line number Diff line number Diff line change @@ -37,4 +37,4 @@ class FruittiesAndroidApp : Application() {
37
37
* because it won't change during the app execution.
38
38
*/
39
39
val LocalAppContainer =
40
- staticCompositionLocalOf<AppContainer > { error(" No AppContainer provided!" ) }
40
+ staticCompositionLocalOf<AppContainer > { error(" No AppContainer provided!" ) }
Original file line number Diff line number Diff line change @@ -36,8 +36,8 @@ import androidx.navigation3.ui.NavDisplay
36
36
import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
37
37
import com.example.fruitties.android.ui.CartScreen
38
38
import com.example.fruitties.android.ui.FruittieScreen
39
- import com.example.fruitties.android.ui.ListScreen
40
39
import com.example.fruitties.android.ui.FruittiesTheme
40
+ import com.example.fruitties.android.ui.ListScreen
41
41
import kotlinx.serialization.Serializable
42
42
43
43
@Serializable
Original file line number Diff line number Diff line change @@ -55,8 +55,8 @@ import androidx.compose.ui.text.style.TextAlign
55
55
import androidx.compose.ui.tooling.preview.Preview
56
56
import androidx.compose.ui.unit.dp
57
57
import androidx.lifecycle.viewmodel.compose.viewModel
58
- import com.example.fruitties.android.R
59
58
import com.example.fruitties.android.LocalAppContainer
59
+ import com.example.fruitties.android.R
60
60
import com.example.fruitties.model.CartItemDetails
61
61
import com.example.fruitties.model.Fruittie
62
62
import com.example.fruitties.viewmodel.CartUiState
@@ -65,7 +65,7 @@ import com.example.fruitties.viewmodel.CartViewModel
65
65
@Composable
66
66
fun CartScreen (
67
67
onNavBarBack : () -> Unit ,
68
- viewModel : CartViewModel = viewModel(factory = LocalAppContainer .current.cartViewModelFactory)
68
+ viewModel : CartViewModel = viewModel(factory = LocalAppContainer .current.cartViewModelFactory),
69
69
) {
70
70
val cartState by viewModel.cartUiState.collectAsState()
71
71
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ fun FruittieScreen(
43
43
extras = creationExtras {
44
44
set(FRUITTIE_ID_KEY , fruittieId)
45
45
},
46
- )
46
+ ),
47
47
) {
48
48
val state = viewModel.state.collectAsState().value
49
49
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ fun ListScreen(
62
62
onFruittieClick : (Fruittie ) -> Unit ,
63
63
viewModel : MainViewModel = viewModel(
64
64
factory = LocalAppContainer .current.mainViewModelFactory,
65
- )
65
+ ),
66
66
) {
67
67
val uiState by viewModel.homeUiState.collectAsState()
68
68
val topAppBarScrollBehavior = TopAppBarDefaults .enterAlwaysScrollBehavior()
@@ -125,8 +125,7 @@ fun FruittieItem(
125
125
modifier = modifier
126
126
.clickable {
127
127
onClick(item)
128
- }
129
- .padding(16 .dp),
128
+ }.padding(16 .dp),
130
129
verticalAlignment = Alignment .CenterVertically ,
131
130
) {
132
131
Column (
Original file line number Diff line number Diff line change 15
15
*/
16
16
package com.example.fruitties.di
17
17
18
- import androidx.lifecycle.viewmodel.CreationExtras
19
18
import androidx.lifecycle.viewmodel.initializer
20
19
import androidx.lifecycle.viewmodel.viewModelFactory
21
20
import com.example.fruitties.DataRepository
@@ -52,11 +51,12 @@ class AppContainer(
52
51
}
53
52
54
53
val fruittieViewModelFactory = viewModelFactory {
55
- initializer { // this: CreationExtras
54
+ initializer {
55
+ // this: CreationExtras
56
56
FruittieViewModel (
57
57
fruittieId = this [FRUITTIE_ID_KEY ] ? : error(" Expected fruittieId!" ),
58
58
repository = dataRepository,
59
59
)
60
60
}
61
61
}
62
- }
62
+ }
Original file line number Diff line number Diff line change 17
17
package com.example.fruitties.viewmodel
18
18
19
19
import androidx.lifecycle.ViewModel
20
- import androidx.lifecycle.ViewModelProvider
21
20
import androidx.lifecycle.viewModelScope
22
21
import co.touchlab.kermit.Logger
23
22
import com.example.fruitties.DataRepository
Original file line number Diff line number Diff line change @@ -2,5 +2,4 @@ package com.example.fruitties.viewmodel
2
2
3
3
import androidx.lifecycle.viewmodel.MutableCreationExtras
4
4
5
- fun creationExtras (block : MutableCreationExtras .() -> Unit ) =
6
- MutableCreationExtras ().apply (block)
5
+ fun creationExtras (block : MutableCreationExtras .() -> Unit ) = MutableCreationExtras ().apply (block)
You can’t perform that action at this time.
0 commit comments