Skip to content

Commit 03a3736

Browse files
committed
Fix spotless
1 parent 5c8ebee commit 03a3736

File tree

8 files changed

+11
-14
lines changed

8 files changed

+11
-14
lines changed

Fruitties/androidApp/src/main/java/com/example/fruitties/android/FruittiesAndroidApp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ class FruittiesAndroidApp : Application() {
3737
* because it won't change during the app execution.
3838
*/
3939
val LocalAppContainer =
40-
staticCompositionLocalOf<AppContainer> { error("No AppContainer provided!") }
40+
staticCompositionLocalOf<AppContainer> { error("No AppContainer provided!") }

Fruitties/androidApp/src/main/java/com/example/fruitties/android/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import androidx.navigation3.ui.NavDisplay
3636
import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
3737
import com.example.fruitties.android.ui.CartScreen
3838
import com.example.fruitties.android.ui.FruittieScreen
39-
import com.example.fruitties.android.ui.ListScreen
4039
import com.example.fruitties.android.ui.FruittiesTheme
40+
import com.example.fruitties.android.ui.ListScreen
4141
import kotlinx.serialization.Serializable
4242

4343
@Serializable

Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/CartScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ import androidx.compose.ui.text.style.TextAlign
5555
import androidx.compose.ui.tooling.preview.Preview
5656
import androidx.compose.ui.unit.dp
5757
import androidx.lifecycle.viewmodel.compose.viewModel
58-
import com.example.fruitties.android.R
5958
import com.example.fruitties.android.LocalAppContainer
59+
import com.example.fruitties.android.R
6060
import com.example.fruitties.model.CartItemDetails
6161
import com.example.fruitties.model.Fruittie
6262
import com.example.fruitties.viewmodel.CartUiState
@@ -65,7 +65,7 @@ import com.example.fruitties.viewmodel.CartViewModel
6565
@Composable
6666
fun CartScreen(
6767
onNavBarBack: () -> Unit,
68-
viewModel: CartViewModel = viewModel(factory = LocalAppContainer.current.cartViewModelFactory)
68+
viewModel: CartViewModel = viewModel(factory = LocalAppContainer.current.cartViewModelFactory),
6969
) {
7070
val cartState by viewModel.cartUiState.collectAsState()
7171

Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fun FruittieScreen(
4343
extras = creationExtras {
4444
set(FRUITTIE_ID_KEY, fruittieId)
4545
},
46-
)
46+
),
4747
) {
4848
val state = viewModel.state.collectAsState().value
4949

Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fun ListScreen(
6262
onFruittieClick: (Fruittie) -> Unit,
6363
viewModel: MainViewModel = viewModel(
6464
factory = LocalAppContainer.current.mainViewModelFactory,
65-
)
65+
),
6666
) {
6767
val uiState by viewModel.homeUiState.collectAsState()
6868
val topAppBarScrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
@@ -125,8 +125,7 @@ fun FruittieItem(
125125
modifier = modifier
126126
.clickable {
127127
onClick(item)
128-
}
129-
.padding(16.dp),
128+
}.padding(16.dp),
130129
verticalAlignment = Alignment.CenterVertically,
131130
) {
132131
Column(

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/di/AppContainer.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.example.fruitties.di
1717

18-
import androidx.lifecycle.viewmodel.CreationExtras
1918
import androidx.lifecycle.viewmodel.initializer
2019
import androidx.lifecycle.viewmodel.viewModelFactory
2120
import com.example.fruitties.DataRepository
@@ -52,11 +51,12 @@ class AppContainer(
5251
}
5352

5453
val fruittieViewModelFactory = viewModelFactory {
55-
initializer { // this: CreationExtras
54+
initializer {
55+
// this: CreationExtras
5656
FruittieViewModel(
5757
fruittieId = this[FRUITTIE_ID_KEY] ?: error("Expected fruittieId!"),
5858
repository = dataRepository,
5959
)
6060
}
6161
}
62-
}
62+
}

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/CartViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.example.fruitties.viewmodel
1818

1919
import androidx.lifecycle.ViewModel
20-
import androidx.lifecycle.ViewModelProvider
2120
import androidx.lifecycle.viewModelScope
2221
import co.touchlab.kermit.Logger
2322
import com.example.fruitties.DataRepository

Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/ViewModelFactory.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ package com.example.fruitties.viewmodel
22

33
import androidx.lifecycle.viewmodel.MutableCreationExtras
44

5-
fun creationExtras(block: MutableCreationExtras.() -> Unit) =
6-
MutableCreationExtras().apply(block)
5+
fun creationExtras(block: MutableCreationExtras.() -> Unit) = MutableCreationExtras().apply(block)

0 commit comments

Comments
 (0)