From bb8e909b237cedcaf36155a11b2cfd7ae069b916 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Sun, 2 Apr 2023 20:26:22 +0300 Subject: [PATCH] Rename SecondViewModel into UnitsListViewModel --- app/src/main/java/com/sadellie/unitto/UnittoApp.kt | 6 +++--- app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt | 8 ++++---- .../sadellie/unitto/feature/unitslist/LeftSideScreen.kt | 4 ++-- .../sadellie/unitto/feature/unitslist/RightSideScreen.kt | 4 ++-- .../{SecondViewModel.kt => UnitsListViewModel.kt} | 2 +- .../feature/unitslist/navigation/UnitsListNavigation.kt | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) rename feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/{SecondViewModel.kt => UnitsListViewModel.kt} (99%) diff --git a/app/src/main/java/com/sadellie/unitto/UnittoApp.kt b/app/src/main/java/com/sadellie/unitto/UnittoApp.kt index 6af5d3be..cc1bb5f9 100644 --- a/app/src/main/java/com/sadellie/unitto/UnittoApp.kt +++ b/app/src/main/java/com/sadellie/unitto/UnittoApp.kt @@ -45,7 +45,7 @@ import com.sadellie.unitto.core.ui.theme.DarkThemeColors import com.sadellie.unitto.core.ui.theme.LightThemeColors import com.sadellie.unitto.feature.converter.ConverterViewModel import com.sadellie.unitto.feature.settings.SettingsViewModel -import com.sadellie.unitto.feature.unitslist.SecondViewModel +import com.sadellie.unitto.feature.unitslist.UnitsListViewModel import io.github.sadellie.themmo.Themmo import io.github.sadellie.themmo.rememberThemmoController import kotlinx.coroutines.launch @@ -53,7 +53,7 @@ import kotlinx.coroutines.launch @Composable internal fun UnittoApp() { val converterViewModel: ConverterViewModel = hiltViewModel() - val secondViewModel: SecondViewModel = hiltViewModel() + val unitsListViewModel: UnitsListViewModel = hiltViewModel() val settingsViewModel: SettingsViewModel = hiltViewModel() val userPrefs = settingsViewModel.userPrefs.collectAsStateWithLifecycle() @@ -132,7 +132,7 @@ internal fun UnittoApp() { UnittoNavigation( navController = navController, converterViewModel = converterViewModel, - secondViewModel = secondViewModel, + unitsListViewModel = unitsListViewModel, settingsViewModel = settingsViewModel, themmoController = it, startDestination = userPrefs.value.startingScreen, diff --git a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt index 88f95407..0de72cbd 100644 --- a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt +++ b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt @@ -30,7 +30,7 @@ import com.sadellie.unitto.feature.settings.SettingsViewModel import com.sadellie.unitto.feature.settings.navigation.navigateToSettings import com.sadellie.unitto.feature.settings.navigation.navigateToUnitGroups import com.sadellie.unitto.feature.settings.navigation.settingGraph -import com.sadellie.unitto.feature.unitslist.SecondViewModel +import com.sadellie.unitto.feature.unitslist.UnitsListViewModel import com.sadellie.unitto.feature.unitslist.navigation.leftScreen import com.sadellie.unitto.feature.unitslist.navigation.navigateToLeftSide import com.sadellie.unitto.feature.unitslist.navigation.navigateToRightSide @@ -41,7 +41,7 @@ import io.github.sadellie.themmo.ThemmoController internal fun UnittoNavigation( navController: NavHostController, converterViewModel: ConverterViewModel, - secondViewModel: SecondViewModel, + unitsListViewModel: UnitsListViewModel, settingsViewModel: SettingsViewModel, themmoController: ThemmoController, startDestination: String, @@ -70,14 +70,14 @@ internal fun UnittoNavigation( ) leftScreen( - viewModel = secondViewModel, + viewModel = unitsListViewModel, navigateUp = navController::navigateUp, navigateToUnitGroups = navController::navigateToUnitGroups, onSelect = converterViewModel::updateUnitFrom ) rightScreen( - viewModel = secondViewModel, + viewModel = unitsListViewModel, navigateUp = navController::navigateUp, navigateToUnitGroups = navController::navigateToUnitGroups, onSelect = converterViewModel::updateUnitTo diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt index 7e36739d..dbd93f60 100644 --- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt +++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt @@ -55,7 +55,7 @@ import com.sadellie.unitto.feature.unitslist.components.UnitListItem /** * Left side screen. Unit to convert from. * - * @param viewModel [SecondViewModel]. + * @param viewModel [UnitsListViewModel]. * @param currentUnitId Currently selected [AbstractUnit] (by ID). * @param navigateUp Action to navigate up. Called when user click back button. * @param navigateToSettingsAction Action to perform when clicking settings chip at the end. @@ -63,7 +63,7 @@ import com.sadellie.unitto.feature.unitslist.components.UnitListItem */ @Composable internal fun LeftSideScreen( - viewModel: SecondViewModel, + viewModel: UnitsListViewModel, currentUnitId: String, navigateUp: () -> Unit, navigateToSettingsAction: () -> Unit, diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt index b6b53736..21f94644 100644 --- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt +++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt @@ -45,7 +45,7 @@ import java.math.BigDecimal /** * Right side screen. Unit to convert to. * - * @param viewModel [SecondViewModel]. + * @param viewModel [UnitsListViewModel]. * @param currentUnit Currently selected [AbstractUnit]. * @param navigateUp Action to navigate up. Called when user click back button. * @param navigateToSettingsAction Action to perform when clicking settings chip at the end. @@ -55,7 +55,7 @@ import java.math.BigDecimal */ @Composable internal fun RightSideScreen( - viewModel: SecondViewModel, + viewModel: UnitsListViewModel, currentUnit: String, navigateUp: () -> Unit, navigateToSettingsAction: () -> Unit, diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/SecondViewModel.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/UnitsListViewModel.kt similarity index 99% rename from feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/SecondViewModel.kt rename to feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/UnitsListViewModel.kt index 67c3a246..e5701452 100644 --- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/SecondViewModel.kt +++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/UnitsListViewModel.kt @@ -38,7 +38,7 @@ import kotlinx.coroutines.withContext import javax.inject.Inject @HiltViewModel -class SecondViewModel @Inject constructor( +class UnitsListViewModel @Inject constructor( private val unitRepository: UnitsRepository, private val allUnitsRepository: AllUnitsRepository, private val mContext: Application, diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt index cb776bad..b7476331 100644 --- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt +++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt @@ -25,7 +25,7 @@ import com.sadellie.unitto.data.model.AbstractUnit import com.sadellie.unitto.data.units.AllUnitsRepository import com.sadellie.unitto.feature.unitslist.LeftSideScreen import com.sadellie.unitto.feature.unitslist.RightSideScreen -import com.sadellie.unitto.feature.unitslist.SecondViewModel +import com.sadellie.unitto.feature.unitslist.UnitsListViewModel const val leftSideRoute = "left_side_route" const val rightSideRoute = "right_side_route" @@ -42,7 +42,7 @@ fun NavController.navigateToRightSide(unitFromId: String, unitToId: String, inpu } fun NavGraphBuilder.leftScreen( - viewModel: SecondViewModel, + viewModel: UnitsListViewModel, navigateUp: () -> Unit, navigateToUnitGroups: () -> Unit, onSelect: (AbstractUnit) -> Unit @@ -63,7 +63,7 @@ fun NavGraphBuilder.leftScreen( } fun NavGraphBuilder.rightScreen( - viewModel: SecondViewModel, + viewModel: UnitsListViewModel, navigateUp: () -> Unit, navigateToUnitGroups: () -> Unit, onSelect: (AbstractUnit) -> Unit