diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyTopAppBar.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyTopAppBar.kt index 09b7174..429e5fb 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyTopAppBar.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyTopAppBar.kt @@ -13,7 +13,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import androidx.lifecycle.viewmodel.compose.viewModel import com.lorenzovainigli.foodexpirationdates.model.repository.PreferencesRepository import com.lorenzovainigli.foodexpirationdates.ui.theme.FoodExpirationDatesTheme import com.lorenzovainigli.foodexpirationdates.viewmodel.PreferencesViewModel @@ -25,7 +24,7 @@ fun MyTopAppBar( actions: @Composable RowScope.() -> Unit = {}, navigationIcon: @Composable () -> Unit = {}, scrollBehavior: TopAppBarScrollBehavior? = null, - prefsViewModel: PreferencesViewModel? = viewModel() + prefsViewModel: PreferencesViewModel? = null ) { val context = LocalContext.current val topBarFontState = prefsViewModel?.getTopBarFont(context)?.collectAsState()?.value diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InfoActivityLayout.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InfoActivityLayout.kt index 649ac0d..7fb54cf 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InfoActivityLayout.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InfoActivityLayout.kt @@ -91,7 +91,8 @@ fun InfoActivityLayout( ) } }, - scrollBehavior = scrollBehavior + scrollBehavior = scrollBehavior, + prefsViewModel = prefsViewModel ) } ) { padding -> diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InsertActivityLayout.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InsertActivityLayout.kt index 39025f4..8f4363d 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InsertActivityLayout.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InsertActivityLayout.kt @@ -123,7 +123,8 @@ fun InsertActivityLayout( ) } }, - scrollBehavior = scrollBehavior + scrollBehavior = scrollBehavior, + prefsViewModel = prefsViewModel ) }, floatingActionButtonPosition = FabPosition.End, diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/MainActivityLayout.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/MainActivityLayout.kt index 64644cb..ba1e64c 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/MainActivityLayout.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/MainActivityLayout.kt @@ -126,7 +126,8 @@ fun MainActivityLayout( ) } }, - scrollBehavior = scrollBehavior + scrollBehavior = scrollBehavior, + prefsViewModel = prefsViewModel ) }, bottomBar = { diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/SettingsActivityLayout.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/SettingsActivityLayout.kt index e548993..27d03df 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/SettingsActivityLayout.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/SettingsActivityLayout.kt @@ -115,7 +115,8 @@ fun SettingsActivityLayout( ) } }, - scrollBehavior = scrollBehavior + scrollBehavior = scrollBehavior, + prefsViewModel = prefsViewModel ) } ) { padding ->