Tiny project refactor

- Updated build files
- Removed unused flavor
- Renamed units module

app/build.gradle.kts

@@ -76,7 +76,6 @@ android {
     flavorDimensions += "mainFlavorDimension"
     productFlavors {
         create("playStore") {}
-        create("ruStore") {}
         create("fdroid") {}
     }
 

build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt

@@ -48,7 +48,6 @@ internal fun Project.configureKotlinAndroid(
         flavorDimensions += "mainFlavorDimension"
         productFlavors {
             create("playStore") {}
-            create("ruStore") {}
             create("fdroid") {}
         }
 

core/base/build.gradle.kts

@@ -33,9 +33,6 @@ android {
         getByName("playStore") {
             storeLink("http://play.google.com/store/apps/details?id=com.sadellie.unitto")
         }
-        getByName("ruStore") {
-            storeLink("https://apps.rustore.ru/app/com.sadellie.unitto")
-        }
         getByName("fdroid") {
             storeLink("https://github.com/sadellie/unitto")
         }

core/ui/build.gradle.kts

@@ -23,12 +23,9 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.core.ui"
-    namespace = "com.sadellie.unitto.core.ui"
+// Workaround from https://github.com/robolectric/robolectric/pull/4736
-
+android.testOptions.unitTests.isIncludeAndroidResources = true
-    // Workaround from https://github.com/robolectric/robolectric/pull/4736
-    testOptions.unitTests.isIncludeAndroidResources = true
-}
 
 dependencies {
     testImplementation(libs.org.robolectric.robolectric)

data/backup/build.gradle.kts

@@ -22,9 +22,7 @@ plugins {
     id("unitto.android.hilt")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.backup"
-    namespace = "com.sadellie.unitto.data.backup"
-}
 
 dependencies {
     implementation(libs.androidx.datastore.datastore.preferences)

data/calculator/build.gradle.kts

@@ -22,11 +22,9 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.calculator"
-    namespace = "com.sadellie.unitto.data.calculator"
-}
 
 dependencies {
-    implementation(project(":data:model"))
     implementation(project(":data:database"))
+    implementation(project(":data:model"))
 }

data/common/build.gradle.kts

@@ -21,9 +21,7 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.common"
-    namespace = "com.sadellie.unitto.data.common"
-}
 
 dependencies {
     implementation(libs.androidx.core.core.ktx)

data/converter/build.gradle.kts

@@ -23,11 +23,10 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
+android.namespace = "com.sadellie.unitto.data.converter"
+android.testOptions.unitTests.isIncludeAndroidResources = true
+
 android {
-    namespace = "com.sadellie.unitto.data.units"
-
-    testOptions.unitTests.isIncludeAndroidResources = true
-
     room {
         val schemaLocation = "$projectDir/schemas"
         schemaDirectory(schemaLocation)
@@ -45,7 +44,7 @@ dependencies {
     implementation(libs.com.squareup.retrofit2.converter.moshi)
 
     implementation(project(":core:base"))
-    implementation(project(":data:database"))
     implementation(project(":data:common"))
+    implementation(project(":data:database"))
     implementation(project(":data:model"))
 }

data/converter/src/main/java/com/sadellie/unitto/data/converter/DataStoreModule.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units
+package com.sadellie.unitto.data.converter
 
 import android.content.Context
 import com.sadellie.unitto.data.database.CurrencyRatesDao

data/converter/src/main/java/com/sadellie/unitto/data/converter/MyUnitIDS.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units
+package com.sadellie.unitto.data.converter
 
 /**
  * All UnitIDs. Long file.

data/converter/src/main/java/com/sadellie/unitto/data/converter/UnitsRepository.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units
+package com.sadellie.unitto.data.converter
 
 import android.content.Context
 import android.util.Log
@@ -30,31 +30,31 @@ import com.sadellie.unitto.data.model.repository.UnitsRepository
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.ReverseUnit
 import com.sadellie.unitto.data.model.unit.filterByLev
-import com.sadellie.unitto.data.units.collections.accelerationCollection
+import com.sadellie.unitto.data.converter.collections.accelerationCollection
-import com.sadellie.unitto.data.units.collections.angleCollection
+import com.sadellie.unitto.data.converter.collections.angleCollection
-import com.sadellie.unitto.data.units.collections.areaCollection
+import com.sadellie.unitto.data.converter.collections.areaCollection
-import com.sadellie.unitto.data.units.collections.currencyCollection
+import com.sadellie.unitto.data.converter.collections.currencyCollection
-import com.sadellie.unitto.data.units.collections.dataCollection
+import com.sadellie.unitto.data.converter.collections.dataCollection
-import com.sadellie.unitto.data.units.collections.dataTransferCollection
+import com.sadellie.unitto.data.converter.collections.dataTransferCollection
-import com.sadellie.unitto.data.units.collections.electrostaticCapacitance
+import com.sadellie.unitto.data.converter.collections.electrostaticCapacitance
-import com.sadellie.unitto.data.units.collections.energyCollection
+import com.sadellie.unitto.data.converter.collections.energyCollection
-import com.sadellie.unitto.data.units.collections.flowRateCollection
+import com.sadellie.unitto.data.converter.collections.flowRateCollection
-import com.sadellie.unitto.data.units.collections.fluxCollection
+import com.sadellie.unitto.data.converter.collections.fluxCollection
-import com.sadellie.unitto.data.units.collections.forceCollection
+import com.sadellie.unitto.data.converter.collections.forceCollection
-import com.sadellie.unitto.data.units.collections.fuelConsumptionCollection
+import com.sadellie.unitto.data.converter.collections.fuelConsumptionCollection
-import com.sadellie.unitto.data.units.collections.lengthCollection
+import com.sadellie.unitto.data.converter.collections.lengthCollection
-import com.sadellie.unitto.data.units.collections.luminanceCollection
+import com.sadellie.unitto.data.converter.collections.luminanceCollection
-import com.sadellie.unitto.data.units.collections.massCollection
+import com.sadellie.unitto.data.converter.collections.massCollection
-import com.sadellie.unitto.data.units.collections.numberBaseCollection
+import com.sadellie.unitto.data.converter.collections.numberBaseCollection
-import com.sadellie.unitto.data.units.collections.powerCollection
+import com.sadellie.unitto.data.converter.collections.powerCollection
-import com.sadellie.unitto.data.units.collections.prefixCollection
+import com.sadellie.unitto.data.converter.collections.prefixCollection
-import com.sadellie.unitto.data.units.collections.pressureCollection
+import com.sadellie.unitto.data.converter.collections.pressureCollection
-import com.sadellie.unitto.data.units.collections.speedCollection
+import com.sadellie.unitto.data.converter.collections.speedCollection
-import com.sadellie.unitto.data.units.collections.temperatureCollection
+import com.sadellie.unitto.data.converter.collections.temperatureCollection
-import com.sadellie.unitto.data.units.collections.timeCollection
+import com.sadellie.unitto.data.converter.collections.timeCollection
-import com.sadellie.unitto.data.units.collections.torqueCollection
+import com.sadellie.unitto.data.converter.collections.torqueCollection
-import com.sadellie.unitto.data.units.collections.volumeCollection
+import com.sadellie.unitto.data.converter.collections.volumeCollection
-import com.sadellie.unitto.data.units.remote.CurrencyApi
+import com.sadellie.unitto.data.converter.remote.CurrencyApi
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Acceleration.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val accelerationCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Angle.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val angleCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Area.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val areaCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Currency.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.ReverseUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val currencyCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Data.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val dataCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/DataTransfer.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val dataTransferCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/ElectrostaticCapacitance.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val electrostaticCapacitance: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Energy.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val energyCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FlowRate.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.ReverseUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 val flowRateCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Flux.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val fluxCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Force.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 val forceCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FuelConsumption.kt

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.FuelBackward
 import com.sadellie.unitto.data.model.unit.FuelForward
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 val fuelConsumptionCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Length.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val lengthCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Luminance.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 val luminanceCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Mass.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val massCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/NumberBase.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NumberBaseUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val numberBaseCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Power.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val powerCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Prefix.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 val prefixCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Pressure.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val pressureCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Speed.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val speedCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Temperature.kt

@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.MAX_PRECISION
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.TemperatureUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 import java.math.RoundingMode
 

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Time.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val timeCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Torque.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 val torqueCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Volume.kt

@@ -16,13 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.collections
+package com.sadellie.unitto.data.converter.collections
 
 import com.sadellie.unitto.core.base.R
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import java.math.BigDecimal
 
 internal val volumeCollection: List<AbstractUnit> by lazy {

data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyApiService.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.remote
+package com.sadellie.unitto.data.converter.remote
 
 import com.squareup.moshi.Moshi
 import retrofit2.Retrofit

data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyUnitResponse.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units.remote
+package com.sadellie.unitto.data.converter.remote
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.ToJson

data/converter/src/test/java/com/sadellie/unitto/data/converter/AllUnitsTest.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units
+package com.sadellie.unitto.data.converter
 
 import android.content.Context
 import androidx.room.Room

data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinFilterAndSortTest.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units
+package com.sadellie.unitto.data.converter
 
 import android.content.Context
 import com.sadellie.unitto.core.base.R

data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinTest.kt

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.sadellie.unitto.data.units
+package com.sadellie.unitto.data.converter
 
 import com.sadellie.unitto.data.common.lev
 import org.junit.Assert.assertEquals

data/database/build.gradle.kts

@@ -23,9 +23,9 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.database"
-    namespace = "com.sadellie.unitto.data.database"
 
+android {
     room {
         val schemaLocation = "$projectDir/schemas"
         schemaDirectory(schemaLocation)

data/evaluatto/build.gradle.kts

@@ -21,10 +21,8 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+// Different namespace. Possible promotion to a separate project.
-    // Different namespace. Possible promotion to a separate project.
+android.namespace = "io.github.sadellie.evaluatto"
-    namespace = "io.github.sadellie.evaluatto"
-}
 
 dependencies {
     implementation(project(":core:base"))

data/licenses/build.gradle.kts

@@ -22,6 +22,4 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.licenses"
-    namespace = "com.sadellie.unitto.data.licenses"
-}

data/model/build.gradle.kts

@@ -21,9 +21,7 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.model"
-    namespace = "com.sadellie.unitto.data.model"
-}
 
 dependencies {
     implementation(project(":core:base"))

data/timezone/build.gradle.kts

@@ -22,13 +22,11 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.timezone"
-    namespace = "com.sadellie.unitto.data.timezone"
-}
 
 dependencies {
     implementation(project(":core:base"))
     implementation(project(":data:common"))
-    implementation(project(":data:model"))
     implementation(project(":data:database"))
+    implementation(project(":data:model"))
 }

data/userprefs/build.gradle.kts

@@ -22,9 +22,7 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.data.userprefs"
-    namespace = "com.sadellie.unitto.data.userprefs"
-}
 
 dependencies {
     implementation(libs.androidx.datastore.datastore.preferences)
@@ -32,5 +30,5 @@ dependencies {
 
     implementation(project(":core:base"))
     implementation(project(":data:model"))
-    implementation(project(":data:units"))
+    implementation(project(":data:converter"))
 }

data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/PreferenceExt.kt

@@ -25,7 +25,7 @@ import com.sadellie.unitto.core.base.TopLevelDestinations
 import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
 import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.UnitsListSorting
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 
 fun Preferences.getEnableDynamicTheme(): Boolean {
     return this[PrefsKeys.ENABLE_DYNAMIC_THEME] ?: true

feature/calculator/build.gradle.kts

@@ -24,19 +24,17 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.feature.calculator"
-    namespace = "com.sadellie.unitto.feature.calculator"
+android.testOptions.unitTests.isIncludeAndroidResources = true
-    testOptions.unitTests.isIncludeAndroidResources = true
-}
 
 dependencies {
     testImplementation(libs.org.robolectric.robolectric)
     testImplementation(libs.org.jetbrains.kotlinx.kotlinx.coroutines.test)
 
+    implementation(project(":data:calculator"))
     implementation(project(":data:common"))
     implementation(project(":data:database"))
+    implementation(project(":data:evaluatto"))
     implementation(project(":data:model"))
     implementation(project(":data:userprefs"))
-    implementation(project(":data:calculator"))
-    implementation(project(":data:evaluatto"))
 }

feature/converter/build.gradle.kts

@@ -25,11 +25,8 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.feature.converter"
-    namespace = "com.sadellie.unitto.feature.converter"
+android.testOptions.unitTests.isIncludeAndroidResources = true
-
-    testOptions.unitTests.isIncludeAndroidResources = true
-}
 
 dependencies {
     testImplementation(libs.org.robolectric.robolectric)
@@ -44,8 +41,8 @@ dependencies {
 
     implementation(project(":data:common"))
     implementation(project(":data:database"))
+    implementation(project(":data:evaluatto"))
     implementation(project(":data:model"))
     implementation(project(":data:userprefs"))
-    implementation(project(":data:units"))
+    implementation(project(":data:converter"))
-    implementation(project(":data:evaluatto"))
 }

feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideScreen.kt

@@ -45,7 +45,7 @@ import com.sadellie.unitto.data.model.UnitGroup
 import com.sadellie.unitto.data.model.UnitsListSorting
 import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import com.sadellie.unitto.feature.converter.components.BasicUnitListItem
 import com.sadellie.unitto.feature.converter.components.ChipsFlexRow
 import com.sadellie.unitto.feature.converter.components.ChipsRow

feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt

@@ -46,7 +46,7 @@ import com.sadellie.unitto.data.model.unit.AbstractUnit
 import com.sadellie.unitto.data.model.unit.DefaultUnit
 import com.sadellie.unitto.data.model.unit.NormalUnit
 import com.sadellie.unitto.data.model.unit.NumberBaseUnit
-import com.sadellie.unitto.data.units.MyUnitIDS
+import com.sadellie.unitto.data.converter.MyUnitIDS
 import com.sadellie.unitto.feature.converter.components.BasicUnitListItem
 import com.sadellie.unitto.feature.converter.components.FavoritesButton
 import com.sadellie.unitto.feature.converter.components.UnitGroupHeader

feature/datecalculator/build.gradle.kts

@@ -24,9 +24,7 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.feature.datecalculator"
-    namespace = "com.sadellie.unitto.feature.datecalculator"
-}
 
 dependencies {
     implementation(project(":data:common"))

feature/settings/build.gradle.kts

@@ -24,9 +24,7 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.feature.settings"
-    namespace = "com.sadellie.unitto.feature.settings"
-}
 
 dependencies {
     implementation(libs.com.github.sadellie.themmo)
@@ -37,6 +35,6 @@ dependencies {
     implementation(project(":data:common"))
     implementation(project(":data:database"))
     implementation(project(":data:model"))
-    implementation(project(":data:userprefs"))
     implementation(project(":data:licenses"))
+    implementation(project(":data:userprefs"))
 }

feature/timezone/build.gradle.kts

@@ -24,9 +24,7 @@ plugins {
     id("unitto.android.library.jacoco")
 }
 
-android {
+android.namespace = "com.sadellie.unitto.feature.timezone"
-    namespace = "com.sadellie.unitto.feature.timezone"
-}
 
 dependencies {
     testImplementation(libs.org.robolectric.robolectric)
@@ -36,8 +34,8 @@ dependencies {
     implementation(libs.androidx.appcompat.appcompat)
 
     implementation(project(":data:common"))
-    implementation(project(":data:userprefs"))
     implementation(project(":data:database"))
-    implementation(project(":data:timezone"))
     implementation(project(":data:model"))
+    implementation(project(":data:timezone"))
+    implementation(project(":data:userprefs"))
 }

feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt

@@ -159,7 +159,6 @@ internal fun FavoriteTimeZoneItem(
                     fadeIn() togetherWith fadeOut() using (SizeTransform(clip = false))
                 }
             ) { time ->
-                // TODO Add AM PM as dots (apply to 12 and 24 hour systems)
                 Text(
                     text = time,
                     style = MaterialTheme.typography.headlineMedium,

settings.gradle.kts

@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Unitto"
 include(":app")
-include(":data:units")
+include(":data:converter")
 include(":core:base")
 include(":core:ui")
 include(":feature:converter")