diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index 395fe5f1..e108d2f2 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -160,7 +160,7 @@ dependencies { implementation(project(":data:websites")) implementation(project(":data:widgets")) implementation(project(":data:wikipedia")) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":data:search-actions")) implementation(project(":services:global-actions")) implementation(project(":services:widgets")) diff --git a/data/currencies/build.gradle.kts b/data/currencies/build.gradle.kts index fd41e791..c75bc776 100644 --- a/data/currencies/build.gradle.kts +++ b/data/currencies/build.gradle.kts @@ -44,6 +44,6 @@ dependencies { implementation(project(":core:ktx")) implementation(project(":core:i18n")) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/data/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts index 55c8f6a8..bd5011a7 100644 --- a/data/customattrs/build.gradle.kts +++ b/data/customattrs/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation(libs.koin.android) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:base")) implementation(project(":core:ktx")) implementation(project(":core:crashreporter")) diff --git a/core/database/.gitignore b/data/database/.gitignore similarity index 100% rename from core/database/.gitignore rename to data/database/.gitignore diff --git a/core/database/build.gradle.kts b/data/database/build.gradle.kts similarity index 100% rename from core/database/build.gradle.kts rename to data/database/build.gradle.kts diff --git a/core/database/consumer-rules.pro b/data/database/consumer-rules.pro similarity index 100% rename from core/database/consumer-rules.pro rename to data/database/consumer-rules.pro diff --git a/core/database/proguard-rules.pro b/data/database/proguard-rules.pro similarity index 100% rename from core/database/proguard-rules.pro rename to data/database/proguard-rules.pro diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/0.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/0.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/0.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/0.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/1.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/1.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/1.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/1.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/10.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/10.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/10.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/10.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/11.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/11.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/11.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/11.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/12.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/12.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/12.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/12.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/13.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/13.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/13.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/13.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/14.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/14.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/14.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/14.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/15.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/15.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/15.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/15.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/16.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/16.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/16.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/16.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/17.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/17.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/17.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/17.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/18.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/18.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/18.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/18.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/19.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/19.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/19.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/19.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/2.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/2.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/2.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/2.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/20.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/20.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/20.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/20.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/21.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/21.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/21.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/21.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/22.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/22.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/22.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/22.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/23.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/23.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/23.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/23.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/24.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/24.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/24.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/24.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/3.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/3.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/3.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/3.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/4.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/4.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/4.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/4.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/5.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/5.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/5.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/5.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/6.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/6.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/6.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/6.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/7.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/7.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/7.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/7.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/8.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/8.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/8.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/8.json diff --git a/core/database/schemas/de.mm20.launcher2.database.AppDatabase/9.json b/data/database/schemas/de.mm20.launcher2.database.AppDatabase/9.json similarity index 100% rename from core/database/schemas/de.mm20.launcher2.database.AppDatabase/9.json rename to data/database/schemas/de.mm20.launcher2.database.AppDatabase/9.json diff --git a/core/database/src/main/AndroidManifest.xml b/data/database/src/main/AndroidManifest.xml similarity index 100% rename from core/database/src/main/AndroidManifest.xml rename to data/database/src/main/AndroidManifest.xml diff --git a/core/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt b/data/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt rename to data/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/Converters.kt b/data/database/src/main/java/de/mm20/launcher2/database/Converters.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/Converters.kt rename to data/database/src/main/java/de/mm20/launcher2/database/Converters.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/IconDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/IconDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/Module.kt b/data/database/src/main/java/de/mm20/launcher2/database/Module.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/Module.kt rename to data/database/src/main/java/de/mm20/launcher2/database/Module.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/SearchableDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/daos/ThemeDao.kt b/data/database/src/main/java/de/mm20/launcher2/database/daos/ThemeDao.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/daos/ThemeDao.kt rename to data/database/src/main/java/de/mm20/launcher2/database/daos/ThemeDao.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/ThemeEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/ThemeEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/ThemeEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/ThemeEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt b/data/database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt rename to data/database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_19_20.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_19_20.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_19_20.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_19_20.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_20_21.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_20_21.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_20_21.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_20_21.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_21_22.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_21_22.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_21_22.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_21_22.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_22_23.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_22_23.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_22_23.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_22_23.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_23_24.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_23_24.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_23_24.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_23_24.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_24_25.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_24_25.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_24_25.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_24_25.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt diff --git a/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt b/data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt similarity index 100% rename from core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt rename to data/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt diff --git a/data/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts index a5e59d1a..6350bb68 100644 --- a/data/search-actions/build.gradle.kts +++ b/data/search-actions/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { implementation(libs.coil.core) implementation(project(":core:base")) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:ktx")) implementation(project(":core:preferences")) implementation(project(":core:crashreporter")) diff --git a/data/searchable/build.gradle.kts b/data/searchable/build.gradle.kts index f7cd9ed8..e07b9db6 100644 --- a/data/searchable/build.gradle.kts +++ b/data/searchable/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { implementation(project(":core:base")) implementation(project(":data:calendar")) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:preferences")) implementation(project(":core:ktx")) implementation(project(":data:wikipedia")) diff --git a/data/themes/build.gradle.kts b/data/themes/build.gradle.kts index d9ea860f..18fea445 100644 --- a/data/themes/build.gradle.kts +++ b/data/themes/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { implementation(libs.koin.android) implementation(project(":core:base")) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:crashreporter")) implementation(project(":libs:material-color-utilities")) diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts index 43d28efa..2dc5348c 100644 --- a/data/weather/build.gradle.kts +++ b/data/weather/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { implementation(libs.suncalc) implementation(libs.koin.android) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:ktx")) implementation(project(":core:crashreporter")) implementation(project(":core:preferences")) diff --git a/data/widgets/build.gradle.kts b/data/widgets/build.gradle.kts index 8160821a..b43b221d 100644 --- a/data/widgets/build.gradle.kts +++ b/data/widgets/build.gradle.kts @@ -52,7 +52,7 @@ dependencies { implementation(project(":core:ktx")) implementation(project(":core:base")) implementation(project(":core:preferences")) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/docs/static/img/dependency-graph.dot b/docs/static/img/dependency-graph.dot index feec16e1..41b3f987 100644 --- a/docs/static/img/dependency-graph.dot +++ b/docs/static/img/dependency-graph.dot @@ -10,7 +10,6 @@ digraph { ":core:base" [fillcolor="#94c1ff"]; ":core:compat" [fillcolor="#94c1ff"]; ":core:crashreporter" [fillcolor="#94c1ff"]; - ":core:database" [fillcolor="#94c1ff"]; ":core:i18n" [fillcolor="#94c1ff"]; ":core:ktx" [fillcolor="#94c1ff"]; ":core:permissions" [fillcolor="#94c1ff"]; @@ -23,6 +22,7 @@ digraph { ":data:contacts" [fillcolor="#fff694"]; ":data:currencies" [fillcolor="#fff694"]; ":data:customattrs" [fillcolor="#fff694"]; + ":data:database" [fillcolor="#fff694"]; ":data:files" [fillcolor="#fff694"]; ":data:notifications" [fillcolor="#fff694"]; ":data:search-actions" [fillcolor="#fff694"]; @@ -89,7 +89,7 @@ digraph { ":app:app" -> ":data:websites" [style=dotted] ":app:app" -> ":data:widgets" [style=dotted] ":app:app" -> ":data:wikipedia" [style=dotted] - ":app:app" -> ":core:database" [style=dotted] + ":app:app" -> ":data:database" [style=dotted] ":app:app" -> ":data:search-actions" [style=dotted] ":app:app" -> ":services:global-actions" [style=dotted] ":app:app" -> ":services:widgets" [style=dotted] @@ -132,10 +132,6 @@ digraph { ":app:ui" -> ":services:widgets" [style=dotted] ":app:ui" -> ":services:favorites" [style=dotted] ":core:shared" -> ":core:shared" - ":core:database" -> ":core:database" - ":core:database" -> ":core:i18n" [style=dotted] - ":core:database" -> ":core:ktx" [style=dotted] - ":core:database" -> ":core:preferences" [style=dotted] ":core:preferences" -> ":core:preferences" ":core:preferences" -> ":core:ktx" [style=dotted] ":core:preferences" -> ":core:i18n" [style=dotted] @@ -175,12 +171,12 @@ digraph { ":data:widgets" -> ":core:ktx" [style=dotted] ":data:widgets" -> ":core:base" [style=dotted] ":data:widgets" -> ":core:preferences" [style=dotted] - ":data:widgets" -> ":core:database" [style=dotted] + ":data:widgets" -> ":data:database" [style=dotted] ":data:widgets" -> ":core:crashreporter" [style=dotted] ":data:searchable" -> ":data:searchable" ":data:searchable" -> ":core:base" [style=dotted] ":data:searchable" -> ":data:calendar" [style=dotted] - ":data:searchable" -> ":core:database" [style=dotted] + ":data:searchable" -> ":data:database" [style=dotted] ":data:searchable" -> ":core:preferences" [style=dotted] ":data:searchable" -> ":core:ktx" [style=dotted] ":data:searchable" -> ":data:wikipedia" [style=dotted] @@ -193,17 +189,21 @@ digraph { ":data:unitconverter" -> ":core:i18n" [style=dotted] ":data:themes" -> ":data:themes" ":data:themes" -> ":core:base" [style=dotted] - ":data:themes" -> ":core:database" [style=dotted] + ":data:themes" -> ":data:database" [style=dotted] ":data:themes" -> ":core:crashreporter" [style=dotted] ":data:themes" -> ":libs:material-color-utilities" [style=dotted] + ":data:database" -> ":data:database" + ":data:database" -> ":core:i18n" [style=dotted] + ":data:database" -> ":core:ktx" [style=dotted] + ":data:database" -> ":core:preferences" [style=dotted] ":data:customattrs" -> ":data:customattrs" - ":data:customattrs" -> ":core:database" [style=dotted] + ":data:customattrs" -> ":data:database" [style=dotted] ":data:customattrs" -> ":core:base" [style=dotted] ":data:customattrs" -> ":core:ktx" [style=dotted] ":data:customattrs" -> ":core:crashreporter" [style=dotted] ":data:customattrs" -> ":data:searchable" [style=dotted] ":data:weather" -> ":data:weather" - ":data:weather" -> ":core:database" [style=dotted] + ":data:weather" -> ":data:database" [style=dotted] ":data:weather" -> ":core:ktx" [style=dotted] ":data:weather" -> ":core:crashreporter" [style=dotted] ":data:weather" -> ":core:preferences" [style=dotted] @@ -224,7 +224,7 @@ digraph { ":data:websites" -> ":core:ktx" [style=dotted] ":data:search-actions" -> ":data:search-actions" ":data:search-actions" -> ":core:base" [style=dotted] - ":data:search-actions" -> ":core:database" [style=dotted] + ":data:search-actions" -> ":data:database" [style=dotted] ":data:search-actions" -> ":core:ktx" [style=dotted] ":data:search-actions" -> ":core:preferences" [style=dotted] ":data:search-actions" -> ":core:crashreporter" [style=dotted] @@ -246,7 +246,7 @@ digraph { ":data:currencies" -> ":data:currencies" ":data:currencies" -> ":core:ktx" [style=dotted] ":data:currencies" -> ":core:i18n" [style=dotted] - ":data:currencies" -> ":core:database" [style=dotted] + ":data:currencies" -> ":data:database" [style=dotted] ":data:currencies" -> ":core:crashreporter" [style=dotted] ":plugins:sdk" -> ":plugins:sdk" ":plugins:sdk" -> ":core:shared" [style=dotted] @@ -290,7 +290,7 @@ digraph { ":services:accounts" -> ":libs:nextcloud" [style=dotted] ":services:icons" -> ":data:customattrs" ":services:icons" -> ":services:icons" - ":services:icons" -> ":core:database" [style=dotted] + ":services:icons" -> ":data:database" [style=dotted] ":services:icons" -> ":core:preferences" [style=dotted] ":services:icons" -> ":core:ktx" [style=dotted] ":services:icons" -> ":core:base" [style=dotted] diff --git a/docs/static/img/dependency-graph.dot.png b/docs/static/img/dependency-graph.dot.png index ff4ea8f5..d1db2a96 100644 Binary files a/docs/static/img/dependency-graph.dot.png and b/docs/static/img/dependency-graph.dot.png differ diff --git a/services/icons/build.gradle.kts b/services/icons/build.gradle.kts index 8e7b25d2..4e5717a1 100644 --- a/services/icons/build.gradle.kts +++ b/services/icons/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { implementation(libs.koin.android) - implementation(project(":core:database")) + implementation(project(":data:database")) implementation(project(":core:preferences")) implementation(project(":core:ktx")) implementation(project(":core:base")) diff --git a/settings.gradle.kts b/settings.gradle.kts index aa777fad..6f7694d9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,7 +24,7 @@ include(":core:compat") include(":core:preferences") include(":core:ktx") include(":core:i18n") -include(":core:database") +include(":data:database") include(":core:permissions") include(":core:shared")