From 7ca5274e2e5090dd1ee77d269715262bbb8f1ba6 Mon Sep 17 00:00:00 2001 From: sadellie Date: Thu, 3 Aug 2023 11:18:29 +0300 Subject: [PATCH] Rename Date Calculator module --- app/build.gradle.kts | 2 +- .../java/com/sadellie/unitto/UnittoNavigation.kt | 4 ++-- .../unitto/core/base/TopLevelDestinations.kt | 4 ++-- .../sadellie/unitto/core/ui/model/DrawerItems.kt | 2 +- .../.gitignore | 0 .../build.gradle.kts | 2 +- .../consumer-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../datecalculator/DateCalculatorScreen.kt} | 16 ++++++++-------- .../addsubtract/AddSubtractPage.kt | 10 +++++----- .../addsubtract/AddSubtractUIState.kt | 2 +- .../addsubtract/AddSubtractViewModel.kt | 2 +- .../components/DateTimeDialogs.kt | 2 +- .../components/DateTimeResultBlock.kt | 4 ++-- .../components/DateTimeSelectorBlock.kt | 2 +- .../components/TimeUnitTextField.kt | 2 +- .../difference/DateDifferencePage.kt | 11 +++++------ .../difference/DateDifferenceViewModel.kt | 3 +-- .../difference/DifferenceUIState.kt | 3 +-- .../difference}/ZonedDateTimeDifference.kt | 2 +- .../navigation/DateCalculatorNavigation.kt} | 12 ++++++------ .../difference}/ZonedDateTimeDifferenceKtTest.kt | 2 +- settings.gradle.kts | 2 +- 23 files changed, 43 insertions(+), 46 deletions(-) rename feature/{datedifference => datecalculator}/.gitignore (100%) rename feature/{datedifference => datecalculator}/build.gradle.kts (94%) rename feature/{datedifference => datecalculator}/consumer-rules.pro (100%) rename feature/{datedifference => datecalculator}/src/main/AndroidManifest.xml (100%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/DateToolsScreen.kt => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt} (91%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/addsubtract/AddSubtractPage.kt (96%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/addsubtract/AddSubtractUIState.kt (95%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/addsubtract/AddSubtractViewModel.kt (98%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/components/DateTimeDialogs.kt (97%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/components/DateTimeResultBlock.kt (96%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/components/DateTimeSelectorBlock.kt (99%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/components/TimeUnitTextField.kt (97%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/difference/DateDifferencePage.kt (92%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/difference/DateDifferenceViewModel.kt (94%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator}/difference/DifferenceUIState.kt (87%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference}/ZonedDateTimeDifference.kt (97%) rename feature/{datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/navigation/DateDifferenceNavigation.kt => datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt} (80%) rename feature/{datedifference/src/test/java/com/sadellie/unitto/feature/datedifference => datecalculator/src/test/java/com/sadellie/unitto/feature/datecalculator/difference}/ZonedDateTimeDifferenceKtTest.kt (96%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2e646e20..e6b36b94 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -121,7 +121,7 @@ dependencies { implementation(project(mapOf("path" to ":feature:calculator"))) implementation(project(mapOf("path" to ":feature:settings"))) implementation(project(mapOf("path" to ":feature:unitslist"))) - implementation(project(mapOf("path" to ":feature:datedifference"))) + implementation(project(mapOf("path" to ":feature:datecalculator"))) implementation(project(mapOf("path" to ":feature:timezone"))) implementation(project(mapOf("path" to ":data:model"))) implementation(project(mapOf("path" to ":data:userprefs"))) diff --git a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt index d77f6d7a..36b2f469 100644 --- a/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt +++ b/app/src/main/java/com/sadellie/unitto/UnittoNavigation.kt @@ -28,7 +28,7 @@ import androidx.navigation.compose.NavHost import com.sadellie.unitto.feature.calculator.navigation.calculatorGraph import com.sadellie.unitto.feature.converter.ConverterViewModel import com.sadellie.unitto.feature.converter.navigation.converterGraph -import com.sadellie.unitto.feature.datedifference.navigation.dateDifferenceGraph +import com.sadellie.unitto.feature.datecalculator.navigation.dateCalculatorGraph import com.sadellie.unitto.feature.settings.navigation.navigateToSettings import com.sadellie.unitto.feature.settings.navigation.navigateToUnitGroups import com.sadellie.unitto.feature.settings.navigation.settingGraph @@ -88,7 +88,7 @@ internal fun UnittoNavigation( navigateToSettings = navController::navigateToSettings ) - dateDifferenceGraph( + dateCalculatorGraph( navigateToMenu = openDrawer, navigateToSettings = navController::navigateToSettings ) diff --git a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt index 1c163cd8..6f90618d 100644 --- a/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt +++ b/core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt @@ -53,7 +53,7 @@ sealed class TopLevelDestinations( name = R.string.calculator ) - data object DateDifference : TopLevelDestinations( + data object DateCalculator : TopLevelDestinations( graph = DATE_CALCULATOR_GRAPH, start = DATE_CALCULATOR_START, name = R.string.date_calculator @@ -77,7 +77,7 @@ val TOP_LEVEL_GRAPH_ROUTES: Map by lazy { mapOf( TopLevelDestinations.Calculator.graph to R.string.calculator, TopLevelDestinations.Converter.graph to R.string.unit_converter, - TopLevelDestinations.DateDifference.graph to R.string.date_calculator, + TopLevelDestinations.DateCalculator.graph to R.string.date_calculator, ) } diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt index fc444dda..4d6ecde1 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt @@ -50,7 +50,7 @@ sealed class DrawerItems( ) object DateDifference : DrawerItems( - destination = TopLevelDestinations.DateDifference, + destination = TopLevelDestinations.DateCalculator, selectedIcon = Icons.Filled.Event, defaultIcon = Icons.Outlined.Event ) diff --git a/feature/datedifference/.gitignore b/feature/datecalculator/.gitignore similarity index 100% rename from feature/datedifference/.gitignore rename to feature/datecalculator/.gitignore diff --git a/feature/datedifference/build.gradle.kts b/feature/datecalculator/build.gradle.kts similarity index 94% rename from feature/datedifference/build.gradle.kts rename to feature/datecalculator/build.gradle.kts index 639591a4..48377011 100644 --- a/feature/datedifference/build.gradle.kts +++ b/feature/datecalculator/build.gradle.kts @@ -24,7 +24,7 @@ plugins { } android { - namespace = "com.sadellie.unitto.feature.datedifference" + namespace = "com.sadellie.unitto.feature.datecalculator" } dependencies { diff --git a/feature/datedifference/consumer-rules.pro b/feature/datecalculator/consumer-rules.pro similarity index 100% rename from feature/datedifference/consumer-rules.pro rename to feature/datecalculator/consumer-rules.pro diff --git a/feature/datedifference/src/main/AndroidManifest.xml b/feature/datecalculator/src/main/AndroidManifest.xml similarity index 100% rename from feature/datedifference/src/main/AndroidManifest.xml rename to feature/datecalculator/src/main/AndroidManifest.xml diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/DateToolsScreen.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt similarity index 91% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/DateToolsScreen.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt index 1c44e5fa..34ea4efc 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/DateToolsScreen.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference +package com.sadellie.unitto.feature.datecalculator import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.imePadding @@ -38,23 +38,23 @@ import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.ui.common.MenuButton import com.sadellie.unitto.core.ui.common.SettingsButton import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar -import com.sadellie.unitto.feature.datedifference.addsubtract.AddSubtractPage -import com.sadellie.unitto.feature.datedifference.difference.DateDifferencePage +import com.sadellie.unitto.feature.datecalculator.addsubtract.AddSubtractPage +import com.sadellie.unitto.feature.datecalculator.difference.DateDifferencePage import kotlinx.coroutines.launch @Composable -internal fun DateToolsRoute( +internal fun DateCalculatorRoute( navigateToMenu: () -> Unit, navigateToSettings: () -> Unit, ) { - DateToolsScreen( + DateCalculatorScreen( navigateToMenu = navigateToMenu, navigateToSettings = navigateToSettings, ) } @Composable -internal fun DateToolsScreen( +internal fun DateCalculatorScreen( navigateToMenu: () -> Unit, navigateToSettings: () -> Unit, ) { @@ -109,8 +109,8 @@ internal fun DateToolsScreen( @Preview @Composable -private fun DateDifferenceScreenPreview() { - DateToolsScreen( +private fun DateCalculatorScreenPreview() { + DateCalculatorScreen( navigateToMenu = {}, navigateToSettings = {}, ) diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractPage.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt similarity index 96% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractPage.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt index 99c27eca..a852b2ce 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractPage.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.addsubtract +package com.sadellie.unitto.feature.datecalculator.addsubtract import android.annotation.SuppressLint import android.content.Context @@ -54,10 +54,10 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.sadellie.unitto.core.base.R -import com.sadellie.unitto.feature.datedifference.components.DateTimeDialogs -import com.sadellie.unitto.feature.datedifference.components.DateTimeSelectorBlock -import com.sadellie.unitto.feature.datedifference.components.DialogState -import com.sadellie.unitto.feature.datedifference.components.TimeUnitTextField +import com.sadellie.unitto.feature.datecalculator.components.DateTimeDialogs +import com.sadellie.unitto.feature.datecalculator.components.DateTimeSelectorBlock +import com.sadellie.unitto.feature.datecalculator.components.DialogState +import com.sadellie.unitto.feature.datecalculator.components.TimeUnitTextField import java.time.ZonedDateTime @Composable diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractUIState.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt similarity index 95% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractUIState.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt index 8ba16124..6afe641c 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractUIState.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.addsubtract +package com.sadellie.unitto.feature.datecalculator.addsubtract import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols import java.time.ZonedDateTime diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractViewModel.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt similarity index 98% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractViewModel.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt index 176955d4..09395f49 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractViewModel.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.addsubtract +package com.sadellie.unitto.feature.datecalculator.addsubtract import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeDialogs.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeDialogs.kt similarity index 97% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeDialogs.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeDialogs.kt index 917c9354..d46a4c5d 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeDialogs.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeDialogs.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.components +package com.sadellie.unitto.feature.datecalculator.components import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeResultBlock.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeResultBlock.kt similarity index 96% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeResultBlock.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeResultBlock.kt index 99f6b306..c85699d5 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeResultBlock.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeResultBlock.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.components +package com.sadellie.unitto.feature.datecalculator.components import androidx.annotation.StringRes import androidx.compose.animation.AnimatedVisibility @@ -47,7 +47,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.ui.common.squashable -import com.sadellie.unitto.feature.datedifference.ZonedDateTimeDifference +import com.sadellie.unitto.feature.datecalculator.difference.ZonedDateTimeDifference @Composable internal fun DateTimeResultBlock( diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeSelectorBlock.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt similarity index 99% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeSelectorBlock.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt index cb860569..57749083 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeSelectorBlock.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.components +package com.sadellie.unitto.feature.datecalculator.components import android.text.format.DateFormat import androidx.compose.animation.AnimatedContent diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/TimeUnitTextField.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt similarity index 97% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/TimeUnitTextField.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt index ceab816c..b6472698 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/TimeUnitTextField.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.components +package com.sadellie.unitto.feature.datecalculator.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.scaleIn diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferencePage.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt similarity index 92% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferencePage.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt index 10555ebf..cf55c3c0 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferencePage.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.difference +package com.sadellie.unitto.feature.datecalculator.difference import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -39,11 +39,10 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.sadellie.unitto.core.base.R -import com.sadellie.unitto.feature.datedifference.ZonedDateTimeDifference -import com.sadellie.unitto.feature.datedifference.components.DateTimeDialogs -import com.sadellie.unitto.feature.datedifference.components.DateTimeResultBlock -import com.sadellie.unitto.feature.datedifference.components.DateTimeSelectorBlock -import com.sadellie.unitto.feature.datedifference.components.DialogState +import com.sadellie.unitto.feature.datecalculator.components.DateTimeDialogs +import com.sadellie.unitto.feature.datecalculator.components.DateTimeResultBlock +import com.sadellie.unitto.feature.datecalculator.components.DateTimeSelectorBlock +import com.sadellie.unitto.feature.datecalculator.components.DialogState import java.time.ZonedDateTime @Composable diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferenceViewModel.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferenceViewModel.kt similarity index 94% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferenceViewModel.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferenceViewModel.kt index 04d242e2..b5e8aa51 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferenceViewModel.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferenceViewModel.kt @@ -16,11 +16,10 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.difference +package com.sadellie.unitto.feature.datecalculator.difference import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.sadellie.unitto.feature.datedifference.minus import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DifferenceUIState.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DifferenceUIState.kt similarity index 87% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DifferenceUIState.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DifferenceUIState.kt index 172deda4..9f998ac2 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DifferenceUIState.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DifferenceUIState.kt @@ -16,9 +16,8 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.difference +package com.sadellie.unitto.feature.datecalculator.difference -import com.sadellie.unitto.feature.datedifference.ZonedDateTimeDifference import java.time.ZonedDateTime internal data class DifferenceUIState( diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifference.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifference.kt similarity index 97% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifference.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifference.kt index c2bab0a1..599f252c 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifference.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifference.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference +package com.sadellie.unitto.feature.datecalculator.difference import java.time.ZonedDateTime import java.time.temporal.ChronoUnit diff --git a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/navigation/DateDifferenceNavigation.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt similarity index 80% rename from feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/navigation/DateDifferenceNavigation.kt rename to feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt index 20d964c7..138f7659 100644 --- a/feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/navigation/DateDifferenceNavigation.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference.navigation +package com.sadellie.unitto.feature.datecalculator.navigation import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import androidx.navigation.navDeepLink import androidx.navigation.navigation import com.sadellie.unitto.core.base.TopLevelDestinations -import com.sadellie.unitto.feature.datedifference.DateToolsRoute +import com.sadellie.unitto.feature.datecalculator.DateCalculatorRoute -private val graph = TopLevelDestinations.DateDifference.graph -private val start = TopLevelDestinations.DateDifference.start +private val graph = TopLevelDestinations.DateCalculator.graph +private val start = TopLevelDestinations.DateCalculator.start -fun NavGraphBuilder.dateDifferenceGraph( +fun NavGraphBuilder.dateCalculatorGraph( navigateToMenu: () -> Unit, navigateToSettings: () -> Unit ) { @@ -39,7 +39,7 @@ fun NavGraphBuilder.dateDifferenceGraph( navDeepLink { uriPattern = "app://com.sadellie.unitto/$start" } ) ) { - DateToolsRoute( + DateCalculatorRoute( navigateToMenu = navigateToMenu, navigateToSettings = navigateToSettings ) diff --git a/feature/datedifference/src/test/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifferenceKtTest.kt b/feature/datecalculator/src/test/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifferenceKtTest.kt similarity index 96% rename from feature/datedifference/src/test/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifferenceKtTest.kt rename to feature/datecalculator/src/test/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifferenceKtTest.kt index f3301bba..3fef255e 100644 --- a/feature/datedifference/src/test/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifferenceKtTest.kt +++ b/feature/datecalculator/src/test/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifferenceKtTest.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.feature.datedifference +package com.sadellie.unitto.feature.datecalculator.difference import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/settings.gradle.kts b/settings.gradle.kts index b6b9ee4b..fda17c24 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ include(":core:ui") include(":feature:converter") include(":feature:unitslist") include(":feature:calculator") -include(":feature:datedifference") +include(":feature:datecalculator") include(":feature:timezone") include(":feature:settings") include(":data:userprefs")