From 610afca6fe9e49f9475c6117f7314dfb8005dce9 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Mon, 13 Feb 2023 21:44:12 +0400 Subject: [PATCH] Clean up navigation --- .../com/sadellie/unitto/UnittoNavigation.kt | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt index 3a0705c3..adfd8136 100644 --- a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt +++ b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt @@ -54,27 +54,25 @@ fun UnittoNavigation( startDestination = converterRoute ) { converterScreen( - navigateToLeftScreen = { navController.navigateToLeftSide(it) }, - navigateToRightScreen = { unitFrom, unitTo, input -> - navController.navigateToRightSide(unitFrom, unitTo, input) - }, - navigateToSettings = { navController.navigateToSettings() }, - navigateToTools = { navController.navigateToTools() }, + navigateToLeftScreen = navController::navigateToLeftSide, + navigateToRightScreen = navController::navigateToRightSide, + navigateToSettings = navController::navigateToSettings, + navigateToTools = navController::navigateToTools, viewModel = converterViewModel ) leftScreen( viewModel = secondViewModel, - navigateUp = { navController.navigateUp() }, - navigateToUnitGroups = { navController.navigateToUnitGroups() }, - onSelect = { converterViewModel.updateUnitFrom(it) } + navigateUp = navController::navigateUp, + navigateToUnitGroups = navController::navigateToUnitGroups, + onSelect = converterViewModel::updateUnitFrom ) rightScreen( viewModel = secondViewModel, - navigateUp = { navController.navigateUp() }, - navigateToUnitGroups = { navController.navigateToUnitGroups() }, - onSelect = { converterViewModel.updateUnitTo(it) } + navigateUp = navController::navigateUp, + navigateToUnitGroups = navController::navigateToUnitGroups, + onSelect = converterViewModel::updateUnitTo ) settingGraph(