From d5cc855b3d28d766d97b46a6f4c096d63e74987c Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Fri, 27 Jan 2023 17:22:53 +0400 Subject: [PATCH] Fixed core:ui module namespace --- core/ui/build.gradle.kts | 2 +- .../com/sadellie/unitto/core/ui/common/AnimatedTopBarText.kt | 2 +- .../java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt | 2 +- .../java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt | 2 +- core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt | 2 +- .../java/com/sadellie/unitto/feature/converter/MainScreen.kt | 2 +- .../sadellie/unitto/feature/converter/components/MyTextField.kt | 2 +- .../sadellie/unitto/feature/converter/components/TopScreen.kt | 2 +- .../unitto/feature/converter/components/UnitSelectionButton.kt | 2 +- .../java/com/sadellie/unitto/feature/settings/AboutScreen.kt | 2 +- .../java/com/sadellie/unitto/feature/settings/SettingsScreen.kt | 2 +- .../java/com/sadellie/unitto/feature/settings/ThemesScreen.kt | 2 +- .../unitto/feature/settings/ThirdPartyLicensesScreen.kt | 2 +- .../com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 5e93e159..7ac1d3c2 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -23,7 +23,7 @@ plugins { } android { - namespace = "com.sadellie.unitto.feature" + namespace = "com.sadellie.unitto.core.ui" } dependencies { diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/AnimatedTopBarText.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/AnimatedTopBarText.kt index 17204c5e..430844c6 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/AnimatedTopBarText.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/AnimatedTopBarText.kt @@ -30,7 +30,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R /** * Composable for MainScreen top bar title. Changes from "Hello" to "Unitto". diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt index 12d55172..38aea268 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt @@ -24,7 +24,7 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R /** * Button that is used in Top bars diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt index 0baf5761..08514aa3 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt @@ -46,7 +46,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.rotate import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R /** * Represents one item in list on Settings screen. diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt index 506ba660..79950164 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R private val Montserrat = FontFamily( Font(R.font.montserrat_light, weight = FontWeight.Light), diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/MainScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/MainScreen.kt index fefc8509..f0e48484 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/MainScreen.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/MainScreen.kt @@ -38,7 +38,7 @@ import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewmodel.compose.viewModel import com.sadellie.unitto.core.ui.common.AnimatedTopBarText -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R import com.sadellie.unitto.feature.converter.components.Keyboard import com.sadellie.unitto.feature.converter.components.PortraitLandscape import com.sadellie.unitto.feature.converter.components.TopScreenPart diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt index 23bb6518..c85e62ee 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt @@ -52,7 +52,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayLarge import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R /** * Component for input and output diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt index 0867f5cd..02caee5b 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt @@ -42,7 +42,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.sadellie.unitto.core.ui.Formatter import com.sadellie.unitto.data.units.AbstractUnit -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R import com.sadellie.unitto.feature.converter.ConverterMode /** diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt index d8b4fa02..f75db0d7 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt +++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt @@ -35,7 +35,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R /** * Button to select a unit diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt index e2951078..582cd6a3 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt @@ -42,7 +42,7 @@ import androidx.compose.ui.res.stringResource import com.sadellie.unitto.core.base.BuildConfig import com.sadellie.unitto.core.ui.common.UnittoLargeTopAppBar import com.sadellie.unitto.core.ui.openLink -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R import com.sadellie.unitto.feature.settings.components.AlertDialogWithList @Composable diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt index a25eb77f..128830d6 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt @@ -47,7 +47,7 @@ import com.sadellie.unitto.core.base.SEPARATORS import com.sadellie.unitto.core.ui.common.Header import com.sadellie.unitto.core.ui.common.UnittoLargeTopAppBar import com.sadellie.unitto.core.ui.openLink -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R import com.sadellie.unitto.feature.settings.components.AlertDialogWithList import com.sadellie.unitto.feature.settings.navigation.aboutRoute import com.sadellie.unitto.feature.settings.navigation.themesRoute diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt index f48c8922..ba37c6c7 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt @@ -33,7 +33,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import com.sadellie.unitto.core.ui.common.UnittoLargeTopAppBar import com.sadellie.unitto.core.ui.common.UnittoListItem -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R import io.github.sadellie.themmo.ThemingMode import io.github.sadellie.themmo.ThemmoController diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt index 7cdef788..aa8f6da5 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt @@ -39,7 +39,7 @@ import androidx.compose.ui.unit.dp import com.sadellie.unitto.core.ui.common.UnittoLargeTopAppBar import com.sadellie.unitto.core.ui.openLink import com.sadellie.unitto.data.ALL_LIBRARIES -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R /** * Screen with used third party libraries diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt index b3cb4061..b13c6767 100644 --- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt +++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt @@ -49,7 +49,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.sadellie.unitto.core.ui.common.Header import com.sadellie.unitto.core.ui.common.UnittoLargeTopAppBar -import com.sadellie.unitto.feature.R +import com.sadellie.unitto.core.ui.R import org.burnoutcrew.reorderable.ReorderableItem import org.burnoutcrew.reorderable.detectReorder import org.burnoutcrew.reorderable.detectReorderAfterLongPress