Reorganize and group modules

app/app/build.gradle.kts

@@ -102,40 +102,40 @@ dependencies {
 
     implementation(libs.koin.android)
 
-    implementation(project(":accounts"))
-    implementation(project(":applications"))
-    implementation(project(":appshortcuts"))
-    implementation(project(":backup"))
-    implementation(project(":badges"))
-    implementation(project(":base"))
-    implementation(project(":calculator"))
-    implementation(project(":calendar"))
-    implementation(project(":contacts"))
-    implementation(project(":crashreporter"))
-    implementation(project(":currencies"))
-    implementation(project(":customattrs"))
-    implementation(project(":favorites"))
-    implementation(project(":files"))
-    implementation(project(":g-services"))
-    implementation(project(":i18n"))
-    implementation(project(":icons"))
-    implementation(project(":ktx"))
-    implementation(project(":ms-services"))
-    implementation(project(":music"))
-    implementation(project(":nextcloud"))
-    implementation(project(":notifications"))
-    implementation(project(":owncloud"))
-    implementation(project(":permissions"))
-    implementation(project(":preferences"))
-    implementation(project(":search"))
-    implementation(project(":unitconverter"))
-    implementation(project(":ui"))
-    implementation(project(":weather"))
-    implementation(project(":websites"))
-    implementation(project(":widgets"))
-    implementation(project(":wikipedia"))
-    implementation(project(":database"))
-    implementation(project(":search-actions"))
+    implementation(project(":services:accounts"))
+    implementation(project(":data:applications"))
+    implementation(project(":data:appshortcuts"))
+    implementation(project(":services:backup"))
+    implementation(project(":services:badges"))
+    implementation(project(":core:base"))
+    implementation(project(":data:calculator"))
+    implementation(project(":data:calendar"))
+    implementation(project(":data:contacts"))
+    implementation(project(":core:crashreporter"))
+    implementation(project(":data:currencies"))
+    implementation(project(":data:customattrs"))
+    implementation(project(":data:favorites"))
+    implementation(project(":data:files"))
+    implementation(project(":libs:g-services"))
+    implementation(project(":core:i18n"))
+    implementation(project(":services:icons"))
+    implementation(project(":core:ktx"))
+    implementation(project(":libs:ms-services"))
+    implementation(project(":services:music"))
+    implementation(project(":libs:nextcloud"))
+    implementation(project(":data:notifications"))
+    implementation(project(":libs:owncloud"))
+    implementation(project(":core:permissions"))
+    implementation(project(":core:preferences"))
+    implementation(project(":services:search"))
+    implementation(project(":data:unitconverter"))
+    implementation(project(":app:ui"))
+    implementation(project(":data:weather"))
+    implementation(project(":data:websites"))
+    implementation(project(":data:widgets"))
+    implementation(project(":data:wikipedia"))
+    implementation(project(":core:database"))
+    implementation(project(":data:search-actions"))
 
     // Uncomment this if you want annoying notifications in your debug builds yelling at you how terrible your code is
     //debugImplementation(libs.leakcanary)

app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt

@@ -12,7 +12,7 @@ import de.mm20.launcher2.badges.badgesModule
 import de.mm20.launcher2.calculator.calculatorModule
 import de.mm20.launcher2.calendar.calendarModule
 import de.mm20.launcher2.contacts.contactsModule
-import de.mm20.launcher2.customattrs.customAttrsModule
+import de.mm20.launcher2.data.customattrs.customAttrsModule
 import de.mm20.launcher2.debug.Debug
 import de.mm20.launcher2.favorites.favoritesModule
 import de.mm20.launcher2.files.filesModule

app/ui/build.gradle.kts

@@ -109,37 +109,37 @@ dependencies {
 
     implementation(libs.lottie)
 
-    implementation(project(":material-color-utilities"))
+    implementation(project(":libs:material-color-utilities"))
 
-    implementation(project(":base"))
-    implementation(project(":i18n"))
-    implementation(project(":compat"))
-    implementation(project(":ktx"))
-    implementation(project(":icons"))
-    implementation(project(":music"))
-    implementation(project(":weather"))
-    implementation(project(":calendar"))
-    implementation(project(":search"))
-    implementation(project(":preferences"))
-    implementation(project(":applications"))
-    implementation(project(":appshortcuts"))
-    implementation(project(":calculator"))
-    implementation(project(":files"))
-    implementation(project(":widgets"))
-    implementation(project(":favorites"))
-    implementation(project(":wikipedia"))
-    implementation(project(":badges"))
-    implementation(project(":crashreporter"))
-    implementation(project(":notifications"))
-    implementation(project(":contacts"))
-    implementation(project(":permissions"))
-    implementation(project(":websites"))
-    implementation(project(":unitconverter"))
-    implementation(project(":nextcloud"))
-    implementation(project(":g-services"))
-    implementation(project(":ms-services"))
-    implementation(project(":owncloud"))
-    implementation(project(":accounts"))
-    implementation(project(":backup"))
-    implementation(project(":search-actions"))
+    implementation(project(":core:base"))
+    implementation(project(":core:i18n"))
+    implementation(project(":core:compat"))
+    implementation(project(":core:ktx"))
+    implementation(project(":services:icons"))
+    implementation(project(":services:music"))
+    implementation(project(":data:weather"))
+    implementation(project(":data:calendar"))
+    implementation(project(":services:search"))
+    implementation(project(":core:preferences"))
+    implementation(project(":data:applications"))
+    implementation(project(":data:appshortcuts"))
+    implementation(project(":data:calculator"))
+    implementation(project(":data:files"))
+    implementation(project(":data:widgets"))
+    implementation(project(":data:favorites"))
+    implementation(project(":data:wikipedia"))
+    implementation(project(":services:badges"))
+    implementation(project(":core:crashreporter"))
+    implementation(project(":data:notifications"))
+    implementation(project(":data:contacts"))
+    implementation(project(":core:permissions"))
+    implementation(project(":data:websites"))
+    implementation(project(":data:unitconverter"))
+    implementation(project(":libs:nextcloud"))
+    implementation(project(":libs:g-services"))
+    implementation(project(":libs:ms-services"))
+    implementation(project(":libs:owncloud"))
+    implementation(project(":services:accounts"))
+    implementation(project(":services:backup"))
+    implementation(project(":data:search-actions"))
 }

app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt

@@ -2,8 +2,8 @@ package de.mm20.launcher2.ui.common
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import de.mm20.launcher2.customattrs.CustomAttributesRepository
-import de.mm20.launcher2.customattrs.utils.withCustomLabels
+import de.mm20.launcher2.data.customattrs.CustomAttributesRepository
+import de.mm20.launcher2.data.customattrs.utils.withCustomLabels
 import de.mm20.launcher2.favorites.FavoritesRepository
 import de.mm20.launcher2.preferences.LauncherDataStore
 import de.mm20.launcher2.search.SavableSearchable

app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt

@@ -5,7 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.ui.geometry.Rect
 import androidx.core.app.ActivityOptionsCompat
 import de.mm20.launcher2.badges.BadgeRepository
-import de.mm20.launcher2.customattrs.CustomAttributesRepository
+import de.mm20.launcher2.data.customattrs.CustomAttributesRepository
 import de.mm20.launcher2.favorites.FavoritesRepository
 import de.mm20.launcher2.icons.IconRepository
 import de.mm20.launcher2.icons.LauncherIcon