Rename Date Calculator module

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")))

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
         )

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<String, Int> 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,
     )
 }
 

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
     )

feature/datecalculator/build.gradle.kts

@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-    namespace = "com.sadellie.unitto.feature.datedifference"
+    namespace = "com.sadellie.unitto.feature.datecalculator"
 }
 
 dependencies {

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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.datecalculator.addsubtract.AddSubtractPage
-import com.sadellie.unitto.feature.datedifference.difference.DateDifferencePage
+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() {
+private fun DateCalculatorScreenPreview() {
-    DateToolsScreen(
+    DateCalculatorScreen(
         navigateToMenu = {},
         navigateToSettings = {},
     )

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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.datecalculator.components.DateTimeDialogs
-import com.sadellie.unitto.feature.datedifference.components.DateTimeSelectorBlock
+import com.sadellie.unitto.feature.datecalculator.components.DateTimeSelectorBlock
-import com.sadellie.unitto.feature.datedifference.components.DialogState
+import com.sadellie.unitto.feature.datecalculator.components.DialogState
-import com.sadellie.unitto.feature.datedifference.components.TimeUnitTextField
+import com.sadellie.unitto.feature.datecalculator.components.TimeUnitTextField
 import java.time.ZonedDateTime
 
 @Composable

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.datedifference.addsubtract
+package com.sadellie.unitto.feature.datecalculator.addsubtract
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeDialogs.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeResultBlock.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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(

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.datedifference.components
+package com.sadellie.unitto.feature.datecalculator.components
 
 import android.text.format.DateFormat
 import androidx.compose.animation.AnimatedContent

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.datedifference.components
+package com.sadellie.unitto.feature.datecalculator.components
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.scaleIn

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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.datecalculator.components.DateTimeDialogs
-import com.sadellie.unitto.feature.datedifference.components.DateTimeDialogs
+import com.sadellie.unitto.feature.datecalculator.components.DateTimeResultBlock
-import com.sadellie.unitto.feature.datedifference.components.DateTimeResultBlock
+import com.sadellie.unitto.feature.datecalculator.components.DateTimeSelectorBlock
-import com.sadellie.unitto.feature.datedifference.components.DateTimeSelectorBlock
+import com.sadellie.unitto.feature.datecalculator.components.DialogState
-import com.sadellie.unitto.feature.datedifference.components.DialogState
 import java.time.ZonedDateTime
 
 @Composable

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferenceViewModel.kt

@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DifferenceUIState.kt

@@ -16,9 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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(

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifference.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.feature.datedifference
+package com.sadellie.unitto.feature.datecalculator.difference
 
 import java.time.ZonedDateTime
 import java.time.temporal.ChronoUnit

feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt

@@ -16,19 +16,19 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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 graph = TopLevelDestinations.DateCalculator.graph
-private val start = TopLevelDestinations.DateDifference.start
+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
             )

feature/datecalculator/src/test/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifferenceKtTest.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-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

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")