Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename SecondViewModel into UnitsListViewModel

Browse Source
This commit is contained in:
Sad Ellie 2023-04-02 20:26:22 +03:00
parent 931235deb0
commit bb8e909b23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/sadellie/unitto/UnittoApp.kt
View File

@ -45,7 +45,7 @@ import com.sadellie.unitto.core.ui.theme.DarkThemeColors
import com.sadellie.unitto.core.ui.theme.LightThemeColors import com.sadellie.unitto.core.ui.theme.LightThemeColors
import com.sadellie.unitto.feature.converter.ConverterViewModel import com.sadellie.unitto.feature.converter.ConverterViewModel
import com.sadellie.unitto.feature.settings.SettingsViewModel 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.Themmo
import io.github.sadellie.themmo.rememberThemmoController import io.github.sadellie.themmo.rememberThemmoController
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -53,7 +53,7 @@ import kotlinx.coroutines.launch
@Composable @Composable
internal fun UnittoApp() { internal fun UnittoApp() {
val converterViewModel: ConverterViewModel = hiltViewModel() val converterViewModel: ConverterViewModel = hiltViewModel()
val secondViewModel: SecondViewModel = hiltViewModel() val unitsListViewModel: UnitsListViewModel = hiltViewModel()
val settingsViewModel: SettingsViewModel = hiltViewModel() val settingsViewModel: SettingsViewModel = hiltViewModel()
val userPrefs = settingsViewModel.userPrefs.collectAsStateWithLifecycle() val userPrefs = settingsViewModel.userPrefs.collectAsStateWithLifecycle()
@ -132,7 +132,7 @@ internal fun UnittoApp() {
UnittoNavigation( UnittoNavigation(
navController = navController, navController = navController,
converterViewModel = converterViewModel, converterViewModel = converterViewModel,
secondViewModel = secondViewModel, unitsListViewModel = unitsListViewModel,
settingsViewModel = settingsViewModel, settingsViewModel = settingsViewModel,
themmoController = it, themmoController = it,
startDestination = userPrefs.value.startingScreen, startDestination = userPrefs.value.startingScreen,

8
app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt
View File

@ -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.navigateToSettings
import com.sadellie.unitto.feature.settings.navigation.navigateToUnitGroups import com.sadellie.unitto.feature.settings.navigation.navigateToUnitGroups
import com.sadellie.unitto.feature.settings.navigation.settingGraph 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.leftScreen
import com.sadellie.unitto.feature.unitslist.navigation.navigateToLeftSide import com.sadellie.unitto.feature.unitslist.navigation.navigateToLeftSide
import com.sadellie.unitto.feature.unitslist.navigation.navigateToRightSide import com.sadellie.unitto.feature.unitslist.navigation.navigateToRightSide
@ -41,7 +41,7 @@ import io.github.sadellie.themmo.ThemmoController
internal fun UnittoNavigation( internal fun UnittoNavigation(
navController: NavHostController, navController: NavHostController,
converterViewModel: ConverterViewModel, converterViewModel: ConverterViewModel,
secondViewModel: SecondViewModel, unitsListViewModel: UnitsListViewModel,
settingsViewModel: SettingsViewModel, settingsViewModel: SettingsViewModel,
themmoController: ThemmoController, themmoController: ThemmoController,
startDestination: String, startDestination: String,
@ -70,14 +70,14 @@ internal fun UnittoNavigation(
) )
leftScreen( leftScreen(
viewModel = secondViewModel, viewModel = unitsListViewModel,
navigateUp = navController::navigateUp, navigateUp = navController::navigateUp,
navigateToUnitGroups = navController::navigateToUnitGroups, navigateToUnitGroups = navController::navigateToUnitGroups,
onSelect = converterViewModel::updateUnitFrom onSelect = converterViewModel::updateUnitFrom
) )
rightScreen( rightScreen(
viewModel = secondViewModel, viewModel = unitsListViewModel,
navigateUp = navController::navigateUp, navigateUp = navController::navigateUp,
navigateToUnitGroups = navController::navigateToUnitGroups, navigateToUnitGroups = navController::navigateToUnitGroups,
onSelect = converterViewModel::updateUnitTo onSelect = converterViewModel::updateUnitTo

4
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt
View File

@ -55,7 +55,7 @@ import com.sadellie.unitto.feature.unitslist.components.UnitListItem
/** /**
* Left side screen. Unit to convert from. * Left side screen. Unit to convert from.
* *
* @param viewModel [SecondViewModel]. * @param viewModel [UnitsListViewModel].
* @param currentUnitId Currently selected [AbstractUnit] (by ID). * @param currentUnitId Currently selected [AbstractUnit] (by ID).
* @param navigateUp Action to navigate up. Called when user click back button. * @param navigateUp Action to navigate up. Called when user click back button.
* @param navigateToSettingsAction Action to perform when clicking settings chip at the end. * @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 @Composable
internal fun LeftSideScreen( internal fun LeftSideScreen(
viewModel: SecondViewModel, viewModel: UnitsListViewModel,
currentUnitId: String, currentUnitId: String,
navigateUp: () -> Unit, navigateUp: () -> Unit,
navigateToSettingsAction: () -> Unit, navigateToSettingsAction: () -> Unit,

4
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt
View File

@ -45,7 +45,7 @@ import java.math.BigDecimal
/** /**
* Right side screen. Unit to convert to. * Right side screen. Unit to convert to.
* *
* @param viewModel [SecondViewModel]. * @param viewModel [UnitsListViewModel].
* @param currentUnit Currently selected [AbstractUnit]. * @param currentUnit Currently selected [AbstractUnit].
* @param navigateUp Action to navigate up. Called when user click back button. * @param navigateUp Action to navigate up. Called when user click back button.
* @param navigateToSettingsAction Action to perform when clicking settings chip at the end. * @param navigateToSettingsAction Action to perform when clicking settings chip at the end.
@ -55,7 +55,7 @@ import java.math.BigDecimal
*/ */
@Composable @Composable
internal fun RightSideScreen( internal fun RightSideScreen(
viewModel: SecondViewModel, viewModel: UnitsListViewModel,
currentUnit: String, currentUnit: String,
navigateUp: () -> Unit, navigateUp: () -> Unit,
navigateToSettingsAction: () -> Unit, navigateToSettingsAction: () -> Unit,

2
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/SecondViewModel.kt → feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/UnitsListViewModel.kt
View File

@ -38,7 +38,7 @@ import kotlinx.coroutines.withContext
import javax.inject.Inject import javax.inject.Inject
@HiltViewModel @HiltViewModel
class SecondViewModel @Inject constructor( class UnitsListViewModel @Inject constructor(
private val unitRepository: UnitsRepository, private val unitRepository: UnitsRepository,
private val allUnitsRepository: AllUnitsRepository, private val allUnitsRepository: AllUnitsRepository,
private val mContext: Application, private val mContext: Application,

6
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/navigation/UnitsListNavigation.kt
View File

@ -25,7 +25,7 @@ import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.units.AllUnitsRepository import com.sadellie.unitto.data.units.AllUnitsRepository
import com.sadellie.unitto.feature.unitslist.LeftSideScreen import com.sadellie.unitto.feature.unitslist.LeftSideScreen
import com.sadellie.unitto.feature.unitslist.RightSideScreen 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 leftSideRoute = "left_side_route"
const val rightSideRoute = "right_side_route" const val rightSideRoute = "right_side_route"
@ -42,7 +42,7 @@ fun NavController.navigateToRightSide(unitFromId: String, unitToId: String, inpu
} }
fun NavGraphBuilder.leftScreen( fun NavGraphBuilder.leftScreen(
viewModel: SecondViewModel, viewModel: UnitsListViewModel,
navigateUp: () -> Unit, navigateUp: () -> Unit,
navigateToUnitGroups: () -> Unit, navigateToUnitGroups: () -> Unit,
onSelect: (AbstractUnit) -> Unit onSelect: (AbstractUnit) -> Unit
@ -63,7 +63,7 @@ fun NavGraphBuilder.leftScreen(
} }
fun NavGraphBuilder.rightScreen( fun NavGraphBuilder.rightScreen(
viewModel: SecondViewModel, viewModel: UnitsListViewModel,
navigateUp: () -> Unit, navigateUp: () -> Unit,
navigateToUnitGroups: () -> Unit, navigateToUnitGroups: () -> Unit,
onSelect: (AbstractUnit) -> Unit onSelect: (AbstractUnit) -> Unit