diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 725bd1ef..32ff74ee 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -76,7 +76,6 @@ android { flavorDimensions += "mainFlavorDimension" productFlavors { create("playStore") {} - create("ruStore") {} create("fdroid") {} } diff --git a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt b/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt index 740b75a9..07c0db59 100644 --- a/build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt +++ b/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") {} } diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts index 4ce1f673..ef406e31 100644 --- a/core/base/build.gradle.kts +++ b/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") } diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index a46a9bb2..02591fac 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -23,12 +23,9 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.core.ui" - - // Workaround from https://github.com/robolectric/robolectric/pull/4736 - testOptions.unitTests.isIncludeAndroidResources = true -} +android.namespace = "com.sadellie.unitto.core.ui" +// Workaround from https://github.com/robolectric/robolectric/pull/4736 +android.testOptions.unitTests.isIncludeAndroidResources = true dependencies { testImplementation(libs.org.robolectric.robolectric) diff --git a/data/backup/build.gradle.kts b/data/backup/build.gradle.kts index a3d51364..27888522 100644 --- a/data/backup/build.gradle.kts +++ b/data/backup/build.gradle.kts @@ -22,9 +22,7 @@ plugins { id("unitto.android.hilt") } -android { - namespace = "com.sadellie.unitto.data.backup" -} +android.namespace = "com.sadellie.unitto.data.backup" dependencies { implementation(libs.androidx.datastore.datastore.preferences) diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts index 8cc8d086..6b0d4be8 100644 --- a/data/calculator/build.gradle.kts +++ b/data/calculator/build.gradle.kts @@ -22,11 +22,9 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.data.calculator" -} +android.namespace = "com.sadellie.unitto.data.calculator" dependencies { - implementation(project(":data:model")) implementation(project(":data:database")) + implementation(project(":data:model")) } diff --git a/data/common/build.gradle.kts b/data/common/build.gradle.kts index 6f5dad9a..bc5a0ea3 100644 --- a/data/common/build.gradle.kts +++ b/data/common/build.gradle.kts @@ -21,9 +21,7 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.data.common" -} +android.namespace = "com.sadellie.unitto.data.common" dependencies { implementation(libs.androidx.core.core.ktx) diff --git a/data/units/.gitignore b/data/converter/.gitignore similarity index 100% rename from data/units/.gitignore rename to data/converter/.gitignore diff --git a/data/units/build.gradle.kts b/data/converter/build.gradle.kts similarity index 92% rename from data/units/build.gradle.kts rename to data/converter/build.gradle.kts index 05c0f66e..099f9476 100644 --- a/data/units/build.gradle.kts +++ b/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")) } diff --git a/data/units/consumer-rules.pro b/data/converter/consumer-rules.pro similarity index 100% rename from data/units/consumer-rules.pro rename to data/converter/consumer-rules.pro diff --git a/data/units/src/main/AndroidManifest.xml b/data/converter/src/main/AndroidManifest.xml similarity index 100% rename from data/units/src/main/AndroidManifest.xml rename to data/converter/src/main/AndroidManifest.xml diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/DataStoreModule.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/DataStoreModule.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/DataStoreModule.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/DataStoreModule.kt index a3a7fd4e..88074c27 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/DataStoreModule.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/DataStoreModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.data.units +package com.sadellie.unitto.data.converter import android.content.Context import com.sadellie.unitto.data.database.CurrencyRatesDao diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/MyUnitIDS.kt similarity index 99% rename from data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/MyUnitIDS.kt index f2f3f428..4f707a08 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/MyUnitIDS.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.data.units +package com.sadellie.unitto.data.converter /** * All UnitIDs. Long file. diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/UnitsRepository.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/UnitsRepository.kt similarity index 83% rename from data/units/src/main/java/com/sadellie/unitto/data/units/UnitsRepository.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/UnitsRepository.kt index 61fb275f..6eef19ce 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/UnitsRepository.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/UnitsRepository.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -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.units.collections.angleCollection -import com.sadellie.unitto.data.units.collections.areaCollection -import com.sadellie.unitto.data.units.collections.currencyCollection -import com.sadellie.unitto.data.units.collections.dataCollection -import com.sadellie.unitto.data.units.collections.dataTransferCollection -import com.sadellie.unitto.data.units.collections.electrostaticCapacitance -import com.sadellie.unitto.data.units.collections.energyCollection -import com.sadellie.unitto.data.units.collections.flowRateCollection -import com.sadellie.unitto.data.units.collections.fluxCollection -import com.sadellie.unitto.data.units.collections.forceCollection -import com.sadellie.unitto.data.units.collections.fuelConsumptionCollection -import com.sadellie.unitto.data.units.collections.lengthCollection -import com.sadellie.unitto.data.units.collections.luminanceCollection -import com.sadellie.unitto.data.units.collections.massCollection -import com.sadellie.unitto.data.units.collections.numberBaseCollection -import com.sadellie.unitto.data.units.collections.powerCollection -import com.sadellie.unitto.data.units.collections.prefixCollection -import com.sadellie.unitto.data.units.collections.pressureCollection -import com.sadellie.unitto.data.units.collections.speedCollection -import com.sadellie.unitto.data.units.collections.temperatureCollection -import com.sadellie.unitto.data.units.collections.timeCollection -import com.sadellie.unitto.data.units.collections.torqueCollection -import com.sadellie.unitto.data.units.collections.volumeCollection -import com.sadellie.unitto.data.units.remote.CurrencyApi +import com.sadellie.unitto.data.converter.collections.accelerationCollection +import com.sadellie.unitto.data.converter.collections.angleCollection +import com.sadellie.unitto.data.converter.collections.areaCollection +import com.sadellie.unitto.data.converter.collections.currencyCollection +import com.sadellie.unitto.data.converter.collections.dataCollection +import com.sadellie.unitto.data.converter.collections.dataTransferCollection +import com.sadellie.unitto.data.converter.collections.electrostaticCapacitance +import com.sadellie.unitto.data.converter.collections.energyCollection +import com.sadellie.unitto.data.converter.collections.flowRateCollection +import com.sadellie.unitto.data.converter.collections.fluxCollection +import com.sadellie.unitto.data.converter.collections.forceCollection +import com.sadellie.unitto.data.converter.collections.fuelConsumptionCollection +import com.sadellie.unitto.data.converter.collections.lengthCollection +import com.sadellie.unitto.data.converter.collections.luminanceCollection +import com.sadellie.unitto.data.converter.collections.massCollection +import com.sadellie.unitto.data.converter.collections.numberBaseCollection +import com.sadellie.unitto.data.converter.collections.powerCollection +import com.sadellie.unitto.data.converter.collections.prefixCollection +import com.sadellie.unitto.data.converter.collections.pressureCollection +import com.sadellie.unitto.data.converter.collections.speedCollection +import com.sadellie.unitto.data.converter.collections.temperatureCollection +import com.sadellie.unitto.data.converter.collections.timeCollection +import com.sadellie.unitto.data.converter.collections.torqueCollection +import com.sadellie.unitto.data.converter.collections.volumeCollection +import com.sadellie.unitto.data.converter.remote.CurrencyApi import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Acceleration.kt similarity index 98% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Acceleration.kt index d2cb5b4f..f8d906cd 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Acceleration.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Angle.kt similarity index 94% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Angle.kt index 763f3e61..3aedf835 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Angle.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Area.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Area.kt index cba35afc..c6102de4 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Area.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Currency.kt similarity index 99% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Currency.kt index d86b5897..63d7c7d1 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Currency.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Data.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Data.kt index 623255aa..22513f8d 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Data.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/DataTransfer.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/DataTransfer.kt index 3fa087d1..f7b48015 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/DataTransfer.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/ElectrostaticCapacitance.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/ElectrostaticCapacitance.kt similarity index 96% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/ElectrostaticCapacitance.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/ElectrostaticCapacitance.kt index 1f5bcc9a..7ca91aea 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/ElectrostaticCapacitance.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/ElectrostaticCapacitance.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Energy.kt similarity index 96% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Energy.kt index aec9dc3a..0f17dbec 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Energy.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FlowRate.kt similarity index 98% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FlowRate.kt index 8606a5de..71824d55 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FlowRate.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Flux.kt similarity index 95% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Flux.kt index 17c4e826..dfd64d4d 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Flux.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Force.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Force.kt index 43bf93ed..f96bd97c 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Force.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FuelConsumption.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FuelConsumption.kt similarity index 96% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/FuelConsumption.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FuelConsumption.kt index 7b41d4e1..7690b2b9 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/FuelConsumption.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/FuelConsumption.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Length.kt similarity index 98% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Length.kt index a342e1e7..8344c74c 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Length.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Luminance.kt similarity index 98% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Luminance.kt index de37d8b1..3d7e8c9d 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Luminance.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Mass.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Mass.kt index 1b9341ea..c311378c 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Mass.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/NumberBase.kt similarity index 96% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/NumberBase.kt index 4861f396..b1604f45 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/NumberBase.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Power.kt similarity index 95% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Power.kt index 4dbc5c32..c6450d58 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Power.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Prefix.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Prefix.kt index 3875349c..f8079d3a 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Prefix.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Pressure.kt similarity index 98% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Pressure.kt index ecfd5fcf..2613e811 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Pressure.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Speed.kt similarity index 98% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Speed.kt index 86e891fa..cf0d682d 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Speed.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Temperature.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Temperature.kt index 54f81778..d6a48ad8 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Temperature.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -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 diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Time.kt similarity index 96% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Time.kt index e7e68dc4..dd7c24bc 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Time.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Torque.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Torque.kt index 10f2bb72..b22016a8 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Torque.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Volume.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Volume.kt index ecd0d046..ef7d0da3 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/collections/Volume.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -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 by lazy { diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyApiService.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyApiService.kt index 95383a9e..da656247 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyApiService.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyApiService.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.data.units.remote +package com.sadellie.unitto.data.converter.remote import com.squareup.moshi.Moshi import retrofit2.Retrofit diff --git a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyUnitResponse.kt b/data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyUnitResponse.kt similarity index 97% rename from data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyUnitResponse.kt rename to data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyUnitResponse.kt index b8f55413..81ad855b 100644 --- a/data/units/src/main/java/com/sadellie/unitto/data/units/remote/CurrencyUnitResponse.kt +++ b/data/converter/src/main/java/com/sadellie/unitto/data/converter/remote/CurrencyUnitResponse.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.data.units.remote +package com.sadellie.unitto.data.converter.remote import com.squareup.moshi.FromJson import com.squareup.moshi.ToJson diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt b/data/converter/src/test/java/com/sadellie/unitto/data/converter/AllUnitsTest.kt similarity index 99% rename from data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt rename to data/converter/src/test/java/com/sadellie/unitto/data/converter/AllUnitsTest.kt index d16af0c8..34810cac 100644 --- a/data/units/src/test/java/com/sadellie/unitto/data/units/AllUnitsTest.kt +++ b/data/converter/src/test/java/com/sadellie/unitto/data/converter/AllUnitsTest.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.data.units +package com.sadellie.unitto.data.converter import android.content.Context import androidx.room.Room diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinFilterAndSortTest.kt b/data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinFilterAndSortTest.kt similarity index 98% rename from data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinFilterAndSortTest.kt rename to data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinFilterAndSortTest.kt index e3a4a14f..2788ce81 100644 --- a/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinFilterAndSortTest.kt +++ b/data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinFilterAndSortTest.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.data.units +package com.sadellie.unitto.data.converter import android.content.Context import com.sadellie.unitto.core.base.R diff --git a/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinTest.kt b/data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinTest.kt similarity index 97% rename from data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinTest.kt rename to data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinTest.kt index e9d4df7f..bd3ebf40 100644 --- a/data/units/src/test/java/com/sadellie/unitto/data/units/LevenshteinTest.kt +++ b/data/converter/src/test/java/com/sadellie/unitto/data/converter/LevenshteinTest.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.sadellie.unitto.data.units +package com.sadellie.unitto.data.converter import com.sadellie.unitto.data.common.lev import org.junit.Assert.assertEquals diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts index a10dd391..045847cf 100644 --- a/data/database/build.gradle.kts +++ b/data/database/build.gradle.kts @@ -23,9 +23,9 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.data.database" +android.namespace = "com.sadellie.unitto.data.database" +android { room { val schemaLocation = "$projectDir/schemas" schemaDirectory(schemaLocation) diff --git a/data/evaluatto/build.gradle.kts b/data/evaluatto/build.gradle.kts index 5d504462..d727bdbe 100644 --- a/data/evaluatto/build.gradle.kts +++ b/data/evaluatto/build.gradle.kts @@ -21,10 +21,8 @@ plugins { id("unitto.android.library.jacoco") } -android { - // Different namespace. Possible promotion to a separate project. - namespace = "io.github.sadellie.evaluatto" -} +// Different namespace. Possible promotion to a separate project. +android.namespace = "io.github.sadellie.evaluatto" dependencies { implementation(project(":core:base")) diff --git a/data/licenses/build.gradle.kts b/data/licenses/build.gradle.kts index c4703f00..95f855f1 100644 --- a/data/licenses/build.gradle.kts +++ b/data/licenses/build.gradle.kts @@ -22,6 +22,4 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.data.licenses" -} +android.namespace = "com.sadellie.unitto.data.licenses" diff --git a/data/model/build.gradle.kts b/data/model/build.gradle.kts index 43cbfa77..560c78ab 100644 --- a/data/model/build.gradle.kts +++ b/data/model/build.gradle.kts @@ -21,9 +21,7 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.data.model" -} +android.namespace = "com.sadellie.unitto.data.model" dependencies { implementation(project(":core:base")) diff --git a/data/timezone/build.gradle.kts b/data/timezone/build.gradle.kts index 1e184ee4..6aa3d789 100644 --- a/data/timezone/build.gradle.kts +++ b/data/timezone/build.gradle.kts @@ -22,13 +22,11 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.data.timezone" -} +android.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")) } diff --git a/data/userprefs/build.gradle.kts b/data/userprefs/build.gradle.kts index c53b9775..9552ed88 100644 --- a/data/userprefs/build.gradle.kts +++ b/data/userprefs/build.gradle.kts @@ -22,9 +22,7 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.data.userprefs" -} +android.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")) } diff --git a/data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/PreferenceExt.kt b/data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/PreferenceExt.kt index 33c06724..e1f26159 100644 --- a/data/userprefs/src/main/java/com/sadellie/unitto/data/userprefs/PreferenceExt.kt +++ b/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 diff --git a/feature/calculator/build.gradle.kts b/feature/calculator/build.gradle.kts index 5aec6b54..6e4a37db 100644 --- a/feature/calculator/build.gradle.kts +++ b/feature/calculator/build.gradle.kts @@ -24,19 +24,17 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.feature.calculator" - testOptions.unitTests.isIncludeAndroidResources = true -} +android.namespace = "com.sadellie.unitto.feature.calculator" +android.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")) } diff --git a/feature/converter/build.gradle.kts b/feature/converter/build.gradle.kts index 703dc6be..2e184b1e 100644 --- a/feature/converter/build.gradle.kts +++ b/feature/converter/build.gradle.kts @@ -25,11 +25,8 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.feature.converter" - - testOptions.unitTests.isIncludeAndroidResources = true -} +android.namespace = "com.sadellie.unitto.feature.converter" +android.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:evaluatto")) + implementation(project(":data:converter")) } diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideScreen.kt index 77e4ce26..acf98acf 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/LeftSideScreen.kt +++ b/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 diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt index 6cb49f95..9e04fd7b 100644 --- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/RightSideScreen.kt +++ b/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 diff --git a/feature/datecalculator/build.gradle.kts b/feature/datecalculator/build.gradle.kts index adf07f13..b32a799f 100644 --- a/feature/datecalculator/build.gradle.kts +++ b/feature/datecalculator/build.gradle.kts @@ -24,9 +24,7 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.feature.datecalculator" -} +android.namespace = "com.sadellie.unitto.feature.datecalculator" dependencies { implementation(project(":data:common")) diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index 85d45651..f0942865 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -24,9 +24,7 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.feature.settings" -} +android.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")) } diff --git a/feature/timezone/build.gradle.kts b/feature/timezone/build.gradle.kts index f5cc505a..2264f5a3 100644 --- a/feature/timezone/build.gradle.kts +++ b/feature/timezone/build.gradle.kts @@ -24,9 +24,7 @@ plugins { id("unitto.android.library.jacoco") } -android { - namespace = "com.sadellie.unitto.feature.timezone" -} +android.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")) } diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt b/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt index f5bdd8f9..6f280f50 100644 --- a/feature/timezone/src/main/java/com/sadellie/unitto/feature/timezone/components/FavoriteTimeZoneItem.kt +++ b/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, diff --git a/settings.gradle.kts b/settings.gradle.kts index be9e2822..78ca8da2 100644 --- a/settings.gradle.kts +++ b/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")