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

Rename Date Calculator module

Browse Source
This commit is contained in:
sadellie 2023-08-03 11:18:29 +03:00
parent 6236a1baec
commit 7ca5274e2e
23 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

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

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

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

4
core/base/src/main/java/com/sadellie/unitto/core/base/TopLevelDestinations.kt
View File

@ -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,
)
}

2
core/ui/src/main/java/com/sadellie/unitto/core/ui/model/DrawerItems.kt
View File

@ -50,7 +50,7 @@ sealed class DrawerItems(
)
object DateDifference : DrawerItems(
destination = TopLevelDestinations.DateDifference,
destination = TopLevelDestinations.DateCalculator,
selectedIcon = Icons.Filled.Event,
defaultIcon = Icons.Outlined.Event
)

0
feature/datedifference/.gitignore → feature/datecalculator/.gitignore vendored
View File

2
feature/datedifference/build.gradle.kts → feature/datecalculator/build.gradle.kts
View File

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

0
feature/datedifference/consumer-rules.pro → feature/datecalculator/consumer-rules.pro
View File

0
feature/datedifference/src/main/AndroidManifest.xml → feature/datecalculator/src/main/AndroidManifest.xml
View File

16
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/DateToolsScreen.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt
View File

@ -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.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 = {},
)

10
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractPage.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractPage.kt
View File

@ -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.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

2
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractUIState.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractUIState.kt
View File

@ -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

2
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/addsubtract/AddSubtractViewModel.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/addsubtract/AddSubtractViewModel.kt
View File

@ -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

2
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeDialogs.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeDialogs.kt
View File

@ -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

4
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeResultBlock.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeResultBlock.kt
View File

@ -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(

2
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/DateTimeSelectorBlock.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt
View File

@ -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

2
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/components/TimeUnitTextField.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/components/TimeUnitTextField.kt
View File

@ -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

11
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferencePage.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt
View File

@ -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.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

3
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DateDifferenceViewModel.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferenceViewModel.kt
View File

@ -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

3
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/difference/DifferenceUIState.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DifferenceUIState.kt
View File

@ -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(

2
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifference.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifference.kt
View File

@ -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

12
feature/datedifference/src/main/java/com/sadellie/unitto/feature/datedifference/navigation/DateDifferenceNavigation.kt → feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt
View File

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

2
feature/datedifference/src/test/java/com/sadellie/unitto/feature/datedifference/ZonedDateTimeDifferenceKtTest.kt → feature/datecalculator/src/test/java/com/sadellie/unitto/feature/datecalculator/difference/ZonedDateTimeDifferenceKtTest.kt
View File

@ -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

2
settings.gradle.kts
View File

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