diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml deleted file mode 100644 index d536a1e2..00000000 --- a/.github/workflows/android.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Android CI - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build diff --git a/.gitignore b/.gitignore index c2880309..aa724b77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,15 @@ *.iml -/.gradle +.gradle /local.properties -/.idea /.idea/caches /.idea/libraries /.idea/modules.xml /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +.DS_Store /build /captures .externalNativeBuild .cxx -local.properties \ No newline at end of file +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml new file mode 100644 index 00000000..371f2e29 --- /dev/null +++ b/.idea/appInsightsSettings.xml @@ -0,0 +1,26 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..b589d56e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 00000000..0c0c3383 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..c74c2714 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,43 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..103e00cb --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,32 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..e805548a --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 00000000..f8051a6f --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..8978d23d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e523fed7..00000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or noteEntity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting noteEntity and all - other entities that control, are controlled by, or are under common - control with that noteEntity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such noteEntity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such noteEntity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any noteEntity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/README.md b/README.md index 9a34b344..cd3dfe62 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ JetNote is modern note android application written by kotlin language and [jetpack-compose](https://github.com/JetBrains/compose-jb) toolkit. The app dealing with Room for Database, Dagger-Hilt dependency injection, Coroutine the non-blocking programming, Navigation-Compose, DataStore, ExoPlayer to play the recorded media in the app, CameraX to take and save picture, And more to make it good app that inspired by google app **keep Notes**. [![API](https://img.shields.io/badge/API-25%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=25) -[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.9.10-blue.svg)](https://kotlinlang.org) +[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.9.20-blue.svg)](https://kotlinlang.org) [![Jetpack Compose](https://img.shields.io/badge/Jetpack%20Compose-1.5.4-blueviolet)](https://developer.android.com/jetpack/androidx/releases/compose) [![Kotlin Coroutines Version](https://img.shields.io/badge/Coroutines-v1.7.3-yellow.svg)](https://kotlinlang.org/docs/reference/coroutines-overview.html) [![Gradle](https://img.shields.io/badge/Gradle-7.4-green)](https://gradle.org) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8a099f05..6442d5dd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,45 +1,36 @@ -import com.android.build.api.dsl.Packaging - +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id ("com.android.application") - id ("org.jetbrains.kotlin.android") + alias(libs.plugins.androidApplication) + alias(libs.plugins.kotlinAndroid) id ("kotlin-kapt") - id ("dagger.hilt.android.plugin") id ("com.chrisney.enigma") } android { - namespace = "com.example.mobile" + namespace = "city.zouitel.jetnote" compileSdk = 34 defaultConfig { applicationId = "city.zouitel.jetnote" - minSdk = 25 - targetSdk = 33 - versionCode = 334 - versionName = "3.3.4" + minSdk = 26 + targetSdk = 34 + versionCode = 400 + versionName = "4.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary = true } -// compileSdkPreview ="UpsideDownCake" } buildTypes { release { - isShrinkResources = true - isMinifyEnabled = true + isMinifyEnabled = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) } - create("benchmark") { - signingConfig = signingConfigs.getByName("debug") - matchingFallbacks += listOf("release") - isDebuggable = false - } } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -52,22 +43,26 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.3" + kotlinCompilerExtensionVersion = "1.5.4" } - fun Packaging.options() { + packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } } + lint { + abortOnError = false + } + /** * Configure the build for multiple APKs */ splits { - /** - * Configure multiple APKs for screen densities. - */ + /** + * Configure multiple APKs for screen densities. + */ density { isEnable = true include("ldpi", "xxhdpi", "xxxhdpi") @@ -85,55 +80,46 @@ android { } } -hilt { - enableAggregatingTask = true -} - enigma.enabled = true enigma.injectFakeKeys = true dependencies { + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.navigation) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + androidTestImplementation(platform(libs.compose.bom)) + androidTestImplementation(libs.ui.test.junit4) + debugImplementation(libs.ui.tooling) + debugImplementation(libs.ui.test.manifest) + //Modules. - implementation(projects.common.ui) - implementation(projects.service.notification) - implementation(projects.ui.graph) - implementation(projects.ui.features.widget) - implementation(projects.ui.features.quickNote) + implementation(projects.core.database) + implementation(projects.core.datastore) + implementation(projects.core.repository) + implementation(projects.domain) implementation(projects.init) + implementation(projects.services.notifications) + implementation(projects.ui.common.systemDesign) + api(projects.ui.navigation) - //AndroidX. - implementation(libs.androidx.core) - implementation(libs.androidx.corektx) - implementation(libs.androidx.appcompat) - implementation(libs.androidx.runtimektx) - implementation(libs.androidx.constraintlayout) - - //Compose. - implementation(libs.compose.ui) - implementation(libs.compose.material3) - implementation(libs.compose.activity) - implementation(libs.compose.navigation) - implementation(libs.compose.toolingpreview) - implementation(libs.compose.viewmodel) - implementation(libs.compose.constraintlayout) - - //Dagger-Hilt - implementation (libs.dagger) - implementation (libs.dagger.hilt) - implementation (libs.hilt.navcomp) - implementation (libs.hilt.work) - kapt (libs.dagger.compiler) - kapt (libs.hilt.compiler) - kapt (libs.dagger.hiltcompiler) - //Lifecycle. - implementation(libs.androidx.lifecycle.viewmodel.compose) - implementation(libs.androidx.lifecycle.runtime.compose) - implementation(libs.androidx.lifecycle.process) + implementation(libs.lifecycle.compose.viewmodel) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.lifecycle.process) //WorkManager. - implementation(libs.androidx.workmanager) + implementation(libs.workmanager) //Accompanist. implementation(libs.accompanist.systemuicontroller) @@ -145,22 +131,12 @@ dependencies { implementation(libs.beetle) //Global Exception. - implementation(libs.globalexception) +// implementation(libs.globalexception) - // - debugImplementation("com.squareup.leakcanary:leakcanary-android:2.10") - //Test. - testImplementation (libs.androidx.junit) - debugImplementation (libs.compose.manifest) - debugImplementation (libs.compose.uitest) - - androidTestImplementation (libs.androidx.extjunit) - androidTestImplementation (libs.compose.junit4) - - androidTestImplementation(libs.bundles.composetest) { - exclude(group = "androidx.core", module = "core-ktx") - exclude(group = "androidx.activity", module = "activity") - exclude(group = "androidx.lifecycle", module = "lifecycle-runtime-ktx") - } + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.worker) + implementation(libs.koin.compose) } \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8a0dc3d1..481bb434 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -14,8 +14,8 @@ # Uncomment this to preserve the line number information for # debugging stack traces. --keepattributes SourceFile,LineNumberTable +#-keepattributes SourceFile,LineNumberTable # If you keep the line number information, uncomment this to # hide the original source file name. --renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/city/zouitel/jetnote/ExampleInstrumentedTest.kt b/app/src/androidTest/java/city/zouitel/jetnote/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..c4a8203f --- /dev/null +++ b/app/src/androidTest/java/city/zouitel/jetnote/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.jetnote + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.jetnote", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2a2a99e8..fecf21d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,13 +2,21 @@ + + + - + @@ -31,7 +39,7 @@ tools:targetApi="29" /> @@ -65,7 +73,7 @@ @@ -76,7 +84,7 @@ Unit ) { val currentTheme = remember(dataStoreVM, dataStoreVM::getTheme).collectAsState() diff --git a/app/src/main/java/city/zouitel/jetnote/NoteApplication.kt b/app/src/main/java/city/zouitel/jetnote/NoteApplication.kt new file mode 100644 index 00000000..0f4596f0 --- /dev/null +++ b/app/src/main/java/city/zouitel/jetnote/NoteApplication.kt @@ -0,0 +1,75 @@ +package city.zouitel.jetnote + +import android.app.Application +import city.zouitel.audios.di.exoPlayerKoinModule +import city.zouitel.database.di.databaseKoinModule +import city.zouitel.datastore.datastoreKoinModule +import city.zouitel.domain.di.useCasesKoinModule +import city.zouitel.links.di.linksKoinModule +import city.zouitel.note.di.noteKoinModule +import city.zouitel.notifications.di.notificationKoinModule +import city.zouitel.quicknote.di.quickNoteKoinModule +import city.zouitel.recoder.di.recorderKoinModule +import city.zouitel.reminder.di.reminderKoinModule +import city.zouitel.repository.di.repositoryKoinModule +import city.zouitel.systemDesign.di.datastoreVMKoinModule +import city.zouitel.tags.di.tagsKoinModule +import city.zouitel.tasks.di.tasksKoinModule +import city.zouitel.widget.di.widgetKoinModule +import com.karacca.beetle.Beetle +import org.koin.android.ext.koin.androidContext +import org.koin.android.ext.koin.androidLogger +import org.koin.core.component.KoinComponent +import org.koin.core.context.startKoin +import org.koin.core.logger.Level + +class NoteApplication: Application() +{ + + override fun onCreate() { + super.onCreate() + startKoin { + androidLogger(Level.INFO) + androidContext(this@NoteApplication) +// workManagerFactory() + modules( + databaseKoinModule, + datastoreKoinModule, + repositoryKoinModule, +// useCasesKoinModule, +// initializerKoinModule, + exoPlayerKoinModule, + linksKoinModule, + noteKoinModule, + quickNoteKoinModule, + recorderKoinModule, + reminderKoinModule, + tagsKoinModule, + tasksKoinModule, + widgetKoinModule, + notificationKoinModule, + datastoreVMKoinModule + ) + } + + /** + * Global Exception Handler. + */ +// GlobalExceptionHandler.initialize(this, NoteActivity::class.java) + + /** + * + */ + Beetle.configure { + enableAssignees = true + enableLabels = true + } + Beetle.init(this, "City-Zouitel", "JetNote") + + /** + * Work Manager Initializer. + */ +// AppInitializer.getInstance(this).initializeComponent(WorkManagerInitializer::class.java) + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/mobile/utils.kt b/app/src/main/java/city/zouitel/jetnote/utils.kt similarity index 100% rename from app/src/main/java/com/example/mobile/utils.kt rename to app/src/main/java/city/zouitel/jetnote/utils.kt diff --git a/app/src/main/java/com/example/mobile/NoteApplication.kt b/app/src/main/java/com/example/mobile/NoteApplication.kt deleted file mode 100644 index a72e76e1..00000000 --- a/app/src/main/java/com/example/mobile/NoteApplication.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.example.mobile - -import android.app.Application -import androidx.startup.AppInitializer -import com.emirhankolver.GlobalExceptionHandler -import com.karacca.beetle.Beetle -import dagger.hilt.android.HiltAndroidApp -import city.zouitel.init.WorkManagerInitializer - -@HiltAndroidApp -class NoteApplication: Application() { - - override fun onCreate() { - super.onCreate() - - /** - * Global Exception Handler. - */ - GlobalExceptionHandler.initialize(this, NoteActivity::class.java) - - /** - * - */ - Beetle.configure { - enableAssignees = true - enableLabels = true - } - Beetle.init(this, "City-Zouitel", "JetNote") - - /** - * Work Manager Initializer. - */ - AppInitializer.getInstance(this).initializeComponent(WorkManagerInitializer::class.java) - } - -} \ No newline at end of file diff --git a/common/ui/src/main/res/drawable-xxhdpi/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/ic_launcher_background.xml rename to app/src/main/res/drawable/ic_launcher_background.xml diff --git a/common/ui/src/main/res/drawable-xxhdpi/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/ic_launcher_foreground.xml rename to app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 00000000..6f3b755b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 00000000..fa0f996d --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 00000000..9ee9997b --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/city/zouitel/jetnote/ExampleUnitTest.kt b/app/src/test/java/city/zouitel/jetnote/ExampleUnitTest.kt new file mode 100644 index 00000000..b593d878 --- /dev/null +++ b/app/src/test/java/city/zouitel/jetnote/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.jetnote + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts deleted file mode 100644 index cd24ff1d..00000000 --- a/benchmark/build.gradle.kts +++ /dev/null @@ -1,52 +0,0 @@ -plugins { - id("com.android.test") - id("org.jetbrains.kotlin.android") -} - -android { - namespace = "com.example.benchmark" - compileSdk = 33 - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = "1.8" - } - - defaultConfig { - minSdk = 25 - targetSdk = 33 - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - // This benchmark buildType is used for benchmarking, and should function like your - // release build (for example, with minification on). It"s signed with a debug key - // for easy local/CI testing. - create("benchmark") { - isDebuggable = true - signingConfig = getByName("debug").signingConfig - matchingFallbacks += listOf("release") - } - } - - targetProjectPath = ":app" - experimentalProperties["android.experimental.self-instrumenting"] = true -} - -dependencies { - implementation("androidx.test.ext:junit:1.1.5") - implementation("androidx.test.espresso:espresso-core:3.5.1") - implementation("androidx.test.uiautomator:uiautomator:2.2.0") - implementation("androidx.benchmark:benchmark-macro-junit4:1.1.0-beta05") -} - -androidComponents { - beforeVariants(selector().all()) { -// it.enabled = it.buildType == "benchmark" - } -} \ No newline at end of file diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml deleted file mode 100644 index 898f2374..00000000 --- a/benchmark/src/main/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/benchmark/src/main/java/com/example/benchmark/ExampleStartupBenchmark.kt b/benchmark/src/main/java/com/example/benchmark/ExampleStartupBenchmark.kt deleted file mode 100644 index e9f9c349..00000000 --- a/benchmark/src/main/java/com/example/benchmark/ExampleStartupBenchmark.kt +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.benchmark - -import androidx.benchmark.macro.CompilationMode -import androidx.benchmark.macro.StartupMode -import androidx.benchmark.macro.StartupTimingMetric -import androidx.benchmark.macro.junit4.MacrobenchmarkRule -import androidx.test.ext.junit.runners.AndroidJUnit4 -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -/** - * This is an example startup benchmark. - * - * It navigates to the device's home screen, and launches the default activity. - * - * Before running this benchmark: - * 1) switch your app's active build variant in the Studio (affects Studio runs only) - * 2) add `` to your app's manifest, within the `` tag - * - * Run this benchmark from Studio to see startup measurements, and captured system traces - * for investigating your app's performance. - */ -@RunWith(AndroidJUnit4::class) -class ExampleStartupBenchmark { - @get:Rule - val benchmarkRule = MacrobenchmarkRule() - - @Test - fun startup() = benchmarkRule.measureRepeated( - packageName = "city.zouitel.jetnote", - metrics = listOf(StartupTimingMetric()), - iterations = 5, - startupMode = StartupMode.COLD - ) { - pressHome() - startActivityAndWait() - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 9e0a04aa..8d36806c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,20 +1,15 @@ - +// Top-level build file where you can add configuration options common to all sub-projects/modules. +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - alias(libs.plugins.dependencyanalysis) - id("com.android.application") version "7.4.0" apply false - id("org.jetbrains.kotlin.android") version "1.8.0" apply false - id("com.android.library") version "7.4.0" apply false - id("com.android.dynamic-feature") version "7.4.2" apply false - id("com.android.test") version "7.4.2" apply false - id("org.jetbrains.kotlin.jvm") version "1.7.21" apply false + alias(libs.plugins.androidApplication) apply false + alias(libs.plugins.kotlinAndroid) apply false + alias(libs.plugins.androidLibrary) apply false + alias(libs.plugins.dependencyanalysis) apply false } buildscript { dependencies { - classpath(libs.dagger.hilt.gradle.plugin) - classpath(libs.kotlin) - classpath(libs.android.gradle.plugin) - classpath(libs.aboutlibraries.plugin) + classpath(libs.licenses.plugin) classpath("gradle.plugin.chrisney:enigma:1.0.0.8") } @@ -27,5 +22,5 @@ buildscript { } tasks.register("clean", Delete::class){ - delete(rootProject.layout.buildDirectory) -} + delete(rootProject.buildDir) +} \ No newline at end of file diff --git a/common/effect/build.gradle.kts b/common/effect/build.gradle.kts deleted file mode 100644 index fc63c0ef..00000000 --- a/common/effect/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("city.android-lib") -} - -android { - namespace = "com.example.common_effect" -} \ No newline at end of file diff --git a/common/logic/build.gradle.kts b/common/logic/build.gradle.kts deleted file mode 100644 index 3f53550e..00000000 --- a/common/logic/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("city.android-lib") -} - -android { - namespace = "com.example.common_logic" -} \ No newline at end of file diff --git a/common/mapper/build.gradle.kts b/common/mapper/build.gradle.kts deleted file mode 100644 index 493e91ba..00000000 --- a/common/mapper/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("city.android-lib") -} - -android { - namespace = "com.example.common_mapper" -} \ No newline at end of file diff --git a/common/ui/build.gradle.kts b/common/ui/build.gradle.kts deleted file mode 100644 index 8203227f..00000000 --- a/common/ui/build.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.common_ui" -} - -dependencies { - implementation(projects.data.datastore) - - //AndroidX. - implementation(libs.androidx.constraintlayout) - - //Accompanist. - implementation(libs.accompanist.permissions) - implementation(libs.accompanist.pager) - implementation(libs.accompanist.pager.indicators) - implementation(libs.accompanist.systemuicontroller) - implementation(libs.accompanist.navigation.animation) - implementation(libs.accompanist.swiperefresh) - implementation(libs.accompanist.flowlayout) - - //Baha-UrlPreview. - implementation(libs.url.preview) - - //Balloon. - implementation ("com.github.skydoves:balloon-compose:1.5.3") -} \ No newline at end of file diff --git a/common/ui/src/main/java/com/example/common_ui/DispatcherMod.kt b/common/ui/src/main/java/com/example/common_ui/DispatcherMod.kt deleted file mode 100644 index add64a5d..00000000 --- a/common/ui/src/main/java/com/example/common_ui/DispatcherMod.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.common_ui - -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.android.components.ViewModelComponent -import dagger.hilt.components.SingletonComponent - -@Module -@InstallIn( - SingletonComponent::class, - ViewModelComponent::class -) -object DispatcherMod { - -// @Provides -// fun ioDispatcher(): CoroutineDispatcher = Dispatchers.IO -} \ No newline at end of file diff --git a/common/ui/src/main/java/com/example/common_ui/Utils.kt b/common/ui/src/main/java/com/example/common_ui/Utils.kt deleted file mode 100644 index 569bf804..00000000 --- a/common/ui/src/main/java/com/example/common_ui/Utils.kt +++ /dev/null @@ -1 +0,0 @@ -package com.example.common_ui diff --git a/benchmark/.gitignore b/core/database/.gitignore similarity index 100% rename from benchmark/.gitignore rename to core/database/.gitignore diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts new file mode 100644 index 00000000..c396c964 --- /dev/null +++ b/core/database/build.gradle.kts @@ -0,0 +1,68 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) + alias(libs.plugins.ksp) +} + +android { + namespace = "city.zouitel.database" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + +} + +ksp { + arg("room.schemaLocation", "$projectDir/schemas") +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + //Modules. + implementation(projects.core.repository) + + //Room. + implementation(libs.roomkts) + api(libs.room.runtime) + ksp(libs.room.compiler) + + //Security. + implementation (libs.security) + + //Sqlcipher. + implementation (libs.sqlcipher) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) +} \ No newline at end of file diff --git a/core/database/consumer-rules.pro b/core/database/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/core/database/proguard-rules.pro b/core/database/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/core/database/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/database/schemas/city.zouitel.database.Database/1.json b/core/database/schemas/city.zouitel.database.Database/1.json new file mode 100644 index 00000000..877906f2 --- /dev/null +++ b/core/database/schemas/city.zouitel.database.Database/1.json @@ -0,0 +1,296 @@ +{ + "formatVersion": 1, + "database": { + "version": 1, + "identityHash": "c5a4c217b4521dd1d3558c316d6fe3ca", + "entities": [ + { + "tableName": "notes_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`unique_id` TEXT NOT NULL, `title` TEXT, `description` TEXT, `priority` TEXT NOT NULL, `color` INTEGER NOT NULL, `text_color` INTEGER NOT NULL, `date` TEXT NOT NULL, `trashed` INTEGER NOT NULL, `audio_duration` INTEGER NOT NULL, `reminding` INTEGER NOT NULL, `image_url` TEXT, `audio_url` TEXT, PRIMARY KEY(`unique_id`))", + "fields": [ + { + "fieldPath": "uid", + "columnName": "unique_id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "description", + "columnName": "description", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "priority", + "columnName": "priority", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "color", + "columnName": "color", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "textColor", + "columnName": "text_color", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "date", + "columnName": "date", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "trashed", + "columnName": "trashed", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "audioDuration", + "columnName": "audio_duration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "reminding", + "columnName": "reminding", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "imageUrl", + "columnName": "image_url", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "audioUrl", + "columnName": "audio_url", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "unique_id" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "labels_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `label` TEXT, `color` INTEGER NOT NULL DEFAULT 0x0000)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "label", + "columnName": "label", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "color", + "columnName": "color", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0x0000" + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "note_and_label", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`noteUid` TEXT NOT NULL, `labelId` INTEGER NOT NULL, PRIMARY KEY(`noteUid`, `labelId`))", + "fields": [ + { + "fieldPath": "noteUid", + "columnName": "noteUid", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "labelId", + "columnName": "labelId", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "noteUid", + "labelId" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "tasks_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `item` TEXT, `isDone` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "item", + "columnName": "item", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "isDone", + "columnName": "isDone", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "note_and_todo", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`noteUid` TEXT NOT NULL, `todoId` INTEGER NOT NULL, PRIMARY KEY(`noteUid`, `todoId`))", + "fields": [ + { + "fieldPath": "noteUid", + "columnName": "noteUid", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "todoId", + "columnName": "todoId", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "noteUid", + "todoId" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "links_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `url` TEXT NOT NULL, `host` TEXT NOT NULL, `imageLink` TEXT, `title` TEXT, `description` TEXT, PRIMARY KEY(`id`))", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "url", + "columnName": "url", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "host", + "columnName": "host", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "image", + "columnName": "imageLink", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "title", + "columnName": "title", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "description", + "columnName": "description", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "id" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "note_and_link", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`noteUid` TEXT NOT NULL, `linkId` TEXT NOT NULL, PRIMARY KEY(`noteUid`, `linkId`))", + "fields": [ + { + "fieldPath": "noteUid", + "columnName": "noteUid", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "linkId", + "columnName": "linkId", + "affinity": "TEXT", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "noteUid", + "linkId" + ] + }, + "indices": [], + "foreignKeys": [] + } + ], + "views": [], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c5a4c217b4521dd1d3558c316d6fe3ca')" + ] + } +} \ No newline at end of file diff --git a/core/database/src/androidTest/java/city/zouitel/database/ExampleInstrumentedTest.kt b/core/database/src/androidTest/java/city/zouitel/database/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..72ce5856 --- /dev/null +++ b/core/database/src/androidTest/java/city/zouitel/database/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.database + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.database.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/common/effect/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xml similarity index 100% rename from common/effect/src/main/AndroidManifest.xml rename to core/database/src/main/AndroidManifest.xml diff --git a/data/local/src/main/java/com/example/local/Database.kt b/core/database/src/main/java/city/zouitel/database/Database.kt similarity index 89% rename from data/local/src/main/java/com/example/local/Database.kt rename to core/database/src/main/java/city/zouitel/database/Database.kt index 095ea0c9..87aa69d6 100644 --- a/data/local/src/main/java/com/example/local/Database.kt +++ b/core/database/src/main/java/city/zouitel/database/Database.kt @@ -1,9 +1,9 @@ -package com.example.local +package city.zouitel.database import androidx.room.Database import androidx.room.RoomDatabase -import com.example.local.dao.* -import com.example.local.model.* +import city.zouitel.database.dao.* +import city.zouitel.database.model.* @Database( version = 1, diff --git a/data/local/src/main/java/com/example/local/Encryption.kt b/core/database/src/main/java/city/zouitel/database/Encryption.kt similarity index 87% rename from data/local/src/main/java/com/example/local/Encryption.kt rename to core/database/src/main/java/city/zouitel/database/Encryption.kt index 9b41fd3d..44aa876f 100644 --- a/data/local/src/main/java/com/example/local/Encryption.kt +++ b/core/database/src/main/java/city/zouitel/database/Encryption.kt @@ -1,17 +1,16 @@ -package com.example.local +package city.zouitel.database import android.content.Context import android.os.Build import androidx.annotation.RequiresApi import androidx.security.crypto.EncryptedFile import androidx.security.crypto.MasterKeys -import com.example.local.utils.Constants.CRYPTIC_PASS +import city.zouitel.database.utils.Constants.CRYPTIC_PASS import java.io.File import java.security.SecureRandom class Encryption(private val ctx: Context) { - @RequiresApi(Build.VERSION_CODES.O) fun getCrypticPass(): ByteArray { val file = File(ctx.filesDir, CRYPTIC_PASS) val encryptedFile = EncryptedFile.Builder( @@ -30,7 +29,6 @@ class Encryption(private val ctx: Context) { } } - @RequiresApi(Build.VERSION_CODES.O) private fun generateCryptic(): ByteArray { val random = SecureRandom.getInstanceStrong() val res = ByteArray(32) diff --git a/data/local/src/main/java/com/example/local/dao/DataDao.kt b/core/database/src/main/java/city/zouitel/database/dao/DataDao.kt similarity index 84% rename from data/local/src/main/java/com/example/local/dao/DataDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/DataDao.kt index db19a942..65cc7f7b 100644 --- a/data/local/src/main/java/com/example/local/dao/DataDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/DataDao.kt @@ -1,7 +1,7 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.* -import com.example.local.model.DataEntity +import city.zouitel.database.model.DataEntity @Dao interface DataDao { diff --git a/data/local/src/main/java/com/example/local/dao/LinkDao.kt b/core/database/src/main/java/city/zouitel/database/dao/LinkDao.kt similarity index 80% rename from data/local/src/main/java/com/example/local/dao/LinkDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/LinkDao.kt index e4924bf9..daefb330 100644 --- a/data/local/src/main/java/com/example/local/dao/LinkDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/LinkDao.kt @@ -1,7 +1,7 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.* -import com.example.local.model.LinkEntity +import city.zouitel.database.model.LinkEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/data/local/src/main/java/com/example/local/dao/NoteAndLinkDao.kt b/core/database/src/main/java/city/zouitel/database/dao/NoteAndLinkDao.kt similarity index 81% rename from data/local/src/main/java/com/example/local/dao/NoteAndLinkDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/NoteAndLinkDao.kt index 001b58d8..6f4c221e 100644 --- a/data/local/src/main/java/com/example/local/dao/NoteAndLinkDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/NoteAndLinkDao.kt @@ -1,7 +1,7 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.* -import com.example.local.model.NoteAndLinkEntity +import city.zouitel.database.model.NoteAndLinkEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/data/local/src/main/java/com/example/local/dao/NoteAndTagDao.kt b/core/database/src/main/java/city/zouitel/database/dao/NoteAndTagDao.kt similarity index 81% rename from data/local/src/main/java/com/example/local/dao/NoteAndTagDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/NoteAndTagDao.kt index 65c89d41..0e707839 100644 --- a/data/local/src/main/java/com/example/local/dao/NoteAndTagDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/NoteAndTagDao.kt @@ -1,7 +1,7 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.* -import com.example.local.model.NoteAndTagEntity +import city.zouitel.database.model.NoteAndTagEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/data/local/src/main/java/com/example/local/dao/NoteAndTaskDao.kt b/core/database/src/main/java/city/zouitel/database/dao/NoteAndTaskDao.kt similarity index 81% rename from data/local/src/main/java/com/example/local/dao/NoteAndTaskDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/NoteAndTaskDao.kt index 5bf29bff..99e0b317 100644 --- a/data/local/src/main/java/com/example/local/dao/NoteAndTaskDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/NoteAndTaskDao.kt @@ -1,7 +1,7 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.* -import com.example.local.model.NoteAndTaskEntity +import city.zouitel.database.model.NoteAndTaskEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/data/local/src/main/java/com/example/local/dao/NoteDao.kt b/core/database/src/main/java/city/zouitel/database/dao/NoteDao.kt similarity index 94% rename from data/local/src/main/java/com/example/local/dao/NoteDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/NoteDao.kt index 775b233b..15ac1892 100644 --- a/data/local/src/main/java/com/example/local/dao/NoteDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/NoteDao.kt @@ -1,9 +1,9 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.Dao import androidx.room.Query import androidx.room.Transaction -import com.example.local.model.relational.NoteEntity +import city.zouitel.database.model.relational.NoteEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/data/local/src/main/java/com/example/local/dao/TagDao.kt b/core/database/src/main/java/city/zouitel/database/dao/TagDao.kt similarity index 83% rename from data/local/src/main/java/com/example/local/dao/TagDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/TagDao.kt index 4c08f169..ca2d5482 100644 --- a/data/local/src/main/java/com/example/local/dao/TagDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/TagDao.kt @@ -1,7 +1,7 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.* -import com.example.local.model.TagEntity +import city.zouitel.database.model.TagEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/data/local/src/main/java/com/example/local/dao/TaskDao.kt b/core/database/src/main/java/city/zouitel/database/dao/TaskDao.kt similarity index 81% rename from data/local/src/main/java/com/example/local/dao/TaskDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/TaskDao.kt index 2db10760..689e6653 100644 --- a/data/local/src/main/java/com/example/local/dao/TaskDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/TaskDao.kt @@ -1,7 +1,7 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.* -import com.example.local.model.TaskEntity +import city.zouitel.database.model.TaskEntity import kotlinx.coroutines.flow.Flow @Dao diff --git a/data/local/src/main/java/com/example/local/dao/WidgetDao.kt b/core/database/src/main/java/city/zouitel/database/dao/WidgetDao.kt similarity index 73% rename from data/local/src/main/java/com/example/local/dao/WidgetDao.kt rename to core/database/src/main/java/city/zouitel/database/dao/WidgetDao.kt index 5bb7007f..3b229ea2 100644 --- a/data/local/src/main/java/com/example/local/dao/WidgetDao.kt +++ b/core/database/src/main/java/city/zouitel/database/dao/WidgetDao.kt @@ -1,9 +1,9 @@ -package com.example.local.dao +package city.zouitel.database.dao import androidx.room.Dao import androidx.room.Query import androidx.room.Transaction -import com.example.local.model.relational.NoteEntity +import city.zouitel.database.model.relational.NoteEntity @Dao interface WidgetDao { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/DataDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/DataDataSourceImpl.kt similarity index 63% rename from data/local/src/main/java/com/example/local/datasourceImpl/DataDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/DataDataSourceImpl.kt index f8840f5e..34430ad8 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/DataDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/DataDataSourceImpl.kt @@ -1,12 +1,11 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.DataDao -import com.example.local.mapper.DataMapper -import com.example.repository.datasource.DataDataSource -import com.example.repository.model.Data as OutData -import javax.inject.Inject +import city.zouitel.database.dao.DataDao +import city.zouitel.database.mapper.DataMapper +import city.zouitel.repository.datasource.DataDataSource +import city.zouitel.repository.model.Data as OutData -class DataDataSourceImpl @Inject constructor( +class DataDataSourceImpl /*@Inject*/ constructor( private val dataDao: DataDao, private val dataMapper: DataMapper ): DataDataSource { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/LinkDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/LinkDataSourceImpl.kt similarity index 65% rename from data/local/src/main/java/com/example/local/datasourceImpl/LinkDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/LinkDataSourceImpl.kt index 46765886..79edbc43 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/LinkDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/LinkDataSourceImpl.kt @@ -1,14 +1,13 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.LinkDao -import com.example.local.mapper.LinkMapper -import com.example.repository.datasource.LinkDataSource -import com.example.repository.model.Link as OutLink +import city.zouitel.database.dao.LinkDao +import city.zouitel.database.mapper.LinkMapper +import city.zouitel.repository.datasource.LinkDataSource +import city.zouitel.repository.model.Link as OutLink import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class LinkDataSourceImpl @Inject constructor( +class LinkDataSourceImpl /*@Inject*/ constructor( private val linkDao: LinkDao, private val linkMapper: LinkMapper ): LinkDataSource { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/NoteAndLinkDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndLinkDataSourceImpl.kt similarity index 68% rename from data/local/src/main/java/com/example/local/datasourceImpl/NoteAndLinkDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndLinkDataSourceImpl.kt index 68aab7ae..2d82b4da 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/NoteAndLinkDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndLinkDataSourceImpl.kt @@ -1,14 +1,13 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.NoteAndLinkDao -import com.example.local.mapper.NoteAndLinkMapper -import com.example.repository.datasource.NoteAndLinkDataSource -import com.example.repository.model.NoteAndLink as OutNoteAndLink +import city.zouitel.database.dao.NoteAndLinkDao +import city.zouitel.database.mapper.NoteAndLinkMapper +import city.zouitel.repository.datasource.NoteAndLinkDataSource +import city.zouitel.repository.model.NoteAndLink as OutNoteAndLink import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteAndLinkDataSourceImpl @Inject constructor( +class NoteAndLinkDataSourceImpl /*@Inject*/ constructor( private val noteAndLinkDao: NoteAndLinkDao, private val noteAndLinkMapper: NoteAndLinkMapper ): NoteAndLinkDataSource { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/NoteAndTagDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndTagDataSourceImpl.kt similarity index 68% rename from data/local/src/main/java/com/example/local/datasourceImpl/NoteAndTagDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndTagDataSourceImpl.kt index 4fbfae9d..da5dc4c8 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/NoteAndTagDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndTagDataSourceImpl.kt @@ -1,14 +1,13 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.NoteAndTagDao -import com.example.local.mapper.NoteAndTagMapper -import com.example.repository.datasource.NoteAndTagDataSource -import com.example.repository.model.NoteAndTag as OutNoteAndTag +import city.zouitel.database.dao.NoteAndTagDao +import city.zouitel.database.mapper.NoteAndTagMapper +import city.zouitel.repository.datasource.NoteAndTagDataSource +import city.zouitel.repository.model.NoteAndTag as OutNoteAndTag import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteAndTagDataSourceImpl @Inject constructor( +class NoteAndTagDataSourceImpl /*@Inject*/ constructor( private val noteAndTagDao: NoteAndTagDao, private val noteAndTagMapper: NoteAndTagMapper ): NoteAndTagDataSource { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/NoteAndTaskDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndTaskDataSourceImpl.kt similarity index 68% rename from data/local/src/main/java/com/example/local/datasourceImpl/NoteAndTaskDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndTaskDataSourceImpl.kt index d6c2ca34..d7a446d5 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/NoteAndTaskDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteAndTaskDataSourceImpl.kt @@ -1,14 +1,13 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.NoteAndTaskDao -import com.example.local.mapper.NoteAndTaskMapper -import com.example.repository.datasource.NoteAndTaskDataSource -import com.example.repository.model.NoteAndTask as OutNoteAndTask +import city.zouitel.database.dao.NoteAndTaskDao +import city.zouitel.database.mapper.NoteAndTaskMapper +import city.zouitel.repository.datasource.NoteAndTaskDataSource +import city.zouitel.repository.model.NoteAndTask as OutNoteAndTask import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteAndTaskDataSourceImpl @Inject constructor( +class NoteAndTaskDataSourceImpl /*@Inject*/ constructor( private val noteAndTaskDao: NoteAndTaskDao, private val noteAndTaskMapper: NoteAndTaskMapper ): NoteAndTaskDataSource { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/NoteDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteDataSourceImpl.kt similarity index 84% rename from data/local/src/main/java/com/example/local/datasourceImpl/NoteDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteDataSourceImpl.kt index 0be61358..3753bda9 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/NoteDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/NoteDataSourceImpl.kt @@ -1,14 +1,13 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.NoteDao -import com.example.local.mapper.NoteMapper -import com.example.repository.datasource.NoteDataSource -import com.example.repository.model.Note as OutNote +import city.zouitel.database.dao.NoteDao +import city.zouitel.database.mapper.NoteMapper +import city.zouitel.repository.datasource.NoteDataSource +import city.zouitel.repository.model.Note as OutNote import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteDataSourceImpl @Inject constructor( +class NoteDataSourceImpl /*@Inject*/ constructor( private val noteDao: NoteDao, private val noteMapper: NoteMapper ): NoteDataSource { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/TagDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/TagDataSourceImpl.kt similarity index 69% rename from data/local/src/main/java/com/example/local/datasourceImpl/TagDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/TagDataSourceImpl.kt index 85d8d8ec..a0279bd1 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/TagDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/TagDataSourceImpl.kt @@ -1,14 +1,13 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.TagDao -import com.example.local.mapper.TagMapper -import com.example.repository.datasource.TagDataSource -import com.example.repository.model.Tag as OutTag +import city.zouitel.database.dao.TagDao +import city.zouitel.database.mapper.TagMapper +import city.zouitel.repository.datasource.TagDataSource +import city.zouitel.repository.model.Tag as OutTag import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class TagDataSourceImpl @Inject constructor( +class TagDataSourceImpl /*@Inject*/ constructor( private val tagDao: TagDao, private val tagMapper: TagMapper ): TagDataSource { diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/TaskDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/TaskDataSourceImpl.kt similarity index 70% rename from data/local/src/main/java/com/example/local/datasourceImpl/TaskDataSourceImpl.kt rename to core/database/src/main/java/city/zouitel/database/datasourceImpl/TaskDataSourceImpl.kt index f0685974..b94f5dd3 100644 --- a/data/local/src/main/java/com/example/local/datasourceImpl/TaskDataSourceImpl.kt +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/TaskDataSourceImpl.kt @@ -1,14 +1,13 @@ -package com.example.local.datasourceImpl +package city.zouitel.database.datasourceImpl -import com.example.local.dao.TaskDao -import com.example.local.mapper.TaskMapper -import com.example.repository.datasource.TaskDataSource -import com.example.repository.model.Task as OutTask +import city.zouitel.database.dao.TaskDao +import city.zouitel.database.mapper.TaskMapper +import city.zouitel.repository.datasource.TaskDataSource +import city.zouitel.repository.model.Task as OutTask import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class TaskDataSourceImpl @Inject constructor( +class TaskDataSourceImpl /*@Inject*/ constructor( private val taskDao: TaskDao, private val taskMapper: TaskMapper ): TaskDataSource { diff --git a/core/database/src/main/java/city/zouitel/database/datasourceImpl/WidgetDataSourceImpl.kt b/core/database/src/main/java/city/zouitel/database/datasourceImpl/WidgetDataSourceImpl.kt new file mode 100644 index 00000000..54e0cf67 --- /dev/null +++ b/core/database/src/main/java/city/zouitel/database/datasourceImpl/WidgetDataSourceImpl.kt @@ -0,0 +1,16 @@ +package city.zouitel.database.datasourceImpl + +import city.zouitel.database.dao.WidgetDao +import city.zouitel.database.mapper.WidgetMapper +import city.zouitel.repository.datasource.WidgetDataSource +import city.zouitel.repository.model.Note as OutNote + +class WidgetDataSourceImpl /*@Inject*/ constructor( + private val widgetDao: WidgetDao, + private val widgetMapper: WidgetMapper +): WidgetDataSource { + override val getAllWidgetMainEntityById: List + get() = widgetDao.allWidgetEntitiesById().map { + widgetMapper.readOnly(it) + } +} \ No newline at end of file diff --git a/data/local/src/main/java/com/example/local/di/DaoModule.kt b/core/database/src/main/java/city/zouitel/database/di/DaoModule.kt similarity index 57% rename from data/local/src/main/java/com/example/local/di/DaoModule.kt rename to core/database/src/main/java/city/zouitel/database/di/DaoModule.kt index 5846eb0d..4519b694 100644 --- a/data/local/src/main/java/com/example/local/di/DaoModule.kt +++ b/core/database/src/main/java/city/zouitel/database/di/DaoModule.kt @@ -1,49 +1,44 @@ -package com.example.local.di +package city.zouitel.database.di -import com.example.local.Database -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton +import city.zouitel.database.Database -@Module -@InstallIn(SingletonComponent::class) +//@Module +//@InstallIn(SingletonComponent::class) object DaoModule { - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteDao(database: Database) = database.getNoteDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideLabelDao(database: Database) = database.getLabelDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndLabelDao(database: Database) = database.getNoteAndLabelDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideEntityDao(database: Database) = database.getEntityDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideWidgetEntityDao(database: Database) = database.getWidgetEntityDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideTodoDao(database: Database) = database.getTodoDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndTodoDao(database: Database) = database.getNoteAndTodoDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideLinkDao(database: Database) = database.getLinkDao() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndLinkDao(database: Database) = database.getNoteAndLink() } \ No newline at end of file diff --git a/data/local/src/main/java/com/example/local/di/DataSourceModule.kt b/core/database/src/main/java/city/zouitel/database/di/DataSourceModule.kt similarity index 57% rename from data/local/src/main/java/com/example/local/di/DataSourceModule.kt rename to core/database/src/main/java/city/zouitel/database/di/DataSourceModule.kt index 24838ab3..870aa1e0 100644 --- a/data/local/src/main/java/com/example/local/di/DataSourceModule.kt +++ b/core/database/src/main/java/city/zouitel/database/di/DataSourceModule.kt @@ -1,50 +1,45 @@ -package com.example.local.di - -import com.example.local.datasourceImpl.* -import com.example.repository.datasource.* -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) +package city.zouitel.database.di + +import city.zouitel.database.datasourceImpl.* +import city.zouitel.repository.datasource.* + +//@Module +//@InstallIn(SingletonComponent::class) interface DataSourceModule { - @Binds - @Singleton +// @Binds +// @Singleton fun bindLinkDataSource(data: LinkDataSourceImpl): LinkDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindDataDataSource(data: DataDataSourceImpl): DataDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteAndLinkDataSource(data: NoteAndLinkDataSourceImpl): NoteAndLinkDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteAndTagDataSource(data: NoteAndTagDataSourceImpl): NoteAndTagDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteAndTaskDataSource(data: NoteAndTaskDataSourceImpl): NoteAndTaskDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteDataSource(data: NoteDataSourceImpl): NoteDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindTagDataSource(data: TagDataSourceImpl): TagDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindTaskDataSource(data: TaskDataSourceImpl): TaskDataSource - @Binds - @Singleton +// @Binds +// @Singleton fun bindWidgetDataSource(data: WidgetDataSourceImpl): WidgetDataSource } \ No newline at end of file diff --git a/core/database/src/main/java/city/zouitel/database/di/DatabaseDI.kt b/core/database/src/main/java/city/zouitel/database/di/DatabaseDI.kt new file mode 100644 index 00000000..0c15399d --- /dev/null +++ b/core/database/src/main/java/city/zouitel/database/di/DatabaseDI.kt @@ -0,0 +1,101 @@ +package city.zouitel.database.di + +import android.app.Application +import androidx.room.Room +import city.zouitel.database.Database +import city.zouitel.database.Encryption +import city.zouitel.database.datasourceImpl.DataDataSourceImpl +import city.zouitel.database.datasourceImpl.LinkDataSourceImpl +import city.zouitel.database.datasourceImpl.NoteAndLinkDataSourceImpl +import city.zouitel.database.datasourceImpl.NoteAndTagDataSourceImpl +import city.zouitel.database.datasourceImpl.NoteAndTaskDataSourceImpl +import city.zouitel.database.datasourceImpl.NoteDataSourceImpl +import city.zouitel.database.datasourceImpl.TagDataSourceImpl +import city.zouitel.database.datasourceImpl.TaskDataSourceImpl +import city.zouitel.database.datasourceImpl.WidgetDataSourceImpl +import city.zouitel.database.mapper.DataMapper +import city.zouitel.database.mapper.LinkMapper +import city.zouitel.database.mapper.NoteAndLinkMapper +import city.zouitel.database.mapper.NoteAndTagMapper +import city.zouitel.database.mapper.NoteAndTaskMapper +import city.zouitel.database.mapper.NoteMapper +import city.zouitel.database.mapper.TagMapper +import city.zouitel.database.mapper.TaskMapper +import city.zouitel.database.mapper.WidgetMapper +import city.zouitel.database.utils.Constants +import city.zouitel.repository.datasource.DataDataSource +import city.zouitel.repository.datasource.LinkDataSource +import city.zouitel.repository.datasource.NoteAndLinkDataSource +import city.zouitel.repository.datasource.NoteAndTagDataSource +import city.zouitel.repository.datasource.NoteAndTaskDataSource +import city.zouitel.repository.datasource.NoteDataSource +import city.zouitel.repository.datasource.TagDataSource +import city.zouitel.repository.datasource.TaskDataSource +import city.zouitel.repository.datasource.WidgetDataSource +import net.sqlcipher.database.SupportFactory +import org.koin.android.ext.koin.androidApplication +import org.koin.android.ext.koin.androidContext +import org.koin.core.module.dsl.factoryOf +import org.koin.core.module.dsl.singleOf +import org.koin.dsl.bind +import org.koin.dsl.module + +val databaseKoinModule = module { + + //DataSource. + singleOf(::LinkDataSourceImpl) bind LinkDataSource::class + singleOf(::DataDataSourceImpl) bind DataDataSource::class + singleOf(::NoteAndLinkDataSourceImpl) bind NoteAndLinkDataSource::class + singleOf(::NoteAndTagDataSourceImpl) bind NoteAndTagDataSource::class + singleOf(::NoteAndTaskDataSourceImpl) bind NoteAndTaskDataSource::class + singleOf(::NoteDataSourceImpl) bind NoteDataSource::class + singleOf(::TagDataSourceImpl) bind TagDataSource::class + singleOf(::TaskDataSourceImpl) bind TaskDataSource::class + singleOf(::WidgetDataSourceImpl) bind WidgetDataSource::class + + //Dao's. + single { get().getNoteDao() } + single { get().getLabelDao() } + single { get().getNoteAndLabelDao() } + single { get().getEntityDao() } + single { get().getWidgetEntityDao() } + single { get().getTodoDao() } + single { get().getNoteAndTodoDao() } + single { get().getLinkDao() } + single { get().getNoteAndLink() } + + //Mappers + factoryOf(::DataMapper) + factoryOf(::LinkMapper) + factoryOf(::TagMapper) + factoryOf(::TaskMapper) + factoryOf(::NoteAndLinkMapper) + factoryOf(::NoteAndTagMapper) + factoryOf(::NoteAndTaskMapper) + factory { + NoteMapper(get(), get(), get(), get()) + } + factory { param -> + WidgetMapper( + param.get(), + param.get(), + param.get(), + param.get(), + ) + } + + //Database. + single { + Room.databaseBuilder( + androidContext(), + Database::class.java, + Constants.DATABASE_NAME + ).openHelperFactory( + SupportFactory(Encryption(androidContext()).getCrypticPass()) + ) + .fallbackToDestructiveMigration() + .fallbackToDestructiveMigrationOnDowngrade() + .build() + } + +} \ No newline at end of file diff --git a/data/local/src/main/java/com/example/local/di/DatabaseModule.kt b/core/database/src/main/java/city/zouitel/database/di/DatabaseModule.kt similarity index 56% rename from data/local/src/main/java/com/example/local/di/DatabaseModule.kt rename to core/database/src/main/java/city/zouitel/database/di/DatabaseModule.kt index 38c369c8..1b22c842 100644 --- a/data/local/src/main/java/com/example/local/di/DatabaseModule.kt +++ b/core/database/src/main/java/city/zouitel/database/di/DatabaseModule.kt @@ -1,39 +1,32 @@ -package com.example.local.di +package city.zouitel.database.di import android.app.Application import android.content.Context import android.os.Build import androidx.annotation.RequiresApi import androidx.room.Room -import com.example.local.utils.Constants.DATABASE_NAME -import com.example.local.Database -import com.example.local.Encryption -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.android.qualifiers.ApplicationContext -import dagger.hilt.components.SingletonComponent +import city.zouitel.database.utils.Constants.DATABASE_NAME +import city.zouitel.database.Database +import city.zouitel.database.Encryption import net.sqlcipher.database.SupportFactory -import javax.inject.Singleton -@Module -@InstallIn(SingletonComponent::class) +//@Module +//@InstallIn(SingletonComponent::class) object DatabaseModule { - @Provides - @Singleton +// @Provides +// @Singleton fun provideEncryption(application: Application) = Encryption(application) - @RequiresApi(Build.VERSION_CODES.O) - @Provides - @Singleton +// @Provides +// @Singleton fun provideSupportEncryption(encryption: Encryption) = SupportFactory(encryption.getCrypticPass()) - @Singleton - @Provides +// @Singleton +// @Provides fun provideDatabase( - @ApplicationContext context: Context, + /*@ApplicationContext*/ context: Context, supportFactory: SupportFactory ) = Room.databaseBuilder( context.applicationContext, diff --git a/data/local/src/main/java/com/example/local/di/MapperModule.kt b/core/database/src/main/java/city/zouitel/database/di/MapperModule.kt similarity index 60% rename from data/local/src/main/java/com/example/local/di/MapperModule.kt rename to core/database/src/main/java/city/zouitel/database/di/MapperModule.kt index f8943743..3fdc7e3b 100644 --- a/data/local/src/main/java/com/example/local/di/MapperModule.kt +++ b/core/database/src/main/java/city/zouitel/database/di/MapperModule.kt @@ -1,46 +1,41 @@ -package com.example.local.di +package city.zouitel.database.di -import com.example.local.mapper.* -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton +import city.zouitel.database.mapper.* -@Module -@InstallIn(SingletonComponent::class) +//@Module +//@InstallIn(SingletonComponent::class) object MapperModule { - @Singleton - @Provides +// @Singleton +// @Provides fun provideDataMapper() = DataMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideLinkMapper() = LinkMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideTagMapper() = TagMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideTaskMapper() = TaskMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndLinkMapper() = NoteAndLinkMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndTagMapper() = NoteAndTagMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndTaskMapper() = NoteAndTaskMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteMapper( dataMapper: DataMapper, tagMapper: TagMapper, @@ -48,8 +43,8 @@ object MapperModule { linkMapper: LinkMapper ) = NoteMapper(dataMapper, tagMapper, taskMapper, linkMapper) - @Singleton - @Provides +// @Singleton +// @Provides fun provideWidgetMapper( dataMapper: DataMapper, tagMapper: TagMapper, diff --git a/data/local/src/main/java/com/example/local/mapper/DataMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/DataMapper.kt similarity index 70% rename from data/local/src/main/java/com/example/local/mapper/DataMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/DataMapper.kt index 509224f7..978b1cc6 100644 --- a/data/local/src/main/java/com/example/local/mapper/DataMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/DataMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.DataEntity as InData -import com.example.repository.model.Data as OutData +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.DataEntity as InData +import city.zouitel.repository.model.Data as OutData class DataMapper: Mapper.Base { override fun toLocal(data: OutData): InData = with(data){ diff --git a/data/local/src/main/java/com/example/local/mapper/LinkMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/LinkMapper.kt similarity index 61% rename from data/local/src/main/java/com/example/local/mapper/LinkMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/LinkMapper.kt index 11eaad3a..ee1dace5 100644 --- a/data/local/src/main/java/com/example/local/mapper/LinkMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/LinkMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.LinkEntity as InLink -import com.example.repository.model.Link as OutLink +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.LinkEntity as InLink +import city.zouitel.repository.model.Link as OutLink class LinkMapper : Mapper.Base { override fun toLocal(data: OutLink): InLink = with(data) { diff --git a/data/local/src/main/java/com/example/local/mapper/NoteAndLinkMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/NoteAndLinkMapper.kt similarity index 58% rename from data/local/src/main/java/com/example/local/mapper/NoteAndLinkMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/NoteAndLinkMapper.kt index 19f31da4..6b1d84e5 100644 --- a/data/local/src/main/java/com/example/local/mapper/NoteAndLinkMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/NoteAndLinkMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.NoteAndLinkEntity as InNoteAndLink -import com.example.repository.model.NoteAndLink as OutNoteAndLink +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.NoteAndLinkEntity as InNoteAndLink +import city.zouitel.repository.model.NoteAndLink as OutNoteAndLink class NoteAndLinkMapper: Mapper.Base { override fun toLocal(data: OutNoteAndLink): InNoteAndLink = with(data){ diff --git a/data/local/src/main/java/com/example/local/mapper/NoteAndTagMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/NoteAndTagMapper.kt similarity index 58% rename from data/local/src/main/java/com/example/local/mapper/NoteAndTagMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/NoteAndTagMapper.kt index c98ef4c3..288d5df2 100644 --- a/data/local/src/main/java/com/example/local/mapper/NoteAndTagMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/NoteAndTagMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.NoteAndTagEntity as InNoteAndTag -import com.example.repository.model.NoteAndTag as OutNoteAndTag +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.NoteAndTagEntity as InNoteAndTag +import city.zouitel.repository.model.NoteAndTag as OutNoteAndTag class NoteAndTagMapper: Mapper.Base { override fun toLocal(data: OutNoteAndTag): InNoteAndTag = with(data){ diff --git a/data/local/src/main/java/com/example/local/mapper/NoteAndTaskMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/NoteAndTaskMapper.kt similarity index 58% rename from data/local/src/main/java/com/example/local/mapper/NoteAndTaskMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/NoteAndTaskMapper.kt index 8513297f..7e84856b 100644 --- a/data/local/src/main/java/com/example/local/mapper/NoteAndTaskMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/NoteAndTaskMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.NoteAndTaskEntity as InNoteAndTask -import com.example.repository.model.NoteAndTask as OutNoteAndTask +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.NoteAndTaskEntity as InNoteAndTask +import city.zouitel.repository.model.NoteAndTask as OutNoteAndTask class NoteAndTaskMapper: Mapper.Base { override fun toLocal(data: OutNoteAndTask): InNoteAndTask = with(data){ diff --git a/data/local/src/main/java/com/example/local/mapper/NoteMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/NoteMapper.kt similarity index 74% rename from data/local/src/main/java/com/example/local/mapper/NoteMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/NoteMapper.kt index c5028efc..036be3eb 100644 --- a/data/local/src/main/java/com/example/local/mapper/NoteMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/NoteMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.relational.NoteEntity as InNote -import com.example.repository.model.Note as OutNote +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.relational.NoteEntity as InNote +import city.zouitel.repository.model.Note as OutNote class NoteMapper( private val dataMapper: DataMapper, diff --git a/data/local/src/main/java/com/example/local/mapper/TagMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/TagMapper.kt similarity index 56% rename from data/local/src/main/java/com/example/local/mapper/TagMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/TagMapper.kt index ebbba36b..b479ab92 100644 --- a/data/local/src/main/java/com/example/local/mapper/TagMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/TagMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.TagEntity as InTag -import com.example.repository.model.Tag as OutTag +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.TagEntity as InTag +import city.zouitel.repository.model.Tag as OutTag class TagMapper: Mapper.Base { override fun toLocal(data: OutTag): InTag = with(data){ diff --git a/data/local/src/main/java/com/example/local/mapper/TaskMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/TaskMapper.kt similarity index 56% rename from data/local/src/main/java/com/example/local/mapper/TaskMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/TaskMapper.kt index 86c362bf..5d2d92fc 100644 --- a/data/local/src/main/java/com/example/local/mapper/TaskMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/TaskMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.TaskEntity as InTask -import com.example.repository.model.Task as OutTask +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.TaskEntity as InTask +import city.zouitel.repository.model.Task as OutTask class TaskMapper: Mapper.Base { override fun toLocal(data: OutTask): InTask = with(data){ diff --git a/data/local/src/main/java/com/example/local/mapper/WidgetMapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/WidgetMapper.kt similarity index 74% rename from data/local/src/main/java/com/example/local/mapper/WidgetMapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/WidgetMapper.kt index dc9b0ad4..b1e73d3d 100644 --- a/data/local/src/main/java/com/example/local/mapper/WidgetMapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/WidgetMapper.kt @@ -1,8 +1,8 @@ -package com.example.local.mapper +package city.zouitel.database.mapper -import com.example.local.mapper.base.Mapper -import com.example.local.model.relational.NoteEntity as InNote -import com.example.repository.model.Note as OutNote +import city.zouitel.database.mapper.base.Mapper +import city.zouitel.database.model.relational.NoteEntity as InNote +import city.zouitel.repository.model.Note as OutNote class WidgetMapper ( private val dataMapper: DataMapper, diff --git a/data/local/src/main/java/com/example/local/mapper/base/Mapper.kt b/core/database/src/main/java/city/zouitel/database/mapper/base/Mapper.kt similarity index 83% rename from data/local/src/main/java/com/example/local/mapper/base/Mapper.kt rename to core/database/src/main/java/city/zouitel/database/mapper/base/Mapper.kt index ce1f88dd..370e3212 100644 --- a/data/local/src/main/java/com/example/local/mapper/base/Mapper.kt +++ b/core/database/src/main/java/city/zouitel/database/mapper/base/Mapper.kt @@ -1,4 +1,4 @@ -package com.example.local.mapper.base +package city.zouitel.database.mapper.base sealed interface Mapper { interface Base { diff --git a/data/local/src/main/java/com/example/local/model/DataEntity.kt b/core/database/src/main/java/city/zouitel/database/model/DataEntity.kt similarity index 54% rename from data/local/src/main/java/com/example/local/model/DataEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/DataEntity.kt index c2667133..d84b4620 100644 --- a/data/local/src/main/java/com/example/local/model/DataEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/DataEntity.kt @@ -1,23 +1,23 @@ -package com.example.local.model +package city.zouitel.database.model import androidx.annotation.Keep import androidx.room.Entity import androidx.room.PrimaryKey import androidx.room.ColumnInfo -import com.example.local.utils.Constants.AUDIO_DURATION -import com.example.local.utils.Constants.AUDIO_URL -import com.example.local.utils.Constants.COLOR -import com.example.local.utils.Constants.DATE -import com.example.local.utils.Constants.DESCRIPTION -import com.example.local.utils.Constants.IMAGE_UIL -import com.example.local.utils.Constants.NON -import com.example.local.utils.Constants.NOTES_TABLE -import com.example.local.utils.Constants.PRIORITY -import com.example.local.utils.Constants.REMINDING -import com.example.local.utils.Constants.TEXT_COLOR -import com.example.local.utils.Constants.TITLE -import com.example.local.utils.Constants.TRASHED -import com.example.local.utils.Constants.UUID +import city.zouitel.database.utils.Constants.AUDIO_DURATION +import city.zouitel.database.utils.Constants.AUDIO_URL +import city.zouitel.database.utils.Constants.COLOR +import city.zouitel.database.utils.Constants.DATE +import city.zouitel.database.utils.Constants.DESCRIPTION +import city.zouitel.database.utils.Constants.IMAGE_UIL +import city.zouitel.database.utils.Constants.NON +import city.zouitel.database.utils.Constants.NOTES_TABLE +import city.zouitel.database.utils.Constants.PRIORITY +import city.zouitel.database.utils.Constants.REMINDING +import city.zouitel.database.utils.Constants.TEXT_COLOR +import city.zouitel.database.utils.Constants.TITLE +import city.zouitel.database.utils.Constants.TRASHED +import city.zouitel.database.utils.Constants.UUID @Entity( tableName = NOTES_TABLE diff --git a/data/local/src/main/java/com/example/local/model/LinkEntity.kt b/core/database/src/main/java/city/zouitel/database/model/LinkEntity.kt similarity index 56% rename from data/local/src/main/java/com/example/local/model/LinkEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/LinkEntity.kt index 8feaa95b..a821e30f 100644 --- a/data/local/src/main/java/com/example/local/model/LinkEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/LinkEntity.kt @@ -1,16 +1,16 @@ -package com.example.local.model +package city.zouitel.database.model import androidx.annotation.Keep import androidx.room.ColumnInfo import androidx.room.PrimaryKey import androidx.room.Entity -import com.example.local.utils.Constants.DESCRIPTION -import com.example.local.utils.Constants.HOST -import com.example.local.utils.Constants.ID -import com.example.local.utils.Constants.IMG_LINK -import com.example.local.utils.Constants.LINKS_TABLE -import com.example.local.utils.Constants.TITLE -import com.example.local.utils.Constants.URL +import city.zouitel.database.utils.Constants.DESCRIPTION +import city.zouitel.database.utils.Constants.HOST +import city.zouitel.database.utils.Constants.ID +import city.zouitel.database.utils.Constants.IMG_LINK +import city.zouitel.database.utils.Constants.LINKS_TABLE +import city.zouitel.database.utils.Constants.TITLE +import city.zouitel.database.utils.Constants.URL @Entity( tableName = LINKS_TABLE diff --git a/data/local/src/main/java/com/example/local/model/NoteAndLinkEntity.kt b/core/database/src/main/java/city/zouitel/database/model/NoteAndLinkEntity.kt similarity index 86% rename from data/local/src/main/java/com/example/local/model/NoteAndLinkEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/NoteAndLinkEntity.kt index 97e3bca1..5beabe9b 100644 --- a/data/local/src/main/java/com/example/local/model/NoteAndLinkEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/NoteAndLinkEntity.kt @@ -1,4 +1,4 @@ -package com.example.local.model +package city.zouitel.database.model import androidx.annotation.Keep import androidx.room.Entity diff --git a/data/local/src/main/java/com/example/local/model/NoteAndTagEntity.kt b/core/database/src/main/java/city/zouitel/database/model/NoteAndTagEntity.kt similarity index 86% rename from data/local/src/main/java/com/example/local/model/NoteAndTagEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/NoteAndTagEntity.kt index 2ac470e2..95c57f35 100644 --- a/data/local/src/main/java/com/example/local/model/NoteAndTagEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/NoteAndTagEntity.kt @@ -1,4 +1,4 @@ -package com.example.local.model +package city.zouitel.database.model import androidx.annotation.Keep import androidx.room.Entity diff --git a/data/local/src/main/java/com/example/local/model/NoteAndTaskEntity.kt b/core/database/src/main/java/city/zouitel/database/model/NoteAndTaskEntity.kt similarity index 85% rename from data/local/src/main/java/com/example/local/model/NoteAndTaskEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/NoteAndTaskEntity.kt index f5409212..300be25b 100644 --- a/data/local/src/main/java/com/example/local/model/NoteAndTaskEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/NoteAndTaskEntity.kt @@ -1,4 +1,4 @@ -package com.example.local.model +package city.zouitel.database.model import androidx.annotation.Keep import androidx.room.Entity diff --git a/data/local/src/main/java/com/example/local/model/TagEntity.kt b/core/database/src/main/java/city/zouitel/database/model/TagEntity.kt similarity index 58% rename from data/local/src/main/java/com/example/local/model/TagEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/TagEntity.kt index f1664a80..0fd8835b 100644 --- a/data/local/src/main/java/com/example/local/model/TagEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/TagEntity.kt @@ -1,11 +1,11 @@ -package com.example.local.model +package city.zouitel.database.model import androidx.annotation.Keep import androidx.room.* -import com.example.local.utils.Constants.COLOR -import com.example.local.utils.Constants.ID -import com.example.local.utils.Constants.LABEL -import com.example.local.utils.Constants.LABELS_TABLE +import city.zouitel.database.utils.Constants.COLOR +import city.zouitel.database.utils.Constants.ID +import city.zouitel.database.utils.Constants.LABEL +import city.zouitel.database.utils.Constants.LABELS_TABLE @Entity( tableName = LABELS_TABLE diff --git a/data/local/src/main/java/com/example/local/model/TaskEntity.kt b/core/database/src/main/java/city/zouitel/database/model/TaskEntity.kt similarity index 65% rename from data/local/src/main/java/com/example/local/model/TaskEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/TaskEntity.kt index eb19c661..0ace2de5 100644 --- a/data/local/src/main/java/com/example/local/model/TaskEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/TaskEntity.kt @@ -1,9 +1,9 @@ -package com.example.local.model +package city.zouitel.database.model import androidx.annotation.Keep import androidx.room.* -import com.example.local.utils.Constants.ID -import com.example.local.utils.Constants.TASKS_TABLE +import city.zouitel.database.utils.Constants.ID +import city.zouitel.database.utils.Constants.TASKS_TABLE @Entity( tableName = TASKS_TABLE diff --git a/data/local/src/main/java/com/example/local/model/relational/NoteEntity.kt b/core/database/src/main/java/city/zouitel/database/model/relational/NoteEntity.kt similarity index 85% rename from data/local/src/main/java/com/example/local/model/relational/NoteEntity.kt rename to core/database/src/main/java/city/zouitel/database/model/relational/NoteEntity.kt index ddfba285..510d172c 100644 --- a/data/local/src/main/java/com/example/local/model/relational/NoteEntity.kt +++ b/core/database/src/main/java/city/zouitel/database/model/relational/NoteEntity.kt @@ -1,11 +1,11 @@ -package com.example.local.model.relational +package city.zouitel.database.model.relational import androidx.room.Embedded import androidx.room.Junction import androidx.room.Relation -import com.example.local.model.* -import com.example.local.utils.Constants.ID -import com.example.local.utils.Constants.UUID +import city.zouitel.database.model.* +import city.zouitel.database.utils.Constants.ID +import city.zouitel.database.utils.Constants.UUID data class NoteEntity( @Embedded val dataEntity: DataEntity, diff --git a/data/local/src/main/java/com/example/local/utils/Constants.kt b/core/database/src/main/java/city/zouitel/database/utils/Constants.kt similarity index 96% rename from data/local/src/main/java/com/example/local/utils/Constants.kt rename to core/database/src/main/java/city/zouitel/database/utils/Constants.kt index d5846eae..43c42573 100644 --- a/data/local/src/main/java/com/example/local/utils/Constants.kt +++ b/core/database/src/main/java/city/zouitel/database/utils/Constants.kt @@ -1,4 +1,4 @@ -package com.example.local.utils +package city.zouitel.database.utils internal object Constants { diff --git a/core/database/src/test/java/city/zouitel/database/ExampleUnitTest.kt b/core/database/src/test/java/city/zouitel/database/ExampleUnitTest.kt new file mode 100644 index 00000000..1659abfc --- /dev/null +++ b/core/database/src/test/java/city/zouitel/database/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.database + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/common/effect/.gitignore b/core/datastore/.gitignore similarity index 100% rename from common/effect/.gitignore rename to core/datastore/.gitignore diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts new file mode 100644 index 00000000..5082f965 --- /dev/null +++ b/core/datastore/build.gradle.kts @@ -0,0 +1,56 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.datastore" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + //Modules. + implementation(projects.core.repository) + + //DataStore. + implementation (libs.datastore) + + //AndroidX. + implementation(libs.constraintlayout) + + //SecurityDatastore. + implementation("io.github.osipxd:security-crypto-datastore-preferences:1.0.0-alpha04") +} \ No newline at end of file diff --git a/core/datastore/consumer-rules.pro b/core/datastore/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/core/datastore/proguard-rules.pro b/core/datastore/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/core/datastore/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/datastore/src/androidTest/java/city/zouitel/datastore/ExampleInstrumentedTest.kt b/core/datastore/src/androidTest/java/city/zouitel/datastore/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..1bc7f593 --- /dev/null +++ b/core/datastore/src/androidTest/java/city/zouitel/datastore/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.datastore + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.datastore.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/common/logic/src/main/AndroidManifest.xml b/core/datastore/src/main/AndroidManifest.xml similarity index 100% rename from common/logic/src/main/AndroidManifest.xml rename to core/datastore/src/main/AndroidManifest.xml diff --git a/data/datastore/src/main/java/com/example/datastore/Cons.kt b/core/datastore/src/main/java/city/zouitel/datastore/Cons.kt similarity index 95% rename from data/datastore/src/main/java/com/example/datastore/Cons.kt rename to core/datastore/src/main/java/city/zouitel/datastore/Cons.kt index 940c0155..9e4dcc1e 100644 --- a/data/datastore/src/main/java/com/example/datastore/Cons.kt +++ b/core/datastore/src/main/java/city/zouitel/datastore/Cons.kt @@ -1,4 +1,4 @@ -package com.example.datastore +package city.zouitel.datastore object Cons { const val LAYOUT = "LAYOUT_PREFERENCES_KEY" diff --git a/data/datastore/src/main/java/com/example/datastore/DataStoreModule.kt b/core/datastore/src/main/java/city/zouitel/datastore/DataStoreModule.kt similarity index 75% rename from data/datastore/src/main/java/com/example/datastore/DataStoreModule.kt rename to core/datastore/src/main/java/city/zouitel/datastore/DataStoreModule.kt index c985cefc..8e082de8 100644 --- a/data/datastore/src/main/java/com/example/datastore/DataStoreModule.kt +++ b/core/datastore/src/main/java/city/zouitel/datastore/DataStoreModule.kt @@ -1,4 +1,4 @@ -package com.example.datastore +package city.zouitel.datastore import android.content.Context import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler @@ -9,23 +9,18 @@ import androidx.datastore.preferences.core.emptyPreferences import androidx.datastore.preferences.preferencesDataStoreFile import androidx.security.crypto.EncryptedFile import androidx.security.crypto.MasterKeys -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.android.qualifiers.ApplicationContext -import dagger.hilt.components.SingletonComponent +import city.zouitel.datastore.Cons import io.github.osipxd.security.crypto.createEncrypted -import javax.inject.Singleton -@Module -@InstallIn(SingletonComponent::class) +//@Module +//@InstallIn(SingletonComponent::class) object DataStoreModule { - @Singleton - @Provides +// @Singleton +// @Provides fun provideEncryptedDataStore( - @ApplicationContext context: Context + /*@ApplicationContext*/ context: Context ): DataStore = PreferenceDataStoreFactory.createEncrypted( corruptionHandler = ReplaceFileCorruptionHandler( diff --git a/data/datastore/src/main/java/com/example/datastore/DataStoreRepo.kt b/core/datastore/src/main/java/city/zouitel/datastore/DataStoreRepo.kt similarity index 92% rename from data/datastore/src/main/java/com/example/datastore/DataStoreRepo.kt rename to core/datastore/src/main/java/city/zouitel/datastore/DataStoreRepo.kt index 1eba68f3..6d1e5905 100644 --- a/data/datastore/src/main/java/com/example/datastore/DataStoreRepo.kt +++ b/core/datastore/src/main/java/city/zouitel/datastore/DataStoreRepo.kt @@ -1,4 +1,4 @@ -package com.example.datastore +package city.zouitel.datastore import kotlinx.coroutines.flow.Flow diff --git a/data/datastore/src/main/java/com/example/datastore/DataStoreRepoImpl.kt b/core/datastore/src/main/java/city/zouitel/datastore/DataStoreRepoImpl.kt similarity index 94% rename from data/datastore/src/main/java/com/example/datastore/DataStoreRepoImpl.kt rename to core/datastore/src/main/java/city/zouitel/datastore/DataStoreRepoImpl.kt index 02b18dcd..64ace556 100644 --- a/data/datastore/src/main/java/com/example/datastore/DataStoreRepoImpl.kt +++ b/core/datastore/src/main/java/city/zouitel/datastore/DataStoreRepoImpl.kt @@ -1,14 +1,12 @@ -package com.example.datastore +package city.zouitel.datastore import kotlinx.coroutines.flow.Flow import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.* import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.map -import javax.inject.Inject - -class DataStoreRepoImpl @Inject constructor( +class DataStoreRepoImpl /*@Inject*/ constructor( private val dataStore: DataStore ) : DataStoreRepo { diff --git a/data/datastore/src/main/java/com/example/datastore/Keys.kt b/core/datastore/src/main/java/city/zouitel/datastore/Keys.kt similarity index 85% rename from data/datastore/src/main/java/com/example/datastore/Keys.kt rename to core/datastore/src/main/java/city/zouitel/datastore/Keys.kt index 7c1a6045..97ea9124 100644 --- a/data/datastore/src/main/java/com/example/datastore/Keys.kt +++ b/core/datastore/src/main/java/city/zouitel/datastore/Keys.kt @@ -1,7 +1,8 @@ -package com.example.datastore +package city.zouitel.datastore import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey +import city.zouitel.datastore.Cons object Keys { val LAYOUT_KEY = stringPreferencesKey(Cons.LAYOUT) diff --git a/core/datastore/src/main/java/city/zouitel/datastore/RepoMod.kt b/core/datastore/src/main/java/city/zouitel/datastore/RepoMod.kt new file mode 100644 index 00000000..bbb1f094 --- /dev/null +++ b/core/datastore/src/main/java/city/zouitel/datastore/RepoMod.kt @@ -0,0 +1,12 @@ +package city.zouitel.datastore + +import city.zouitel.datastore.DataStoreRepo +import city.zouitel.datastore.DataStoreRepoImpl + +//@Module +//@InstallIn(ViewModelComponent::class) +abstract class RepoMod { + +// @Binds + abstract fun bindRepository(impl: DataStoreRepoImpl): DataStoreRepo +} \ No newline at end of file diff --git a/core/datastore/src/main/java/city/zouitel/datastore/datastoreDI.kt b/core/datastore/src/main/java/city/zouitel/datastore/datastoreDI.kt new file mode 100644 index 00000000..5752ff91 --- /dev/null +++ b/core/datastore/src/main/java/city/zouitel/datastore/datastoreDI.kt @@ -0,0 +1,39 @@ +package city.zouitel.datastore + +import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler +import androidx.datastore.preferences.core.PreferenceDataStoreFactory +import androidx.datastore.preferences.core.emptyPreferences +import androidx.datastore.preferences.preferencesDataStoreFile +import androidx.security.crypto.EncryptedFile +import androidx.security.crypto.MasterKeys +import io.github.osipxd.security.crypto.createEncrypted +import kotlinx.coroutines.Dispatchers +import org.koin.android.ext.koin.androidContext +import org.koin.core.module.dsl.singleOf +import org.koin.dsl.bind +import org.koin.dsl.module + +val datastoreKoinModule = module { +// includes(dispatcherKoinModule) + + single { + PreferenceDataStoreFactory.createEncrypted( + corruptionHandler = ReplaceFileCorruptionHandler( + produceNewData = { emptyPreferences() } + ) + ) { + EncryptedFile.Builder( + androidContext().preferencesDataStoreFile(Cons.DS_FILE), + androidContext(), + MasterKeys.getOrCreate(MasterKeys.AES256_GCM_SPEC), + EncryptedFile.FileEncryptionScheme.AES256_GCM_HKDF_4KB + ).build() + } + } + + singleOf(::DataStoreRepoImpl) bind DataStoreRepo::class +} + +//private val dispatcherKoinModule = module { +// single { Dispatchers.IO } +//} \ No newline at end of file diff --git a/core/datastore/src/test/java/city/zouitel/datastore/ExampleUnitTest.kt b/core/datastore/src/test/java/city/zouitel/datastore/ExampleUnitTest.kt new file mode 100644 index 00000000..9178126f --- /dev/null +++ b/core/datastore/src/test/java/city/zouitel/datastore/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.datastore + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/common/logic/.gitignore b/core/repository/.gitignore similarity index 100% rename from common/logic/.gitignore rename to core/repository/.gitignore diff --git a/core/repository/build.gradle.kts b/core/repository/build.gradle.kts new file mode 100644 index 00000000..966cc56b --- /dev/null +++ b/core/repository/build.gradle.kts @@ -0,0 +1,54 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.repository" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + //Modules. + implementation(projects.domain) + + //Koin. + api(libs.koin.core) + api(libs.koin.android) + + //Kotlin-Coroutines. + implementation(libs.coroutines.core) +} \ No newline at end of file diff --git a/core/repository/consumer-rules.pro b/core/repository/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/core/repository/proguard-rules.pro b/core/repository/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/core/repository/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/repository/src/androidTest/java/city/zouitel/repository/ExampleInstrumentedTest.kt b/core/repository/src/androidTest/java/city/zouitel/repository/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..521c8cc9 --- /dev/null +++ b/core/repository/src/androidTest/java/city/zouitel/repository/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.repository + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.repository.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/common/mapper/src/main/AndroidManifest.xml b/core/repository/src/main/AndroidManifest.xml similarity index 100% rename from common/mapper/src/main/AndroidManifest.xml rename to core/repository/src/main/AndroidManifest.xml diff --git a/data/repository/src/main/java/com/example/repository/datasource/DataDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/DataDataSource.kt similarity index 68% rename from data/repository/src/main/java/com/example/repository/datasource/DataDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/DataDataSource.kt index 9fbe72ca..a70fb269 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/DataDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/DataDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.Data +import city.zouitel.repository.model.Data interface DataDataSource { diff --git a/data/repository/src/main/java/com/example/repository/datasource/ExoDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/ExoDataSource.kt similarity index 88% rename from data/repository/src/main/java/com/example/repository/datasource/ExoDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/ExoDataSource.kt index a8d36f72..7764b1c1 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/ExoDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/ExoDataSource.kt @@ -1,4 +1,4 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource import android.content.Context import com.google.android.exoplayer2.ExoPlayer diff --git a/data/repository/src/main/java/com/example/repository/datasource/LinkDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/LinkDataSource.kt similarity index 68% rename from data/repository/src/main/java/com/example/repository/datasource/LinkDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/LinkDataSource.kt index 14b5af29..71174f8d 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/LinkDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/LinkDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.Link +import city.zouitel.repository.model.Link import kotlinx.coroutines.flow.Flow interface LinkDataSource { diff --git a/data/repository/src/main/java/com/example/repository/datasource/NoteAndLinkDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndLinkDataSource.kt similarity index 72% rename from data/repository/src/main/java/com/example/repository/datasource/NoteAndLinkDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndLinkDataSource.kt index 0d63c740..63d74ff7 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/NoteAndLinkDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndLinkDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.NoteAndLink +import city.zouitel.repository.model.NoteAndLink import kotlinx.coroutines.flow.Flow interface NoteAndLinkDataSource { diff --git a/data/repository/src/main/java/com/example/repository/datasource/NoteAndTagDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndTagDataSource.kt similarity index 72% rename from data/repository/src/main/java/com/example/repository/datasource/NoteAndTagDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndTagDataSource.kt index 76ad3b6a..7a3943ca 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/NoteAndTagDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndTagDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.NoteAndTag +import city.zouitel.repository.model.NoteAndTag import kotlinx.coroutines.flow.Flow interface NoteAndTagDataSource { diff --git a/data/repository/src/main/java/com/example/repository/datasource/NoteAndTaskDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndTaskDataSource.kt similarity index 72% rename from data/repository/src/main/java/com/example/repository/datasource/NoteAndTaskDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndTaskDataSource.kt index 3503082c..43021e26 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/NoteAndTaskDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteAndTaskDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.NoteAndTask +import city.zouitel.repository.model.NoteAndTask import kotlinx.coroutines.flow.Flow interface NoteAndTaskDataSource { diff --git a/data/repository/src/main/java/com/example/repository/datasource/NoteDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteDataSource.kt similarity index 82% rename from data/repository/src/main/java/com/example/repository/datasource/NoteDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/NoteDataSource.kt index 546e72c4..301ba2b8 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/NoteDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/NoteDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.Note +import city.zouitel.repository.model.Note import kotlinx.coroutines.flow.Flow interface NoteDataSource { diff --git a/data/repository/src/main/java/com/example/repository/datasource/TagDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/TagDataSource.kt similarity index 71% rename from data/repository/src/main/java/com/example/repository/datasource/TagDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/TagDataSource.kt index 27bad4ee..4abce630 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/TagDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/TagDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.Tag +import city.zouitel.repository.model.Tag import kotlinx.coroutines.flow.Flow interface TagDataSource { diff --git a/data/repository/src/main/java/com/example/repository/datasource/TaskDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/TaskDataSource.kt similarity index 73% rename from data/repository/src/main/java/com/example/repository/datasource/TaskDataSource.kt rename to core/repository/src/main/java/city/zouitel/repository/datasource/TaskDataSource.kt index 09d4cd54..dfe9b0ba 100644 --- a/data/repository/src/main/java/com/example/repository/datasource/TaskDataSource.kt +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/TaskDataSource.kt @@ -1,6 +1,6 @@ -package com.example.repository.datasource +package city.zouitel.repository.datasource -import com.example.repository.model.Task +import city.zouitel.repository.model.Task import kotlinx.coroutines.flow.Flow interface TaskDataSource { diff --git a/core/repository/src/main/java/city/zouitel/repository/datasource/WidgetDataSource.kt b/core/repository/src/main/java/city/zouitel/repository/datasource/WidgetDataSource.kt new file mode 100644 index 00000000..06a4bdf0 --- /dev/null +++ b/core/repository/src/main/java/city/zouitel/repository/datasource/WidgetDataSource.kt @@ -0,0 +1,8 @@ +package city.zouitel.repository.datasource + +import city.zouitel.repository.model.Note + +interface WidgetDataSource { + + val getAllWidgetMainEntityById: List +} \ No newline at end of file diff --git a/data/repository/src/main/java/com/example/repository/di/MapperModule.kt b/core/repository/src/main/java/city/zouitel/repository/di/MapperModule.kt similarity index 60% rename from data/repository/src/main/java/com/example/repository/di/MapperModule.kt rename to core/repository/src/main/java/city/zouitel/repository/di/MapperModule.kt index 495c6730..0a37176d 100644 --- a/data/repository/src/main/java/com/example/repository/di/MapperModule.kt +++ b/core/repository/src/main/java/city/zouitel/repository/di/MapperModule.kt @@ -1,46 +1,41 @@ -package com.example.repository.di +package city.zouitel.repository.di -import com.example.repository.mapper.* -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton +import city.zouitel.repository.mapper.* -@Module -@InstallIn(SingletonComponent::class) +//@Module +//@InstallIn(SingletonComponent::class) object MapperModule { - @Singleton - @Provides +// @Singleton +// @Provides fun provideDataMapper() = DataMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideLinkMapper() = LinkMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideTagMapper() = TagMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideTaskMapper() = TaskMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndLinkMapper() = NoteAndLinkMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndTagMapper() = NoteAndTagMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteAndTaskMapper() = NoteAndTaskMapper() - @Singleton - @Provides +// @Singleton +// @Provides fun provideNoteMapper( dataMapper: DataMapper, tagMapper: TagMapper, @@ -48,8 +43,8 @@ object MapperModule { linkMapper: LinkMapper ) = NoteMapper(dataMapper, tagMapper, taskMapper, linkMapper) - @Singleton - @Provides +// @Singleton +// @Provides fun provideWidgetMapper( dataMapper: DataMapper, tagMapper: TagMapper, diff --git a/data/repository/src/main/java/com/example/repository/di/RepositoryModule.kt b/core/repository/src/main/java/city/zouitel/repository/di/RepositoryModule.kt similarity index 56% rename from data/repository/src/main/java/com/example/repository/di/RepositoryModule.kt rename to core/repository/src/main/java/city/zouitel/repository/di/RepositoryModule.kt index 36ac0803..132ce575 100644 --- a/data/repository/src/main/java/com/example/repository/di/RepositoryModule.kt +++ b/core/repository/src/main/java/city/zouitel/repository/di/RepositoryModule.kt @@ -1,50 +1,45 @@ -package com.example.repository.di - -import com.example.domain.repository.* -import com.example.repository.repositoryImpl.* -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) +package city.zouitel.repository.di + +import city.zouitel.domain.repository.* +import city.zouitel.repository.repositoryImpl.* + +//@Module +//@InstallIn(SingletonComponent::class) interface RepositoryModule { - @Binds - @Singleton +// @Binds +// @Singleton fun bindLinkRepository(data: LinkRepositoryImpl): LinkRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindDataRepository(data: DataRepositoryImpl): DataRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteAndLinkRepository(data: NoteAndLinkRepositoryImpl): NoteAndLinkRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteAndTagRepository(data: NoteAndTagRepositoryImpl): NoteAndTagRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteAndTaskRepository(data: NoteAndTaskRepositoryImpl): NoteAndTaskRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindNoteRepository(data: NoteRepositoryImpl): NoteRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindTagRepository(data: TagRepositoryImpl): TagRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindTaskRepository(data: TaskRepositoryImpl): TaskRepository - @Binds - @Singleton +// @Binds +// @Singleton fun bindWidgetRepository(data: WidgetRepositoryImpl): WidgetRepository } \ No newline at end of file diff --git a/core/repository/src/main/java/city/zouitel/repository/di/repositoryDI.kt b/core/repository/src/main/java/city/zouitel/repository/di/repositoryDI.kt new file mode 100644 index 00000000..c7ea1a0e --- /dev/null +++ b/core/repository/src/main/java/city/zouitel/repository/di/repositoryDI.kt @@ -0,0 +1,119 @@ +package city.zouitel.repository.di + +import city.zouitel.domain.repository.DataRepository +import city.zouitel.domain.repository.LinkRepository +import city.zouitel.domain.repository.NoteAndLinkRepository +import city.zouitel.domain.repository.NoteAndTagRepository +import city.zouitel.domain.repository.NoteAndTaskRepository +import city.zouitel.domain.repository.NoteRepository +import city.zouitel.domain.repository.TagRepository +import city.zouitel.domain.repository.TaskRepository +import city.zouitel.domain.repository.WidgetRepository +import city.zouitel.domain.usecase.DataUseCase +import city.zouitel.domain.usecase.LinkUseCase +import city.zouitel.domain.usecase.NoteAndLinkUseCase +import city.zouitel.domain.usecase.NoteAndTagUseCase +import city.zouitel.domain.usecase.NoteAndTaskUseCase +import city.zouitel.domain.usecase.NoteUseCase +import city.zouitel.domain.usecase.TagUseCase +import city.zouitel.domain.usecase.TaskUseCase +import city.zouitel.domain.usecase.WidgetUseCase +import city.zouitel.repository.mapper.DataMapper +import city.zouitel.repository.mapper.LinkMapper +import city.zouitel.repository.mapper.NoteAndLinkMapper +import city.zouitel.repository.mapper.NoteAndTagMapper +import city.zouitel.repository.mapper.NoteAndTaskMapper +import city.zouitel.repository.mapper.NoteMapper +import city.zouitel.repository.mapper.TagMapper +import city.zouitel.repository.mapper.TaskMapper +import city.zouitel.repository.mapper.WidgetMapper +import city.zouitel.repository.repositoryImpl.DataRepositoryImpl +import city.zouitel.repository.repositoryImpl.LinkRepositoryImpl +import city.zouitel.repository.repositoryImpl.NoteAndLinkRepositoryImpl +import city.zouitel.repository.repositoryImpl.NoteAndTagRepositoryImpl +import city.zouitel.repository.repositoryImpl.NoteAndTaskRepositoryImpl +import city.zouitel.repository.repositoryImpl.NoteRepositoryImpl +import city.zouitel.repository.repositoryImpl.TagRepositoryImpl +import city.zouitel.repository.repositoryImpl.TaskRepositoryImpl +import city.zouitel.repository.repositoryImpl.WidgetRepositoryImpl +import org.koin.core.module.dsl.factoryOf +import org.koin.core.module.dsl.singleOf +import org.koin.dsl.bind +import org.koin.dsl.module + +val repositoryKoinModule = module { + + //Mappers. + factoryOf(::DataMapper) + factoryOf(::LinkMapper) + factoryOf(::TagMapper) + factoryOf(::TaskMapper) + factoryOf(::NoteAndLinkMapper) + factoryOf(::NoteAndTagMapper) + factoryOf(::NoteAndTaskMapper) + factory { + NoteMapper(get(), get(), get(), get()) + } + + factory { param -> + WidgetMapper( + param.get(), + param.get(), + param.get(), + param.get() + ) + } + + //Repositories. + singleOf(::LinkRepositoryImpl) bind LinkRepository::class + singleOf(::DataRepositoryImpl) bind DataRepository::class + singleOf(::NoteAndLinkRepositoryImpl) bind NoteAndLinkRepository::class + singleOf(::NoteAndTagRepositoryImpl) bind NoteAndTagRepository::class + singleOf(::NoteAndTaskRepositoryImpl) bind NoteAndTaskRepository::class + singleOf(::NoteRepositoryImpl) bind NoteRepository::class + singleOf(::TagRepositoryImpl) bind TagRepository::class + singleOf(::TaskRepositoryImpl) bind TaskRepository::class + singleOf(::WidgetRepositoryImpl) bind WidgetRepository::class + + // + factoryOf(DataUseCase::AddData) + factoryOf(DataUseCase::EditData) + factoryOf(DataUseCase::DeleteData) + factoryOf(DataUseCase::DeleteAllTrashedData) + + factoryOf(LinkUseCase::AddLink) + factoryOf(LinkUseCase::DeleteLink) + factoryOf(LinkUseCase::GetAllLinks) + + factoryOf(NoteAndLinkUseCase::AddNoteAndLink) + factoryOf(NoteAndLinkUseCase::DeleteNoteAndLink) + factoryOf(NoteAndLinkUseCase::GetAllNotesAndLinks) + + factoryOf(NoteAndTagUseCase::AddNoteAndTag) + factoryOf(NoteAndTagUseCase::DeleteNoteAndTag) + factoryOf(NoteAndTagUseCase::GetAllNotesAndTags) + + factoryOf(NoteAndTaskUseCase::AddNoteAndTask) + factoryOf(NoteAndTaskUseCase::DeleteNoteAndTask) + factoryOf(NoteAndTaskUseCase::GetAllNotesAndTask) + + factoryOf(NoteUseCase::GetAllNotesById) + factoryOf(NoteUseCase::GetAllNotesByName) + factoryOf(NoteUseCase::GetAllNotesByNewest) + factoryOf(NoteUseCase::GetAllRemindingNotes) + factoryOf(NoteUseCase::GetAllNotesByOldest) + factoryOf(NoteUseCase::GetAllNotesByPriority) + factoryOf(NoteUseCase::GetAllTrashedNotes) + + factoryOf(TagUseCase::AddTag) + factoryOf(TagUseCase::DeleteTag) + factoryOf(TagUseCase::UpdateTag) + factoryOf(TagUseCase::GetAllTags) + + factoryOf(TaskUseCase::AddTaskItem) + factoryOf(TaskUseCase::DeleteTaskItem) + factoryOf(TaskUseCase::UpdateTaskItem) + factoryOf(TaskUseCase::GetAllTaskItems) + + factoryOf(WidgetUseCase::GetAllWidgetMainEntityById) +} \ No newline at end of file diff --git a/data/repository/src/main/java/com/example/repository/mapper/DataMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/DataMapper.kt similarity index 71% rename from data/repository/src/main/java/com/example/repository/mapper/DataMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/DataMapper.kt index 9473ff50..8097c8f4 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/DataMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/DataMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.Data as InData -import com.example.domain.model.Data as OutData +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.Data as InData +import city.zouitel.domain.model.Data as OutData class DataMapper: Mapper.Base { override fun toRepository(data: OutData): InData = with(data){ diff --git a/data/repository/src/main/java/com/example/repository/mapper/LinkMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/LinkMapper.kt similarity index 62% rename from data/repository/src/main/java/com/example/repository/mapper/LinkMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/LinkMapper.kt index d19fcbb7..86a244fb 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/LinkMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/LinkMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.domain.model.Link as OutLink -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.Link as InLink +import city.zouitel.domain.model.Link as OutLink +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.Link as InLink class LinkMapper: Mapper.Base { override fun toRepository(data: OutLink): InLink = with(data) { diff --git a/data/repository/src/main/java/com/example/repository/mapper/NoteAndLinkMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndLinkMapper.kt similarity index 59% rename from data/repository/src/main/java/com/example/repository/mapper/NoteAndLinkMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndLinkMapper.kt index 3c8b08c2..006cbefb 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/NoteAndLinkMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndLinkMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.NoteAndLink as InNoteAndLink -import com.example.domain.model.NoteAndLink as OutNoteAndLink +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.NoteAndLink as InNoteAndLink +import city.zouitel.domain.model.NoteAndLink as OutNoteAndLink class NoteAndLinkMapper: Mapper.Base { override fun toRepository(data: OutNoteAndLink): InNoteAndLink = with(data){ diff --git a/data/repository/src/main/java/com/example/repository/mapper/NoteAndTagMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndTagMapper.kt similarity index 59% rename from data/repository/src/main/java/com/example/repository/mapper/NoteAndTagMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndTagMapper.kt index 42590001..88fe79b3 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/NoteAndTagMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndTagMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.NoteAndTag as InNoteAndTag -import com.example.domain.model.NoteAndTag as OutNoteAndTag +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.NoteAndTag as InNoteAndTag +import city.zouitel.domain.model.NoteAndTag as OutNoteAndTag class NoteAndTagMapper: Mapper.Base { override fun toRepository(data: OutNoteAndTag): InNoteAndTag = with(data){ diff --git a/data/repository/src/main/java/com/example/repository/mapper/NoteAndTaskMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndTaskMapper.kt similarity index 59% rename from data/repository/src/main/java/com/example/repository/mapper/NoteAndTaskMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndTaskMapper.kt index 4f722675..67b6e2c5 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/NoteAndTaskMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteAndTaskMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.NoteAndTask as InNoteAndTask -import com.example.domain.model.NoteAndTask as OutNoteAndTask +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.NoteAndTask as InNoteAndTask +import city.zouitel.domain.model.NoteAndTask as OutNoteAndTask class NoteAndTaskMapper: Mapper.Base { override fun toRepository(data: OutNoteAndTask): InNoteAndTask = with(data){ diff --git a/data/repository/src/main/java/com/example/repository/mapper/NoteMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteMapper.kt similarity index 75% rename from data/repository/src/main/java/com/example/repository/mapper/NoteMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/NoteMapper.kt index caf8e828..eb69cbc8 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/NoteMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/NoteMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.Note as InNote -import com.example.domain.model.Note as OutNote +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.Note as InNote +import city.zouitel.domain.model.Note as OutNote class NoteMapper( private val dataMapper: DataMapper, diff --git a/data/repository/src/main/java/com/example/repository/mapper/TagMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/TagMapper.kt similarity index 57% rename from data/repository/src/main/java/com/example/repository/mapper/TagMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/TagMapper.kt index f1ff5e1d..1cf52cbf 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/TagMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/TagMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.Tag as InTag -import com.example.domain.model.Tag as OutTag +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.Tag as InTag +import city.zouitel.domain.model.Tag as OutTag class TagMapper: Mapper.Base { override fun toRepository(data: OutTag): InTag = with(data){ diff --git a/data/repository/src/main/java/com/example/repository/mapper/TaskMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/TaskMapper.kt similarity index 57% rename from data/repository/src/main/java/com/example/repository/mapper/TaskMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/TaskMapper.kt index 08a24a03..9b7ef9fb 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/TaskMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/TaskMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.Task as InTask -import com.example.domain.model.Task as OutTask +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.Task as InTask +import city.zouitel.domain.model.Task as OutTask class TaskMapper: Mapper.Base { override fun toRepository(data: OutTask): InTask = with(data){ diff --git a/data/repository/src/main/java/com/example/repository/mapper/WidgetMapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/WidgetMapper.kt similarity index 75% rename from data/repository/src/main/java/com/example/repository/mapper/WidgetMapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/WidgetMapper.kt index 0996e040..61423e5f 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/WidgetMapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/WidgetMapper.kt @@ -1,8 +1,8 @@ -package com.example.repository.mapper +package city.zouitel.repository.mapper -import com.example.repository.mapper.base.Mapper -import com.example.repository.model.Note as InNote -import com.example.domain.model.Note as OutNote +import city.zouitel.repository.mapper.base.Mapper +import city.zouitel.repository.model.Note as InNote +import city.zouitel.domain.model.Note as OutNote class WidgetMapper ( private val dataMapper: DataMapper, diff --git a/data/repository/src/main/java/com/example/repository/mapper/base/Mapper.kt b/core/repository/src/main/java/city/zouitel/repository/mapper/base/Mapper.kt similarity index 83% rename from data/repository/src/main/java/com/example/repository/mapper/base/Mapper.kt rename to core/repository/src/main/java/city/zouitel/repository/mapper/base/Mapper.kt index b4f3f111..3d8daafa 100644 --- a/data/repository/src/main/java/com/example/repository/mapper/base/Mapper.kt +++ b/core/repository/src/main/java/city/zouitel/repository/mapper/base/Mapper.kt @@ -1,4 +1,4 @@ -package com.example.repository.mapper.base +package city.zouitel.repository.mapper.base sealed interface Mapper { interface Base { diff --git a/data/repository/src/main/java/com/example/repository/model/Data.kt b/core/repository/src/main/java/city/zouitel/repository/model/Data.kt similarity index 82% rename from data/repository/src/main/java/com/example/repository/model/Data.kt rename to core/repository/src/main/java/city/zouitel/repository/model/Data.kt index e644ac78..8babdf2c 100644 --- a/data/repository/src/main/java/com/example/repository/model/Data.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/Data.kt @@ -1,7 +1,7 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep -import com.example.repository.utils.Constants.NON +import city.zouitel.repository.utils.Constants.NON @Keep data class Data( diff --git a/data/repository/src/main/java/com/example/repository/model/Link.kt b/core/repository/src/main/java/city/zouitel/repository/model/Link.kt similarity index 86% rename from data/repository/src/main/java/com/example/repository/model/Link.kt rename to core/repository/src/main/java/city/zouitel/repository/model/Link.kt index 9cb0ab8b..c127f49e 100644 --- a/data/repository/src/main/java/com/example/repository/model/Link.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/Link.kt @@ -1,4 +1,4 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep diff --git a/data/repository/src/main/java/com/example/repository/model/Note.kt b/core/repository/src/main/java/city/zouitel/repository/model/Note.kt similarity index 69% rename from data/repository/src/main/java/com/example/repository/model/Note.kt rename to core/repository/src/main/java/city/zouitel/repository/model/Note.kt index 38c6ef8e..9885d4be 100644 --- a/data/repository/src/main/java/com/example/repository/model/Note.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/Note.kt @@ -1,6 +1,7 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep +import city.zouitel.repository.model.Link @Keep data class Note( diff --git a/data/repository/src/main/java/com/example/repository/model/NoteAndLink.kt b/core/repository/src/main/java/city/zouitel/repository/model/NoteAndLink.kt similarity index 75% rename from data/repository/src/main/java/com/example/repository/model/NoteAndLink.kt rename to core/repository/src/main/java/city/zouitel/repository/model/NoteAndLink.kt index a09adb87..a7bb3afc 100644 --- a/data/repository/src/main/java/com/example/repository/model/NoteAndLink.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/NoteAndLink.kt @@ -1,4 +1,4 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep diff --git a/data/repository/src/main/java/com/example/repository/model/NoteAndTag.kt b/core/repository/src/main/java/city/zouitel/repository/model/NoteAndTag.kt similarity index 74% rename from data/repository/src/main/java/com/example/repository/model/NoteAndTag.kt rename to core/repository/src/main/java/city/zouitel/repository/model/NoteAndTag.kt index 20bc7eb3..1e41baa9 100644 --- a/data/repository/src/main/java/com/example/repository/model/NoteAndTag.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/NoteAndTag.kt @@ -1,4 +1,4 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep diff --git a/data/repository/src/main/java/com/example/repository/model/NoteAndTask.kt b/core/repository/src/main/java/city/zouitel/repository/model/NoteAndTask.kt similarity index 74% rename from data/repository/src/main/java/com/example/repository/model/NoteAndTask.kt rename to core/repository/src/main/java/city/zouitel/repository/model/NoteAndTask.kt index a8dc2858..6527b960 100644 --- a/data/repository/src/main/java/com/example/repository/model/NoteAndTask.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/NoteAndTask.kt @@ -1,4 +1,4 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep diff --git a/data/repository/src/main/java/com/example/repository/model/Tag.kt b/core/repository/src/main/java/city/zouitel/repository/model/Tag.kt similarity index 78% rename from data/repository/src/main/java/com/example/repository/model/Tag.kt rename to core/repository/src/main/java/city/zouitel/repository/model/Tag.kt index fe6adad9..d3a47cab 100644 --- a/data/repository/src/main/java/com/example/repository/model/Tag.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/Tag.kt @@ -1,4 +1,4 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep diff --git a/data/repository/src/main/java/com/example/repository/model/Task.kt b/core/repository/src/main/java/city/zouitel/repository/model/Task.kt similarity index 78% rename from data/repository/src/main/java/com/example/repository/model/Task.kt rename to core/repository/src/main/java/city/zouitel/repository/model/Task.kt index a07dabe1..29b0e06d 100644 --- a/data/repository/src/main/java/com/example/repository/model/Task.kt +++ b/core/repository/src/main/java/city/zouitel/repository/model/Task.kt @@ -1,4 +1,4 @@ -package com.example.repository.model +package city.zouitel.repository.model import androidx.annotation.Keep diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/DataRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/DataRepositoryImpl.kt similarity index 62% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/DataRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/DataRepositoryImpl.kt index 7ba1d511..918bacae 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/DataRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/DataRepositoryImpl.kt @@ -1,12 +1,11 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.Data as OutData -import com.example.domain.repository.DataRepository -import com.example.repository.datasource.DataDataSource -import com.example.repository.mapper.DataMapper -import javax.inject.Inject +import city.zouitel.domain.model.Data as OutData +import city.zouitel.domain.repository.DataRepository +import city.zouitel.repository.datasource.DataDataSource +import city.zouitel.repository.mapper.DataMapper -class DataRepositoryImpl @Inject constructor( +class DataRepositoryImpl /*@Inject*/ constructor( private val dataSource: DataDataSource, private val mapper: DataMapper ): DataRepository { diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/LinkRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/LinkRepositoryImpl.kt similarity index 64% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/LinkRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/LinkRepositoryImpl.kt index dbca10f6..638da855 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/LinkRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/LinkRepositoryImpl.kt @@ -1,14 +1,13 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.Link as OutLink -import com.example.domain.repository.LinkRepository -import com.example.repository.datasource.LinkDataSource -import com.example.repository.mapper.LinkMapper +import city.zouitel.domain.model.Link as OutLink +import city.zouitel.domain.repository.LinkRepository +import city.zouitel.repository.datasource.LinkDataSource +import city.zouitel.repository.mapper.LinkMapper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class LinkRepositoryImpl @Inject constructor( +class LinkRepositoryImpl /*@Inject*/ constructor( private val dataSource: LinkDataSource, private val mapper: LinkMapper ): LinkRepository { diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndLinkRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndLinkRepositoryImpl.kt similarity index 66% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndLinkRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndLinkRepositoryImpl.kt index 553ac498..0d199e8b 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndLinkRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndLinkRepositoryImpl.kt @@ -1,14 +1,13 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.NoteAndLink as OutNoteAndLink -import com.example.domain.repository.NoteAndLinkRepository -import com.example.repository.datasource.NoteAndLinkDataSource -import com.example.repository.mapper.NoteAndLinkMapper +import city.zouitel.domain.model.NoteAndLink as OutNoteAndLink +import city.zouitel.domain.repository.NoteAndLinkRepository +import city.zouitel.repository.datasource.NoteAndLinkDataSource +import city.zouitel.repository.mapper.NoteAndLinkMapper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteAndLinkRepositoryImpl @Inject constructor( +class NoteAndLinkRepositoryImpl /*@Inject*/ constructor( private val dataSource: NoteAndLinkDataSource, private val mapper: NoteAndLinkMapper ): NoteAndLinkRepository { diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndTagRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndTagRepositoryImpl.kt similarity index 62% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndTagRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndTagRepositoryImpl.kt index 71e065cf..e805b682 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndTagRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndTagRepositoryImpl.kt @@ -1,15 +1,14 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.NoteAndTag as OutNoteAndTag -import com.example.domain.repository.NoteAndTagRepository -import com.example.repository.datasource.NoteAndTagDataSource -import com.example.repository.mapper.NoteAndTagMapper -import com.example.repository.model.NoteAndTag as InNoteAndTag +import city.zouitel.domain.model.NoteAndTag as OutNoteAndTag +import city.zouitel.domain.repository.NoteAndTagRepository +import city.zouitel.repository.datasource.NoteAndTagDataSource +import city.zouitel.repository.mapper.NoteAndTagMapper +import city.zouitel.repository.model.NoteAndTag as InNoteAndTag import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteAndTagRepositoryImpl @Inject constructor( +class NoteAndTagRepositoryImpl /*@Inject*/ constructor( private val dataSource: NoteAndTagDataSource, private val mapper: NoteAndTagMapper ): NoteAndTagRepository { diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndTaskRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndTaskRepositoryImpl.kt similarity index 66% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndTaskRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndTaskRepositoryImpl.kt index 020c2a62..073dc9bd 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteAndTaskRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteAndTaskRepositoryImpl.kt @@ -1,14 +1,13 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.NoteAndTask as OutNoteAndTask -import com.example.domain.repository.NoteAndTaskRepository -import com.example.repository.datasource.NoteAndTaskDataSource -import com.example.repository.mapper.NoteAndTaskMapper +import city.zouitel.domain.model.NoteAndTask as OutNoteAndTask +import city.zouitel.domain.repository.NoteAndTaskRepository +import city.zouitel.repository.datasource.NoteAndTaskDataSource +import city.zouitel.repository.mapper.NoteAndTaskMapper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteAndTaskRepositoryImpl @Inject constructor( +class NoteAndTaskRepositoryImpl /*@Inject*/ constructor( private val dataSource: NoteAndTaskDataSource, private val mapper: NoteAndTaskMapper ): NoteAndTaskRepository { diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteRepositoryImpl.kt similarity index 83% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/NoteRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteRepositoryImpl.kt index 4fdb0bea..2e0be5da 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/NoteRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/NoteRepositoryImpl.kt @@ -1,14 +1,13 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.Note as OutNote -import com.example.domain.repository.NoteRepository -import com.example.repository.datasource.NoteDataSource -import com.example.repository.mapper.NoteMapper +import city.zouitel.domain.model.Note as OutNote +import city.zouitel.domain.repository.NoteRepository +import city.zouitel.repository.datasource.NoteDataSource +import city.zouitel.repository.mapper.NoteMapper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class NoteRepositoryImpl @Inject constructor( +class NoteRepositoryImpl /*@Inject*/ constructor( private val dataSource: NoteDataSource, private val mapper: NoteMapper ): NoteRepository { diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/TagRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/TagRepositoryImpl.kt similarity index 68% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/TagRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/TagRepositoryImpl.kt index 945e0399..01dd5ce6 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/TagRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/TagRepositoryImpl.kt @@ -1,14 +1,13 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.Tag as OutTag -import com.example.domain.repository.TagRepository -import com.example.repository.datasource.TagDataSource -import com.example.repository.mapper.TagMapper +import city.zouitel.domain.model.Tag as OutTag +import city.zouitel.domain.repository.TagRepository +import city.zouitel.repository.datasource.TagDataSource +import city.zouitel.repository.mapper.TagMapper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class TagRepositoryImpl @Inject constructor( +class TagRepositoryImpl /*@Inject*/ constructor( private val dataSource: TagDataSource, private val mapper: TagMapper ): TagRepository { diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/TaskRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/TaskRepositoryImpl.kt similarity index 69% rename from data/repository/src/main/java/com/example/repository/repositoryImpl/TaskRepositoryImpl.kt rename to core/repository/src/main/java/city/zouitel/repository/repositoryImpl/TaskRepositoryImpl.kt index 91ef0792..8dd09bd4 100644 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/TaskRepositoryImpl.kt +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/TaskRepositoryImpl.kt @@ -1,14 +1,13 @@ -package com.example.repository.repositoryImpl +package city.zouitel.repository.repositoryImpl -import com.example.domain.model.Task as OutTask -import com.example.domain.repository.TaskRepository -import com.example.repository.datasource.TaskDataSource -import com.example.repository.mapper.TaskMapper +import city.zouitel.domain.model.Task as OutTask +import city.zouitel.domain.repository.TaskRepository +import city.zouitel.repository.datasource.TaskDataSource +import city.zouitel.repository.mapper.TaskMapper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import javax.inject.Inject -class TaskRepositoryImpl @Inject constructor( +class TaskRepositoryImpl /*@Inject*/ constructor( private val dataSource: TaskDataSource, private val mapper: TaskMapper ): TaskRepository { diff --git a/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/WidgetRepositoryImpl.kt b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/WidgetRepositoryImpl.kt new file mode 100644 index 00000000..eab44cf1 --- /dev/null +++ b/core/repository/src/main/java/city/zouitel/repository/repositoryImpl/WidgetRepositoryImpl.kt @@ -0,0 +1,16 @@ +package city.zouitel.repository.repositoryImpl + +import city.zouitel.domain.model.Note as OutNote +import city.zouitel.domain.repository.WidgetRepository +import city.zouitel.repository.datasource.WidgetDataSource +import city.zouitel.repository.mapper.WidgetMapper + +class WidgetRepositoryImpl /*@Inject*/ constructor( + private val dataSource: WidgetDataSource, + private val mapper: WidgetMapper +): WidgetRepository { + override val getAllWidgetMainEntityById: List + get() = dataSource.getAllWidgetMainEntityById.map { note -> + mapper.toDomain(note) + } +} \ No newline at end of file diff --git a/data/repository/src/main/java/com/example/repository/utils/Constants.kt b/core/repository/src/main/java/city/zouitel/repository/utils/Constants.kt similarity index 60% rename from data/repository/src/main/java/com/example/repository/utils/Constants.kt rename to core/repository/src/main/java/city/zouitel/repository/utils/Constants.kt index 88a4ac65..e8d8c657 100644 --- a/data/repository/src/main/java/com/example/repository/utils/Constants.kt +++ b/core/repository/src/main/java/city/zouitel/repository/utils/Constants.kt @@ -1,4 +1,4 @@ -package com.example.repository.utils +package city.zouitel.repository.utils object Constants { const val NON = "non_specified" diff --git a/core/repository/src/test/java/city/zouitel/repository/ExampleUnitTest.kt b/core/repository/src/test/java/city/zouitel/repository/ExampleUnitTest.kt new file mode 100644 index 00000000..4f9e04b8 --- /dev/null +++ b/core/repository/src/test/java/city/zouitel/repository/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.repository + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/data/datastore/.gitignore b/data/datastore/.gitignore deleted file mode 100644 index c2880309..00000000 --- a/data/datastore/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -/.gradle -/local.properties -/.idea -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -/build -/captures -.externalNativeBuild -.cxx -local.properties \ No newline at end of file diff --git a/data/datastore/build.gradle.kts b/data/datastore/build.gradle.kts deleted file mode 100644 index dc117e1d..00000000 --- a/data/datastore/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - id("city.android-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.datastore" -} - -dependencies { - - //DataStore. - implementation (libs.datastore) - - //AndroidX. - implementation(libs.androidx.constraintlayout) - - //SecurityDatastore. - implementation("io.github.osipxd:security-crypto-datastore-preferences:1.0.0-alpha04") -} \ No newline at end of file diff --git a/data/datastore/src/main/java/com/example/datastore/RepoMod.kt b/data/datastore/src/main/java/com/example/datastore/RepoMod.kt deleted file mode 100644 index 82e9f742..00000000 --- a/data/datastore/src/main/java/com/example/datastore/RepoMod.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.datastore - -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.android.components.ViewModelComponent - -@Module -@InstallIn(ViewModelComponent::class) -abstract class RepoMod { - - @Binds - abstract fun bindRepository(impl: DataStoreRepoImpl): DataStoreRepo -} \ No newline at end of file diff --git a/data/local/.gitignore b/data/local/.gitignore deleted file mode 100644 index c2880309..00000000 --- a/data/local/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -*.iml -/.gradle -/local.properties -/.idea -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -/build -/captures -.externalNativeBuild -.cxx -local.properties \ No newline at end of file diff --git a/data/local/build.gradle.kts b/data/local/build.gradle.kts deleted file mode 100644 index 127fe121..00000000 --- a/data/local/build.gradle.kts +++ /dev/null @@ -1,32 +0,0 @@ -plugins { - id("city.android-lib") - id("city.dagger-hilt") - id ("kotlin-kapt") -// alias(libs.plugins.ksp) -} - -android { - namespace = "com.example.local" -} - -kapt { - arguments { - arg("room.schemaLocation", "$projectDir/schemas") - } -} -dependencies { - - //Modules. - implementation(projects.data.repository) - - //Room. - implementation(libs.roomkts) - api(libs.room.runtime) - kapt(libs.room.compiler) - - //Security. - implementation (libs.androidx.security) - - //Sqlcipher. - implementation (libs.sqlcipher) -} \ No newline at end of file diff --git a/data/local/src/main/AndroidManifest.xml b/data/local/src/main/AndroidManifest.xml deleted file mode 100644 index 45e89c38..00000000 --- a/data/local/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/local/src/main/java/com/example/local/datasourceImpl/WidgetDataSourceImpl.kt b/data/local/src/main/java/com/example/local/datasourceImpl/WidgetDataSourceImpl.kt deleted file mode 100644 index 901c6449..00000000 --- a/data/local/src/main/java/com/example/local/datasourceImpl/WidgetDataSourceImpl.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.local.datasourceImpl - -import com.example.local.dao.WidgetDao -import com.example.local.mapper.WidgetMapper -import com.example.repository.datasource.WidgetDataSource -import com.example.repository.model.Note as OutNote -import javax.inject.Inject - -class WidgetDataSourceImpl @Inject constructor( - private val widgetDao: WidgetDao, - private val widgetMapper: WidgetMapper -): WidgetDataSource { - override val getAllWidgetMainEntityById: List - get() = widgetDao.allWidgetEntitiesById().map { - widgetMapper.readOnly(it) - } -} \ No newline at end of file diff --git a/data/repository/build.gradle.kts b/data/repository/build.gradle.kts deleted file mode 100644 index fff43f7c..00000000 --- a/data/repository/build.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id("city.android-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.repository" -} - -dependencies { - - //Project. - implementation(projects.domain) - - //Kotlin-Coroutines. - implementation(libs.kotlinx.coroutines.core) -} \ No newline at end of file diff --git a/data/repository/src/main/java/com/example/repository/datasource/WidgetDataSource.kt b/data/repository/src/main/java/com/example/repository/datasource/WidgetDataSource.kt deleted file mode 100644 index 89ecea54..00000000 --- a/data/repository/src/main/java/com/example/repository/datasource/WidgetDataSource.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.repository.datasource - -import com.example.repository.model.Note - -interface WidgetDataSource { - - val getAllWidgetMainEntityById: List -} \ No newline at end of file diff --git a/data/repository/src/main/java/com/example/repository/repositoryImpl/WidgetRepositoryImpl.kt b/data/repository/src/main/java/com/example/repository/repositoryImpl/WidgetRepositoryImpl.kt deleted file mode 100644 index 32f5400a..00000000 --- a/data/repository/src/main/java/com/example/repository/repositoryImpl/WidgetRepositoryImpl.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.repository.repositoryImpl - -import com.example.domain.model.Note as OutNote -import com.example.domain.repository.WidgetRepository -import com.example.repository.datasource.WidgetDataSource -import com.example.repository.mapper.WidgetMapper -import javax.inject.Inject - -class WidgetRepositoryImpl @Inject constructor( - private val dataSource: WidgetDataSource, - private val mapper: WidgetMapper -): WidgetRepository { - override val getAllWidgetMainEntityById: List - get() = dataSource.getAllWidgetMainEntityById.map { note -> - mapper.toDomain(note) - } -} \ No newline at end of file diff --git a/domain/.gitignore b/domain/.gitignore index c2880309..42afabfd 100644 --- a/domain/.gitignore +++ b/domain/.gitignore @@ -1,15 +1 @@ -*.iml -/.gradle -/local.properties -/.idea -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -/build -/captures -.externalNativeBuild -.cxx -local.properties \ No newline at end of file +/build \ No newline at end of file diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 20dc6ff4..dfe7410f 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -1,17 +1,50 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.dagger-hilt") -// alias(libs.plugins.ksp) + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.domain" + namespace = "city.zouitel.domain" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } } dependencies { - //Projects. - implementation(projects.data.datastore) + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + //Koin. + api(libs.koin.core) + api(libs.koin.android) //ExoPlayer api(libs.exoplayer.core) diff --git a/domain/consumer-rules.pro b/domain/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/domain/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/domain/src/androidTest/java/city/zouitel/domain/ExampleInstrumentedTest.kt b/domain/src/androidTest/java/city/zouitel/domain/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..d8c38002 --- /dev/null +++ b/domain/src/androidTest/java/city/zouitel/domain/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.domain + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.domain.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/domain/src/main/java/city/zouitel/domain/di/ExoPlayerModule.kt b/domain/src/main/java/city/zouitel/domain/di/ExoPlayerModule.kt new file mode 100644 index 00000000..dcbc7dc5 --- /dev/null +++ b/domain/src/main/java/city/zouitel/domain/di/ExoPlayerModule.kt @@ -0,0 +1,13 @@ +package city.zouitel.domain.di + +import city.zouitel.domain.exoplayer.ExoPlayerImpl +import com.google.android.exoplayer2.ExoPlayer + +//@Module +//@InstallIn(SingletonComponent::class) +object ExoPlayerModule { + +// @Singleton +// @Provides + fun provideExoPlayer(exo: ExoPlayer) = ExoPlayerImpl(exo) +} \ No newline at end of file diff --git a/domain/src/main/java/city/zouitel/domain/di/useCasesDI.kt b/domain/src/main/java/city/zouitel/domain/di/useCasesDI.kt new file mode 100644 index 00000000..1e007cba --- /dev/null +++ b/domain/src/main/java/city/zouitel/domain/di/useCasesDI.kt @@ -0,0 +1,60 @@ +package city.zouitel.domain.di + +import city.zouitel.domain.usecase.DataUseCase +import city.zouitel.domain.usecase.LinkUseCase +import city.zouitel.domain.usecase.NoteAndLinkUseCase +import city.zouitel.domain.usecase.NoteAndTagUseCase +import city.zouitel.domain.usecase.NoteAndTaskUseCase +import city.zouitel.domain.usecase.NoteUseCase +import city.zouitel.domain.usecase.TagUseCase +import city.zouitel.domain.usecase.TaskUseCase +import city.zouitel.domain.usecase.WidgetUseCase +import org.koin.core.annotation.KoinInternalApi +import org.koin.core.module.dsl.factoryOf +import org.koin.dsl.module + +@OptIn(KoinInternalApi::class) +val useCasesKoinModule = module { +// includedModules.add(repositoryKoinModule) + +// factoryOf(DataUseCase::AddData) +// factoryOf(DataUseCase::EditData) +// factoryOf(DataUseCase::DeleteData) +// factoryOf(DataUseCase::DeleteAllTrashedData) +// +// factoryOf(LinkUseCase::AddLink) +// factoryOf(LinkUseCase::DeleteLink) +// factoryOf(LinkUseCase::GetAllLinks) +// +// factoryOf(NoteAndLinkUseCase::AddNoteAndLink) +// factoryOf(NoteAndLinkUseCase::DeleteNoteAndLink) +// factoryOf(NoteAndLinkUseCase::GetAllNotesAndLinks) +// +// factoryOf(NoteAndTagUseCase::AddNoteAndTag) +// factoryOf(NoteAndTagUseCase::DeleteNoteAndTag) +// factoryOf(NoteAndTagUseCase::GetAllNotesAndTags) +// +// factoryOf(NoteAndTaskUseCase::AddNoteAndTask) +// factoryOf(NoteAndTaskUseCase::DeleteNoteAndTask) +// factoryOf(NoteAndTaskUseCase::GetAllNotesAndTask) +// +// factoryOf(NoteUseCase::GetAllNotesById) +// factoryOf(NoteUseCase::GetAllNotesByName) +// factoryOf(NoteUseCase::GetAllNotesByNewest) +// factoryOf(NoteUseCase::GetAllRemindingNotes) +// factoryOf(NoteUseCase::GetAllNotesByOldest) +// factoryOf(NoteUseCase::GetAllNotesByPriority) +// factoryOf(NoteUseCase::GetAllTrashedNotes) +// +// factoryOf(TagUseCase::AddTag) +// factoryOf(TagUseCase::DeleteTag) +// factoryOf(TagUseCase::UpdateTag) +// factoryOf(TagUseCase::GetAllTags) +// +// factoryOf(TaskUseCase::AddTaskItem) +// factoryOf(TaskUseCase::DeleteTaskItem) +// factoryOf(TaskUseCase::UpdateTaskItem) +// factoryOf(TaskUseCase::GetAllTaskItems) +// +// factoryOf(WidgetUseCase::GetAllWidgetMainEntityById) +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/exoplayer/ExoPlayerImpl.kt b/domain/src/main/java/city/zouitel/domain/exoplayer/ExoPlayerImpl.kt similarity index 92% rename from domain/src/main/java/com/example/domain/exoplayer/ExoPlayerImpl.kt rename to domain/src/main/java/city/zouitel/domain/exoplayer/ExoPlayerImpl.kt index a8f729f3..2e44ed9c 100644 --- a/domain/src/main/java/com/example/domain/exoplayer/ExoPlayerImpl.kt +++ b/domain/src/main/java/city/zouitel/domain/exoplayer/ExoPlayerImpl.kt @@ -1,4 +1,4 @@ -package com.example.domain.exoplayer +package city.zouitel.domain.exoplayer import android.content.Context import android.media.MediaMetadataRetriever @@ -6,9 +6,8 @@ import androidx.core.net.toUri import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.MediaItem import java.io.File -import javax.inject.Inject -class ExoPlayerImpl @Inject constructor ( +class ExoPlayerImpl ( private val exo: ExoPlayer, ): ExoRepo { diff --git a/domain/src/main/java/com/example/domain/exoplayer/ExoRepo.kt b/domain/src/main/java/city/zouitel/domain/exoplayer/ExoRepo.kt similarity index 89% rename from domain/src/main/java/com/example/domain/exoplayer/ExoRepo.kt rename to domain/src/main/java/city/zouitel/domain/exoplayer/ExoRepo.kt index 3c51543e..5541751c 100644 --- a/domain/src/main/java/com/example/domain/exoplayer/ExoRepo.kt +++ b/domain/src/main/java/city/zouitel/domain/exoplayer/ExoRepo.kt @@ -1,4 +1,4 @@ -package com.example.domain.exoplayer +package city.zouitel.domain.exoplayer import android.content.Context import com.google.android.exoplayer2.ExoPlayer diff --git a/domain/src/main/java/com/example/domain/model/Data.kt b/domain/src/main/java/city/zouitel/domain/model/Data.kt similarity index 84% rename from domain/src/main/java/com/example/domain/model/Data.kt rename to domain/src/main/java/city/zouitel/domain/model/Data.kt index 05ea4cf3..082937c7 100644 --- a/domain/src/main/java/com/example/domain/model/Data.kt +++ b/domain/src/main/java/city/zouitel/domain/model/Data.kt @@ -1,7 +1,7 @@ -package com.example.domain.model +package city.zouitel.domain.model import androidx.annotation.Keep -import com.example.domain.utils.Constants.NON +import city.zouitel.domain.utils.Constants.NON @Keep data class Data( diff --git a/domain/src/main/java/com/example/domain/model/Link.kt b/domain/src/main/java/city/zouitel/domain/model/Link.kt similarity index 87% rename from domain/src/main/java/com/example/domain/model/Link.kt rename to domain/src/main/java/city/zouitel/domain/model/Link.kt index 68128f83..24ea799f 100644 --- a/domain/src/main/java/com/example/domain/model/Link.kt +++ b/domain/src/main/java/city/zouitel/domain/model/Link.kt @@ -1,4 +1,4 @@ -package com.example.domain.model +package city.zouitel.domain.model import androidx.annotation.Keep diff --git a/domain/src/main/java/com/example/domain/model/Note.kt b/domain/src/main/java/city/zouitel/domain/model/Note.kt similarity index 84% rename from domain/src/main/java/com/example/domain/model/Note.kt rename to domain/src/main/java/city/zouitel/domain/model/Note.kt index 312f3369..53ef6dbc 100644 --- a/domain/src/main/java/com/example/domain/model/Note.kt +++ b/domain/src/main/java/city/zouitel/domain/model/Note.kt @@ -1,4 +1,4 @@ -package com.example.domain.model +package city.zouitel.domain.model import androidx.annotation.Keep diff --git a/domain/src/main/java/com/example/domain/model/NoteAndLink.kt b/domain/src/main/java/city/zouitel/domain/model/NoteAndLink.kt similarity index 77% rename from domain/src/main/java/com/example/domain/model/NoteAndLink.kt rename to domain/src/main/java/city/zouitel/domain/model/NoteAndLink.kt index d02802e9..988d926a 100644 --- a/domain/src/main/java/com/example/domain/model/NoteAndLink.kt +++ b/domain/src/main/java/city/zouitel/domain/model/NoteAndLink.kt @@ -1,4 +1,4 @@ -package com.example.domain.model +package city.zouitel.domain.model import androidx.annotation.Keep diff --git a/domain/src/main/java/com/example/domain/model/NoteAndTag.kt b/domain/src/main/java/city/zouitel/domain/model/NoteAndTag.kt similarity index 76% rename from domain/src/main/java/com/example/domain/model/NoteAndTag.kt rename to domain/src/main/java/city/zouitel/domain/model/NoteAndTag.kt index 5895b203..11daec23 100644 --- a/domain/src/main/java/com/example/domain/model/NoteAndTag.kt +++ b/domain/src/main/java/city/zouitel/domain/model/NoteAndTag.kt @@ -1,4 +1,4 @@ -package com.example.domain.model +package city.zouitel.domain.model import androidx.annotation.Keep diff --git a/domain/src/main/java/com/example/domain/model/NoteAndTask.kt b/domain/src/main/java/city/zouitel/domain/model/NoteAndTask.kt similarity index 76% rename from domain/src/main/java/com/example/domain/model/NoteAndTask.kt rename to domain/src/main/java/city/zouitel/domain/model/NoteAndTask.kt index 4abe2b32..3c3c55c1 100644 --- a/domain/src/main/java/com/example/domain/model/NoteAndTask.kt +++ b/domain/src/main/java/city/zouitel/domain/model/NoteAndTask.kt @@ -1,4 +1,4 @@ -package com.example.domain.model +package city.zouitel.domain.model import androidx.annotation.Keep diff --git a/domain/src/main/java/com/example/domain/model/Tag.kt b/domain/src/main/java/city/zouitel/domain/model/Tag.kt similarity index 80% rename from domain/src/main/java/com/example/domain/model/Tag.kt rename to domain/src/main/java/city/zouitel/domain/model/Tag.kt index 9cee8669..35e027e7 100644 --- a/domain/src/main/java/com/example/domain/model/Tag.kt +++ b/domain/src/main/java/city/zouitel/domain/model/Tag.kt @@ -1,4 +1,4 @@ -package com.example.domain.model +package city.zouitel.domain.model import androidx.annotation.Keep diff --git a/ui/features/tasks/src/main/java/com/example/tasks/model/Task.kt b/domain/src/main/java/city/zouitel/domain/model/Task.kt similarity index 80% rename from ui/features/tasks/src/main/java/com/example/tasks/model/Task.kt rename to domain/src/main/java/city/zouitel/domain/model/Task.kt index 5757e411..26cefc7d 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/model/Task.kt +++ b/domain/src/main/java/city/zouitel/domain/model/Task.kt @@ -1,4 +1,4 @@ -package com.example.tasks.model +package city.zouitel.domain.model import androidx.annotation.Keep diff --git a/domain/src/main/java/com/example/domain/repository/DataRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/DataRepository.kt similarity index 68% rename from domain/src/main/java/com/example/domain/repository/DataRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/DataRepository.kt index de566895..2008476e 100644 --- a/domain/src/main/java/com/example/domain/repository/DataRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/DataRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.Data as OutData +import city.zouitel.domain.model.Data as OutData interface DataRepository { diff --git a/domain/src/main/java/com/example/domain/repository/ExoRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/ExoRepository.kt similarity index 89% rename from domain/src/main/java/com/example/domain/repository/ExoRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/ExoRepository.kt index 1a4568dc..3deefc40 100644 --- a/domain/src/main/java/com/example/domain/repository/ExoRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/ExoRepository.kt @@ -1,4 +1,4 @@ -package com.example.domain.repository +package city.zouitel.domain.repository import android.content.Context import com.google.android.exoplayer2.ExoPlayer diff --git a/domain/src/main/java/com/example/domain/repository/LinkRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/LinkRepository.kt similarity index 70% rename from domain/src/main/java/com/example/domain/repository/LinkRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/LinkRepository.kt index 738acf8a..efafae80 100644 --- a/domain/src/main/java/com/example/domain/repository/LinkRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/LinkRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.Link +import city.zouitel.domain.model.Link import kotlinx.coroutines.flow.Flow interface LinkRepository { diff --git a/domain/src/main/java/com/example/domain/repository/NoteAndLinkRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/NoteAndLinkRepository.kt similarity index 71% rename from domain/src/main/java/com/example/domain/repository/NoteAndLinkRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/NoteAndLinkRepository.kt index 8aebb276..bad17871 100644 --- a/domain/src/main/java/com/example/domain/repository/NoteAndLinkRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/NoteAndLinkRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.NoteAndLink as OutNoteAndLink +import city.zouitel.domain.model.NoteAndLink as OutNoteAndLink import kotlinx.coroutines.flow.Flow interface NoteAndLinkRepository { diff --git a/domain/src/main/java/com/example/domain/repository/NoteAndTagRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/NoteAndTagRepository.kt similarity index 71% rename from domain/src/main/java/com/example/domain/repository/NoteAndTagRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/NoteAndTagRepository.kt index 3e087473..b1ee6343 100644 --- a/domain/src/main/java/com/example/domain/repository/NoteAndTagRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/NoteAndTagRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.NoteAndTag as OutNoteAndTag +import city.zouitel.domain.model.NoteAndTag as OutNoteAndTag import kotlinx.coroutines.flow.Flow interface NoteAndTagRepository { diff --git a/domain/src/main/java/com/example/domain/repository/NoteAndTaskRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/NoteAndTaskRepository.kt similarity index 71% rename from domain/src/main/java/com/example/domain/repository/NoteAndTaskRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/NoteAndTaskRepository.kt index ee34a73a..57667d24 100644 --- a/domain/src/main/java/com/example/domain/repository/NoteAndTaskRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/NoteAndTaskRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.NoteAndTask as OutNoteAndTask +import city.zouitel.domain.model.NoteAndTask as OutNoteAndTask import kotlinx.coroutines.flow.Flow interface NoteAndTaskRepository { diff --git a/domain/src/main/java/com/example/domain/repository/NoteRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/NoteRepository.kt similarity index 82% rename from domain/src/main/java/com/example/domain/repository/NoteRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/NoteRepository.kt index 51d1e80f..71f77840 100644 --- a/domain/src/main/java/com/example/domain/repository/NoteRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/NoteRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.Note as OutNote +import city.zouitel.domain.model.Note as OutNote import kotlinx.coroutines.flow.Flow interface NoteRepository { diff --git a/domain/src/main/java/com/example/domain/repository/TagRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/TagRepository.kt similarity index 71% rename from domain/src/main/java/com/example/domain/repository/TagRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/TagRepository.kt index fddd4bbe..3dc05ecf 100644 --- a/domain/src/main/java/com/example/domain/repository/TagRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/TagRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.Tag as OutTag +import city.zouitel.domain.model.Tag as OutTag import kotlinx.coroutines.flow.Flow interface TagRepository { diff --git a/domain/src/main/java/com/example/domain/repository/TaskRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/TaskRepository.kt similarity index 73% rename from domain/src/main/java/com/example/domain/repository/TaskRepository.kt rename to domain/src/main/java/city/zouitel/domain/repository/TaskRepository.kt index 7187a47e..a6f2ec49 100644 --- a/domain/src/main/java/com/example/domain/repository/TaskRepository.kt +++ b/domain/src/main/java/city/zouitel/domain/repository/TaskRepository.kt @@ -1,6 +1,6 @@ -package com.example.domain.repository +package city.zouitel.domain.repository -import com.example.domain.model.Task as OutTask +import city.zouitel.domain.model.Task as OutTask import kotlinx.coroutines.flow.Flow interface TaskRepository { diff --git a/domain/src/main/java/city/zouitel/domain/repository/WidgetRepository.kt b/domain/src/main/java/city/zouitel/domain/repository/WidgetRepository.kt new file mode 100644 index 00000000..6ea9cd5e --- /dev/null +++ b/domain/src/main/java/city/zouitel/domain/repository/WidgetRepository.kt @@ -0,0 +1,9 @@ +package city.zouitel.domain.repository + +import city.zouitel.domain.model.Note as OutNote + + +interface WidgetRepository { + + val getAllWidgetMainEntityById: List +} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/DataUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/DataUseCase.kt similarity index 63% rename from domain/src/main/java/com/example/domain/usecase/DataUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/DataUseCase.kt index bd129868..d2a7ba61 100644 --- a/domain/src/main/java/com/example/domain/usecase/DataUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/DataUseCase.kt @@ -1,32 +1,29 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.model.Data -import com.example.domain.repository.DataRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.model.Data +import city.zouitel.domain.repository.DataRepository -@Singleton sealed class DataUseCase { - class AddData @Inject constructor ( + class AddData ( private val repository: DataRepository ): DataUseCase() { suspend operator fun invoke(data: Data) = repository.addData(data) } - class EditData @Inject constructor( + class EditData /*@Inject*/ constructor( private val repository: DataRepository ): DataUseCase() { suspend operator fun invoke(data: Data) = repository.editData(data) } - class DeleteData @Inject constructor( + class DeleteData /*@Inject*/ constructor( private val repository: DataRepository ): DataUseCase() { suspend operator fun invoke(data: Data) = repository.deleteData(data) } - class DeleteAllTrashedData @Inject constructor( + class DeleteAllTrashedData /*@Inject*/ constructor( private val repository: DataRepository ) : DataUseCase() { suspend operator fun invoke() = repository.deleteAllTrashedData() diff --git a/domain/src/main/java/com/example/domain/usecase/LinkUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/LinkUseCase.kt similarity index 59% rename from domain/src/main/java/com/example/domain/usecase/LinkUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/LinkUseCase.kt index 39539b23..850124be 100644 --- a/domain/src/main/java/com/example/domain/usecase/LinkUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/LinkUseCase.kt @@ -1,25 +1,23 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.model.Link -import com.example.domain.repository.LinkRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.model.Link +import city.zouitel.domain.repository.LinkRepository -@Singleton +//@Singleton sealed class LinkUseCase { - class GetAllLinks @Inject constructor( + class GetAllLinks /*@Inject*/ constructor( private val repository: LinkRepository ): LinkUseCase() { operator fun invoke() = repository.getAllLinks } - class AddLink @Inject constructor( + class AddLink /*@Inject*/ constructor( private val repository: LinkRepository ): LinkUseCase() { suspend operator fun invoke(link: Link) = repository.addLink(link) } - class DeleteLink @Inject constructor( + class DeleteLink /*@Inject*/ constructor( private val repository: LinkRepository ): LinkUseCase() { suspend operator fun invoke(link: Link) = repository.deleteLink(link) diff --git a/domain/src/main/java/com/example/domain/usecase/NoteAndLinkUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/NoteAndLinkUseCase.kt similarity index 59% rename from domain/src/main/java/com/example/domain/usecase/NoteAndLinkUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/NoteAndLinkUseCase.kt index d9f7a53d..e891548d 100644 --- a/domain/src/main/java/com/example/domain/usecase/NoteAndLinkUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/NoteAndLinkUseCase.kt @@ -1,26 +1,24 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.model.Link -import com.example.domain.model.NoteAndLink -import com.example.domain.repository.NoteAndLinkRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.model.Link +import city.zouitel.domain.model.NoteAndLink +import city.zouitel.domain.repository.NoteAndLinkRepository -@Singleton +//@Singleton sealed class NoteAndLinkUseCase { - class GetAllNotesAndLinks @Inject constructor( + class GetAllNotesAndLinks /*@Inject*/ constructor( private val repository: NoteAndLinkRepository ): NoteAndLinkUseCase() { operator fun invoke() = repository.getAllNotesAndLinks } - class AddNoteAndLink @Inject constructor( + class AddNoteAndLink /*@Inject*/ constructor( private val repository: NoteAndLinkRepository ): NoteAndLinkUseCase() { suspend operator fun invoke(noteAndLink: NoteAndLink) = repository.addNoteAndLink(noteAndLink) } - class DeleteNoteAndLink @Inject constructor( + class DeleteNoteAndLink /*@Inject*/ constructor( private val repository: NoteAndLinkRepository ): NoteAndLinkUseCase() { suspend operator fun invoke(noteAndLink: NoteAndLink) = repository.deleteNoteAndLink(noteAndLink) diff --git a/domain/src/main/java/com/example/domain/usecase/NoteAndTagUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/NoteAndTagUseCase.kt similarity index 61% rename from domain/src/main/java/com/example/domain/usecase/NoteAndTagUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/NoteAndTagUseCase.kt index a3c96b1d..e66bec29 100644 --- a/domain/src/main/java/com/example/domain/usecase/NoteAndTagUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/NoteAndTagUseCase.kt @@ -1,25 +1,23 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.model.NoteAndTag -import com.example.domain.repository.NoteAndTagRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.model.NoteAndTag +import city.zouitel.domain.repository.NoteAndTagRepository -@Singleton +//@Singleton sealed class NoteAndTagUseCase { - class GetAllNotesAndTags @Inject constructor( + class GetAllNotesAndTags /*@Inject*/ constructor( private val repository: NoteAndTagRepository ): NoteAndTagUseCase() { operator fun invoke() = repository.getAllNotesAndTags } - class AddNoteAndTag @Inject constructor( + class AddNoteAndTag /*@Inject*/ constructor( private val repository: NoteAndTagRepository ): NoteAndTagUseCase() { suspend operator fun invoke(noteAndTag: NoteAndTag) = repository.addNoteAndTag(noteAndTag) } - class DeleteNoteAndTag @Inject constructor( + class DeleteNoteAndTag /*@Inject*/ constructor( private val repository: NoteAndTagRepository ): NoteAndTagUseCase() { suspend operator fun invoke(noteAndTag: NoteAndTag) = repository.deleteNoteAndTag(noteAndTag) diff --git a/domain/src/main/java/com/example/domain/usecase/NoteAndTaskUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/NoteAndTaskUseCase.kt similarity index 62% rename from domain/src/main/java/com/example/domain/usecase/NoteAndTaskUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/NoteAndTaskUseCase.kt index f10452dc..c4164ca5 100644 --- a/domain/src/main/java/com/example/domain/usecase/NoteAndTaskUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/NoteAndTaskUseCase.kt @@ -1,26 +1,24 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.model.NoteAndTask -import com.example.domain.repository.NoteAndTaskRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.model.NoteAndTask +import city.zouitel.domain.repository.NoteAndTaskRepository -@Singleton +//@Singleton sealed class NoteAndTaskUseCase { - class GetAllNotesAndTask @Inject constructor( + class GetAllNotesAndTask /*@Inject*/ constructor( private val repository: NoteAndTaskRepository ): NoteAndTaskUseCase() { operator fun invoke() = repository.getAllNotesAndTask } - class AddNoteAndTask @Inject constructor( + class AddNoteAndTask /*@Inject*/ constructor( private val repository: NoteAndTaskRepository ): NoteAndTaskUseCase() { suspend operator fun invoke(noteAndTask: NoteAndTask) = repository.addNoteAndTask(noteAndTask) } - class DeleteNoteAndTask @Inject constructor( + class DeleteNoteAndTask /*@Inject*/ constructor( private val repository: NoteAndTaskRepository ): NoteAndTaskUseCase() { suspend operator fun invoke(noteAndTask: NoteAndTask) = repository.deleteNoteAndTask(noteAndTask) diff --git a/domain/src/main/java/com/example/domain/usecase/NoteUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/NoteUseCase.kt similarity index 66% rename from domain/src/main/java/com/example/domain/usecase/NoteUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/NoteUseCase.kt index f0ebf748..08b0cdec 100644 --- a/domain/src/main/java/com/example/domain/usecase/NoteUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/NoteUseCase.kt @@ -1,49 +1,47 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.repository.NoteRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.repository.NoteRepository -@Singleton +//@Singleton sealed class NoteUseCase { - class GetAllNotesById @Inject constructor( + class GetAllNotesById /*@Inject*/ constructor( private val repository: NoteRepository ): NoteUseCase() { operator fun invoke() = repository.getAllNotesById } - class GetAllNotesByName @Inject constructor( + class GetAllNotesByName /*@Inject*/ constructor( private val repository: NoteRepository ): NoteUseCase() { operator fun invoke() = repository.getAllNotesByName } - class GetAllNotesByNewest @Inject constructor( + class GetAllNotesByNewest /*@Inject*/ constructor( private val repository: NoteRepository ): NoteUseCase() { operator fun invoke() = repository.getAllNotesByNewest } - class GetAllNotesByOldest @Inject constructor( + class GetAllNotesByOldest /*@Inject*/ constructor( private val repository: NoteRepository ): NoteUseCase() { operator fun invoke() = repository.getAllNotesByOldest } - class GetAllTrashedNotes @Inject constructor( + class GetAllTrashedNotes /*@Inject*/ constructor( private val repository: NoteRepository ): NoteUseCase() { operator fun invoke() = repository.getAllTrashedNotes } - class GetAllNotesByPriority @Inject constructor( + class GetAllNotesByPriority /*@Inject*/ constructor( private val repository: NoteRepository ): NoteUseCase() { operator fun invoke() = repository.allNotesByPriority } - class GetAllRemindingNotes @Inject constructor( + class GetAllRemindingNotes /*@Inject*/ constructor( private val repository: NoteRepository ): NoteUseCase() { operator fun invoke() = repository.getAllRemindingNotes diff --git a/domain/src/main/java/com/example/domain/usecase/TagUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/TagUseCase.kt similarity index 63% rename from domain/src/main/java/com/example/domain/usecase/TagUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/TagUseCase.kt index 7210eaae..3810157c 100644 --- a/domain/src/main/java/com/example/domain/usecase/TagUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/TagUseCase.kt @@ -1,32 +1,30 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.model.Tag -import com.example.domain.repository.TagRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.model.Tag +import city.zouitel.domain.repository.TagRepository -@Singleton +//@Singleton sealed class TagUseCase { - class GetAllTags @Inject constructor( + class GetAllTags /*@Inject*/ constructor( private val repository: TagRepository ): TagUseCase() { operator fun invoke() = repository.getAllTags } - class AddTag @Inject constructor( + class AddTag /*@Inject*/ constructor( private val repository: TagRepository ): TagUseCase() { suspend operator fun invoke(tag: Tag) = repository.addTag(tag) } - class UpdateTag @Inject constructor( + class UpdateTag /*@Inject*/ constructor( private val repository: TagRepository ): TagUseCase() { suspend operator fun invoke(tag: Tag) = repository.updateTag(tag) } - class DeleteTag @Inject constructor( + class DeleteTag /*@Inject*/ constructor( private val repository: TagRepository ): TagUseCase() { suspend operator fun invoke(tag: Tag) = repository.deleteTag(tag) diff --git a/domain/src/main/java/com/example/domain/usecase/TaskUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/TaskUseCase.kt similarity index 63% rename from domain/src/main/java/com/example/domain/usecase/TaskUseCase.kt rename to domain/src/main/java/city/zouitel/domain/usecase/TaskUseCase.kt index 2c13aed2..6e5e6297 100644 --- a/domain/src/main/java/com/example/domain/usecase/TaskUseCase.kt +++ b/domain/src/main/java/city/zouitel/domain/usecase/TaskUseCase.kt @@ -1,32 +1,30 @@ -package com.example.domain.usecase +package city.zouitel.domain.usecase -import com.example.domain.model.Task -import com.example.domain.repository.TaskRepository -import javax.inject.Inject -import javax.inject.Singleton +import city.zouitel.domain.model.Task +import city.zouitel.domain.repository.TaskRepository -@Singleton +//@Singleton sealed class TaskUseCase { - class GetAllTaskItems @Inject constructor( + class GetAllTaskItems /*@Inject*/ constructor( private val repository: TaskRepository ): TaskUseCase() { operator fun invoke() = repository.getAllTaskItems } - class AddTaskItem @Inject constructor( + class AddTaskItem /*@Inject*/ constructor( private val repository: TaskRepository ): TaskUseCase() { suspend operator fun invoke(task: Task) = repository.addTaskItem(task) } - class UpdateTaskItem @Inject constructor( + class UpdateTaskItem /*@Inject*/ constructor( private val repository: TaskRepository ): TaskUseCase() { suspend operator fun invoke(task: Task) = repository.updateTaskItem(task) } - class DeleteTaskItem @Inject constructor( + class DeleteTaskItem /*@Inject*/ constructor( private val repository: TaskRepository ): TaskUseCase() { suspend operator fun invoke(task: Task) = repository.deleteTaskItem(task) diff --git a/domain/src/main/java/city/zouitel/domain/usecase/WidgetUseCase.kt b/domain/src/main/java/city/zouitel/domain/usecase/WidgetUseCase.kt new file mode 100644 index 00000000..c4e2135e --- /dev/null +++ b/domain/src/main/java/city/zouitel/domain/usecase/WidgetUseCase.kt @@ -0,0 +1,13 @@ +package city.zouitel.domain.usecase + +import city.zouitel.domain.repository.WidgetRepository + +//@Singleton +sealed class WidgetUseCase { + + class GetAllWidgetMainEntityById /*@Inject*/ constructor( + private val repository: WidgetRepository + ): WidgetUseCase() { + operator fun invoke() = repository.getAllWidgetMainEntityById + } +} diff --git a/domain/src/main/java/com/example/domain/utils/Constants.kt b/domain/src/main/java/city/zouitel/domain/utils/Constants.kt similarity index 62% rename from domain/src/main/java/com/example/domain/utils/Constants.kt rename to domain/src/main/java/city/zouitel/domain/utils/Constants.kt index ba85cb6c..b10a2509 100644 --- a/domain/src/main/java/com/example/domain/utils/Constants.kt +++ b/domain/src/main/java/city/zouitel/domain/utils/Constants.kt @@ -1,4 +1,4 @@ -package com.example.domain.utils +package city.zouitel.domain.utils object Constants { const val NON = "non_specified" diff --git a/domain/src/main/java/com/example/domain/utils/Dispatcher.kt b/domain/src/main/java/city/zouitel/domain/utils/Dispatcher.kt similarity index 60% rename from domain/src/main/java/com/example/domain/utils/Dispatcher.kt rename to domain/src/main/java/city/zouitel/domain/utils/Dispatcher.kt index 6208c305..be3b9136 100644 --- a/domain/src/main/java/com/example/domain/utils/Dispatcher.kt +++ b/domain/src/main/java/city/zouitel/domain/utils/Dispatcher.kt @@ -1,7 +1,7 @@ -package com.example.domain.utils +package city.zouitel.domain.utils -import javax.inject.Qualifier +//import javax.inject.Qualifier @Retention(AnnotationRetention.RUNTIME) -@Qualifier +//@Qualifier annotation class Dispatcher(val dispatcher: Dispatchers = Dispatchers.DEFAULT) diff --git a/domain/src/main/java/com/example/domain/utils/Dispatchers.kt b/domain/src/main/java/city/zouitel/domain/utils/Dispatchers.kt similarity index 63% rename from domain/src/main/java/com/example/domain/utils/Dispatchers.kt rename to domain/src/main/java/city/zouitel/domain/utils/Dispatchers.kt index 9a23fd6a..fd422e17 100644 --- a/domain/src/main/java/com/example/domain/utils/Dispatchers.kt +++ b/domain/src/main/java/city/zouitel/domain/utils/Dispatchers.kt @@ -1,4 +1,4 @@ -package com.example.domain.utils +package city.zouitel.domain.utils enum class Dispatchers { DEFAULT, diff --git a/domain/src/main/java/com/example/domain/di/ExoPlayerModule.kt b/domain/src/main/java/com/example/domain/di/ExoPlayerModule.kt deleted file mode 100644 index f5d458a3..00000000 --- a/domain/src/main/java/com/example/domain/di/ExoPlayerModule.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.domain.di - -import com.example.domain.exoplayer.ExoPlayerImpl -import com.google.android.exoplayer2.ExoPlayer -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -object ExoPlayerModule { - - @Singleton - @Provides - fun provideExoPlayer(exo: ExoPlayer) = ExoPlayerImpl(exo) -} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/repository/WidgetRepository.kt b/domain/src/main/java/com/example/domain/repository/WidgetRepository.kt deleted file mode 100644 index 441dfd96..00000000 --- a/domain/src/main/java/com/example/domain/repository/WidgetRepository.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.domain.repository - -import com.example.domain.model.Note as OutNote - - -interface WidgetRepository { - - val getAllWidgetMainEntityById: List -} \ No newline at end of file diff --git a/domain/src/main/java/com/example/domain/usecase/WidgetUseCase.kt b/domain/src/main/java/com/example/domain/usecase/WidgetUseCase.kt deleted file mode 100644 index ae531284..00000000 --- a/domain/src/main/java/com/example/domain/usecase/WidgetUseCase.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.domain.usecase - -import com.example.domain.repository.WidgetRepository -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -sealed class WidgetUseCase { - - class GetAllWidgetMainEntityById @Inject constructor( - private val repository: WidgetRepository - ): WidgetUseCase() { - operator fun invoke() = repository.getAllWidgetMainEntityById - } -} diff --git a/domain/src/test/java/city/zouitel/domain/ExampleUnitTest.kt b/domain/src/test/java/city/zouitel/domain/ExampleUnitTest.kt new file mode 100644 index 00000000..f724b8de --- /dev/null +++ b/domain/src/test/java/city/zouitel/domain/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.domain + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/enigma-backup/.gitignore b/enigma-backup/.gitignore new file mode 100644 index 00000000..e7a210ec --- /dev/null +++ b/enigma-backup/.gitignore @@ -0,0 +1,3 @@ +* +*/ +!.gitignore \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3cb31190..3c5031eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true # AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK +# Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": @@ -20,14 +20,4 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true -org.gradle.parallel=true -android.enableJetifier=true -#Enable more aggressive optimizations for R8. -android.enableR8.fullMode=true - -# Set the property here so it matches the configuration cache fingerprint of the :build-logic-commons and :build-logic builds -systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true - -#To determine what is calling splits.density. -android.debug.obsoleteApi=true \ No newline at end of file +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/libraries.versions.toml b/gradle/libraries.versions.toml deleted file mode 100644 index d3e33781..00000000 --- a/gradle/libraries.versions.toml +++ /dev/null @@ -1,216 +0,0 @@ -[versions] -# Project -gradle = "8.1.0" -kotlin = "1.9.10" - -# Plugins -ksp = "1.9.10-1.0.13" -dependencyanalysis = "1.25.0" - -# KotlinX -kotlinx_serialization = "1.6.0" -kotlinx_coroutines = "1.7.3" - -#AndroidX. -core = "1.12.0" -corektx = "1.12.0" -appcompat = "1.6.1" -runtimektx = "2.6.2" -constraintlayout = "2.1.4" -extjunit = "1.1.5" -glance = "1.0.0" -security = "1.0.0" -workmanager = "2.9.0" -startup = "1.1.1" -lifecycle = "2.6.2" - -#Compose. -comp = "1.5.4" -comp_nav = "2.7.6" -comp_viewmodel = "2.6.2" -comp_activity = "1.8.2" -comp_material3 = "1.1.2" -comp_constraintlayout = "1.1.0-alpha13" - -# Koin -#koin_core = "3.5.0" -#koin_compose = "3.5.0" -#koin_android = "3.5.0" - -#Exo. -exoplayer = "2.19.1" - -#Room. -room = "2.6.1" - -#Datastore. -datastore = "1.0.0" - -#Livedata. -livedatakts = "2.6.2" - -#Dagger-Hilt. -dagger_hilt = "2.48" -hilt_nav_comp = "1.1.0" -hilt_compiler = "1.1.0" -hilt-work = "1.1.0" - -#Accompanist. -accompanist = "0.28.0" - -#CameraX. -camerax = "1.3.1" - -#Glide. -#glide = "4.15.0" -#glide_comp = "4.14.0" - -#Coil -coil_compose = "2.2.1" -coil_svg = "2.2.2" - -#License. -about_libraries = "10.9.2" - -#Retrofit. -retrofit = "2.9.0" - -#Okhttp -okhttp = "5.0.0-alpha.1" - -#Junit. -junit = "4.13.2" - -#Others. -sketchbook = "1.0.4" -swipe = "1.1.1" -global_exception = "1.0.1" -url_preview = "1.0.1" -beetle = "2.0.1" -sqlcipher = "4.5.3" - -[libraries] -#Kotlin -kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } - -#KotlinX -#kotlinx_serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx_serialization" } -kotlinx_coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx_coroutines" } - -#AndroidX. -android_gradle_plugin = { module = "com.android.tools.build:gradle", version.ref = "gradle" } -androidx_core = { module = "androidx.core:core", version.ref = "core" } -androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "corektx" } -androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } -androidx_runtimektx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "runtimektx" } -androidx_constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } -androidx_extjunit = { module = "androidx.test.ext:junit", version.ref = "extjunit" } -androidx_glance = { module = "androidx.glance:glance-appwidget", version.ref = "glance" } -androidx_security = { module = "androidx.security:security-crypto", version.ref = "security" } -androidx_workmanager = { module = "androidx.work:work-runtime-ktx", version.ref = "workmanager" } -androidx_startup = { module = "androidx.startup:startup-runtime", version.ref = "startup" } -androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycle" } -androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" } -androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycle" } - -#Compose. -compose_ui = { module = "androidx.compose.ui:ui", version.ref = "comp" } -compose_toolingpreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "comp" } -compose_navigation = { module = "androidx.navigation:navigation-compose", version.ref = "comp_nav" } -compose_viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "comp_viewmodel" } -compose_activity = { module = "androidx.activity:activity-compose", version.ref = "comp_activity" } -compose_material3 = { module = "androidx.compose.material3:material3", version.ref = "comp_material3" } -compose_constraintlayout = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "comp_constraintlayout" } -compose_uitest = { module = "androidx.compose.ui:ui-test", version.ref = "comp" } -compose_junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "comp" } -compose_manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "comp" } - -#Koin -#koin_core = { module = "io.insert-koin:koin-core", version.ref = "koin_core" } -#koin_android = { module = "io.insert-koin:koin-android", version.ref = "koin_android" } -#koin_compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin_compose" } -#koin_test = { module = "io.insert-koin:koin-test", version.ref = "koin_core" } - -# Exo. -exoplayer_core = { module = "com.google.android.exoplayer:exoplayer-core", version.ref = "exoplayer" } -exoplayer_ui = { module = "com.google.android.exoplayer:exoplayer-ui", version.ref = "exoplayer" } -exoplayer_extension = { module = "com.google.android.exoplayer:extension-mediasession", version.ref = "exoplayer" } - -#Room. -roomkts = { module = "androidx.room:room-ktx", version.ref = "room" } -room_runtime = { module = "androidx.room:room-runtime", version.ref = "room" } -room_compiler = { module = "androidx.room:room-compiler", version.ref = "room" } - -#DataStore. -datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" } - -#Livedata. -livedatakts = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "livedatakts" } - -#Dagger-Hilt. -dagger = { module = "com.google.dagger:dagger", version.ref = "dagger_hilt" } -dagger_compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger_hilt" } -dagger_hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger_hilt" } -dagger_hiltcompiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger_hilt" } -hilt_navcomp = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hilt_nav_comp" } -hilt_compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt_compiler" } -hilt_work = { module = "androidx.hilt:hilt-work", version.ref = "hilt-work" } -dagger_hilt_gradle_plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "dagger_hilt" } - -#Accompanist. -accompanist_permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist_pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } -accompanist_pager_indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanist" } -accompanist_systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } -accompanist_navigation_animation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" } -accompanist_swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist_flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist_insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" } - -#CameraX. -camerax_core = { module = "androidx.camera:camera-core", version.ref = "camerax" } -camerax_lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camerax" } -camerax_view = { module = "androidx.camera:camera-view", version.ref = "camerax" } -camerax_extensions = { module = "androidx.camera:camera-extensions", version.ref = "camerax" } - -#Glide. -#glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" } -#glide_compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glide" } -#glide_comp = { module = "com.github.bumptech.glide:compose", version.ref = "glide_comp" } - -#Coil. -coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil_compose" } -coil_svg = { module = "io.coil-kt:coil-svg", version.ref = "coil_svg" } - -#License. -aboutlibraries_comp = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "about_libraries" } -aboutlibraries_plugin = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "about_libraries" } - -#Retrofit. -#retrofit = "com.squareup.retrofit2:retrofit:2.9.0" -#retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } - -#Okhttp. -#okhttp_bom = { module = "com.squareup.okhttp3:okhttp-bom", version.ref = "okhttp" } -#okhttp_bom_core = { module = "com.squareup.okhttp3:okhttp" } -#okhttp_bom_interceptor = { module = "com.squareup.okhttp3:logging-interceptor" } - -#Junit. -androidx_junit = { module = "junit:junit", version.ref = "junit" } - -#Others. -url_preview = { module = "tw.com.oneup.www:Baha-UrlPreview", version.ref = "url_preview" } -beetle = { module = "com.karacca:beetle", version.ref = "beetle" } -swipe = { module = "me.saket.swipe:swipe", version.ref = "swipe" } -globalexception = { module = "com.github.emirhankolver:GlobalExceptionHandler", version.ref = "global_exception" } -sketchbook = { module = "io.getstream:sketchbook", version.ref = "sketchbook" } -sqlcipher = { module = "net.zetetic:android-database-sqlcipher", version.ref = "sqlcipher" } - -[bundles] -compose = ["compose.ui", "compose.toolingpreview", "compose.material3"] -composetest = ["compose.uitest", "compose.junit4", "compose.manifest"] - -[plugins] -#kotlin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -#ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyanalysis" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..dec52814 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,166 @@ +[versions] +agp = "8.2.1" +kotlin = "1.9.20" + +#Android. +core-ktx = "1.12.0" +junit = "4.13.2" +androidx-test-ext-junit = "1.1.5" +espresso-core = "3.5.1" +lifecycle = "2.7.0" +constraintlayout = "2.1.4" +glance = "1.0.0-alpha05" +security = "1.0.0" +workmanager = "2.9.0" +startup = "1.1.1" + +#Compose. +activity-compose = "1.8.2" +compose-bom = "2023.10.01" +appcompat = "1.6.1" +material = "1.11.0" +navigation-compose = "2.7.6" +compose-constraintlayout = "1.1.0-alpha07" + +#Plugins. +ksp = "1.9.10-1.0.13" +dependencyanalysis = "1.25.0" + +#KotlinX. +serialization = "1.6.0" +coroutines = "1.7.3" + +#Koin. +koin-core = "3.5.0" +koin-compose = "3.5.0" +koin-android = "3.5.0" +koin-worker = "3.5.0" +koin-test = "3.5.0" + +#Room. +room = "2.6.1" + +#Datastore. +datastore = "1.0.0" + +#Exo. +exoplayer = "2.19.1" + +#Accompanist. +accompanist = "0.28.0" + +#CameraX. +camerax = "1.3.1" + +#Coil +coil-compose = "2.2.1" +coil-svg = "2.2.2" + +#License. +license = "10.9.2" + +#Others. +sketchbook = "1.0.4" +swipe = "1.1.1" +global-exception = "1.0.1" +url-preview = "1.0.1" +beetle = "2.0.1" +sqlcipher = "4.5.3" + +[libraries] +# KotlinX +serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } +coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } +#Android. +core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" } +espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" } +lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle" } +lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycle" } +lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" } +lifecycle-compose-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" } +constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } +glance = { module = "androidx.glance:glance-appwidget", version.ref = "glance" } +security = { module = "androidx.security:security-crypto", version.ref = "security" } +workmanager = { module = "androidx.work:work-runtime-ktx", version.ref = "workmanager" } +startup = { module = "androidx.startup:startup-runtime", version.ref = "startup" } + +activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" } +compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" } +ui = { group = "androidx.compose.ui", name = "ui" } +ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +material3 = { group = "androidx.compose.material3", name = "material3" } +appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" } +compose-constraintlayout = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "compose-constraintlayout" } + +#Koin. +koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin-core" } +koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin-android" } +koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin-compose" } +koin-worker = { module = "io.insert-koin:koin-androidx-workmanager", version.ref = "koin-worker" } +koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin-test" } + +#Room. +roomkts = { module = "androidx.room:room-ktx", version.ref = "room" } +room_runtime = { module = "androidx.room:room-runtime", version.ref = "room" } +room_compiler = { module = "androidx.room:room-compiler", version.ref = "room" } + +#DataStore. +datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" } + +# Exo. +exoplayer-core = { module = "com.google.android.exoplayer:exoplayer-core", version.ref = "exoplayer" } +exoplayer-ui = { module = "com.google.android.exoplayer:exoplayer-ui", version.ref = "exoplayer" } +exoplayer-extension = { module = "com.google.android.exoplayer:extension-mediasession", version.ref = "exoplayer" } + +#Accompanist. +accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } +accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } +accompanist-pager_indicators = { module = "com.google.accompanist:accompanist-pager-indicators", version.ref = "accompanist" } +accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } +accompanist-navigation_animation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" } +accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } +accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } +accompanist-insets = { module = "com.google.accompanist:accompanist-insets", version.ref = "accompanist" } + +#CameraX. +camerax-core = { module = "androidx.camera:camera-core", version.ref = "camerax" } +camerax-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camerax" } +camerax-view = { module = "androidx.camera:camera-view", version.ref = "camerax" } +camerax-extensions = { module = "androidx.camera:camera-extensions", version.ref = "camerax" } + +#Coil. +coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" } +coil_svg = { module = "io.coil-kt:coil-svg", version.ref = "coil-svg" } + +#License. +licenses = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "license" } +licenses-plugin = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "license" } + +#Others. +url_preview = { module = "tw.com.oneup.www:Baha-UrlPreview", version.ref = "url-preview" } +beetle = { module = "com.karacca:beetle", version.ref = "beetle" } +swipe = { module = "me.saket.swipe:swipe", version.ref = "swipe" } +#globalexception = { module = "com.github.emirhankolver:GlobalExceptionHandler", version.ref = "global-exception" } +sketchbook = { module = "io.getstream:sketchbook", version.ref = "sketchbook" } +sqlcipher = { module = "net.zetetic:android-database-sqlcipher", version.ref = "sqlcipher" } + +[bundles] +compose = ["ui", "ui-tooling-preview", "material3"] +composetest = ["ui-test-junit4", "ui-test-manifest"] + +[plugins] +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +dependencyanalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyanalysis" } +androidApplication = { id = "com.android.application", version.ref = "agp" } +kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +androidLibrary = { id = "com.android.library", version.ref = "agp" } + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..e708b1c0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 03bc5150..66e5d7c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Sat Jan 20 12:36:46 WAT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..4f906e0c 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/bin/sh +#!/usr/bin/env sh # -# Copyright © 2015-2021 the original authors. +# Copyright 2015 the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,101 +17,67 @@ # ############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # Attempt to set APP_HOME - # Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" warn () { echo "$*" -} >&2 +} die () { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -140,105 +106,80 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi # For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg + i=`expr $i + 1` done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..ac1b06f9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/init/build.gradle.kts b/init/build.gradle.kts index 479cc19a..735cb621 100644 --- a/init/build.gradle.kts +++ b/init/build.gradle.kts @@ -1,19 +1,76 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { namespace = "city.zouitel.init" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { - implementation(libs.androidx.startup) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.worker) + + implementation(libs.startup) //Lifecycle. - implementation(libs.androidx.lifecycle.process) + implementation(libs.lifecycle.process) + + // + implementation(libs.workmanager) //Sqlcipher. implementation (libs.sqlcipher) - implementation("androidx.sqlite:sqlite:2.3.1") + implementation("androidx.sqlite:sqlite-ktx:2.4.0") } \ No newline at end of file diff --git a/init/consumer-rules.pro b/init/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/init/proguard-rules.pro b/init/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/init/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/init/src/androidTest/java/city/zouitel/init/ExampleInstrumentedTest.kt b/init/src/androidTest/java/city/zouitel/init/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..6c2a6d87 --- /dev/null +++ b/init/src/androidTest/java/city/zouitel/init/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.init + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.init.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/init/src/main/AndroidManifest.xml b/init/src/main/AndroidManifest.xml index 1d1f1dd7..768da3dd 100644 --- a/init/src/main/AndroidManifest.xml +++ b/init/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ - { -@Module -@InstallIn(SingletonComponent::class) -object WorkManagerInitializer : Initializer { - - @Provides - @Singleton - override fun create(@ApplicationContext context: Context): WorkManager { - val workFactory = getWorkerFactory(context) - val configuration = Configuration.Builder() - .setWorkerFactory(workFactory) - .build() + override fun create(context: Context): WorkManager { + val configuration = Configuration.Builder().build() WorkManager.initialize(context, configuration) return WorkManager.getInstance(context) } @@ -35,12 +19,4 @@ object WorkManagerInitializer : Initializer { ProcessLifecycleInitializer::class.java ) } - - private fun getWorkerFactory(appContext: Context): HiltWorkerFactory { - val workManagerEntryPoint = EntryPointAccessors.fromApplication( - appContext, - WorkManagerInitializerEntryPoint::class.java - ) - return workManagerEntryPoint.hiltWorkerFactory() - } } \ No newline at end of file diff --git a/init/src/main/java/city/zouitel/init/WorkManagerInitializerEntryPoint.kt b/init/src/main/java/city/zouitel/init/WorkManagerInitializerEntryPoint.kt deleted file mode 100644 index c68153cc..00000000 --- a/init/src/main/java/city/zouitel/init/WorkManagerInitializerEntryPoint.kt +++ /dev/null @@ -1,12 +0,0 @@ -package city.zouitel.init - -import androidx.hilt.work.HiltWorkerFactory -import dagger.hilt.EntryPoint -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent - -@InstallIn(SingletonComponent::class) -@EntryPoint -interface WorkManagerInitializerEntryPoint { - fun hiltWorkerFactory(): HiltWorkerFactory -} \ No newline at end of file diff --git a/init/src/main/java/city/zouitel/init/WorkerDI.kt b/init/src/main/java/city/zouitel/init/WorkerDI.kt new file mode 100644 index 00000000..6f9fa7d9 --- /dev/null +++ b/init/src/main/java/city/zouitel/init/WorkerDI.kt @@ -0,0 +1,7 @@ +package city.zouitel.init + +import org.koin.dsl.module + +val initializerKoinModule = module { + +} \ No newline at end of file diff --git a/init/src/test/java/city/zouitel/init/ExampleUnitTest.kt b/init/src/test/java/city/zouitel/init/ExampleUnitTest.kt new file mode 100644 index 00000000..59623073 --- /dev/null +++ b/init/src/test/java/city/zouitel/init/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.init + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/plugins/.gradle/7.6.1/executionHistory/executionHistory.bin b/plugins/.gradle/7.6.1/executionHistory/executionHistory.bin deleted file mode 100644 index d0e2165e..00000000 Binary files a/plugins/.gradle/7.6.1/executionHistory/executionHistory.bin and /dev/null differ diff --git a/plugins/.gradle/7.6.1/executionHistory/executionHistory.lock b/plugins/.gradle/7.6.1/executionHistory/executionHistory.lock deleted file mode 100644 index d4868019..00000000 Binary files a/plugins/.gradle/7.6.1/executionHistory/executionHistory.lock and /dev/null differ diff --git a/plugins/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/plugins/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index dfc4ba41..00000000 Binary files a/plugins/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/plugins/.gradle/buildOutputCleanup/cache.properties b/plugins/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 57d23ee0..00000000 --- a/plugins/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Fri Jan 12 16:26:14 WAT 2024 -gradle.version=8.3 diff --git a/plugins/.gradle/buildOutputCleanup/outputFiles.bin b/plugins/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index e71546cd..00000000 Binary files a/plugins/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/plugins/.gradle/file-system.probe b/plugins/.gradle/file-system.probe deleted file mode 100644 index e48ea75e..00000000 Binary files a/plugins/.gradle/file-system.probe and /dev/null differ diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts deleted file mode 100644 index 3327f2df..00000000 --- a/plugins/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ - -plugins { - `kotlin-dsl` - `kotlin-dsl-precompiled-script-plugins` -} - -dependencies { - implementation(libs.kotlin) - implementation(libs.android.gradle.plugin) - implementation(libs.dagger.hilt.gradle.plugin) -} - -repositories { - mavenCentral() - google() -} diff --git a/plugins/settings.gradle.kts b/plugins/settings.gradle.kts deleted file mode 100644 index 7997723c..00000000 --- a/plugins/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -dependencyResolutionManagement { - repositories { - mavenCentral() - } - versionCatalogs { - create("libs") { - from(files("../gradle/libraries.versions.toml")) - } - } -} \ No newline at end of file diff --git a/plugins/src/main/java/com/example/plugins/Bundles.kt b/plugins/src/main/java/com/example/plugins/Bundles.kt deleted file mode 100644 index 1230f9c6..00000000 --- a/plugins/src/main/java/com/example/plugins/Bundles.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.plugins - -import org.gradle.api.artifacts.ExternalModuleDependencyBundle -import org.gradle.api.artifacts.MinimalExternalModuleDependency -import org.gradle.api.artifacts.VersionCatalog -import org.gradle.api.provider.Provider - -object Bundles { - - internal val VersionCatalog.compose: Provider - get() = findBundle("compose").get() - - internal val VersionCatalog.composeTest: Provider - get() = findBundle("composetest").get() -} \ No newline at end of file diff --git a/plugins/src/main/java/com/example/plugins/Extensions.kt b/plugins/src/main/java/com/example/plugins/Extensions.kt deleted file mode 100644 index f222e707..00000000 --- a/plugins/src/main/java/com/example/plugins/Extensions.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.example.plugins - -import com.android.build.api.dsl.CommonExtension -import com.android.build.api.dsl.CompileOptions -import com.android.build.api.dsl.LibraryExtension -import com.android.build.api.dsl.Packaging -import org.gradle.api.JavaVersion -import org.gradle.api.plugins.ExtensionAware -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions - - -fun CommonExtension<*, *, *, *, *>.androidConfig() { - defaultConfig { - compileSdk = Versions.compileSdk - minSdk = Versions.minSdk - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - fun Packaging.options() { - resources { - excludes += "/META-INF/{AL2.0,LGPL2.1}" - } - } - - kotlinOptions { - jvmTarget = "1.8" - } -} - -fun CommonExtension<*, *, *, *, *>.composeConfig() { - buildFeatures { - compose = true - } - composeOptions { - kotlinCompilerExtensionVersion = Versions.composeVersion - } -} - -fun LibraryExtension.proguardConfig() { - buildTypes { - release { - isMinifyEnabled = true - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } -} - -private fun CommonExtension<*, *, *, *, *>.kotlinOptions (options: KotlinJvmOptions.() -> Unit) { - (this as ExtensionAware).extensions.configure("kotlinOptions", options) -} diff --git a/plugins/src/main/java/com/example/plugins/Libraries.kt b/plugins/src/main/java/com/example/plugins/Libraries.kt deleted file mode 100644 index 05c7f128..00000000 --- a/plugins/src/main/java/com/example/plugins/Libraries.kt +++ /dev/null @@ -1,66 +0,0 @@ -package com.example.plugins - -import org.gradle.api.artifacts.MinimalExternalModuleDependency -import org.gradle.api.artifacts.VersionCatalog -import org.gradle.api.provider.Provider - -object Libraries { - - //AndroidX. - internal val VersionCatalog.core: Provider - get() = findLibrary("androidx_core").get() - - internal val VersionCatalog.coreKtx: Provider - get() = findLibrary("androidx_corektx").get() - - internal val VersionCatalog.appcompat: Provider - get() = findLibrary("androidx_appcompat").get() - - internal val VersionCatalog.runTimeKtx: Provider - get() = findLibrary("androidx_runtimektx").get() - - //Compose. - internal val VersionCatalog.ui: Provider - get() = findLibrary("compose_ui").get() - - internal val VersionCatalog.toolingPreview: Provider - get() = findLibrary("compose_toolingpreview").get() - - internal val VersionCatalog.navigation: Provider - get() = findLibrary("compose_navigation").get() - - internal val VersionCatalog.viewmodel: Provider - get() = findLibrary("compose_viewmodel").get() - - internal val VersionCatalog.activity: Provider - get() = findLibrary("compose_activity").get() - - internal val VersionCatalog.material3: Provider - get() = findLibrary("compose_material3").get() - - internal val VersionCatalog.constraintLayout: Provider - get() = findLibrary("compose_constraintlayout").get() - - //Dagger-Hilt. - internal val VersionCatalog.dagger: Provider - get() = findLibrary("dagger").get() - - internal val VersionCatalog.compiler: Provider - get() = findLibrary("dagger_compiler").get() - - internal val VersionCatalog.hilt: Provider - get() = findLibrary("dagger_hilt").get() - - internal val VersionCatalog.daggerHiltCompiler: Provider - get() = findLibrary("dagger_hiltcompiler").get() - - internal val VersionCatalog.hiltNavComp: Provider - get() = findLibrary("hilt_navcomp").get() - - internal val VersionCatalog.hiltCompiler: Provider - get() = findLibrary("hilt_compiler").get() - - internal val VersionCatalog.hiltWork: Provider - get() = findLibrary("hilt_work").get() - -} \ No newline at end of file diff --git a/plugins/src/main/java/com/example/plugins/Versions.kt b/plugins/src/main/java/com/example/plugins/Versions.kt deleted file mode 100644 index 376df62b..00000000 --- a/plugins/src/main/java/com/example/plugins/Versions.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.plugins - -object Versions { - const val compileSdk = 34 - const val targetSdk = 33 - const val minSdk = 25 - - const val code = 320 - const val name = "3.2.0" - - const val composeVersion = "1.5.3" -} \ No newline at end of file diff --git a/plugins/src/main/java/com/example/plugins/city.android-lib.gradle.kts b/plugins/src/main/java/com/example/plugins/city.android-lib.gradle.kts deleted file mode 100644 index 70b2c5b4..00000000 --- a/plugins/src/main/java/com/example/plugins/city.android-lib.gradle.kts +++ /dev/null @@ -1,37 +0,0 @@ -import com.example.plugins.Libraries.appcompat -import com.example.plugins.Libraries.core -import com.example.plugins.Libraries.coreKtx -import com.example.plugins.Libraries.runTimeKtx -import com.example.plugins.androidConfig -import com.example.plugins.proguardConfig - -plugins { - id("com.android.library") - id("kotlin-android") -} - -android { - androidConfig() - proguardConfig() -} - -val libs: VersionCatalog = extensions - .getByType() - .named("libs") - -dependencies { - - //AndroidX. - "implementation"(libs.core) - "implementation"(libs.coreKtx) - "implementation"(libs.appcompat) - "implementation"(libs.runTimeKtx) -} - - - - - - - - diff --git a/plugins/src/main/java/com/example/plugins/city.compose-lib.gradle.kts b/plugins/src/main/java/com/example/plugins/city.compose-lib.gradle.kts deleted file mode 100644 index cede98cf..00000000 --- a/plugins/src/main/java/com/example/plugins/city.compose-lib.gradle.kts +++ /dev/null @@ -1,42 +0,0 @@ -import com.example.plugins.Bundles.compose -import com.example.plugins.Bundles.composeTest -import com.example.plugins.Libraries.activity -import com.example.plugins.Libraries.constraintLayout -import com.example.plugins.Libraries.material3 -import com.example.plugins.Libraries.navigation -import com.example.plugins.Libraries.toolingPreview -import com.example.plugins.Libraries.ui -import com.example.plugins.Libraries.viewmodel -import com.example.plugins.androidConfig -import com.example.plugins.composeConfig -import com.example.plugins.proguardConfig -import org.gradle.kotlin.dsl.dependencies -import org.gradle.kotlin.dsl.getByType - -plugins { - id("com.android.library") - id("kotlin-android") -} - -android { - composeConfig() -} - -val libs: VersionCatalog = extensions - .getByType() - .named("libs") - -dependencies { - //Compose Bundle. - "implementation"(libs.compose) - "implementation"(libs.composeTest) - - //Compose Libs. - "implementation"(libs.ui) - "implementation"(libs.material3) - "implementation"(libs.navigation) - "implementation"(libs.viewmodel) - "implementation"(libs.toolingPreview) - "implementation"(libs.activity) - "implementation"(libs.constraintLayout) -} \ No newline at end of file diff --git a/plugins/src/main/java/com/example/plugins/city.dagger-hilt.gradle.kts b/plugins/src/main/java/com/example/plugins/city.dagger-hilt.gradle.kts deleted file mode 100644 index de9b3288..00000000 --- a/plugins/src/main/java/com/example/plugins/city.dagger-hilt.gradle.kts +++ /dev/null @@ -1,37 +0,0 @@ -import com.example.plugins.Libraries.compiler -import com.example.plugins.Libraries.dagger -import com.example.plugins.Libraries.daggerHiltCompiler -import com.example.plugins.Libraries.hilt -import com.example.plugins.Libraries.hiltCompiler -import com.example.plugins.Libraries.hiltNavComp -import com.example.plugins.Libraries.hiltWork -import dagger.hilt.android.plugin.HiltExtension -import org.jetbrains.kotlin.gradle.plugin.KaptExtension - -plugins { - id ("dagger.hilt.android.plugin") - id ("kotlin-kapt") -} - -val libs: VersionCatalog = extensions - .getByType() - .named("libs") - -val hilt = extensions - .getByType() - -val kapt = extensions - .getByType() - -kapt.correctErrorTypes = true -hilt.enableAggregatingTask = true - -dependencies { - "implementation"(libs.dagger) - "implementation"(libs.hilt) - "implementation"(libs.hiltWork) - "implementation"(libs.hiltNavComp) - "kapt"(libs.daggerHiltCompiler) - "kapt"(libs.hiltCompiler) - "kapt"(libs.compiler) -} diff --git a/service/notification/build.gradle.kts b/service/notification/build.gradle.kts deleted file mode 100644 index abb9c5cb..00000000 --- a/service/notification/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - id("city.android-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.notification" -} - -dependencies { - //Projects. - implementation(projects.common.ui) - - //AndroidX. - implementation(libs.androidx.constraintlayout) -} \ No newline at end of file diff --git a/common/mapper/.gitignore b/services/notifications/.gitignore similarity index 100% rename from common/mapper/.gitignore rename to services/notifications/.gitignore diff --git a/services/notifications/build.gradle.kts b/services/notifications/build.gradle.kts new file mode 100644 index 00000000..d8fb69da --- /dev/null +++ b/services/notifications/build.gradle.kts @@ -0,0 +1,66 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.notifications" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + //AndroidX. + implementation(libs.constraintlayout) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) +} \ No newline at end of file diff --git a/services/notifications/consumer-rules.pro b/services/notifications/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/services/notifications/proguard-rules.pro b/services/notifications/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/services/notifications/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/services/notifications/src/androidTest/java/city/zouitel/notifications/ExampleInstrumentedTest.kt b/services/notifications/src/androidTest/java/city/zouitel/notifications/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..1495c1e6 --- /dev/null +++ b/services/notifications/src/androidTest/java/city/zouitel/notifications/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.notifications + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.notifications.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/service/notification/src/main/AndroidManifest.xml b/services/notifications/src/main/AndroidManifest.xml similarity index 100% rename from service/notification/src/main/AndroidManifest.xml rename to services/notifications/src/main/AndroidManifest.xml diff --git a/services/notifications/src/main/java/city/zouitel/notifications/Cons.kt b/services/notifications/src/main/java/city/zouitel/notifications/Cons.kt new file mode 100644 index 00000000..9e2a76fd --- /dev/null +++ b/services/notifications/src/main/java/city/zouitel/notifications/Cons.kt @@ -0,0 +1,14 @@ +package city.zouitel.notifications + +object Cons { + const val NOTIFICATION_ID = 1 + const val CHANNEL_ID = "NOTE_CHANNEL" + const val CHANNEL_NAME = "JETNOTE_NOTIFY" + + const val JPEG = "jpeg" + const val TITLE = "Title" + const val DESCRIPTION = "Description" + const val UID = "Uid" + const val IMAGES = "images_folder" + +} \ No newline at end of file diff --git a/service/notification/src/main/java/com/example/notification/di/NotificationModule.kt b/services/notifications/src/main/java/city/zouitel/notifications/di/NotificationModule.kt similarity index 53% rename from service/notification/src/main/java/com/example/notification/di/NotificationModule.kt rename to services/notifications/src/main/java/city/zouitel/notifications/di/NotificationModule.kt index ed9fac74..8d96a95b 100644 --- a/service/notification/src/main/java/com/example/notification/di/NotificationModule.kt +++ b/services/notifications/src/main/java/city/zouitel/notifications/di/NotificationModule.kt @@ -1,4 +1,4 @@ -package com.example.notification.di +package city.zouitel.notifications.di import android.annotation.SuppressLint import android.app.NotificationChannel @@ -8,24 +8,18 @@ import android.graphics.Color import android.os.Build import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import com.example.common_ui.Cons.CHANNEL_ID -import com.example.common_ui.Cons.CHANNEL_NAME -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.android.qualifiers.ApplicationContext -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton +import city.zouitel.notifications.Cons.CHANNEL_ID +import city.zouitel.notifications.Cons.CHANNEL_NAME -@Module -@InstallIn(SingletonComponent::class) +//@Module +//@InstallIn(SingletonComponent::class) object NotificationModule { @SuppressLint("InvalidColorHexValue") - @Singleton - @Provides +// @Singleton +// @Provides fun notificationBuilder( - @ApplicationContext context: Context + /*@ApplicationContext*/ context: Context ): NotificationCompat.Builder { return NotificationCompat.Builder(context, CHANNEL_ID) .setDefaults(android.app.Notification.DEFAULT_ALL) @@ -37,21 +31,18 @@ object NotificationModule { } @SuppressLint("ServiceCast") - @Singleton - @Provides +// @Singleton +// @Provides fun notificationChannel( - @ApplicationContext context: Context + /*@ApplicationContext*/ context: Context ): NotificationManagerCompat { val notificationManager = NotificationManagerCompat.from(context) - // Create the NotificationChannel, but only on API 26+ - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val channel = NotificationChannel( - CHANNEL_ID, - CHANNEL_NAME, - NotificationManager.IMPORTANCE_DEFAULT - ) - notificationManager.createNotificationChannel(channel) - } + val channel = NotificationChannel( + CHANNEL_ID, + CHANNEL_NAME, + NotificationManager.IMPORTANCE_DEFAULT + ) + notificationManager.createNotificationChannel(channel) return notificationManager } } \ No newline at end of file diff --git a/services/notifications/src/main/java/city/zouitel/notifications/di/notificationDI.kt b/services/notifications/src/main/java/city/zouitel/notifications/di/notificationDI.kt new file mode 100644 index 00000000..ba457fef --- /dev/null +++ b/services/notifications/src/main/java/city/zouitel/notifications/di/notificationDI.kt @@ -0,0 +1,37 @@ +package city.zouitel.notifications.di + +import android.app.NotificationChannel +import android.app.NotificationManager +import android.graphics.Color +import androidx.core.app.NotificationCompat +import androidx.core.app.NotificationManagerCompat +import city.zouitel.notifications.Cons +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.dsl.module +import city.zouitel.notifications.viewmodel.NotificationVM +import org.koin.android.ext.koin.androidContext + +val notificationKoinModule = module { + viewModelOf(::NotificationVM) + + single { + NotificationCompat.Builder(androidContext(), Cons.CHANNEL_ID) + .setDefaults(android.app.Notification.DEFAULT_ALL) + .setSmallIcon(android.R.drawable.ic_popup_reminder) + .setColor(Color.YELLOW) +// .setOngoing(true) to ability cancel the notification or not. + .setLights(Color.WHITE, 300, 100) + .setPriority(NotificationCompat.PRIORITY_DEFAULT) + } + + single { + NotificationManagerCompat.from(androidContext()) + .createNotificationChannel( + NotificationChannel( + Cons.CHANNEL_ID, + Cons.CHANNEL_NAME, + NotificationManager.IMPORTANCE_DEFAULT + ) + ) + } +} \ No newline at end of file diff --git a/service/notification/src/main/java/com/example/notification/reciver/Notification.kt b/services/notifications/src/main/java/city/zouitel/notifications/reciver/Notification.kt similarity index 67% rename from service/notification/src/main/java/com/example/notification/reciver/Notification.kt rename to services/notifications/src/main/java/city/zouitel/notifications/reciver/Notification.kt index e90c91cf..01b8a067 100644 --- a/service/notification/src/main/java/com/example/notification/reciver/Notification.kt +++ b/services/notifications/src/main/java/city/zouitel/notifications/reciver/Notification.kt @@ -1,4 +1,4 @@ -package com.example.notification.reciver +package city.zouitel.notifications.reciver import android.Manifest import android.content.Context @@ -8,20 +8,19 @@ import android.graphics.BitmapFactory import androidx.core.app.ActivityCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import com.example.common_ui.Cons.DESCRIPTION -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.common_ui.Cons.NOTIFICATION_ID -import com.example.common_ui.Cons.TITLE -import com.example.common_ui.Cons.UID -import dagger.hilt.android.AndroidEntryPoint +import city.zouitel.notifications.Cons.DESCRIPTION +import city.zouitel.notifications.Cons.IMAGES +import city.zouitel.notifications.Cons.JPEG +import city.zouitel.notifications.Cons.NOTIFICATION_ID +import city.zouitel.notifications.Cons.TITLE +import city.zouitel.notifications.Cons.UID import java.io.File -import javax.inject.Inject -@AndroidEntryPoint -class Notification : HiltBroadcastReceiver() { - @Inject lateinit var notifyBuilder : NotificationCompat.Builder - @Inject lateinit var notifyManager : NotificationManagerCompat +//@AndroidEntryPoint +class Notification : NotifyBroadcastReceiver() { + + /*@Inject*/ lateinit var notifyBuilder : NotificationCompat.Builder + /*@Inject*/ lateinit var notifyManager : NotificationManagerCompat override fun onReceive(context: Context, intent: Intent) { super.onReceive(context, intent) diff --git a/service/notification/src/main/java/com/example/notification/reciver/HiltBroadcastReceiver.kt b/services/notifications/src/main/java/city/zouitel/notifications/reciver/NotifyBroadcastReceiver.kt similarity index 64% rename from service/notification/src/main/java/com/example/notification/reciver/HiltBroadcastReceiver.kt rename to services/notifications/src/main/java/city/zouitel/notifications/reciver/NotifyBroadcastReceiver.kt index b1e28a34..8007f657 100644 --- a/service/notification/src/main/java/com/example/notification/reciver/HiltBroadcastReceiver.kt +++ b/services/notifications/src/main/java/city/zouitel/notifications/reciver/NotifyBroadcastReceiver.kt @@ -1,12 +1,11 @@ -package com.example.notification.reciver +package city.zouitel.notifications.reciver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.annotation.CallSuper -import dagger.Module -abstract class HiltBroadcastReceiver : BroadcastReceiver() { +abstract class NotifyBroadcastReceiver : BroadcastReceiver() { @CallSuper override fun onReceive(context: Context, intent: Intent) {} diff --git a/service/notification/src/main/java/com/example/notification/viewmodel/NotificationVM.kt b/services/notifications/src/main/java/city/zouitel/notifications/viewmodel/NotificationVM.kt similarity index 82% rename from service/notification/src/main/java/com/example/notification/viewmodel/NotificationVM.kt rename to services/notifications/src/main/java/city/zouitel/notifications/viewmodel/NotificationVM.kt index 642c3e41..8f743c7e 100644 --- a/service/notification/src/main/java/com/example/notification/viewmodel/NotificationVM.kt +++ b/services/notifications/src/main/java/city/zouitel/notifications/viewmodel/NotificationVM.kt @@ -1,4 +1,4 @@ -package com.example.notification.viewmodel +package city.zouitel.notifications.viewmodel import android.app.AlarmManager import android.app.PendingIntent @@ -6,10 +6,10 @@ import android.content.Context import android.content.Intent import androidx.compose.runtime.MutableState import androidx.lifecycle.ViewModel -import com.example.common_ui.Cons.DESCRIPTION -import com.example.common_ui.Cons.TITLE -import com.example.common_ui.Cons.UID -import com.example.notification.reciver.Notification +import city.zouitel.notifications.Cons.DESCRIPTION +import city.zouitel.notifications.Cons.TITLE +import city.zouitel.notifications.Cons.UID +import city.zouitel.notifications.reciver.Notification class NotificationVM: ViewModel() { diff --git a/services/notifications/src/test/java/city/zouitel/notifications/ExampleUnitTest.kt b/services/notifications/src/test/java/city/zouitel/notifications/ExampleUnitTest.kt new file mode 100644 index 00000000..49aa2bd3 --- /dev/null +++ b/services/notifications/src/test/java/city/zouitel/notifications/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.notifications + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index a46d88f1..4d4d0762 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,69 +1,37 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") - pluginManagement { repositories { - includeBuild("plugins") - gradlePluginPortal() google() mavenCentral() + gradlePluginPortal() } } - dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() - maven("https://jitpack.io") - } - versionCatalogs { - create("libs") { - from(files("gradle/libraries.versions.toml")) - } } } rootProject.name = "JetNote" - -include( - ":app" -) -include( - ":common:ui", - ":common:effect", - ":common:logic", - ":common:mapper", -) -include( - "service:notification" -) -include( - ":ui:features:camera", - ":ui:features:tags", - ":ui:features:record", - ":ui:features:tasks", - ":ui:features:media-player", - ":ui:features:reminder", - ":ui:features:note", - ":ui:features:widget", - ":ui:features:quick-note", - ":ui:features:links", - ":ui:graph" -) -include( - ":domain" -) -include( - ":data:local", - ":data:datastore", - ":data:repository" -) -include( - ":benchmark" -) -include( - ":data:remote" -) -include( - ":init" -) +include(":app") +include(":core:database") +include(":core:repository") +include(":core:datastore") +include(":domain") +include(":ui:features:note") +include(":ui:features:quickNote") +include(":ui:features:camera") +include(":ui:features:links") +include(":ui:features:audios") +include(":ui:features:recorder") +include(":ui:features:reminder") +include(":ui:features:tags") +include(":ui:features:tasks") +include(":ui:features:widget") +include(":ui:navigation") +include(":services:notifications") +include(":init") +include(":ui:common:systemDesign") +include(":ui:common:logic") diff --git a/common/ui/.gitignore b/ui/common/logic/.gitignore similarity index 100% rename from common/ui/.gitignore rename to ui/common/logic/.gitignore diff --git a/ui/common/logic/build.gradle.kts b/ui/common/logic/build.gradle.kts new file mode 100644 index 00000000..04d4f351 --- /dev/null +++ b/ui/common/logic/build.gradle.kts @@ -0,0 +1,44 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.logic" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) +} \ No newline at end of file diff --git a/ui/common/logic/consumer-rules.pro b/ui/common/logic/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/common/logic/proguard-rules.pro b/ui/common/logic/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/common/logic/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/common/logic/src/androidTest/java/city/zouitel/logic/ExampleInstrumentedTest.kt b/ui/common/logic/src/androidTest/java/city/zouitel/logic/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..0c140e74 --- /dev/null +++ b/ui/common/logic/src/androidTest/java/city/zouitel/logic/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.logic + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.logic.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/common/ui/src/main/AndroidManifest.xml b/ui/common/logic/src/main/AndroidManifest.xml similarity index 100% rename from common/ui/src/main/AndroidManifest.xml rename to ui/common/logic/src/main/AndroidManifest.xml diff --git a/ui/common/logic/src/test/java/city/zouitel/logic/ExampleUnitTest.kt b/ui/common/logic/src/test/java/city/zouitel/logic/ExampleUnitTest.kt new file mode 100644 index 00000000..aaaecbf3 --- /dev/null +++ b/ui/common/logic/src/test/java/city/zouitel/logic/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.logic + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/data/repository/.gitignore b/ui/common/systemDesign/.gitignore similarity index 100% rename from data/repository/.gitignore rename to ui/common/systemDesign/.gitignore diff --git a/ui/common/systemDesign/build.gradle.kts b/ui/common/systemDesign/build.gradle.kts new file mode 100644 index 00000000..a813fe95 --- /dev/null +++ b/ui/common/systemDesign/build.gradle.kts @@ -0,0 +1,82 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.systemDesign" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + + //Modules. + implementation(projects.core.datastore) + + //AndroidX. + implementation(libs.constraintlayout) + + //Accompanist. + implementation(libs.accompanist.permissions) + implementation(libs.accompanist.pager) + implementation(libs.accompanist.pager.indicators) + implementation(libs.accompanist.systemuicontroller) + implementation(libs.accompanist.navigation.animation) + implementation(libs.accompanist.swiperefresh) + implementation(libs.accompanist.flowlayout) + + //Baha-UrlPreview. + implementation(libs.url.preview) + + //Balloon. + implementation ("com.github.skydoves:balloon-compose:1.5.3") + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) +} \ No newline at end of file diff --git a/ui/common/systemDesign/consumer-rules.pro b/ui/common/systemDesign/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/common/systemDesign/proguard-rules.pro b/ui/common/systemDesign/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/common/systemDesign/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/common/systemDesign/src/androidTest/java/city/zouitel/systemDesign/ExampleInstrumentedTest.kt b/ui/common/systemDesign/src/androidTest/java/city/zouitel/systemDesign/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..c821000d --- /dev/null +++ b/ui/common/systemDesign/src/androidTest/java/city/zouitel/systemDesign/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.systemDesign + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.common.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/data/datastore/src/main/AndroidManifest.xml b/ui/common/systemDesign/src/main/AndroidManifest.xml similarity index 100% rename from data/datastore/src/main/AndroidManifest.xml rename to ui/common/systemDesign/src/main/AndroidManifest.xml diff --git a/common/ui/src/main/java/com/example/common_ui/AdaptingRow.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/AdaptingRow.kt similarity index 71% rename from common/ui/src/main/java/com/example/common_ui/AdaptingRow.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/AdaptingRow.kt index 5d7dcae2..4231f61d 100644 --- a/common/ui/src/main/java/com/example/common_ui/AdaptingRow.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/AdaptingRow.kt @@ -1,17 +1,16 @@ -package com.example.common_ui +package city.zouitel.systemDesign -import android.icu.text.MeasureFormat -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp @Composable fun RowScope.AdaptingRow( - modifier: Modifier = Modifier, - content: @Composable () -> Unit, + modifier: Modifier = Modifier, + content: @Composable () -> Unit, ) { Row( modifier = modifier, diff --git a/common/ui/src/main/java/com/example/common_ui/BackgroundColors.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/BackgroundColors.kt similarity index 95% rename from common/ui/src/main/java/com/example/common_ui/BackgroundColors.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/BackgroundColors.kt index 6a68e410..835533a5 100644 --- a/common/ui/src/main/java/com/example/common_ui/BackgroundColors.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/BackgroundColors.kt @@ -1,4 +1,4 @@ -package com.example.common_ui +package city.zouitel.systemDesign import androidx.compose.ui.graphics.Color diff --git a/common/ui/src/main/java/com/example/common_ui/Cons.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Cons.kt similarity index 92% rename from common/ui/src/main/java/com/example/common_ui/Cons.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Cons.kt index 79cdcc82..a747970d 100644 --- a/common/ui/src/main/java/com/example/common_ui/Cons.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Cons.kt @@ -1,11 +1,11 @@ -package com.example.common_ui +package city.zouitel.systemDesign object Cons { const val APP_NAME = "JetNote" const val TAG = "This" const val NUL = "null" - const val APP_VERSION = "3.3.4" + const val APP_VERSION = "4.0" const val ID = "Id" const val TITLE = "Title" @@ -54,10 +54,6 @@ object Cons { const val ORDER_BY_REMINDER = "ORDER_BY_REMINDER" const val BY_ID = "ORDER_BY_ID" - const val NOTIFICATION_ID = 1 - const val CHANNEL_ID = "NOTE_CHANNEL" - const val CHANNEL_NAME = "JETNOTE_NOTIFY" - const val SEARCH_IN_LOCAL = "Search in local.." const val SEARCH_IN_TRASH = "Search in trash.." const val SEARCH_IN_CLOUD = "Search in cloud.." diff --git a/common/ui/src/main/java/com/example/common_ui/DataStoreVM.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/DataStoreVM.kt similarity index 86% rename from common/ui/src/main/java/com/example/common_ui/DataStoreVM.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/DataStoreVM.kt index 8f11e29e..5abb974d 100644 --- a/common/ui/src/main/java/com/example/common_ui/DataStoreVM.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/DataStoreVM.kt @@ -1,19 +1,18 @@ -package com.example.common_ui +package city.zouitel.systemDesign import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.datastore.DataStoreRepo -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.datastore.Cons +import city.zouitel.datastore.DataStoreRepo import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import javax.inject.Inject -@HiltViewModel -class DataStoreVM @Inject constructor( +//@HiltViewModel +class DataStoreVM /*@Inject*/ constructor( private val dataStoreRepo: DataStoreRepo ) : ViewModel() { @@ -37,14 +36,14 @@ class DataStoreVM @Inject constructor( .stateIn( viewModelScope, SharingStarted.WhileSubscribed(), - Cons.BY_NAME + city.zouitel.systemDesign.Cons.BY_NAME ) val getTheme: StateFlow = dataStoreRepo.getTheme .stateIn( viewModelScope, SharingStarted.WhileSubscribed(), - com.example.datastore.Cons.DARK + Cons.DARK ) diff --git a/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/DispatcherMod.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/DispatcherMod.kt new file mode 100644 index 00000000..5f5dea29 --- /dev/null +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/DispatcherMod.kt @@ -0,0 +1,13 @@ +package city.zouitel.systemDesign + + +//@Module +//@InstallIn( +// SingletonComponent::class, +// ViewModelComponent::class +//) +object DispatcherMod { + +// @Provides +// fun ioDispatcher(): CoroutineDispatcher = Dispatchers.IO +} \ No newline at end of file diff --git a/common/ui/src/main/java/com/example/common_ui/Icons.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Icons.kt similarity index 97% rename from common/ui/src/main/java/com/example/common_ui/Icons.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Icons.kt index ba58265f..ca2d7746 100644 --- a/common/ui/src/main/java/com/example/common_ui/Icons.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Icons.kt @@ -1,4 +1,7 @@ -package com.example.common_ui +package city.zouitel.systemDesign + +import city.zouitel.systemDesign.R + object Icons { diff --git a/ui/graph/src/main/java/com/example/graph/ImageDisplay.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/ImageDisplay.kt similarity index 96% rename from ui/graph/src/main/java/com/example/graph/ImageDisplay.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/ImageDisplay.kt index 93629d12..a70eacf0 100644 --- a/ui/graph/src/main/java/com/example/graph/ImageDisplay.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/ImageDisplay.kt @@ -1,4 +1,4 @@ -package com.example.graph +package city.zouitel.systemDesign import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* @@ -35,4 +35,4 @@ fun ImageDisplayed( } } } -} \ No newline at end of file +} diff --git a/common/ui/src/main/java/com/example/common_ui/Lambda.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Lambda.kt similarity index 90% rename from common/ui/src/main/java/com/example/common_ui/Lambda.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Lambda.kt index a256d222..795bef31 100644 --- a/common/ui/src/main/java/com/example/common_ui/Lambda.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Lambda.kt @@ -1,22 +1,15 @@ -package com.example.common_ui +package city.zouitel.systemDesign import android.content.Context import android.content.Intent import android.net.Uri -import android.widget.Toast import androidx.compose.runtime.MutableState import androidx.compose.ui.graphics.Color -import com.baha.url.preview.BahaUrlPreview -import com.baha.url.preview.IUrlPreviewCallback -import com.baha.url.preview.UrlInfoItem -import com.example.common_ui.Cons.IMPORTANT -import com.example.common_ui.Cons.LOW -import com.example.common_ui.Cons.NON -import com.example.common_ui.Cons.NORMAL -import com.example.common_ui.Cons.URGENT -import kotlinx.coroutines.* -import java.net.URL -import java.util.* +import city.zouitel.systemDesign.Cons.IMPORTANT +import city.zouitel.systemDesign.Cons.LOW +import city.zouitel.systemDesign.Cons.NON +import city.zouitel.systemDesign.Cons.NORMAL +import city.zouitel.systemDesign.Cons.URGENT // val sharApp: (Context, String) -> Unit = { ctx, txt -> diff --git a/common/ui/src/main/java/com/example/common_ui/MaterialColors.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/MaterialColors.kt similarity index 99% rename from common/ui/src/main/java/com/example/common_ui/MaterialColors.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/MaterialColors.kt index f033a0da..efccc55f 100644 --- a/common/ui/src/main/java/com/example/common_ui/MaterialColors.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/MaterialColors.kt @@ -1,4 +1,4 @@ -package com.example.common_ui +package city.zouitel.systemDesign import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/common/ui/src/main/java/com/example/common_ui/Popup.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Popup.kt similarity index 57% rename from common/ui/src/main/java/com/example/common_ui/Popup.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Popup.kt index e2816dbe..3f430243 100644 --- a/common/ui/src/main/java/com/example/common_ui/Popup.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Popup.kt @@ -1,28 +1,10 @@ -package com.example.common_ui +package city.zouitel.systemDesign -import androidx.activity.compose.setContent -import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.foundation.layout.* -import androidx.compose.material.Button -import androidx.compose.material.contentColorFor import androidx.compose.material3.Text import androidx.compose.runtime.* -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.toArgb -import androidx.compose.ui.hapticfeedback.HapticFeedbackType -import androidx.compose.ui.platform.LocalHapticFeedback -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import androidx.compose.ui.window.Popup -import androidx.compose.ui.window.PopupPositionProvider -import androidx.compose.ui.window.PopupProperties -import com.example.common_ui.MaterialColors.Companion.ON_SURFACE -import com.example.common_ui.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.ON_SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE import com.skydoves.balloon.ArrowPositionRules import com.skydoves.balloon.BalloonAnimation import com.skydoves.balloon.BalloonHighlightAnimation diff --git a/common/ui/src/main/java/com/example/common_ui/SoundEffect.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/SoundEffect.kt similarity index 91% rename from common/ui/src/main/java/com/example/common_ui/SoundEffect.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/SoundEffect.kt index 5cb41667..2e15afe6 100644 --- a/common/ui/src/main/java/com/example/common_ui/SoundEffect.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/SoundEffect.kt @@ -1,4 +1,4 @@ -package com.example.common_ui +package city.zouitel.systemDesign import android.content.Context import android.media.AudioManager diff --git a/common/ui/src/main/java/com/example/common_ui/TextColors.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/TextColors.kt similarity index 92% rename from common/ui/src/main/java/com/example/common_ui/TextColors.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/TextColors.kt index 90e9d500..4cce0bc4 100644 --- a/common/ui/src/main/java/com/example/common_ui/TextColors.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/TextColors.kt @@ -1,4 +1,4 @@ -package com.example.common_ui +package city.zouitel.systemDesign import androidx.compose.ui.graphics.Color diff --git a/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Utils.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Utils.kt new file mode 100644 index 00000000..1b243707 --- /dev/null +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/Utils.kt @@ -0,0 +1 @@ +package city.zouitel.systemDesign diff --git a/common/ui/src/main/java/com/example/common_ui/VerticalGrid.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/VerticalGrid.kt similarity index 98% rename from common/ui/src/main/java/com/example/common_ui/VerticalGrid.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/VerticalGrid.kt index ee6b9cd1..0a06fed3 100644 --- a/common/ui/src/main/java/com/example/common_ui/VerticalGrid.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/VerticalGrid.kt @@ -1,4 +1,4 @@ -package com.example.common_ui +package city.zouitel.systemDesign import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/di/dataStoreDI.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/di/dataStoreDI.kt new file mode 100644 index 00000000..22e98cd6 --- /dev/null +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/di/dataStoreDI.kt @@ -0,0 +1,9 @@ +package city.zouitel.systemDesign.di + +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.dsl.module +import city.zouitel.systemDesign.DataStoreVM + +val datastoreVMKoinModule = module { + viewModelOf(::DataStoreVM) +} \ No newline at end of file diff --git a/common/ui/src/main/java/com/example/common_ui/listOfPriorityColors.kt b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/listOfPriorityColors.kt similarity index 83% rename from common/ui/src/main/java/com/example/common_ui/listOfPriorityColors.kt rename to ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/listOfPriorityColors.kt index 25e8417c..0645e876 100644 --- a/common/ui/src/main/java/com/example/common_ui/listOfPriorityColors.kt +++ b/ui/common/systemDesign/src/main/java/city/zouitel/systemDesign/listOfPriorityColors.kt @@ -1,4 +1,4 @@ -package com.example.common_ui +package city.zouitel.systemDesign import androidx.compose.ui.graphics.Color diff --git a/common/ui/src/main/res/drawable-hdpi/add_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/add_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/add_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/add_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/add_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/add_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/add_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/add_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/add_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/add_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/add_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/add_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/add_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/add_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/add_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_down_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_down_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_down_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_down_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_down_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_down_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_down_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_down_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_down_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_down_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_down_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_down_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_up_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_up_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_up_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_up_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_small_up_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_small_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_small_up_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_up_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_up_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_up_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_up_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/angle_up_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/angle_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/angle_up_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/apps_sort_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/apps_sort_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/apps_sort_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/apps_sort_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/apps_sort_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/apps_sort_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/apps_sort_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/apps_sort_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/apps_sort_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/apps_sort_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/apps_sort_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_ring_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_ring_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_ring_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_ring_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_ring_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_ring_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_ring_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_ring_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/bell_ring_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/bell_ring_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/bell_ring_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/broom_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/broom_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/broom_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/broom_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/broom_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/broom_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/broom_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/broom_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/broom_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/broom_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/broom_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/broom_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/broom_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/broom_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/broom_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/broom_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/broom_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/broom_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/broom_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/broom_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/calendar_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/calendar_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/calendar_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/calendar_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/calendar_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/calendar_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/calendar_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/calendar_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/calendar_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/calendar_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/calendar_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/camera_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/camera_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/camera_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/camera_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/camera_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/camera_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/camera_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/camera_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/camera_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/camera_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/camera_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/camera_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/camera_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/camera_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/camera_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/camera_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/camera_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/camera_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/camera_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/camera_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/check_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/check_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/check_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/check_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/check_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/check_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/check_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/check_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/check_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/check_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/check_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/check_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/check_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/check_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/check_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/checkbox_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/checkbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/checkbox_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/checkbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/checkbox_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/checkbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/checkbox_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/checkbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/checkbox_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/checkbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/checkbox_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/circle_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/circle_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/circle_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/circle_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/circle_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/circle_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/circle_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/circle_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/circle_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/circle_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/clock_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/clock_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/clock_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/clock_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/clock_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/clock_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/clock_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/clock_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/clock_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/clock_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/clock_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/clock_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/clock_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/clock_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/clock_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/clock_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/clock_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/clock_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/clock_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/clock_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_disabled_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_disabled_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_disabled_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_disabled_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_disabled_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_disabled_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_disabled_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_disabled_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_disabled_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_disabled_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_disabled_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_download_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_download_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_download_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_download_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_download_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_download_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_download_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_download_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_download_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_download_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_download_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_upload_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_upload_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_upload_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_upload_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_upload_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_upload_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_upload_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_upload_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/cloud_upload_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cloud_upload_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cloud_upload_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/comment_exclamation_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/comment_exclamation_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/comment_exclamation_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/comment_exclamation_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/comment_exclamation_24_.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/comment_exclamation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_24_.png diff --git a/common/ui/src/main/res/drawable-hdpi/comment_exclamation_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/comment_exclamation_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/comment_exclamation_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/comment_exclamation_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/comment_exclamation_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/copy_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/copy_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/copy_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/copy_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/copy_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/copy_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/copy_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/copy_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/copy_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/copy_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/copy_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/copy_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/copy_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/copy_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/copy_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/copy_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/copy_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/copy_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/copy_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/copy_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/cross_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/cross_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/cross_circle_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/delete_user_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/delete_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/delete_user_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/delete_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/delete_user_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/delete_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/delete_user_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/delete_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/delete_user_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/delete_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/delete_user_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/disk_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/disk_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/disk_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/disk_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/disk_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/disk_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/disk_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/disk_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/disk_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/disk_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/disk_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/disk_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/disk_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/disk_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/disk_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/disk_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/disk_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/disk_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/disk_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/disk_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/download_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/download_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/download_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/download_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/download_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/download_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/download_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/download_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/download_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/download_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/download_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/download_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/download_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/download_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/download_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/exit_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/exit_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/exit_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/exit_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/exit_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/exit_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/exit_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/exit_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/exit_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/exit_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/exit_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/exit_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/exit_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/exit_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/exit_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/exit_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/exit_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/exit_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/exit_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/exit_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/github_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/github_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/github_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/github_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/github_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/github_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/github_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/github_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/github_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/github_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/github_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/github_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/github_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/github_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/github_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/github_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/github_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/github_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/github_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/github_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/globe_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/globe_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/globe_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/globe_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/globe_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/globe_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/globe_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/globe_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/globe_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/globe_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/globe_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/globe_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/globe_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/globe_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/globe_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/globe_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/globe_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/globe_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/globe_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/globe_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/home_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/home_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/home_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/home_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/home_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/home_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/home_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/home_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/home_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/home_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/home_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/home_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/home_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/home_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/home_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/home_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/home_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/home_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/home_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/home_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/inbox_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/inbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/inbox_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/inbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/inbox_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/inbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/inbox_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/inbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/inbox_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/inbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/inbox_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/interlining_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interlining_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/interlining_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interlining_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/interlining_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interlining_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/interlining_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interlining_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/interlining_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interlining_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interlining_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_18_.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_18_.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_18_.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_18_.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_20_.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_20_.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_20_.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_20_.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_24_.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_24_.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_36_.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_36_.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_36_.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_36_.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/interrogation_48_.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_48_.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/interrogation_48_.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/interrogation_48_.png diff --git a/common/ui/src/main/res/drawable-hdpi/label_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/label_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/label_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/label_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/label_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/label_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/label_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/label_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/label_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/label_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/label_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/label_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/label_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/label_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/label_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/list_check_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/list_check_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/list_check_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/list_check_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/list_check_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/list_check_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/list_check_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/list_check_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/list_check_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/list_check_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/list_check_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/menu_burger_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/menu_burger_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/menu_burger_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/menu_burger_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/menu_burger_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/menu_burger_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/menu_burger_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/menu_burger_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/menu_burger_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/menu_burger_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/menu_burger_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/microphone_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/microphone_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/microphone_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/microphone_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/microphone_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/microphone_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/microphone_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/microphone_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/microphone_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/microphone_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/microphone_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/moon_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/moon_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/moon_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/moon_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/moon_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/moon_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/moon_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/moon_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/moon_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/moon_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/moon_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/moon_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/moon_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/moon_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/moon_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/moon_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/moon_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/moon_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/moon_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/moon_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/no_label_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/no_label_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/no_label_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/no_label_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/no_label_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/no_label_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/no_label_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/no_label_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/no_label_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/no_label_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/no_label_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/opacity_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/opacity_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/opacity_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/opacity_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/opacity_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/opacity_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/opacity_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/opacity_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/opacity_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/opacity_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/opacity_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/pause_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pause_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pause_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pause_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/pause_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pause_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pause_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pause_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/pause_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pause_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pause_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pause_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/pause_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pause_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pause_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pause_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/pause_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pause_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pause_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pause_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/pencil_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pencil_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/pencil_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pencil_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/pencil_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pencil_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/pencil_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pencil_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/pencil_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/pencil_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/pencil_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/picture_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/picture_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/picture_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/picture_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/picture_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/picture_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/picture_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/picture_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/picture_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/picture_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/picture_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/picture_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/picture_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/picture_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/picture_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/picture_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/picture_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/picture_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/picture_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/picture_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/play_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/play_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/play_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/play_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/play_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/play_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/play_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/play_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/play_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/play_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/play_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/play_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/play_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/play_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/play_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/play_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/play_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/play_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/play_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/play_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/plus_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/plus_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/plus_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/plus_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/plus_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/plus_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/plus_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/plus_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/plus_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/plus_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/plus_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/plus_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/plus_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/plus_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/plus_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/plus_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/plus_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/plus_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/plus_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/plus_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/remove_user_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/remove_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/remove_user_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/remove_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/remove_user_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/remove_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/remove_user_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/remove_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/remove_user_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/remove_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/remove_user_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/reset_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/reset_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/reset_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/reset_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/reset_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/reset_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/reset_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/reset_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/reset_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/reset_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/reset_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/reset_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/reset_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/reset_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/reset_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/reset_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/reset_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/reset_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/reset_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/reset_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/rotate_left_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/rotate_left_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/rotate_left_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/rotate_left_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/rotate_left_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/rotate_left_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/rotate_left_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/rotate_left_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/rotate_left_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/rotate_left_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/rotate_left_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/settings_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/settings_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/settings_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/settings_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/settings_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/settings_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/settings_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/settings_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/settings_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/settings_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/settings_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/settings_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/settings_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/settings_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/settings_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/settings_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/settings_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/settings_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/settings_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/settings_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/share_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/share_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/share_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/share_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/share_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/share_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/share_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/share_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/share_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/share_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/share_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/share_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/share_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/share_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/share_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/share_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/share_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/share_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/share_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/share_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alpha_down_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alpha_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alpha_down_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alpha_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alpha_down_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alpha_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alpha_down_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alpha_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alpha_down_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alpha_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alpha_down_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_alt_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_down_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_down_alt_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_amount_up_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_amount_up_alt_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_numeric_down_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_numeric_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_numeric_down_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_numeric_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_numeric_down_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_numeric_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_numeric_down_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_numeric_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/sort_numeric_down_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sort_numeric_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sort_numeric_down_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/stop_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/stop_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/stop_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/stop_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/stop_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/stop_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/stop_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/stop_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/stop_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/stop_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/stop_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/stop_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/stop_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/stop_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/stop_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/stop_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/stop_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/stop_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/stop_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/stop_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/sun_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sun_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sun_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sun_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/sun_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sun_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sun_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sun_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/sun_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sun_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sun_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sun_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/sun_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sun_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sun_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sun_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/sun_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/sun_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/sun_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/sun_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/tags_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/tags_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/tags_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/tags_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/tags_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/tags_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/tags_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/tags_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/tags_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/tags_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/tags_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/tags_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/tags_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/tags_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/tags_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/tags_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/tags_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/tags_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/tags_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/tags_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/trash_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/trash_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/trash_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/trash_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/trash_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/trash_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/trash_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/trash_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/trash_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/trash_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/trash_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/trash_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/trash_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/trash_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/trash_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/trash_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/trash_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/trash_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/trash_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/trash_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_add_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_add_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_add_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_add_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_add_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_add_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_add_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_add_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/user_add_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/user_add_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/user_add_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/void_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/void_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/void_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/void_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/void_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/void_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/void_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/void_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/void_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/void_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/void_circle_48.png diff --git a/common/ui/src/main/res/drawable-hdpi/wifi_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/wifi_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_18.png diff --git a/common/ui/src/main/res/drawable-hdpi/wifi_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/wifi_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_20.png diff --git a/common/ui/src/main/res/drawable-hdpi/wifi_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/wifi_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_24.png diff --git a/common/ui/src/main/res/drawable-hdpi/wifi_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/wifi_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_36.png diff --git a/common/ui/src/main/res/drawable-hdpi/wifi_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-hdpi/wifi_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-hdpi/wifi_alt_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/add_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/add_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/add_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/add_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/add_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/add_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/add_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/add_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/add_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/add_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/add_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/add_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/add_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/add_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/add_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_down_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_down_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_down_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_down_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_down_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_down_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_down_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_down_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_down_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_down_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_down_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_down_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_up_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_up_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_up_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_up_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_small_up_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_small_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_small_up_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_up_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_up_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_up_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_up_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/angle_up_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/angle_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/angle_up_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/apps_sort_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/apps_sort_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/apps_sort_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/apps_sort_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/apps_sort_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/apps_sort_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/apps_sort_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/apps_sort_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/apps_sort_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/apps_sort_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/apps_sort_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_ring_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_ring_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_ring_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_ring_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_ring_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_ring_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_ring_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_ring_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/bell_ring_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/bell_ring_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/bell_ring_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/broom_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/broom_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/broom_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/broom_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/broom_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/broom_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/broom_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/broom_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/broom_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/broom_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/broom_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/broom_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/broom_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/broom_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/broom_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/broom_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/broom_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/broom_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/broom_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/broom_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/calendar_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/calendar_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/calendar_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/calendar_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/calendar_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/calendar_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/calendar_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/calendar_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/calendar_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/calendar_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/calendar_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/camera_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/camera_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/camera_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/camera_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/camera_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/camera_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/camera_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/camera_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/camera_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/camera_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/camera_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/camera_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/camera_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/camera_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/camera_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/camera_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/camera_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/camera_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/camera_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/camera_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/check_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/check_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/check_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/check_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/check_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/check_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/check_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/check_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/check_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/check_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/check_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/check_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/check_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/check_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/check_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/checkbox_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/checkbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/checkbox_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/checkbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/checkbox_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/checkbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/checkbox_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/checkbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/checkbox_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/checkbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/checkbox_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/circle_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/circle_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/circle_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/circle_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/circle_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/circle_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/circle_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/circle_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/circle_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/circle_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/clock_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/clock_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/clock_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/clock_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/clock_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/clock_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/clock_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/clock_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/clock_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/clock_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/clock_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/clock_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/clock_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/clock_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/clock_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/clock_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/clock_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/clock_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/clock_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/clock_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_disabled_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_disabled_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_disabled_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_disabled_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_disabled_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_disabled_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_disabled_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_disabled_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_disabled_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_disabled_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_disabled_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_download_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_download_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_download_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_download_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_download_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_download_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_download_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_download_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_download_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_download_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_download_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_upload_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_upload_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_upload_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_upload_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_upload_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_upload_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_upload_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_upload_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/cloud_upload_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cloud_upload_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cloud_upload_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/comment_exclamation_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/comment_exclamation_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/comment_exclamation_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/comment_exclamation_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/comment_exclamation_24_.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/comment_exclamation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_24_.png diff --git a/common/ui/src/main/res/drawable-mdpi/comment_exclamation_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/comment_exclamation_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/comment_exclamation_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/comment_exclamation_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/comment_exclamation_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/copy_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/copy_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/copy_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/copy_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/copy_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/copy_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/copy_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/copy_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/copy_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/copy_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/copy_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/copy_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/copy_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/copy_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/copy_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/copy_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/copy_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/copy_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/copy_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/copy_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/cross_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/cross_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/cross_circle_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/delete_user_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/delete_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/delete_user_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/delete_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/delete_user_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/delete_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/delete_user_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/delete_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/delete_user_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/delete_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/delete_user_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/disk_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/disk_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/disk_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/disk_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/disk_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/disk_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/disk_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/disk_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/disk_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/disk_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/disk_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/disk_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/disk_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/disk_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/disk_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/disk_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/disk_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/disk_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/disk_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/disk_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/download_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/download_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/download_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/download_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/download_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/download_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/download_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/download_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/download_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/download_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/download_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/download_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/download_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/download_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/download_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/exit_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/exit_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/exit_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/exit_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/exit_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/exit_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/exit_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/exit_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/exit_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/exit_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/exit_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/exit_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/exit_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/exit_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/exit_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/exit_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/exit_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/exit_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/exit_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/exit_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/github_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/github_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/github_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/github_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/github_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/github_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/github_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/github_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/github_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/github_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/github_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/github_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/github_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/github_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/github_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/github_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/github_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/github_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/github_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/github_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/globe_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/globe_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/globe_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/globe_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/globe_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/globe_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/globe_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/globe_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/globe_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/globe_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/globe_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/globe_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/globe_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/globe_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/globe_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/globe_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/globe_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/globe_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/globe_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/globe_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/home_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/home_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/home_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/home_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/home_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/home_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/home_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/home_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/home_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/home_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/home_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/home_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/home_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/home_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/home_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/home_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/home_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/home_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/home_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/home_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/inbox_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/inbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/inbox_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/inbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/inbox_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/inbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/inbox_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/inbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/inbox_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/inbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/inbox_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/interlining_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interlining_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/interlining_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interlining_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/interlining_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interlining_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/interlining_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interlining_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/interlining_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interlining_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interlining_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_18_.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_18_.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_18_.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_18_.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_20_.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_20_.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_20_.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_20_.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_24_.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_24_.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_36_.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_36_.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_36_.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_36_.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/interrogation_48_.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_48_.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/interrogation_48_.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/interrogation_48_.png diff --git a/common/ui/src/main/res/drawable-mdpi/label_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/label_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/label_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/label_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/label_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/label_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/label_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/label_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/label_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/label_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/label_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/label_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/label_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/label_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/label_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/list_check_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/list_check_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/list_check_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/list_check_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/list_check_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/list_check_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/list_check_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/list_check_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/list_check_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/list_check_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/list_check_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/menu_burger_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/menu_burger_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/menu_burger_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/menu_burger_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/menu_burger_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/menu_burger_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/menu_burger_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/menu_burger_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/menu_burger_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/menu_burger_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/menu_burger_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/microphone_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/microphone_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/microphone_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/microphone_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/microphone_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/microphone_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/microphone_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/microphone_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/microphone_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/microphone_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/microphone_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/moon_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/moon_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/moon_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/moon_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/moon_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/moon_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/moon_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/moon_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/moon_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/moon_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/moon_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/moon_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/moon_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/moon_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/moon_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/moon_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/moon_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/moon_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/moon_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/moon_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/no_label_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/no_label_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/no_label_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/no_label_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/no_label_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/no_label_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/no_label_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/no_label_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/no_label_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/no_label_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/no_label_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/opacity_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/opacity_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/opacity_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/opacity_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/opacity_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/opacity_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/opacity_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/opacity_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/opacity_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/opacity_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/opacity_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/pause_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/pause_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/pause_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/pause_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/pause_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/pause_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/pause_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/pause_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/pause_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/pause_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/pause_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/pause_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/pause_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/pause_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/pause_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/pause_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/pause_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/pause_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/pause_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/pause_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/picture_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/picture_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/picture_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/picture_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/picture_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/picture_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/picture_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/picture_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/picture_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/picture_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/picture_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/picture_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/picture_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/picture_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/picture_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/picture_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/picture_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/picture_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/picture_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/picture_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/play_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/play_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/play_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/play_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/play_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/play_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/play_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/play_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/play_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/play_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/play_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/play_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/play_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/play_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/play_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/play_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/play_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/play_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/play_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/play_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/plus_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/plus_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/plus_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/plus_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/plus_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/plus_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/plus_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/plus_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/plus_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/plus_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/plus_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/plus_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/plus_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/plus_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/plus_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/plus_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/plus_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/plus_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/plus_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/plus_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/remove_user_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/remove_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/remove_user_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/remove_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/remove_user_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/remove_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/remove_user_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/remove_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/remove_user_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/remove_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/remove_user_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/reset_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/reset_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/reset_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/reset_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/reset_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/reset_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/reset_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/reset_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/reset_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/reset_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/reset_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/reset_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/reset_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/reset_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/reset_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/reset_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/reset_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/reset_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/reset_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/reset_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/rotate_left_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/rotate_left_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/rotate_left_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/rotate_left_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/rotate_left_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/rotate_left_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/rotate_left_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/rotate_left_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/rotate_left_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/rotate_left_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/rotate_left_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/settings_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/settings_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/settings_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/settings_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/settings_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/settings_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/settings_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/settings_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/settings_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/settings_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/settings_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/settings_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/settings_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/settings_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/settings_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/settings_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/settings_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/settings_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/settings_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/settings_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/share_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/share_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/share_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/share_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/share_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/share_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/share_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/share_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/share_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/share_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/share_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/share_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/share_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/share_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/share_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/share_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/share_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/share_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/share_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/share_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alpha_down_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alpha_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alpha_down_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alpha_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alpha_down_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alpha_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alpha_down_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alpha_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alpha_down_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alpha_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alpha_down_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_alt_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_down_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_down_alt_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_amount_up_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_amount_up_alt_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_numeric_down_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_numeric_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_numeric_down_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_numeric_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_numeric_down_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_numeric_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_numeric_down_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_numeric_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/sort_numeric_down_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sort_numeric_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sort_numeric_down_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/stop_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/stop_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/stop_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/stop_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/stop_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/stop_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/stop_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/stop_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/stop_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/stop_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/stop_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/stop_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/stop_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/stop_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/stop_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/stop_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/stop_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/stop_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/stop_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/stop_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/sun_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sun_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sun_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sun_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/sun_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sun_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sun_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sun_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/sun_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sun_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sun_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sun_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/sun_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sun_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sun_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sun_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/sun_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/sun_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/sun_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/sun_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/tags_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/tags_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/tags_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/tags_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/tags_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/tags_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/tags_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/tags_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/tags_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/tags_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/tags_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/tags_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/tags_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/tags_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/tags_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/tags_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/tags_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/tags_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/tags_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/tags_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/trash_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/trash_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/trash_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/trash_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/trash_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/trash_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/trash_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/trash_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/trash_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/trash_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/trash_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/trash_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/trash_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/trash_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/trash_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/trash_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/trash_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/trash_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/trash_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/trash_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_add_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_add_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_add_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_add_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_add_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_add_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_add_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_add_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/user_add_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/user_add_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/user_add_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/void_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/void_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/void_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/void_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/void_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/void_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/void_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/void_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/void_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/void_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/void_circle_48.png diff --git a/common/ui/src/main/res/drawable-mdpi/wifi_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/wifi_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_18.png diff --git a/common/ui/src/main/res/drawable-mdpi/wifi_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/wifi_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_20.png diff --git a/common/ui/src/main/res/drawable-mdpi/wifi_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/wifi_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_24.png diff --git a/common/ui/src/main/res/drawable-mdpi/wifi_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/wifi_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_36.png diff --git a/common/ui/src/main/res/drawable-mdpi/wifi_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-mdpi/wifi_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-mdpi/wifi_alt_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/add_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/add_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/add_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/add_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/add_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/add_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/add_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/add_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/add_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/add_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/add_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/add_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/add_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/add_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/add_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_down_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_down_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_up_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_up_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_up_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_up_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_small_up_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_small_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_small_up_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_up_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_up_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_up_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_up_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/angle_up_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/angle_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/angle_up_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/apps_sort_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/apps_sort_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/apps_sort_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/apps_sort_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/apps_sort_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/apps_sort_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/apps_sort_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/apps_sort_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/apps_sort_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/apps_sort_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/apps_sort_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_ring_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_ring_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_ring_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_ring_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_ring_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_ring_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_ring_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_ring_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/bell_ring_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/bell_ring_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/bell_ring_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/broom_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/broom_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/broom_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/broom_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/broom_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/broom_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/broom_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/broom_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/broom_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/broom_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/broom_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/calendar_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/calendar_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/calendar_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/calendar_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/calendar_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/calendar_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/calendar_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/calendar_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/calendar_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/calendar_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/calendar_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/camera_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/camera_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/camera_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/camera_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/camera_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/camera_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/camera_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/camera_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/camera_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/camera_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/camera_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/check_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/check_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/check_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/check_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/check_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/check_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/check_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/check_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/check_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/check_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/check_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/check_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/check_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/check_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/check_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/checkbox_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/checkbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/checkbox_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/checkbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/checkbox_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/checkbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/checkbox_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/checkbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/checkbox_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/checkbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/checkbox_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/circle_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/clock_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/clock_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/clock_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/clock_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/clock_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/clock_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/clock_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/clock_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/clock_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/clock_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/clock_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_disabled_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_disabled_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_disabled_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_disabled_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_disabled_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_disabled_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_disabled_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_disabled_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_disabled_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_disabled_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_disabled_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_download_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_download_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_download_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_download_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_download_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_download_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_download_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_download_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_download_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_download_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_download_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_upload_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_upload_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_upload_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_upload_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_upload_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_upload_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_upload_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_upload_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cloud_upload_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cloud_upload_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cloud_upload_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/comment_exclamation_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/comment_exclamation_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/comment_exclamation_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/comment_exclamation_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/comment_exclamation_24_.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/comment_exclamation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_24_.png diff --git a/common/ui/src/main/res/drawable-xhdpi/comment_exclamation_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/comment_exclamation_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/comment_exclamation_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/comment_exclamation_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/comment_exclamation_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/copy_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/copy_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/copy_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/copy_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/copy_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/copy_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/copy_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/copy_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/copy_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/copy_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/copy_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/cross_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/cross_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/cross_circle_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/delete_user_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/delete_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/delete_user_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/delete_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/delete_user_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/delete_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/delete_user_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/delete_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/delete_user_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/delete_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/delete_user_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/disk_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/disk_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/disk_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/disk_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/disk_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/disk_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/disk_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/disk_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/disk_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/disk_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/disk_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/download_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/download_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/download_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/download_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/download_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/download_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/download_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/download_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/download_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/download_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/download_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/download_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/download_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/download_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/download_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/exit_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/exit_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/exit_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/exit_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/exit_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/exit_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/exit_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/exit_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/exit_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/exit_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/exit_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/github_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/github_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/github_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/github_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/github_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/github_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/github_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/github_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/github_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/github_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/github_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/github_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/github_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/github_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/github_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/github_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/github_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/github_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/github_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/github_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/globe_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/globe_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/globe_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/globe_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/globe_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/globe_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/globe_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/globe_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/globe_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/globe_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/globe_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/home_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/home_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/home_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/home_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/home_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/home_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/home_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/home_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/home_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/home_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/home_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/home_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/home_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/home_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/home_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/home_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/home_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/home_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/home_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/home_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/inbox_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/inbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/inbox_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/inbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/inbox_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/inbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/inbox_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/inbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/inbox_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/inbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/inbox_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interlining_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interlining_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interlining_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interlining_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interlining_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interlining_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interlining_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interlining_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interlining_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interlining_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interlining_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_18_.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_18_.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_18_.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_18_.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_20_.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_20_.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_20_.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_20_.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_24_.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_24_.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_36_.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_36_.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_36_.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_36_.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/interrogation_48_.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_48_.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/interrogation_48_.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/interrogation_48_.png diff --git a/common/ui/src/main/res/drawable-xhdpi/label_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/label_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/label_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/label_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/label_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/label_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/label_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/label_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/label_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/label_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/label_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/label_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/label_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/label_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/label_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/list_check_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/list_check_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/list_check_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/list_check_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/list_check_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/list_check_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/list_check_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/list_check_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/list_check_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/list_check_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/list_check_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/menu_burger_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/menu_burger_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/menu_burger_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/menu_burger_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/menu_burger_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/menu_burger_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/menu_burger_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/menu_burger_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/menu_burger_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/menu_burger_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/menu_burger_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/microphone_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/microphone_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/microphone_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/microphone_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/microphone_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/microphone_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/microphone_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/microphone_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/microphone_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/microphone_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/microphone_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/moon_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/moon_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/moon_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/moon_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/moon_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/moon_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/moon_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/moon_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/moon_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/moon_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/moon_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/no_label_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/no_label_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/no_label_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/no_label_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/no_label_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/no_label_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/no_label_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/no_label_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/no_label_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/no_label_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/no_label_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/opacity_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/opacity_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/opacity_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/opacity_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/opacity_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/opacity_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/opacity_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/opacity_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/opacity_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/opacity_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/opacity_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/pause_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/pause_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/pause_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/pause_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/pause_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/pause_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/pause_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/pause_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/pause_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/pause_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/pause_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/picture_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/picture_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/picture_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/picture_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/picture_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/picture_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/picture_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/picture_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/picture_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/picture_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/picture_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/play_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/play_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/play_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/play_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/play_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/play_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/play_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/play_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/play_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/play_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/play_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/play_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/play_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/play_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/play_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/play_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/play_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/play_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/play_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/play_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/plus_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/plus_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/plus_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/plus_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/plus_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/plus_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/plus_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/plus_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/plus_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/plus_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/plus_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/remove_user_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/remove_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/remove_user_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/remove_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/remove_user_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/remove_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/remove_user_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/remove_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/remove_user_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/remove_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/remove_user_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/reset_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/reset_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/reset_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/reset_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/reset_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/reset_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/reset_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/reset_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/reset_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/reset_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/reset_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/rotate_left_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/rotate_left_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/rotate_left_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/rotate_left_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/rotate_left_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/rotate_left_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/rotate_left_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/rotate_left_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/rotate_left_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/rotate_left_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/rotate_left_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/settings_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/settings_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/settings_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/settings_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/settings_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/settings_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/settings_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/settings_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/settings_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/settings_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/settings_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/share_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/share_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/share_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/share_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/share_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/share_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/share_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/share_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/share_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/share_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/share_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/share_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/share_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/share_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/share_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/share_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/share_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/share_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/share_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/share_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alpha_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alpha_down_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_alt_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_down_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_down_alt_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_amount_up_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_amount_up_alt_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sort_numeric_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sort_numeric_down_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/stop_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/stop_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/stop_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/stop_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/stop_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/stop_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/stop_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/stop_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/stop_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/stop_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/stop_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sun_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sun_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sun_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sun_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sun_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sun_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sun_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sun_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/sun_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/sun_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/sun_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/tags_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/tags_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/tags_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/tags_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/tags_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/tags_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/tags_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/tags_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/tags_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/tags_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/tags_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/trash_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/trash_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/trash_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/trash_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/trash_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/trash_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/trash_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/trash_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/trash_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/trash_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/trash_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_add_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_add_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_add_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_add_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_add_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_add_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_add_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_add_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/user_add_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/user_add_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/user_add_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/void_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/void_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/void_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/void_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/void_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/void_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/void_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/void_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/void_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/void_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/void_circle_48.png diff --git a/common/ui/src/main/res/drawable-xhdpi/wifi_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/wifi_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_18.png diff --git a/common/ui/src/main/res/drawable-xhdpi/wifi_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/wifi_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_20.png diff --git a/common/ui/src/main/res/drawable-xhdpi/wifi_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/wifi_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_24.png diff --git a/common/ui/src/main/res/drawable-xhdpi/wifi_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/wifi_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_36.png diff --git a/common/ui/src/main/res/drawable-xhdpi/wifi_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xhdpi/wifi_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xhdpi/wifi_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/add_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/add_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/add_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/add_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/add_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/add_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/add_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/add_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/add_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/add_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/add_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_down_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_down_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_up_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_up_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_up_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_up_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_small_up_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_small_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_small_up_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_up_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_up_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_up_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_up_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/angle_up_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/angle_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/angle_up_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/apps_sort_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/apps_sort_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/apps_sort_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/apps_sort_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/apps_sort_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/apps_sort_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/apps_sort_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/apps_sort_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/apps_sort_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/apps_sort_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/apps_sort_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_ring_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_ring_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_ring_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_ring_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_ring_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_ring_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_ring_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_ring_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/bell_ring_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/bell_ring_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/bell_ring_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/broom_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/broom_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/broom_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/broom_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/broom_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/broom_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/broom_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/broom_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/broom_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/broom_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/broom_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/calendar_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/calendar_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/calendar_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/calendar_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/calendar_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/calendar_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/calendar_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/calendar_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/calendar_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/calendar_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/calendar_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/camera_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/camera_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/camera_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/camera_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/camera_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/camera_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/camera_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/camera_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/camera_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/camera_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/camera_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/check_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/check_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/check_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/check_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/check_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/check_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/check_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/check_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/check_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/check_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/check_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/checkbox_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/checkbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/checkbox_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/checkbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/checkbox_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/checkbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/checkbox_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/checkbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/checkbox_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/checkbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/checkbox_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/circle_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/clock_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/clock_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/clock_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/clock_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/clock_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/clock_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/clock_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/clock_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/clock_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/clock_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/clock_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_disabled_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_disabled_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_download_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_download_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_download_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_download_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_download_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_download_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_download_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_download_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_download_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_download_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_download_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_upload_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_upload_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_upload_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_upload_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_upload_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_upload_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_upload_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_upload_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cloud_upload_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cloud_upload_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cloud_upload_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_24_.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_24_.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/comment_exclamation_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/comment_exclamation_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/copy_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/copy_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/copy_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/copy_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/copy_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/copy_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/copy_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/copy_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/copy_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/copy_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/copy_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/cross_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/cross_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/cross_circle_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/delete_user_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/delete_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/delete_user_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/delete_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/delete_user_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/delete_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/delete_user_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/delete_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/delete_user_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/delete_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/delete_user_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/disk_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/disk_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/disk_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/disk_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/disk_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/disk_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/disk_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/disk_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/disk_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/disk_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/disk_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/download_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/download_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/download_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/download_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/download_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/download_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/download_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/download_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/download_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/download_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/download_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/exit_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/exit_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/exit_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/exit_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/exit_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/exit_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/exit_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/exit_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/exit_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/exit_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/exit_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/github_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/github_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/github_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/github_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/github_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/github_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/github_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/github_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/github_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/github_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/github_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/globe_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/globe_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/globe_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/globe_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/globe_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/globe_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/globe_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/globe_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/globe_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/globe_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/globe_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/home_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/home_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/home_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/home_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/home_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/home_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/home_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/home_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/home_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/home_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/home_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/ic_image.xml b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_image.xml similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/ic_image.xml rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_image.xml diff --git a/common/ui/src/main/res/drawable/ic_launcher_background.xml b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_launcher_background.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_launcher_background.xml rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_launcher_background.xml diff --git a/common/ui/src/main/res/drawable/ic_launcher_foreground.xml b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_launcher_foreground.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_launcher_foreground.xml rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_launcher_foreground.xml diff --git a/common/ui/src/main/res/drawable-xxhdpi/ic_logo.xml b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_logo.xml similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/ic_logo.xml rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_logo.xml diff --git a/common/ui/src/main/res/drawable-xxhdpi/ic_music.xml b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_music.xml similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/ic_music.xml rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_music.xml diff --git a/common/ui/src/main/res/drawable-xxhdpi/ic_round_pause.xml b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_round_pause.xml similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/ic_round_pause.xml rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_round_pause.xml diff --git a/common/ui/src/main/res/drawable-xxhdpi/ic_round_play_arrow.xml b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_round_play_arrow.xml similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/ic_round_play_arrow.xml rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/ic_round_play_arrow.xml diff --git a/common/ui/src/main/res/drawable-xxhdpi/inbox_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/inbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/inbox_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/inbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/inbox_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/inbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/inbox_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/inbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/inbox_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/inbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/inbox_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interlining_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interlining_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interlining_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interlining_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interlining_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interlining_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interlining_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interlining_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interlining_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interlining_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interlining_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_18_.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_18_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_18_.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_18_.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_20_.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_20_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_20_.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_20_.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_24_.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_24_.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_36_.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_36_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_36_.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_36_.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/interrogation_48_.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_48_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/interrogation_48_.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/interrogation_48_.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/label_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/label_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/label_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/label_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/label_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/label_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/label_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/label_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/label_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/label_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/label_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/list_check_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/list_check_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/list_check_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/list_check_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/list_check_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/list_check_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/list_check_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/list_check_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/list_check_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/list_check_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/list_check_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/menu_burger_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/menu_burger_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/menu_burger_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/menu_burger_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/menu_burger_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/menu_burger_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/menu_burger_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/menu_burger_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/menu_burger_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/menu_burger_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/menu_burger_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/microphone_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/microphone_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/microphone_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/microphone_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/microphone_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/microphone_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/microphone_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/microphone_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/microphone_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/microphone_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/microphone_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/moon_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/moon_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/moon_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/moon_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/moon_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/moon_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/moon_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/moon_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/moon_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/moon_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/moon_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/no_label_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/no_label_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/no_label_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/no_label_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/no_label_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/no_label_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/no_label_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/no_label_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/no_label_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/no_label_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/no_label_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/opacity_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/opacity_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/opacity_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/opacity_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/opacity_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/opacity_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/opacity_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/opacity_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/opacity_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/opacity_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/opacity_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pause_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pause_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pause_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pause_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pause_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pause_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pause_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pause_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pause_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pause_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pause_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pencil_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pencil_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pencil_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pencil_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pencil_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pencil_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pencil_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pencil_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/pencil_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/pencil_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/pencil_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/picture_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/picture_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/picture_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/picture_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/picture_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/picture_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/picture_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/picture_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/picture_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/picture_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/picture_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/play_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/play_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/play_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/play_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/play_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/play_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/play_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/play_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/play_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/play_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/play_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/plus_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/plus_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/plus_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/plus_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/plus_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/plus_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/plus_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/plus_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/plus_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/plus_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/plus_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/remove_user_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/remove_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/remove_user_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/remove_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/remove_user_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/remove_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/remove_user_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/remove_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/remove_user_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/remove_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/remove_user_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/reset_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/reset_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/reset_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/reset_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/reset_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/reset_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/reset_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/reset_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/reset_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/reset_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/reset_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/rotate_left_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/rotate_left_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/rotate_left_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/rotate_left_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/rotate_left_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/rotate_left_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/rotate_left_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/rotate_left_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/rotate_left_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/rotate_left_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/rotate_left_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/settings_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/settings_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/settings_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/settings_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/settings_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/settings_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/settings_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/settings_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/settings_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/settings_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/settings_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/share_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/share_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/share_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/share_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/share_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/share_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/share_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/share_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/share_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/share_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/share_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alpha_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alpha_down_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_down_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_down_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_amount_up_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_amount_up_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sort_numeric_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sort_numeric_down_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/stop_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/stop_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/stop_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/stop_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/stop_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/stop_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/stop_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/stop_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/stop_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/stop_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/stop_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sun_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sun_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sun_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sun_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sun_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sun_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sun_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sun_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/sun_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/sun_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/sun_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/tags_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/tags_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/tags_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/tags_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/tags_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/tags_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/tags_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/tags_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/tags_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/tags_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/tags_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/trash_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/trash_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/trash_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/trash_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/trash_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/trash_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/trash_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/trash_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/trash_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/trash_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/trash_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_add_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_add_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_add_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_add_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_add_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_add_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_add_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_add_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/user_add_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/user_add_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/user_add_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/vinyl_background.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/vinyl_background.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/vinyl_background.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/vinyl_background.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/void_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/void_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/void_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/void_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/void_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/void_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/void_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/void_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/void_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/void_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/void_circle_48.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/wifi_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/wifi_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/wifi_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/wifi_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/wifi_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/wifi_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/wifi_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/wifi_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxhdpi/wifi_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxhdpi/wifi_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxhdpi/wifi_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/add_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/add_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/add_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/add_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/add_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/add_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/add_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/add_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/add_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/add_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/add_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_down_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_down_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_small_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_small_up_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_up_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_up_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_up_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_up_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_up_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_up_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_up_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_up_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/angle_up_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/angle_up_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/angle_up_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/apps_sort_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/apps_sort_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/apps_sort_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/apps_sort_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/apps_sort_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/apps_sort_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/apps_sort_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/apps_sort_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/apps_sort_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/apps_sort_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/apps_sort_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_ring_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_ring_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_ring_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_ring_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_ring_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_ring_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_ring_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_ring_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/bell_ring_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/bell_ring_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/bell_ring_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/broom_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/broom_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/broom_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/broom_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/broom_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/broom_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/broom_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/broom_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/broom_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/broom_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/broom_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/calendar_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/calendar_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/calendar_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/calendar_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/calendar_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/calendar_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/calendar_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/calendar_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/calendar_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/calendar_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/calendar_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/camera_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/camera_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/camera_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/camera_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/camera_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/camera_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/camera_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/camera_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/camera_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/camera_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/camera_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/check_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/check_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/check_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/check_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/check_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/check_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/check_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/check_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/check_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/check_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/check_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/checkbox_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/checkbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/checkbox_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/checkbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/checkbox_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/checkbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/checkbox_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/checkbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/checkbox_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/checkbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/checkbox_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/circle_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/clock_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/clock_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/clock_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/clock_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/clock_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/clock_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/clock_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/clock_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/clock_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/clock_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/clock_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_disabled_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_disabled_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_download_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_download_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_download_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_download_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_download_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_download_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_download_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_download_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_download_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_download_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_download_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cloud_upload_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cloud_upload_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_24_.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_24_.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/comment_exclamation_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/comment_exclamation_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/copy_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/copy_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/copy_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/copy_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/copy_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/copy_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/copy_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/copy_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/copy_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/copy_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/copy_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/cross_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/cross_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/cross_circle_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/delete_user_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/delete_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/delete_user_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/delete_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/delete_user_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/delete_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/delete_user_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/delete_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/delete_user_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/delete_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/delete_user_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/disk_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/disk_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/disk_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/disk_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/disk_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/disk_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/disk_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/disk_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/disk_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/disk_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/disk_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/download_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/download_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/download_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/download_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/download_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/download_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/download_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/download_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/download_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/download_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/download_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/exit_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/exit_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/exit_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/exit_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/exit_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/exit_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/exit_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/exit_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/exit_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/exit_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/exit_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/github_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/github_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/github_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/github_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/github_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/github_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/github_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/github_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/github_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/github_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/github_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/globe_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/globe_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/globe_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/globe_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/globe_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/globe_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/globe_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/globe_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/globe_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/globe_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/globe_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/home_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/home_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/home_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/home_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/home_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/home_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/home_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/home_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/home_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/home_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/home_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/inbox_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/inbox_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/inbox_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/inbox_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/inbox_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/inbox_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/inbox_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/inbox_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/inbox_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/inbox_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/inbox_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interlining_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interlining_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interlining_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interlining_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interlining_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interlining_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interlining_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interlining_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interlining_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interlining_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interlining_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_18_.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_18_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_18_.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_18_.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_20_.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_20_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_20_.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_20_.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_24_.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_24_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_24_.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_24_.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_36_.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_36_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_36_.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_36_.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/interrogation_48_.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_48_.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/interrogation_48_.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/interrogation_48_.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/label_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/label_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/label_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/label_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/label_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/label_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/label_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/label_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/label_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/label_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/label_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/list_check_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/list_check_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/list_check_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/list_check_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/list_check_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/list_check_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/list_check_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/list_check_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/list_check_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/list_check_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/list_check_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/menu_burger_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/menu_burger_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/menu_burger_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/menu_burger_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/menu_burger_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/menu_burger_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/menu_burger_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/menu_burger_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/menu_burger_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/menu_burger_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/menu_burger_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/microphone_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/microphone_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/microphone_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/microphone_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/microphone_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/microphone_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/microphone_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/microphone_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/microphone_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/microphone_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/microphone_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/moon_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/moon_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/moon_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/moon_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/moon_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/moon_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/moon_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/moon_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/moon_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/moon_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/moon_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/no_label_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/no_label_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/no_label_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/no_label_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/no_label_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/no_label_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/no_label_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/no_label_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/no_label_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/no_label_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/no_label_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/opacity_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/opacity_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/opacity_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/opacity_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/opacity_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/opacity_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/opacity_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/opacity_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/opacity_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/opacity_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/opacity_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/pause_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/pause_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/pause_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/pause_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/pause_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/pause_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/pause_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/pause_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/pause_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/pause_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/pause_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/picture_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/picture_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/picture_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/picture_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/picture_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/picture_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/picture_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/picture_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/picture_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/picture_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/picture_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/play_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/play_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/play_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/play_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/play_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/play_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/play_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/play_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/play_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/play_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/play_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/plus_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/plus_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/plus_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/plus_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/plus_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/plus_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/plus_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/plus_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/plus_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/plus_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/plus_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/remove_user_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/remove_user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/remove_user_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/remove_user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/remove_user_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/remove_user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/remove_user_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/remove_user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/remove_user_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/remove_user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/remove_user_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/reset_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/reset_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/reset_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/reset_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/reset_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/reset_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/reset_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/reset_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/reset_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/reset_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/reset_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/rotate_left_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/rotate_left_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/rotate_left_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/rotate_left_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/rotate_left_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/rotate_left_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/rotate_left_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/rotate_left_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/rotate_left_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/rotate_left_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/rotate_left_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/settings_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/settings_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/settings_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/settings_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/settings_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/settings_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/settings_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/settings_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/settings_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/settings_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/settings_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/share_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/share_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/share_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/share_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/share_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/share_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/share_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/share_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/share_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/share_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/share_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alpha_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alpha_down_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_down_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_amount_up_alt_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sort_numeric_down_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sort_numeric_down_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/stop_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/stop_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/stop_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/stop_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/stop_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/stop_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/stop_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/stop_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/stop_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/stop_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/stop_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sun_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sun_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sun_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sun_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sun_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sun_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sun_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sun_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/sun_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/sun_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/sun_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/tags_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/tags_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/tags_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/tags_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/tags_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/tags_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/tags_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/tags_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/tags_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/tags_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/tags_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/trash_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/trash_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/trash_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/trash_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/trash_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/trash_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/trash_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/trash_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/trash_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/trash_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/trash_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_add_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_add_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_add_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_add_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_add_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_add_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_add_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_add_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/user_add_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/user_add_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/user_add_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/void_circle_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/void_circle_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/void_circle_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/void_circle_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/void_circle_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/void_circle_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/void_circle_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/void_circle_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/void_circle_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/void_circle_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/void_circle_48.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_18.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_18.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_18.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_18.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_20.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_20.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_20.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_20.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_24.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_24.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_24.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_24.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_36.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_36.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_36.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_36.png diff --git a/common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_48.png b/ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_48.png similarity index 100% rename from common/ui/src/main/res/drawable-xxxhdpi/wifi_alt_48.png rename to ui/common/systemDesign/src/main/res/drawable-xxxhdpi/wifi_alt_48.png diff --git a/common/ui/src/main/res/drawable/add_24.xml b/ui/common/systemDesign/src/main/res/drawable/add_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/add_24.xml rename to ui/common/systemDesign/src/main/res/drawable/add_24.xml diff --git a/common/ui/src/main/res/drawable/angle_down_24_.xml b/ui/common/systemDesign/src/main/res/drawable/angle_down_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/angle_down_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/angle_down_24_.xml diff --git a/common/ui/src/main/res/drawable/angle_small_down_24_.xml b/ui/common/systemDesign/src/main/res/drawable/angle_small_down_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/angle_small_down_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/angle_small_down_24_.xml diff --git a/common/ui/src/main/res/drawable/angle_small_up_24_.xml b/ui/common/systemDesign/src/main/res/drawable/angle_small_up_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/angle_small_up_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/angle_small_up_24_.xml diff --git a/common/ui/src/main/res/drawable/angle_up_24_.xml b/ui/common/systemDesign/src/main/res/drawable/angle_up_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/angle_up_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/angle_up_24_.xml diff --git a/common/ui/src/main/res/drawable/apps_sort_24.xml b/ui/common/systemDesign/src/main/res/drawable/apps_sort_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/apps_sort_24.xml rename to ui/common/systemDesign/src/main/res/drawable/apps_sort_24.xml diff --git a/common/ui/src/main/res/drawable/bell_24.xml b/ui/common/systemDesign/src/main/res/drawable/bell_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/bell_24.xml rename to ui/common/systemDesign/src/main/res/drawable/bell_24.xml diff --git a/common/ui/src/main/res/drawable/bell_ring_24.xml b/ui/common/systemDesign/src/main/res/drawable/bell_ring_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/bell_ring_24.xml rename to ui/common/systemDesign/src/main/res/drawable/bell_ring_24.xml diff --git a/common/ui/src/main/res/drawable/brightness.png b/ui/common/systemDesign/src/main/res/drawable/brightness.png similarity index 100% rename from common/ui/src/main/res/drawable/brightness.png rename to ui/common/systemDesign/src/main/res/drawable/brightness.png diff --git a/common/ui/src/main/res/drawable/broom_24.xml b/ui/common/systemDesign/src/main/res/drawable/broom_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/broom_24.xml rename to ui/common/systemDesign/src/main/res/drawable/broom_24.xml diff --git a/common/ui/src/main/res/drawable/calendar_24.xml b/ui/common/systemDesign/src/main/res/drawable/calendar_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/calendar_24.xml rename to ui/common/systemDesign/src/main/res/drawable/calendar_24.xml diff --git a/common/ui/src/main/res/drawable/camera_24.xml b/ui/common/systemDesign/src/main/res/drawable/camera_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/camera_24.xml rename to ui/common/systemDesign/src/main/res/drawable/camera_24.xml diff --git a/common/ui/src/main/res/drawable/check_24.xml b/ui/common/systemDesign/src/main/res/drawable/check_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/check_24.xml rename to ui/common/systemDesign/src/main/res/drawable/check_24.xml diff --git a/common/ui/src/main/res/drawable/checkbox_24.xml b/ui/common/systemDesign/src/main/res/drawable/checkbox_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/checkbox_24.xml rename to ui/common/systemDesign/src/main/res/drawable/checkbox_24.xml diff --git a/common/ui/src/main/res/drawable/circle_24.xml b/ui/common/systemDesign/src/main/res/drawable/circle_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/circle_24.xml rename to ui/common/systemDesign/src/main/res/drawable/circle_24.xml diff --git a/common/ui/src/main/res/drawable/clock_24.xml b/ui/common/systemDesign/src/main/res/drawable/clock_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/clock_24.xml rename to ui/common/systemDesign/src/main/res/drawable/clock_24.xml diff --git a/common/ui/src/main/res/drawable/cloud_24.xml b/ui/common/systemDesign/src/main/res/drawable/cloud_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/cloud_24.xml rename to ui/common/systemDesign/src/main/res/drawable/cloud_24.xml diff --git a/common/ui/src/main/res/drawable/cloud_disabled_24_.xml b/ui/common/systemDesign/src/main/res/drawable/cloud_disabled_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/cloud_disabled_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/cloud_disabled_24_.xml diff --git a/common/ui/src/main/res/drawable/cloud_download_24_.xml b/ui/common/systemDesign/src/main/res/drawable/cloud_download_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/cloud_download_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/cloud_download_24_.xml diff --git a/common/ui/src/main/res/drawable/cloud_upload_24_.xml b/ui/common/systemDesign/src/main/res/drawable/cloud_upload_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/cloud_upload_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/cloud_upload_24_.xml diff --git a/common/ui/src/main/res/drawable/comment_exclamation_24.xml b/ui/common/systemDesign/src/main/res/drawable/comment_exclamation_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/comment_exclamation_24.xml rename to ui/common/systemDesign/src/main/res/drawable/comment_exclamation_24.xml diff --git a/common/ui/src/main/res/drawable/copy_24.xml b/ui/common/systemDesign/src/main/res/drawable/copy_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/copy_24.xml rename to ui/common/systemDesign/src/main/res/drawable/copy_24.xml diff --git a/common/ui/src/main/res/drawable/cross_24.xml b/ui/common/systemDesign/src/main/res/drawable/cross_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/cross_24.xml rename to ui/common/systemDesign/src/main/res/drawable/cross_24.xml diff --git a/common/ui/src/main/res/drawable/cross_circle_24.xml b/ui/common/systemDesign/src/main/res/drawable/cross_circle_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/cross_circle_24.xml rename to ui/common/systemDesign/src/main/res/drawable/cross_circle_24.xml diff --git a/common/ui/src/main/res/drawable/cross_circle_24_.xml b/ui/common/systemDesign/src/main/res/drawable/cross_circle_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/cross_circle_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/cross_circle_24_.xml diff --git a/common/ui/src/main/res/drawable/delete_user_24.xml b/ui/common/systemDesign/src/main/res/drawable/delete_user_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/delete_user_24.xml rename to ui/common/systemDesign/src/main/res/drawable/delete_user_24.xml diff --git a/common/ui/src/main/res/drawable/disk_24.xml b/ui/common/systemDesign/src/main/res/drawable/disk_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/disk_24.xml rename to ui/common/systemDesign/src/main/res/drawable/disk_24.xml diff --git a/common/ui/src/main/res/drawable/download_24.xml b/ui/common/systemDesign/src/main/res/drawable/download_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/download_24.xml rename to ui/common/systemDesign/src/main/res/drawable/download_24.xml diff --git a/common/ui/src/main/res/drawable/exit_24.xml b/ui/common/systemDesign/src/main/res/drawable/exit_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/exit_24.xml rename to ui/common/systemDesign/src/main/res/drawable/exit_24.xml diff --git a/common/ui/src/main/res/drawable/github_24.xml b/ui/common/systemDesign/src/main/res/drawable/github_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/github_24.xml rename to ui/common/systemDesign/src/main/res/drawable/github_24.xml diff --git a/common/ui/src/main/res/drawable/globe_24.xml b/ui/common/systemDesign/src/main/res/drawable/globe_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/globe_24.xml rename to ui/common/systemDesign/src/main/res/drawable/globe_24.xml diff --git a/common/ui/src/main/res/drawable/home_24.xml b/ui/common/systemDesign/src/main/res/drawable/home_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/home_24.xml rename to ui/common/systemDesign/src/main/res/drawable/home_24.xml diff --git a/common/ui/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml b/ui/common/systemDesign/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml rename to ui/common/systemDesign/src/main/res/drawable/ic_baseline_add_photo_alternate_24.xml diff --git a/common/ui/src/main/res/drawable/ic_baseline_circle_24.xml b/ui/common/systemDesign/src/main/res/drawable/ic_baseline_circle_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_baseline_circle_24.xml rename to ui/common/systemDesign/src/main/res/drawable/ic_baseline_circle_24.xml diff --git a/common/ui/src/main/res/drawable/ic_baseline_dashboard_24.xml b/ui/common/systemDesign/src/main/res/drawable/ic_baseline_dashboard_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_baseline_dashboard_24.xml rename to ui/common/systemDesign/src/main/res/drawable/ic_baseline_dashboard_24.xml diff --git a/common/ui/src/main/res/drawable/ic_baseline_delete_outline_24.xml b/ui/common/systemDesign/src/main/res/drawable/ic_baseline_delete_outline_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_baseline_delete_outline_24.xml rename to ui/common/systemDesign/src/main/res/drawable/ic_baseline_delete_outline_24.xml diff --git a/common/ui/src/main/res/drawable/ic_baseline_gesture_24.xml b/ui/common/systemDesign/src/main/res/drawable/ic_baseline_gesture_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_baseline_gesture_24.xml rename to ui/common/systemDesign/src/main/res/drawable/ic_baseline_gesture_24.xml diff --git a/common/ui/src/main/res/drawable/ic_baseline_view_agenda_24.xml b/ui/common/systemDesign/src/main/res/drawable/ic_baseline_view_agenda_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_baseline_view_agenda_24.xml rename to ui/common/systemDesign/src/main/res/drawable/ic_baseline_view_agenda_24.xml diff --git a/common/ui/src/main/res/drawable/ic_eraser_black_24dp.xml b/ui/common/systemDesign/src/main/res/drawable/ic_eraser_black_24dp.xml similarity index 100% rename from common/ui/src/main/res/drawable/ic_eraser_black_24dp.xml rename to ui/common/systemDesign/src/main/res/drawable/ic_eraser_black_24dp.xml diff --git a/ui/common/systemDesign/src/main/res/drawable/ic_launcher_background.xml b/ui/common/systemDesign/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/ui/common/systemDesign/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/common/systemDesign/src/main/res/drawable/ic_launcher_foreground.xml b/ui/common/systemDesign/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/ui/common/systemDesign/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/common/ui/src/main/res/drawable/inbox_24.xml b/ui/common/systemDesign/src/main/res/drawable/inbox_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/inbox_24.xml rename to ui/common/systemDesign/src/main/res/drawable/inbox_24.xml diff --git a/common/ui/src/main/res/drawable/interlining_24.xml b/ui/common/systemDesign/src/main/res/drawable/interlining_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/interlining_24.xml rename to ui/common/systemDesign/src/main/res/drawable/interlining_24.xml diff --git a/common/ui/src/main/res/drawable/interrogation_24.xml b/ui/common/systemDesign/src/main/res/drawable/interrogation_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/interrogation_24.xml rename to ui/common/systemDesign/src/main/res/drawable/interrogation_24.xml diff --git a/common/ui/src/main/res/drawable/interrogation_24_.xml b/ui/common/systemDesign/src/main/res/drawable/interrogation_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/interrogation_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/interrogation_24_.xml diff --git a/common/ui/src/main/res/drawable/label_24.xml b/ui/common/systemDesign/src/main/res/drawable/label_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/label_24.xml rename to ui/common/systemDesign/src/main/res/drawable/label_24.xml diff --git a/common/ui/src/main/res/drawable/list_check_24.xml b/ui/common/systemDesign/src/main/res/drawable/list_check_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/list_check_24.xml rename to ui/common/systemDesign/src/main/res/drawable/list_check_24.xml diff --git a/common/ui/src/main/res/drawable/mat.jpg b/ui/common/systemDesign/src/main/res/drawable/mat.jpg similarity index 100% rename from common/ui/src/main/res/drawable/mat.jpg rename to ui/common/systemDesign/src/main/res/drawable/mat.jpg diff --git a/common/ui/src/main/res/drawable/menu_burger_24.xml b/ui/common/systemDesign/src/main/res/drawable/menu_burger_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/menu_burger_24.xml rename to ui/common/systemDesign/src/main/res/drawable/menu_burger_24.xml diff --git a/common/ui/src/main/res/drawable/microphone_24.xml b/ui/common/systemDesign/src/main/res/drawable/microphone_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/microphone_24.xml rename to ui/common/systemDesign/src/main/res/drawable/microphone_24.xml diff --git a/common/ui/src/main/res/drawable/moon_24.xml b/ui/common/systemDesign/src/main/res/drawable/moon_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/moon_24.xml rename to ui/common/systemDesign/src/main/res/drawable/moon_24.xml diff --git a/common/ui/src/main/res/drawable/no_label_24.xml b/ui/common/systemDesign/src/main/res/drawable/no_label_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/no_label_24.xml rename to ui/common/systemDesign/src/main/res/drawable/no_label_24.xml diff --git a/common/ui/src/main/res/drawable/opacity_24.xml b/ui/common/systemDesign/src/main/res/drawable/opacity_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/opacity_24.xml rename to ui/common/systemDesign/src/main/res/drawable/opacity_24.xml diff --git a/common/ui/src/main/res/drawable/paint_palette.png b/ui/common/systemDesign/src/main/res/drawable/paint_palette.png similarity index 100% rename from common/ui/src/main/res/drawable/paint_palette.png rename to ui/common/systemDesign/src/main/res/drawable/paint_palette.png diff --git a/common/ui/src/main/res/drawable/pause_24.xml b/ui/common/systemDesign/src/main/res/drawable/pause_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/pause_24.xml rename to ui/common/systemDesign/src/main/res/drawable/pause_24.xml diff --git a/common/ui/src/main/res/drawable/picture_24.xml b/ui/common/systemDesign/src/main/res/drawable/picture_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/picture_24.xml rename to ui/common/systemDesign/src/main/res/drawable/picture_24.xml diff --git a/common/ui/src/main/res/drawable/play_24.xml b/ui/common/systemDesign/src/main/res/drawable/play_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/play_24.xml rename to ui/common/systemDesign/src/main/res/drawable/play_24.xml diff --git a/common/ui/src/main/res/drawable/plus_24.xml b/ui/common/systemDesign/src/main/res/drawable/plus_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/plus_24.xml rename to ui/common/systemDesign/src/main/res/drawable/plus_24.xml diff --git a/common/ui/src/main/res/drawable/redo.png b/ui/common/systemDesign/src/main/res/drawable/redo.png similarity index 100% rename from common/ui/src/main/res/drawable/redo.png rename to ui/common/systemDesign/src/main/res/drawable/redo.png diff --git a/common/ui/src/main/res/drawable/remove_user_24.xml b/ui/common/systemDesign/src/main/res/drawable/remove_user_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/remove_user_24.xml rename to ui/common/systemDesign/src/main/res/drawable/remove_user_24.xml diff --git a/common/ui/src/main/res/drawable/reset_24.xml b/ui/common/systemDesign/src/main/res/drawable/reset_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/reset_24.xml rename to ui/common/systemDesign/src/main/res/drawable/reset_24.xml diff --git a/common/ui/src/main/res/drawable/rotate_left_24_.xml b/ui/common/systemDesign/src/main/res/drawable/rotate_left_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/rotate_left_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/rotate_left_24_.xml diff --git a/common/ui/src/main/res/drawable/settings_24.xml b/ui/common/systemDesign/src/main/res/drawable/settings_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/settings_24.xml rename to ui/common/systemDesign/src/main/res/drawable/settings_24.xml diff --git a/common/ui/src/main/res/drawable/share_24.xml b/ui/common/systemDesign/src/main/res/drawable/share_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/share_24.xml rename to ui/common/systemDesign/src/main/res/drawable/share_24.xml diff --git a/common/ui/src/main/res/drawable/sort.png b/ui/common/systemDesign/src/main/res/drawable/sort.png similarity index 100% rename from common/ui/src/main/res/drawable/sort.png rename to ui/common/systemDesign/src/main/res/drawable/sort.png diff --git a/common/ui/src/main/res/drawable/sort_alpha_down_24.xml b/ui/common/systemDesign/src/main/res/drawable/sort_alpha_down_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/sort_alpha_down_24.xml rename to ui/common/systemDesign/src/main/res/drawable/sort_alpha_down_24.xml diff --git a/common/ui/src/main/res/drawable/sort_alt_24_.xml b/ui/common/systemDesign/src/main/res/drawable/sort_alt_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/sort_alt_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/sort_alt_24_.xml diff --git a/common/ui/src/main/res/drawable/sort_amount_down_alt_24.xml b/ui/common/systemDesign/src/main/res/drawable/sort_amount_down_alt_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/sort_amount_down_alt_24.xml rename to ui/common/systemDesign/src/main/res/drawable/sort_amount_down_alt_24.xml diff --git a/common/ui/src/main/res/drawable/sort_amount_up_alt_24.xml b/ui/common/systemDesign/src/main/res/drawable/sort_amount_up_alt_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/sort_amount_up_alt_24.xml rename to ui/common/systemDesign/src/main/res/drawable/sort_amount_up_alt_24.xml diff --git a/common/ui/src/main/res/drawable/sort_numeric_down_24_.xml b/ui/common/systemDesign/src/main/res/drawable/sort_numeric_down_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/sort_numeric_down_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/sort_numeric_down_24_.xml diff --git a/common/ui/src/main/res/drawable/stop_24.xml b/ui/common/systemDesign/src/main/res/drawable/stop_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/stop_24.xml rename to ui/common/systemDesign/src/main/res/drawable/stop_24.xml diff --git a/common/ui/src/main/res/drawable/sun_24.xml b/ui/common/systemDesign/src/main/res/drawable/sun_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/sun_24.xml rename to ui/common/systemDesign/src/main/res/drawable/sun_24.xml diff --git a/common/ui/src/main/res/drawable/tags_24.xml b/ui/common/systemDesign/src/main/res/drawable/tags_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/tags_24.xml rename to ui/common/systemDesign/src/main/res/drawable/tags_24.xml diff --git a/common/ui/src/main/res/drawable/trash_24.xml b/ui/common/systemDesign/src/main/res/drawable/trash_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/trash_24.xml rename to ui/common/systemDesign/src/main/res/drawable/trash_24.xml diff --git a/common/ui/src/main/res/drawable/undo.png b/ui/common/systemDesign/src/main/res/drawable/undo.png similarity index 100% rename from common/ui/src/main/res/drawable/undo.png rename to ui/common/systemDesign/src/main/res/drawable/undo.png diff --git a/common/ui/src/main/res/drawable/user_24.xml b/ui/common/systemDesign/src/main/res/drawable/user_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/user_24.xml rename to ui/common/systemDesign/src/main/res/drawable/user_24.xml diff --git a/common/ui/src/main/res/drawable/user_add_24.xml b/ui/common/systemDesign/src/main/res/drawable/user_add_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/user_add_24.xml rename to ui/common/systemDesign/src/main/res/drawable/user_add_24.xml diff --git a/common/ui/src/main/res/drawable/void_circle_24.xml b/ui/common/systemDesign/src/main/res/drawable/void_circle_24.xml similarity index 100% rename from common/ui/src/main/res/drawable/void_circle_24.xml rename to ui/common/systemDesign/src/main/res/drawable/void_circle_24.xml diff --git a/common/ui/src/main/res/drawable/wifi_alt_24_.xml b/ui/common/systemDesign/src/main/res/drawable/wifi_alt_24_.xml similarity index 100% rename from common/ui/src/main/res/drawable/wifi_alt_24_.xml rename to ui/common/systemDesign/src/main/res/drawable/wifi_alt_24_.xml diff --git a/ui/common/systemDesign/src/test/java/city/zouitel/systemDesign/ExampleUnitTest.kt b/ui/common/systemDesign/src/test/java/city/zouitel/systemDesign/ExampleUnitTest.kt new file mode 100644 index 00000000..59dd3777 --- /dev/null +++ b/ui/common/systemDesign/src/test/java/city/zouitel/systemDesign/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.systemDesign + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/plugins/.gitignore b/ui/features/audios/.gitignore similarity index 100% rename from plugins/.gitignore rename to ui/features/audios/.gitignore diff --git a/ui/features/audios/build.gradle.kts b/ui/features/audios/build.gradle.kts new file mode 100644 index 00000000..a1331141 --- /dev/null +++ b/ui/features/audios/build.gradle.kts @@ -0,0 +1,74 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.audios" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.core.datastore) + implementation(projects.domain) + implementation(projects.ui.common.systemDesign) + + //AndroidX. + implementation(libs.constraintlayout) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) +} \ No newline at end of file diff --git a/ui/features/audios/consumer-rules.pro b/ui/features/audios/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/audios/proguard-rules.pro b/ui/features/audios/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/audios/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/audios/src/androidTest/java/city/zouitel/audios/ExampleInstrumentedTest.kt b/ui/features/audios/src/androidTest/java/city/zouitel/audios/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..c860aab1 --- /dev/null +++ b/ui/features/audios/src/androidTest/java/city/zouitel/audios/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.audios + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.audios.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/data/repository/src/main/AndroidManifest.xml b/ui/features/audios/src/main/AndroidManifest.xml similarity index 100% rename from data/repository/src/main/AndroidManifest.xml rename to ui/features/audios/src/main/AndroidManifest.xml diff --git a/ui/features/media-player/src/main/java/com/example/media_player/MediaPlayerViewModel.kt b/ui/features/audios/src/main/java/city/zouitel/audios/MediaPlayerViewModel.kt similarity index 74% rename from ui/features/media-player/src/main/java/com/example/media_player/MediaPlayerViewModel.kt rename to ui/features/audios/src/main/java/city/zouitel/audios/MediaPlayerViewModel.kt index 1e847136..774afe4c 100644 --- a/ui/features/media-player/src/main/java/com/example/media_player/MediaPlayerViewModel.kt +++ b/ui/features/audios/src/main/java/city/zouitel/audios/MediaPlayerViewModel.kt @@ -1,22 +1,20 @@ -package com.example.media_player +package city.zouitel.audios import android.content.Context +import androidx.compose.runtime.mutableLongStateOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.exoplayer.ExoPlayerImpl -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.exoplayer.ExoPlayerImpl import kotlinx.coroutines.launch import java.text.SimpleDateFormat import java.util.* -import javax.inject.Inject -@HiltViewModel -class MediaPlayerViewModel @Inject constructor( +class MediaPlayerViewModel ( private val exoBuilder : ExoPlayerImpl, -):ViewModel() { +): ViewModel() { - var getMediaDuration = mutableStateOf(0L) + var getMediaDuration = mutableLongStateOf(0L) private set fun playMedia(mediaUri: String) { @@ -44,9 +42,9 @@ class MediaPlayerViewModel @Inject constructor( fun getMediaDuration(context: Context, path: String):Long { viewModelScope.launch { - getMediaDuration.value = exoBuilder.getMediaDuration(context,path) + getMediaDuration.longValue = exoBuilder.getMediaDuration(context,path) } - return getMediaDuration.value + return getMediaDuration.longValue } internal fun formatLong(value: Long): String { diff --git a/ui/features/media-player/src/main/java/com/example/media_player/NoteMediaPlayer.kt b/ui/features/audios/src/main/java/city/zouitel/audios/NoteMediaPlayer.kt similarity index 69% rename from ui/features/media-player/src/main/java/com/example/media_player/NoteMediaPlayer.kt rename to ui/features/audios/src/main/java/city/zouitel/audios/NoteMediaPlayer.kt index ebe3ab17..22e12501 100644 --- a/ui/features/media-player/src/main/java/com/example/media_player/NoteMediaPlayer.kt +++ b/ui/features/audios/src/main/java/city/zouitel/audios/NoteMediaPlayer.kt @@ -1,4 +1,4 @@ -package com.example.media_player +package city.zouitel.audios import android.annotation.SuppressLint import androidx.compose.foundation.clickable @@ -13,51 +13,49 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.AdaptingRow -import com.example.common_ui.Cons.AUDIOS -import com.example.common_ui.Cons.MP3 -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.PAUSE_CIRCLE_FILLED_ICON -import com.example.common_ui.Icons.PLAY_CIRCLE_FILLED_ICON -import com.example.common_ui.Icons.TRASH_ICON +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.Cons.AUDIOS +import city.zouitel.systemDesign.Cons.MP3 +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.PAUSE_CIRCLE_FILLED_ICON +import city.zouitel.systemDesign.Icons.PLAY_CIRCLE_FILLED_ICON +import city.zouitel.systemDesign.Icons.TRASH_ICON import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.koin.androidx.compose.koinViewModel import java.io.File - @SuppressLint("CoroutineCreationDuringComposition") @Composable fun NoteMediaPlayer( - exoViewModule: MediaPlayerViewModel = hiltViewModel(), - datastoreVM: DataStoreVM = hiltViewModel(), + exoViewModule: MediaPlayerViewModel = koinViewModel(), + datastoreVM: DataStoreVM = koinViewModel(), localMediaUid: String? ) { val context = LocalContext.current - val processState = remember { mutableStateOf(0f) } val scope = rememberCoroutineScope() - val isPlaying = remember { mutableStateOf(false) } val mediaFile = context.filesDir.path + "/$AUDIOS/" + localMediaUid + "." + MP3 + var processState by remember { mutableFloatStateOf(0f) } + var isPlaying by remember { mutableStateOf(false) } - val currentLayout = datastoreVM.getLayout.collectAsState() - + val currentLayout by datastoreVM.getLayout.collectAsState() // val exoMedia = exoViewModule.prepareMediaPlayer(mediaFile) scope.launch { - while(isPlaying.value && processState.value <= 1f) { + while(isPlaying && processState <= 1f) { delay(exoViewModule.getMediaDuration(context,mediaFile) / 100) - processState.value += .011f + processState += .011f } when { - processState.value >= 1f -> { - isPlaying.value = false - processState.value = 0f + processState >= 1f -> { + isPlaying = false + processState = 0f } } } - if (isPlaying.value) exoViewModule.playMedia(mediaFile) else exoViewModule.pauseMedia(mediaFile) + if (isPlaying) exoViewModule.playMedia(mediaFile) else exoViewModule.pauseMedia(mediaFile) Surface( modifier = Modifier @@ -69,19 +67,19 @@ fun NoteMediaPlayer( AdaptingRow(modifier = Modifier .padding(start = 5.dp, end = 5.dp)) { // - if (currentLayout.value == "GRID"){ + if (currentLayout == "GRID"){ Icon( painter = painterResource( - id = if (isPlaying.value) PAUSE_CIRCLE_FILLED_ICON else PLAY_CIRCLE_FILLED_ICON + id = if (isPlaying) PAUSE_CIRCLE_FILLED_ICON else PLAY_CIRCLE_FILLED_ICON ), null, modifier = Modifier.clickable { - isPlaying.value = !isPlaying.value + isPlaying = !isPlaying } ) LinearProgressIndicator( - progress = processState.value, + progress = processState, modifier = Modifier .weight(1f) .padding(10.dp), @@ -93,16 +91,16 @@ fun NoteMediaPlayer( ) { Icon( painter = painterResource( - id = if (isPlaying.value) PAUSE_CIRCLE_FILLED_ICON else PLAY_CIRCLE_FILLED_ICON + id = if (isPlaying) PAUSE_CIRCLE_FILLED_ICON else PLAY_CIRCLE_FILLED_ICON ), null, modifier = Modifier .padding(start = 3.dp) .clickable { - isPlaying.value = !isPlaying.value + isPlaying = !isPlaying } ) - CircularProgressIndicator(progress = processState.value, + CircularProgressIndicator(progress = processState, modifier = Modifier, ) } diff --git a/ui/features/audios/src/main/java/city/zouitel/audios/di/ExoPlayerMod.kt b/ui/features/audios/src/main/java/city/zouitel/audios/di/ExoPlayerMod.kt new file mode 100644 index 00000000..cd8f3569 --- /dev/null +++ b/ui/features/audios/src/main/java/city/zouitel/audios/di/ExoPlayerMod.kt @@ -0,0 +1,19 @@ +package city.zouitel.audios.di + +import android.content.Context +import com.google.android.exoplayer2.ExoPlayer + +//@Module +//@InstallIn(SingletonComponent::class) +object ExoPlayerMod { + +// @Singleton +// @Provides + fun buildMediaPlayer( + /*@ApplicationContext*/ context: Context, + ) = ExoPlayer.Builder(context).build().apply { + setHandleAudioBecomingNoisy(true) + } +} + + diff --git a/ui/features/audios/src/main/java/city/zouitel/audios/di/exoPlayerDI.kt b/ui/features/audios/src/main/java/city/zouitel/audios/di/exoPlayerDI.kt new file mode 100644 index 00000000..a574de4c --- /dev/null +++ b/ui/features/audios/src/main/java/city/zouitel/audios/di/exoPlayerDI.kt @@ -0,0 +1,23 @@ +package city.zouitel.audios.di + +import com.google.android.exoplayer2.ExoPlayer +import org.koin.android.ext.koin.androidContext +import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.dsl.module +import city.zouitel.audios.MediaPlayerViewModel +import org.koin.core.module.dsl.singleOf +import city.zouitel.domain.exoplayer.* +import org.koin.dsl.bind + +val exoPlayerKoinModule = module { + single { + ExoPlayer.Builder(androidContext()).build().apply { + setHandleAudioBecomingNoisy(true) + } + } + + singleOf(::ExoPlayerImpl) bind ExoRepo::class + + viewModelOf(::MediaPlayerViewModel) +} \ No newline at end of file diff --git a/ui/features/audios/src/test/java/city/zouitel/audios/ExampleUnitTest.kt b/ui/features/audios/src/test/java/city/zouitel/audios/ExampleUnitTest.kt new file mode 100644 index 00000000..82a8b557 --- /dev/null +++ b/ui/features/audios/src/test/java/city/zouitel/audios/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.audios + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/camera/build.gradle.kts b/ui/features/camera/build.gradle.kts index 4ecc8121..06dfab0a 100644 --- a/ui/features/camera/build.gradle.kts +++ b/ui/features/camera/build.gradle.kts @@ -1,68 +1,73 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { -// id("com.android.library") -// id("org.jetbrains.kotlin.android") - id("city.android-lib") - id("city.compose-lib") -// id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.camera" -// compileSdk = 33 -// -// defaultConfig { -// minSdk = 25 -// targetSdk = 33 -// -// testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" -// consumerProguardFiles("consumer-rules.pro") -// } -// -// buildTypes { -// release { -// isMinifyEnabled = false -// proguardFiles( -// getDefaultProguardFile("proguard-android-optimize.txt"), -// "proguard-rules.pro" -// ) -// } -// } -// compileOptions { -// sourceCompatibility = JavaVersion.VERSION_1_8 -// targetCompatibility = JavaVersion.VERSION_1_8 -// } -// buildFeatures { -// compose = true -// } -// composeOptions { -// kotlinCompilerExtensionVersion = "1.4.0" -// } -// kotlinOptions { -// jvmTarget = "1.8" -// } + namespace = "city.zouitel.camera" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { - implementation(projects.common.ui) - //AndroidX. -// implementation(libs.androidx.core) -// implementation(libs.androidx.corektx) -// implementation(libs.androidx.appcompat) -// implementation(libs.androidx.runtimektx) - implementation(libs.androidx.constraintlayout) - //Compose. - implementation(libs.compose.ui) - implementation(libs.compose.material3) - implementation(libs.compose.activity) - implementation(libs.compose.navigation) - implementation(libs.compose.toolingpreview) - implementation(libs.compose.viewmodel) + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) + + //AndroidX. + implementation(libs.constraintlayout) + // CameraX implementation (libs.camerax.core) implementation (libs.camerax.lifecycle) implementation (libs.camerax.view) implementation (libs.camerax.extensions) - } \ No newline at end of file diff --git a/ui/features/camera/consumer-rules.pro b/ui/features/camera/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/camera/proguard-rules.pro b/ui/features/camera/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/camera/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/camera/src/androidTest/java/city/zouitel/camera/ExampleInstrumentedTest.kt b/ui/features/camera/src/androidTest/java/city/zouitel/camera/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..0ae546b7 --- /dev/null +++ b/ui/features/camera/src/androidTest/java/city/zouitel/camera/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.camera + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.camera.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/camera/src/main/java/com/example/camera/AdaptingRow.kt b/ui/features/camera/src/main/java/com/example/camera/AdaptingRow.kt deleted file mode 100644 index bcbd4156..00000000 --- a/ui/features/camera/src/main/java/com/example/camera/AdaptingRow.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.camera - -import android.icu.text.MeasureFormat -import androidx.compose.foundation.layout.* -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp - -@Composable -internal fun RowScope.AdaptingRow( - modifier: Modifier = Modifier, - content: @Composable () -> Unit, -) { - Row( - modifier = modifier, - horizontalArrangement = Arrangement.SpaceAround, - verticalAlignment = Alignment.CenterVertically - ) { - content.invoke() - } -} - -@Composable -internal fun Unit.AdaptingRowBetween( - modifier: Modifier = Modifier, - content: @Composable () -> Unit, -) { - Row( - modifier = modifier, - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically - ) { - content.invoke() - } -} diff --git a/ui/features/camera/src/main/java/com/example/camera/AddImageDialog.kt b/ui/features/camera/src/main/java/com/example/camera/AddImageDialog.kt deleted file mode 100644 index 66cc7fbc..00000000 --- a/ui/features/camera/src/main/java/com/example/camera/AddImageDialog.kt +++ /dev/null @@ -1,102 +0,0 @@ -package com.example.camera - -import android.net.Uri -import androidx.activity.compose.ManagedActivityResultLauncher -import androidx.compose.foundation.layout.* -import androidx.compose.material3.* -import androidx.compose.runtime.Composable -import androidx.compose.runtime.MutableState -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import androidx.navigation.NavController -import com.example.common_ui.Cons.CAMERA_ROUTE -import com.example.common_ui.Icons.CAMERA_ICON -import com.example.common_ui.Icons.IMAGE_ICON - -@Composable -internal fun AddImageDialog( - dialogState: MutableState, -// photoLaunch: ManagedActivityResultLauncher, - imageLaunch: ManagedActivityResultLauncher, - navController: NavController, - uid: String? -) { - - AlertDialog( - onDismissRequest = { - dialogState.value = false - }, - confirmButton = {}, - title = { - Row { - AdaptingRow(modifier = Modifier.fillMaxWidth()) { - Text(text = "Add Image", fontSize = 25.sp) - } - } - }, - text = { - Column { - OutlinedIconButton( - modifier = Modifier - .fillMaxWidth() - .height(50.dp), - onClick = { -// prCamera.launchPermissionRequest() -// if (prCamera.status.isGranted) { -// photoLaunch.launch() -// } else { -// Toast -// .makeText(c, "permission denied", Toast.LENGTH_SHORT) -// .show() -// } - navController.navigate( - CAMERA_ROUTE + "/" + - uid - ) - dialogState.value = false - }) { - Row( - horizontalArrangement = Arrangement.Start, - modifier = Modifier - .fillMaxWidth() - .padding(start = 20.dp) - ) { - Icon(painterResource(id = CAMERA_ICON), contentDescription = null, - modifier = Modifier.size(28.dp) - ) - Spacer(modifier = Modifier.width(10.dp)) - Text(text = "Take Photo", fontSize = 17.sp) - } - } - - Spacer(modifier = Modifier.height(20.dp)) - - OutlinedIconButton( - modifier = Modifier - .fillMaxWidth() - .height(50.dp), - onClick = { - imageLaunch.launch("image/*") - dialogState.value = false - }) { - Row( - horizontalArrangement = Arrangement.Start, - modifier = Modifier - .fillMaxWidth() - .padding(start = 20.dp) - ) { - Icon( - painter = painterResource(id = IMAGE_ICON), - contentDescription = null, - modifier = Modifier.size(28.dp) - ) - Spacer(modifier = Modifier.width(10.dp)) - Text(text = "Choose Image", fontSize = 17.sp) - } - } - } - }, - ) -} \ No newline at end of file diff --git a/ui/features/camera/src/main/java/com/example/camera/CameraCompose.kt b/ui/features/camera/src/main/java/com/example/camera/CameraCompose.kt deleted file mode 100644 index d19f97ab..00000000 --- a/ui/features/camera/src/main/java/com/example/camera/CameraCompose.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.example.camera - -import android.Manifest -import android.content.Context -import android.content.pm.PackageManager -import androidx.activity.compose.rememberLauncherForActivityResult -import androidx.activity.result.contract.ActivityResultContracts -import androidx.compose.foundation.Canvas -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.StrokeCap -import androidx.compose.ui.graphics.drawscope.Stroke -import androidx.compose.ui.unit.dp -import androidx.compose.ui.viewinterop.AndroidView -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import com.example.camera.Commons.REQUIRED_PERMISSIONS - -@Composable -fun CameraCompose( - context: Context, - owner: LifecycleOwner, - cameraX: CameraXVM, - onCaptureClick: () -> Unit, -) { - var hasCamPermission by remember { - mutableStateOf( - REQUIRED_PERMISSIONS.all { - ContextCompat.checkSelfPermission(context, it) == - PackageManager.PERMISSION_GRANTED - }) - } - - - val launcher = rememberLauncherForActivityResult( - contract = ActivityResultContracts.RequestMultiplePermissions(), - onResult = { granted -> - hasCamPermission = granted.size == 2 - } - ) - LaunchedEffect(key1 = true) { - launcher.launch( - arrayOf( - Manifest.permission.CAMERA, - Manifest.permission.WRITE_EXTERNAL_STORAGE - ) - ) - } - Column(modifier = Modifier.fillMaxSize()) { - if (hasCamPermission) { - AndroidView( - modifier = Modifier.fillMaxSize(), - factory = { cameraX.startCameraPreviewView(context, owner) } - ) - } - } - Column( - modifier = Modifier.fillMaxSize(), Arrangement.Bottom, Alignment.CenterHorizontally - ) { - Canvas( - modifier = Modifier - .size(70.dp) - .padding(bottom = 3.dp) - .clickable { - onCaptureClick.invoke() - } - ) { - drawArc( - color = Color.White, - startAngle = 1f, - sweepAngle = 360f, - useCenter = true, - style = Stroke(width = 10f,cap = StrokeCap.Round) - ) - } - } -} - diff --git a/ui/features/camera/src/main/java/com/example/camera/CameraXVM.kt b/ui/features/camera/src/main/java/com/example/camera/CameraXVM.kt deleted file mode 100644 index 3da9ed0b..00000000 --- a/ui/features/camera/src/main/java/com/example/camera/CameraXVM.kt +++ /dev/null @@ -1,141 +0,0 @@ -package com.example.camera - -import android.content.ContentValues -import android.content.Context -import android.content.Intent -import android.graphics.Bitmap -import android.graphics.BitmapFactory -import android.net.Uri -import android.os.Build -import android.os.Environment -import android.provider.MediaStore -import android.widget.Toast -import androidx.camera.core.* -import androidx.camera.lifecycle.ProcessCameraProvider -import androidx.camera.view.PreviewView -import androidx.core.content.ContextCompat -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.ViewModel -import androidx.lifecycle.lifecycleScope -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.Dispatchers.IO -import kotlinx.coroutines.async -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import java.io.File -import java.io.FileOutputStream -import java.io.OutputStream -import java.nio.ByteBuffer - -class CameraXVM: ViewModel() { - - private var imageCapture: ImageCapture? = null - - fun startCameraPreviewView(context: Context, owner: LifecycleOwner,): PreviewView { - val cameraProviderFuture = ProcessCameraProvider.getInstance(context) - val previewView = PreviewView(context) - val preview = Preview.Builder().build().also { - it.setSurfaceProvider(previewView.surfaceProvider) - } - - imageCapture = ImageCapture.Builder().build() - - val camSelector = - CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build() - kotlin.runCatching { - cameraProviderFuture.get().bindToLifecycle( - owner, - camSelector, - preview, - imageCapture - ) - } .onFailure { - it.printStackTrace() - } - return previewView - } - - fun capturePhoto(context: Context, owner: LifecycleOwner,uid: String?) = owner.lifecycleScope.launch{ - val imageCapture = imageCapture ?: return@launch - - imageCapture.takePicture(ContextCompat.getMainExecutor(context), object : - ImageCapture.OnImageCapturedCallback(), ImageCapture.OnImageSavedCallback { - override fun onCaptureSuccess(image: ImageProxy) { - super.onCaptureSuccess(image) - owner.lifecycleScope.launch { - saveMediaToStorage( - imageProxyToBitmap(image,owner), - uid!!, - context - ) - } - } - - override fun onImageSaved(outputFileResults: ImageCapture.OutputFileResults) { -// showLog("onCaptureSuccess: Uri ${outputFileResults.savedUri}") - } - - override fun onError(exception: ImageCaptureException) { - super.onError(exception) -// showLog("onCaptureSuccess: onError") - } - }) - } - - private suspend fun imageProxyToBitmap(image: ImageProxy, owner: LifecycleOwner): Bitmap = - withContext(owner.lifecycleScope.coroutineContext) { - val planeProxy = image.planes[0] - val buffer: ByteBuffer = planeProxy.buffer - val bytes = ByteArray(buffer.remaining()) - buffer.get(bytes) - BitmapFactory.decodeByteArray(bytes, 0, bytes.size) - } - - private suspend fun saveMediaToStorage(bitmap: Bitmap, name: String, context: Context,) { - withContext(IO) { - val filename = "$name.$JPEG" - var fos: OutputStream? = null - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - context.contentResolver?.also { resolver -> - - val contentValues = ContentValues().apply { - - put(MediaStore.MediaColumns.DISPLAY_NAME, filename) - put(MediaStore.MediaColumns.MIME_TYPE, "image/$JPEG") - put( - MediaStore.MediaColumns.RELATIVE_PATH, - Environment.DIRECTORY_DCIM - ) - } - val imageUri: Uri? = - resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues) - - fos = imageUri?.let { with(resolver) { openOutputStream(it) } } - } - } else { - val imagesDir = -// Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM) - context.filesDir.path + "/" + IMAGES + "/" - val image = File(imagesDir, filename).also { fos = FileOutputStream(it) } - Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE).also { mediaScanIntent -> - mediaScanIntent.data = Uri.fromFile(image) - context.sendBroadcast(mediaScanIntent) - } - } - - fos?.use { - val success = async(IO) { - bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it) - } - if (success.await()) { - withContext(Dispatchers.Main) { - Toast.makeText(context, "Saved Successfully", Toast.LENGTH_SHORT) - .show() - } - } - } - } - } -} \ No newline at end of file diff --git a/ui/features/camera/src/main/java/com/example/camera/Commons.kt b/ui/features/camera/src/main/java/com/example/camera/Commons.kt deleted file mode 100644 index ba63aea7..00000000 --- a/ui/features/camera/src/main/java/com/example/camera/Commons.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.camera - -import android.Manifest -import android.content.Context -import android.content.pm.PackageManager -import android.os.Build -import androidx.core.content.ContextCompat - -object Commons { - val REQUIRED_PERMISSIONS = - mutableListOf( - Manifest.permission.CAMERA, - ).apply { - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) { - add(Manifest.permission.WRITE_EXTERNAL_STORAGE) - } - }.toTypedArray() - - fun allPermissionsGranted(ctx: Context) = - REQUIRED_PERMISSIONS.all { - ContextCompat.checkSelfPermission(ctx, it) == - PackageManager.PERMISSION_GRANTED - } -} \ No newline at end of file diff --git a/ui/features/camera/src/main/java/com/example/camera/LaunchCameraX.kt b/ui/features/camera/src/main/java/com/example/camera/LaunchCameraX.kt deleted file mode 100644 index 8fe81436..00000000 --- a/ui/features/camera/src/main/java/com/example/camera/LaunchCameraX.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.camera - -import android.content.Context -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalLifecycleOwner -import androidx.lifecycle.LifecycleOwner -import com.example.camera.Commons.allPermissionsGranted - -@Composable -fun LaunchCameraX( - ctx: Context = LocalContext.current, - owner: LifecycleOwner = LocalLifecycleOwner.current, - uid: String? -) { - val cameraX = CameraXVM() - CameraCompose(context = ctx, owner = owner, cameraX = cameraX) { - if (allPermissionsGranted(ctx)) { - cameraX.capturePhoto(context = ctx,owner = owner, uid = uid) - } - } -} \ No newline at end of file diff --git a/ui/features/camera/src/test/java/city/zouitel/camera/ExampleUnitTest.kt b/ui/features/camera/src/test/java/city/zouitel/camera/ExampleUnitTest.kt new file mode 100644 index 00000000..441ef1a4 --- /dev/null +++ b/ui/features/camera/src/test/java/city/zouitel/camera/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.camera + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/links/build.gradle.kts b/ui/features/links/build.gradle.kts index d29a3526..aaf50d37 100644 --- a/ui/features/links/build.gradle.kts +++ b/ui/features/links/build.gradle.kts @@ -1,24 +1,72 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.links" + namespace = "city.zouitel.links" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { - //Projects. - implementation(projects.common.ui) + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) implementation(projects.domain) //AndroidX. - implementation(libs.androidx.constraintlayout) + implementation(libs.constraintlayout) //WorkManager. - implementation(libs.androidx.workmanager) + implementation(libs.workmanager) //Swipe. implementation(libs.swipe) @@ -29,4 +77,9 @@ dependencies { //Baha-UrlPreview. implementation(libs.url.preview) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.worker) } \ No newline at end of file diff --git a/ui/features/links/consumer-rules.pro b/ui/features/links/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/links/proguard-rules.pro b/ui/features/links/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/links/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/links/src/androidTest/java/city/zouitel/links/ExampleInstrumentedTest.kt b/ui/features/links/src/androidTest/java/city/zouitel/links/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..1b69cba4 --- /dev/null +++ b/ui/features/links/src/androidTest/java/city/zouitel/links/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.links + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.links.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/links/src/main/java/city/zouitel/links/di/LinkModule.kt b/ui/features/links/src/main/java/city/zouitel/links/di/LinkModule.kt new file mode 100644 index 00000000..cc33a241 --- /dev/null +++ b/ui/features/links/src/main/java/city/zouitel/links/di/LinkModule.kt @@ -0,0 +1,27 @@ +package city.zouitel.links.di + +import android.content.Context +import city.zouitel.links.mapper.LinkMapper +import city.zouitel.links.mapper.NoteAndLinkMapper +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.Dispatchers + +//@Module +//@InstallIn(SingletonComponent::class) +object LinkModule { + +// @Singleton +// @Provides + fun provideContext(/*@ApplicationContext*/ context: Context) = context + +// @Provides + fun provideDispatcherIO(): CoroutineDispatcher = Dispatchers.IO + +// @Singleton +// @Provides + fun provideLinkMapper() = LinkMapper() + +// @Singleton +// @Provides + fun provideNoteAndLinkMapper() = NoteAndLinkMapper() +} \ No newline at end of file diff --git a/ui/features/links/src/main/java/city/zouitel/links/di/linksDI.kt b/ui/features/links/src/main/java/city/zouitel/links/di/linksDI.kt new file mode 100644 index 00000000..78f1364b --- /dev/null +++ b/ui/features/links/src/main/java/city/zouitel/links/di/linksDI.kt @@ -0,0 +1,18 @@ +package city.zouitel.links.di + +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.dsl.module +import city.zouitel.links.ui.* +import city.zouitel.links.mapper.* +import city.zouitel.links.worker.LinkWorker +import org.koin.androidx.workmanager.dsl.workerOf +import org.koin.core.module.dsl.factoryOf + +val linksKoinModule = module { + factoryOf(::LinkMapper) + factoryOf(::NoteAndLinkMapper) + + viewModelOf(::LinkVM) + viewModelOf(::NoteAndLinkVM) + workerOf(::LinkWorker) +} \ No newline at end of file diff --git a/ui/features/links/src/main/java/com/example/links/mapper/LinkMapper.kt b/ui/features/links/src/main/java/city/zouitel/links/mapper/LinkMapper.kt similarity index 63% rename from ui/features/links/src/main/java/com/example/links/mapper/LinkMapper.kt rename to ui/features/links/src/main/java/city/zouitel/links/mapper/LinkMapper.kt index f97425dc..2a457f61 100644 --- a/ui/features/links/src/main/java/com/example/links/mapper/LinkMapper.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/mapper/LinkMapper.kt @@ -1,8 +1,8 @@ -package com.example.links.mapper +package city.zouitel.links.mapper -import com.example.domain.model.Link as OutLink -import com.example.links.mapper.base.Mapper -import com.example.links.model.Link as InLink +import city.zouitel.domain.model.Link as OutLink +import city.zouitel.links.mapper.base.Mapper +import city.zouitel.links.model.Link as InLink class LinkMapper: Mapper.Base { override fun toView(data: OutLink): InLink = with(data) { diff --git a/ui/features/links/src/main/java/com/example/links/mapper/NoteAndLinkMapper.kt b/ui/features/links/src/main/java/city/zouitel/links/mapper/NoteAndLinkMapper.kt similarity index 61% rename from ui/features/links/src/main/java/com/example/links/mapper/NoteAndLinkMapper.kt rename to ui/features/links/src/main/java/city/zouitel/links/mapper/NoteAndLinkMapper.kt index 99728244..77a96b7f 100644 --- a/ui/features/links/src/main/java/com/example/links/mapper/NoteAndLinkMapper.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/mapper/NoteAndLinkMapper.kt @@ -1,8 +1,8 @@ -package com.example.links.mapper +package city.zouitel.links.mapper -import com.example.links.mapper.base.Mapper -import com.example.domain.model.NoteAndLink as OutNoteAndLink -import com.example.links.model.NoteAndLink as InNoteAndLink +import city.zouitel.links.mapper.base.Mapper +import city.zouitel.domain.model.NoteAndLink as OutNoteAndLink +import city.zouitel.links.model.NoteAndLink as InNoteAndLink class NoteAndLinkMapper: Mapper.Base { override fun toView(data: OutNoteAndLink): InNoteAndLink = with(data) { diff --git a/ui/features/tags/src/main/java/com/example/tags/mapper/base/Mapper.kt b/ui/features/links/src/main/java/city/zouitel/links/mapper/base/Mapper.kt similarity index 84% rename from ui/features/tags/src/main/java/com/example/tags/mapper/base/Mapper.kt rename to ui/features/links/src/main/java/city/zouitel/links/mapper/base/Mapper.kt index df035525..57eacca8 100644 --- a/ui/features/tags/src/main/java/com/example/tags/mapper/base/Mapper.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/mapper/base/Mapper.kt @@ -1,4 +1,4 @@ -package com.example.tags.mapper.base +package city.zouitel.links.mapper.base sealed interface Mapper { interface Base { diff --git a/ui/features/links/src/main/java/com/example/links/model/Link.kt b/ui/features/links/src/main/java/city/zouitel/links/model/Link.kt similarity index 87% rename from ui/features/links/src/main/java/com/example/links/model/Link.kt rename to ui/features/links/src/main/java/city/zouitel/links/model/Link.kt index e00fe955..0a7a9307 100644 --- a/ui/features/links/src/main/java/com/example/links/model/Link.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/model/Link.kt @@ -1,4 +1,4 @@ -package com.example.links.model +package city.zouitel.links.model import androidx.annotation.Keep diff --git a/ui/features/links/src/main/java/com/example/links/model/NoteAndLink.kt b/ui/features/links/src/main/java/city/zouitel/links/model/NoteAndLink.kt similarity index 77% rename from ui/features/links/src/main/java/com/example/links/model/NoteAndLink.kt rename to ui/features/links/src/main/java/city/zouitel/links/model/NoteAndLink.kt index 566c1183..d5895724 100644 --- a/ui/features/links/src/main/java/com/example/links/model/NoteAndLink.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/model/NoteAndLink.kt @@ -1,4 +1,4 @@ -package com.example.links.model +package city.zouitel.links.model import androidx.annotation.Keep diff --git a/ui/features/links/src/main/java/com/example/links/ui/CacheLinks.kt b/ui/features/links/src/main/java/city/zouitel/links/ui/CacheLinks.kt similarity index 98% rename from ui/features/links/src/main/java/com/example/links/ui/CacheLinks.kt rename to ui/features/links/src/main/java/city/zouitel/links/ui/CacheLinks.kt index 89626dfb..9a15132d 100644 --- a/ui/features/links/src/main/java/com/example/links/ui/CacheLinks.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/ui/CacheLinks.kt @@ -1,4 +1,4 @@ -package com.example.links.ui +package city.zouitel.links.ui import android.annotation.SuppressLint import androidx.compose.runtime.* diff --git a/ui/features/links/src/main/java/com/example/links/ui/LinkPart.kt b/ui/features/links/src/main/java/city/zouitel/links/ui/LinkPart.kt similarity index 96% rename from ui/features/links/src/main/java/com/example/links/ui/LinkPart.kt rename to ui/features/links/src/main/java/city/zouitel/links/ui/LinkPart.kt index 4893df51..6433350d 100644 --- a/ui/features/links/src/main/java/com/example/links/ui/LinkPart.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/ui/LinkPart.kt @@ -1,4 +1,4 @@ -package com.example.links.ui +package city.zouitel.links.ui import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image @@ -17,8 +17,8 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.example.links.model.Link -import com.example.links.model.NoteAndLink as InNoteAndLink +import city.zouitel.links.model.Link +import city.zouitel.links.model.NoteAndLink as InNoteAndLink import me.saket.swipe.SwipeAction import me.saket.swipe.SwipeableActionsBox import me.saket.swipe.rememberSwipeableActionsState diff --git a/ui/features/links/src/main/java/com/example/links/ui/LinkVM.kt b/ui/features/links/src/main/java/city/zouitel/links/ui/LinkVM.kt similarity index 90% rename from ui/features/links/src/main/java/com/example/links/ui/LinkVM.kt rename to ui/features/links/src/main/java/city/zouitel/links/ui/LinkVM.kt index 2cafeac3..457a7d0d 100644 --- a/ui/features/links/src/main/java/com/example/links/ui/LinkVM.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/ui/LinkVM.kt @@ -1,4 +1,4 @@ -package com.example.links.ui +package city.zouitel.links.ui import android.app.Application import android.content.Context @@ -12,27 +12,24 @@ import androidx.work.* import com.baha.url.preview.BahaUrlPreview import com.baha.url.preview.IUrlPreviewCallback import com.baha.url.preview.UrlInfoItem -import com.example.common_ui.Cons.JPEG -import com.example.domain.model.Link as OutLink -import com.example.domain.usecase.LinkUseCase -import com.example.links.mapper.LinkMapper -import com.example.links.model.Link as InLink -import com.example.links.worker.LinkWorker -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.LinkUseCase +import city.zouitel.links.mapper.LinkMapper +import city.zouitel.links.model.Link as InLink +import city.zouitel.links.worker.LinkWorker +import city.zouitel.systemDesign.Cons.JPEG import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch import java.io.File import java.net.URL -import javax.inject.Inject -@HiltViewModel -class LinkVM @Inject constructor( +//@HiltViewModel +class LinkVM /*@Inject*/ constructor( application: Application, getAll: LinkUseCase.GetAllLinks, private val delete: LinkUseCase.DeleteLink, private val mapper: LinkMapper - ): ViewModel() { +): ViewModel() { private val _getAllLinks = MutableStateFlow>(emptyList()) val getAllLinks: StateFlow> diff --git a/ui/features/links/src/main/java/com/example/links/ui/NoteAndLinkVM.kt b/ui/features/links/src/main/java/city/zouitel/links/ui/NoteAndLinkVM.kt similarity index 76% rename from ui/features/links/src/main/java/com/example/links/ui/NoteAndLinkVM.kt rename to ui/features/links/src/main/java/city/zouitel/links/ui/NoteAndLinkVM.kt index 80c8edd2..6ebe1c01 100644 --- a/ui/features/links/src/main/java/com/example/links/ui/NoteAndLinkVM.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/ui/NoteAndLinkVM.kt @@ -1,22 +1,19 @@ -package com.example.links.ui +package city.zouitel.links.ui import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.model.NoteAndLink as OutNoteAndLink -import com.example.domain.usecase.NoteAndLinkUseCase -import com.example.links.mapper.NoteAndLinkMapper -import com.example.links.model.NoteAndLink as InNoteAndLink -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.NoteAndLinkUseCase +import city.zouitel.links.mapper.NoteAndLinkMapper +import city.zouitel.links.model.NoteAndLink as InNoteAndLink import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import javax.inject.Inject -@HiltViewModel -class NoteAndLinkVM @Inject constructor( +//@HiltViewModel +class NoteAndLinkVM /*@Inject*/ constructor( private val getAll: NoteAndLinkUseCase.GetAllNotesAndLinks, private val delete: NoteAndLinkUseCase.DeleteNoteAndLink, private val mapper: NoteAndLinkMapper diff --git a/ui/features/links/src/main/java/com/example/links/utils/Constants.kt b/ui/features/links/src/main/java/city/zouitel/links/utils/Constants.kt similarity index 100% rename from ui/features/links/src/main/java/com/example/links/utils/Constants.kt rename to ui/features/links/src/main/java/city/zouitel/links/utils/Constants.kt diff --git a/ui/features/links/src/main/java/com/example/links/worker/LinkWorker.kt b/ui/features/links/src/main/java/city/zouitel/links/worker/LinkWorker.kt similarity index 78% rename from ui/features/links/src/main/java/com/example/links/worker/LinkWorker.kt rename to ui/features/links/src/main/java/city/zouitel/links/worker/LinkWorker.kt index beb9446a..de870a22 100644 --- a/ui/features/links/src/main/java/com/example/links/worker/LinkWorker.kt +++ b/ui/features/links/src/main/java/city/zouitel/links/worker/LinkWorker.kt @@ -1,31 +1,28 @@ -package com.example.links.worker +package city.zouitel.links.worker import android.content.Context import android.graphics.Bitmap import androidx.core.graphics.drawable.toBitmap -import androidx.hilt.work.HiltWorker import androidx.work.* import coil.ImageLoader import coil.request.ImageRequest -import com.example.common_ui.Cons -import com.example.domain.usecase.LinkUseCase -import com.example.domain.usecase.NoteAndLinkUseCase -import com.example.links.mapper.LinkMapper -import com.example.links.mapper.NoteAndLinkMapper -import com.example.links.model.Link as InLink -import com.example.links.model.NoteAndLink as InNoteAndLink -import dagger.assisted.Assisted -import dagger.assisted.AssistedInject +import city.zouitel.domain.usecase.LinkUseCase +import city.zouitel.domain.usecase.NoteAndLinkUseCase +import city.zouitel.links.mapper.LinkMapper +import city.zouitel.links.mapper.NoteAndLinkMapper +import city.zouitel.systemDesign.Cons +import city.zouitel.links.model.Link as InLink +import city.zouitel.links.model.NoteAndLink as InNoteAndLink import kotlinx.coroutines.* import java.io.File import java.io.FileOutputStream import java.util.* @OptIn(DelicateCoroutinesApi::class) -@HiltWorker -class LinkWorker @AssistedInject constructor( - @Assisted private val context: Context, - @Assisted workerParameters: WorkerParameters, +//@HiltWorker +class LinkWorker /*@AssistedInject*/ constructor( + /*@Assisted*/ private val context: Context, + /*@Assisted*/ workerParameters: WorkerParameters, private val ioDeprecated: CoroutineDispatcher, private val addLink: LinkUseCase.AddLink, private val addNoteAndLink: NoteAndLinkUseCase.AddNoteAndLink, @@ -33,7 +30,7 @@ class LinkWorker @AssistedInject constructor( private val noteAndLinkMapper: NoteAndLinkMapper, ): CoroutineWorker(context, workerParameters) { - val linkImgPath = context.filesDir.path + "/" + "links_img" + private val linkImgPath = context.filesDir.path + "/" + "links_img" override suspend fun doWork(): Result = withContext(ioDeprecated) { return@withContext try { diff --git a/ui/features/links/src/main/java/com/example/links/di/LinkModule.kt b/ui/features/links/src/main/java/com/example/links/di/LinkModule.kt deleted file mode 100644 index d5046db6..00000000 --- a/ui/features/links/src/main/java/com/example/links/di/LinkModule.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.links.di - -import android.content.Context -import com.example.links.mapper.LinkMapper -import com.example.links.mapper.NoteAndLinkMapper -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.android.qualifiers.ApplicationContext -import dagger.hilt.components.SingletonComponent -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -object LinkModule { - - @Singleton - @Provides - fun provideContext(@ApplicationContext context: Context) = context - - @Provides - fun provideDispatcherIO(): CoroutineDispatcher = Dispatchers.IO - - @Singleton - @Provides - fun provideLinkMapper() = LinkMapper() - - @Singleton - @Provides - fun provideNoteAndLinkMapper() = NoteAndLinkMapper() -} \ No newline at end of file diff --git a/ui/features/links/src/test/java/city/zouitel/links/ExampleUnitTest.kt b/ui/features/links/src/test/java/city/zouitel/links/ExampleUnitTest.kt new file mode 100644 index 00000000..51370e59 --- /dev/null +++ b/ui/features/links/src/test/java/city/zouitel/links/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.links + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/media-player/build.gradle.kts b/ui/features/media-player/build.gradle.kts deleted file mode 100644 index b994fcbb..00000000 --- a/ui/features/media-player/build.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.media_player" -} - -dependencies { - //Projects. - implementation(projects.data.datastore) - implementation(projects.domain) - implementation(projects.common.ui) - - //AndroidX. - implementation(libs.androidx.constraintlayout) -} \ No newline at end of file diff --git a/ui/features/media-player/src/main/java/com/example/media_player/di/ExoPlayerMod.kt b/ui/features/media-player/src/main/java/com/example/media_player/di/ExoPlayerMod.kt deleted file mode 100644 index d15d9296..00000000 --- a/ui/features/media-player/src/main/java/com/example/media_player/di/ExoPlayerMod.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.media_player.di - -import android.content.Context -import com.google.android.exoplayer2.ExoPlayer -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.android.qualifiers.ApplicationContext -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -object ExoPlayerMod { - - @Singleton - @Provides - fun buildMediaPlayer( - @ApplicationContext context: Context, - ) = ExoPlayer.Builder(context).build().apply { - setHandleAudioBecomingNoisy(true) - } -} - - diff --git a/ui/features/note/build.gradle.kts b/ui/features/note/build.gradle.kts index 74f528d5..9b85dcb3 100644 --- a/ui/features/note/build.gradle.kts +++ b/ui/features/note/build.gradle.kts @@ -1,28 +1,78 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.note" + namespace = "city.zouitel.note" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { - //Projects. - implementation(projects.common.ui) + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) + implementation(projects.domain) - implementation(projects.data.datastore) + implementation(projects.core.datastore) implementation(projects.ui.features.reminder) - implementation(projects.ui.features.record) + implementation(projects.ui.features.recorder) implementation(projects.ui.features.tasks) - implementation(projects.ui.features.mediaPlayer) + implementation(projects.ui.features.audios) implementation(projects.ui.features.tags) implementation(projects.ui.features.camera) implementation(projects.ui.features.links) //AndroidX. - implementation(libs.androidx.constraintlayout) + implementation(libs.constraintlayout) //Accompanist. implementation(libs.accompanist.permissions) @@ -43,4 +93,9 @@ dependencies { //Baha-UrlPreview. implementation(libs.url.preview) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) } \ No newline at end of file diff --git a/ui/features/note/consumer-rules.pro b/ui/features/note/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/note/proguard-rules.pro b/ui/features/note/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/note/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/note/src/androidTest/java/city/zouitel/note/ExampleInstrumentedTest.kt b/ui/features/note/src/androidTest/java/city/zouitel/note/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..4f348055 --- /dev/null +++ b/ui/features/note/src/androidTest/java/city/zouitel/note/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.note + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.note.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/note/src/main/java/com/example/note/DataViewModel.kt b/ui/features/note/src/main/java/city/zouitel/note/DataViewModel.kt similarity index 95% rename from ui/features/note/src/main/java/com/example/note/DataViewModel.kt rename to ui/features/note/src/main/java/city/zouitel/note/DataViewModel.kt index 3fc40277..2a402013 100644 --- a/ui/features/note/src/main/java/com/example/note/DataViewModel.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/DataViewModel.kt @@ -1,4 +1,4 @@ -package com.example.note +package city.zouitel.note import android.content.Context import android.graphics.Bitmap @@ -15,27 +15,23 @@ import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.asImageBitmap import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.domain.usecase.DataUseCase -import com.example.note.mapper.DataMapper -import com.example.note.model.Data as InData -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.DataUseCase +import city.zouitel.note.mapper.DataMapper +import city.zouitel.systemDesign.Cons.IMAGES +import city.zouitel.systemDesign.Cons.JPEG +import city.zouitel.note.model.Data as InData import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import java.io.* -import javax.inject.Inject - -@HiltViewModel -class DataViewModel @Inject constructor( +//@HiltViewModel +class DataViewModel /*@Inject*/ constructor( private val add: DataUseCase.AddData, private val edit: DataUseCase.EditData, private val delete: DataUseCase.DeleteData, private val eraseTrash: DataUseCase.DeleteAllTrashedData, private val mapper: DataMapper - -):ViewModel() { +): ViewModel() { var isProcessing by mutableStateOf(false) private set diff --git a/ui/features/note/src/main/java/com/example/note/NoteViewModel.kt b/ui/features/note/src/main/java/city/zouitel/note/NoteViewModel.kt similarity index 93% rename from ui/features/note/src/main/java/com/example/note/NoteViewModel.kt rename to ui/features/note/src/main/java/city/zouitel/note/NoteViewModel.kt index 3d3333cd..88e150da 100644 --- a/ui/features/note/src/main/java/com/example/note/NoteViewModel.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/NoteViewModel.kt @@ -1,25 +1,22 @@ -package com.example.note +package city.zouitel.note import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.usecase.NoteUseCase -import com.example.note.mapper.NoteMapper -import com.example.note.model.Note as InNote -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.NoteUseCase +import city.zouitel.note.mapper.NoteMapper +import city.zouitel.note.model.Note as InNote import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import javax.inject.Inject - -@HiltViewModel -class NoteViewModel @Inject constructor( +//@HiltViewModel +class NoteViewModel /*@Inject*/ constructor( private val getAllById: NoteUseCase.GetAllNotesById, private val getAllByOldest: NoteUseCase.GetAllNotesByOldest, private val getAllByNewest: NoteUseCase.GetAllNotesByNewest, diff --git a/ui/features/note/src/main/java/city/zouitel/note/di/NoteModule.kt b/ui/features/note/src/main/java/city/zouitel/note/di/NoteModule.kt new file mode 100644 index 00000000..1d6da5e8 --- /dev/null +++ b/ui/features/note/src/main/java/city/zouitel/note/di/NoteModule.kt @@ -0,0 +1,39 @@ +package city.zouitel.note.di + +import city.zouitel.links.mapper.LinkMapper +import city.zouitel.note.mapper.DataMapper +import city.zouitel.note.* +import city.zouitel.note.mapper.NoteMapper +import city.zouitel.tags.mapper.TagMapper +import city.zouitel.tasks.mapper.TaskMapper +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.core.module.dsl.factoryOf +import org.koin.dsl.module + +//@Module +//@InstallIn(SingletonComponent::class) +object NoteModule { + +// @Singleton +// @Provides + fun provideDataMapper() = DataMapper() + +// @Singleton +// @Provides + fun provideNoteMapper( + dataMapper: DataMapper, + tagMapper: TagMapper, + taskMapper: TaskMapper, + linkMapper: LinkMapper + ) = NoteMapper(dataMapper, tagMapper, taskMapper, linkMapper) +} + +val noteKoinModule = module { + factoryOf(::DataMapper) + factory { + NoteMapper(get(), get(), get(), get()) + } + + viewModelOf(::DataViewModel) + viewModelOf(::NoteViewModel) +} \ No newline at end of file diff --git a/ui/features/note/src/main/java/com/example/note/mapper/DataMapper.kt b/ui/features/note/src/main/java/city/zouitel/note/mapper/DataMapper.kt similarity index 73% rename from ui/features/note/src/main/java/com/example/note/mapper/DataMapper.kt rename to ui/features/note/src/main/java/city/zouitel/note/mapper/DataMapper.kt index 37da5712..c326f415 100644 --- a/ui/features/note/src/main/java/com/example/note/mapper/DataMapper.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/mapper/DataMapper.kt @@ -1,8 +1,8 @@ -package com.example.note.mapper +package city.zouitel.note.mapper -import com.example.tasks.mapper.base.Mapper -import com.example.note.model.Data as InData -import com.example.domain.model.Data as OutData +import city.zouitel.tasks.mapper.base.Mapper +import city.zouitel.note.model.Data as InData +import city.zouitel.domain.model.Data as OutData class DataMapper: Mapper.Base { override fun toView(data: OutData): InData = with(data) { diff --git a/ui/features/note/src/main/java/com/example/note/mapper/NoteMapper.kt b/ui/features/note/src/main/java/city/zouitel/note/mapper/NoteMapper.kt similarity index 63% rename from ui/features/note/src/main/java/com/example/note/mapper/NoteMapper.kt rename to ui/features/note/src/main/java/city/zouitel/note/mapper/NoteMapper.kt index 69184656..6c4b56d6 100644 --- a/ui/features/note/src/main/java/com/example/note/mapper/NoteMapper.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/mapper/NoteMapper.kt @@ -1,12 +1,11 @@ -package com.example.note.mapper +package city.zouitel.note.mapper -import com.example.links.mapper.LinkMapper -import com.example.domain.model.Note as OutNote -import com.example.note.mapper.base.Mapper -import com.example.note.model.Data -import com.example.tags.mapper.TagMapper -import com.example.tasks.mapper.TaskMapper -import com.example.note.model.Note as InNote +import city.zouitel.links.mapper.LinkMapper +import city.zouitel.domain.model.Note as OutNote +import city.zouitel.note.mapper.base.Mapper +import city.zouitel.tags.mapper.TagMapper +import city.zouitel.tasks.mapper.TaskMapper +import city.zouitel.note.model.Note as InNote class NoteMapper( private val dataMapper: DataMapper, diff --git a/ui/features/note/src/main/java/com/example/note/mapper/base/Mapper.kt b/ui/features/note/src/main/java/city/zouitel/note/mapper/base/Mapper.kt similarity index 84% rename from ui/features/note/src/main/java/com/example/note/mapper/base/Mapper.kt rename to ui/features/note/src/main/java/city/zouitel/note/mapper/base/Mapper.kt index 8fef9639..60ac7377 100644 --- a/ui/features/note/src/main/java/com/example/note/mapper/base/Mapper.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/mapper/base/Mapper.kt @@ -1,4 +1,4 @@ -package com.example.note.mapper.base +package city.zouitel.note.mapper.base sealed interface Mapper { interface Base { diff --git a/ui/features/note/src/main/java/com/example/note/model/Data.kt b/ui/features/note/src/main/java/city/zouitel/note/model/Data.kt similarity index 85% rename from ui/features/note/src/main/java/com/example/note/model/Data.kt rename to ui/features/note/src/main/java/city/zouitel/note/model/Data.kt index 3afd36ff..0570c5a7 100644 --- a/ui/features/note/src/main/java/com/example/note/model/Data.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/model/Data.kt @@ -1,7 +1,7 @@ -package com.example.note.model +package city.zouitel.note.model import androidx.annotation.Keep -import com.example.common_ui.Cons.NON +import city.zouitel.systemDesign.Cons.NON @Keep data class Data( diff --git a/ui/features/note/src/main/java/com/example/note/model/Note.kt b/ui/features/note/src/main/java/city/zouitel/note/model/Note.kt similarity index 50% rename from ui/features/note/src/main/java/com/example/note/model/Note.kt rename to ui/features/note/src/main/java/city/zouitel/note/model/Note.kt index 57cde71b..3f7014a9 100644 --- a/ui/features/note/src/main/java/com/example/note/model/Note.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/model/Note.kt @@ -1,10 +1,10 @@ -package com.example.note.model +package city.zouitel.note.model import androidx.annotation.Keep -import com.example.links.model.Link -import com.example.note.model.Data -import com.example.tags.model.Tag -import com.example.tasks.model.Task +import city.zouitel.links.model.Link +import city.zouitel.note.model.Data +import city.zouitel.tags.model.Tag +import city.zouitel.tasks.model.Task @Keep data class Note( diff --git a/ui/features/note/src/main/java/com/example/note/ui/ColorsRow.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/ColorsRow.kt similarity index 83% rename from ui/features/note/src/main/java/com/example/note/ui/ColorsRow.kt rename to ui/features/note/src/main/java/city/zouitel/note/ui/ColorsRow.kt index db0adf25..11a64c67 100644 --- a/ui/features/note/src/main/java/com/example/note/ui/ColorsRow.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/ui/ColorsRow.kt @@ -1,4 +1,4 @@ -package com.example.note +package city.zouitel.note import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -16,16 +16,16 @@ import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.DataStoreVM -import com.example.common_ui.MaterialColors -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.common_ui.SoundEffect +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.SoundEffect +import org.koin.androidx.compose.koinViewModel @Composable fun ColorsRow( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), colorState: MutableState, colors: Array ) { @@ -48,7 +48,8 @@ fun ColorsRow( items(items = colors){ Spacer(modifier = Modifier.width(5.dp)) Canvas( - modifier = Modifier.size(40.dp) + modifier = Modifier + .size(40.dp) .clickable { currentColor.value = it colorState.value = it.toArgb() diff --git a/ui/features/note/src/main/java/com/example/note/ui/add_screen/AddNote.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/add_screen/AddNote.kt similarity index 88% rename from ui/features/note/src/main/java/com/example/note/ui/add_screen/AddNote.kt rename to ui/features/note/src/main/java/city/zouitel/note/ui/add_screen/AddNote.kt index 578a48a2..018c254d 100644 --- a/ui/features/note/src/main/java/com/example/note/ui/add_screen/AddNote.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/ui/add_screen/AddNote.kt @@ -1,4 +1,4 @@ -package com.example.note.ui.add_screen +package city.zouitel.note.ui.add_screen import android.annotation.SuppressLint import android.graphics.Bitmap @@ -42,40 +42,45 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.net.toUri -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.* -import com.example.common_ui.Cons.AUDIOS -import com.example.common_ui.Cons.HOME_ROUTE -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.common_ui.Cons.KEY_STANDARD -import com.example.common_ui.Cons.MP3 -import com.example.common_ui.Cons.NON -import com.example.common_ui.Cons.NUL -import com.example.common_ui.Icons.CIRCLE_ICON_18 -import com.example.common_ui.Icons.DONE_ICON -import com.example.common_ui.MaterialColors.Companion.OUT_LINE_VARIANT -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.links.model.NoteAndLink -import com.example.links.ui.CacheLinks -import com.example.links.ui.LinkPart -import com.example.links.ui.LinkVM -import com.example.links.ui.NoteAndLinkVM -import com.example.media_player.MediaPlayerViewModel -import com.example.note.ui.bottom_bar.AddEditBottomBar -import com.example.note.DataViewModel -import com.example.note.model.Data -import com.example.record.RecordingNote -import com.example.reminder.RemindingNote -import com.example.tags.viewmodel.TagViewModel -import com.example.tags.viewmodel.NoteAndTagViewModel -import com.example.tags.model.NoteAndTag -import com.example.tasks.NoteAndTaskViewModel -import com.example.tasks.TaskViewModel -import com.example.tasks.model.NoteAndTask -import com.example.tasks.model.Task +import city.zouitel.links.model.NoteAndLink +import city.zouitel.links.ui.CacheLinks +import city.zouitel.links.ui.LinkPart +import city.zouitel.links.ui.LinkVM +import city.zouitel.links.ui.NoteAndLinkVM +import city.zouitel.audios.MediaPlayerViewModel +import city.zouitel.note.ui.bottom_bar.AddEditBottomBar +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.recoder.ui.RecordingNote +import city.zouitel.reminder.ui.RemindingNote +import city.zouitel.systemDesign.Cons.AUDIOS +import city.zouitel.systemDesign.Cons.HOME_ROUTE +import city.zouitel.systemDesign.Cons.IMAGES +import city.zouitel.systemDesign.Cons.JPEG +import city.zouitel.systemDesign.Cons.KEY_STANDARD +import city.zouitel.systemDesign.Cons.MP3 +import city.zouitel.systemDesign.Cons.NON +import city.zouitel.systemDesign.Cons.NUL +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18 +import city.zouitel.systemDesign.Icons.DONE_ICON +import city.zouitel.systemDesign.ImageDisplayed +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.OUT_LINE_VARIANT +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.SoundEffect +import city.zouitel.systemDesign.decodeUrl +import city.zouitel.systemDesign.findUrlLink +import city.zouitel.tags.viewmodel.TagViewModel +import city.zouitel.tags.viewmodel.NoteAndTagViewModel +import city.zouitel.tags.model.NoteAndTag +import city.zouitel.tasks.viewmodel.NoteAndTaskViewModel +import city.zouitel.tasks.viewmodel.TaskViewModel +import city.zouitel.tasks.model.NoteAndTask +import city.zouitel.tasks.model.Task import com.google.accompanist.flowlayout.FlowRow +import org.koin.androidx.compose.koinViewModel import java.io.File @SuppressLint( @@ -89,15 +94,15 @@ import java.io.File ) @Composable fun NoteAdd( - dataViewModel: DataViewModel = hiltViewModel(), - exoVM: MediaPlayerViewModel = hiltViewModel(), - noteAndTagViewModel: NoteAndTagViewModel = hiltViewModel(), - tagViewModel: TagViewModel = hiltViewModel(), - taskViewModel: TaskViewModel = hiltViewModel(), - noteAndTodoVM: NoteAndTaskViewModel = hiltViewModel(), - dataStoreVM: DataStoreVM = hiltViewModel(), - linkVM: LinkVM = hiltViewModel(), - noteAndLinkVM: NoteAndLinkVM = hiltViewModel(), + dataViewModel: DataViewModel = koinViewModel(), + exoVM: MediaPlayerViewModel = koinViewModel(), + noteAndTagViewModel: NoteAndTagViewModel = koinViewModel(), + tagViewModel: TagViewModel = koinViewModel(), + taskViewModel: TaskViewModel = koinViewModel(), + noteAndTodoVM: NoteAndTaskViewModel = koinViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), + linkVM: LinkVM = koinViewModel(), + noteAndLinkVM: NoteAndLinkVM = koinViewModel(), navController: NavController, uid: String, description: String? @@ -131,17 +136,11 @@ fun NoteAdd( val titleState = rememberSaveable { mutableStateOf(null) } -// .filterBadWords() -// .filterBadEmoji() -// .filterBadWebsites() val descriptionState = rememberSaveable { mutableStateOf( if (description == NUL) null else decodeUrl(description) ) } -// .filterBadWords() -// .filterBadEmoji() -// .filterBadWebsites() val backgroundColor = getMatColor(SURFACE).toArgb() val backgroundColorState = rememberSaveable { mutableStateOf(backgroundColor) } @@ -279,7 +278,7 @@ fun NoteAdd( if ( File(mediaFile).exists() && !recordDialogState.value ) { - com.example.media_player.NoteMediaPlayer(localMediaUid = uid) + city.zouitel.audios.NoteMediaPlayer(localMediaUid = uid) audioDurationState.value = exoVM.getMediaDuration(ctx, mediaFile).toInt() diff --git a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/AddEditBottomBar.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/AddEditBottomBar.kt similarity index 85% rename from ui/features/note/src/main/java/com/example/note/ui/bottom_bar/AddEditBottomBar.kt rename to ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/AddEditBottomBar.kt index 4196716b..3f40c2e5 100644 --- a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/AddEditBottomBar.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/AddEditBottomBar.kt @@ -1,4 +1,4 @@ -package com.example.note.ui.bottom_bar +package city.zouitel.note.ui.bottom_bar import android.net.Uri import androidx.activity.compose.ManagedActivityResultLauncher @@ -17,24 +17,30 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.* -import com.example.common_ui.Cons.FOCUS_NAVIGATION -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.Icons.ADD_CIRCLE_ICON -import com.example.common_ui.Icons.BELL_ICON -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.common_ui.MaterialColors.Companion.SURFACE_VARIANT -import com.example.note.ColorsRow -import com.example.note.model.Data +import city.zouitel.note.ColorsRow +import city.zouitel.note.model.Data +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.Cons.FOCUS_NAVIGATION +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.ADD_CIRCLE_ICON +import city.zouitel.systemDesign.Icons.BELL_ICON +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE_VARIANT +import city.zouitel.systemDesign.PopupTip +import city.zouitel.systemDesign.SoundEffect +import city.zouitel.systemDesign.listOfBackgroundColors +import city.zouitel.systemDesign.listOfTextColors +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterialApi::class, ExperimentalFoundationApi::class, ExperimentalFoundationApi::class ) @Composable fun AddEditBottomBar( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), note: Data, navController: NavController, imageLaunch : ManagedActivityResultLauncher, diff --git a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/Plus.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/Plus.kt similarity index 88% rename from ui/features/note/src/main/java/com/example/note/ui/bottom_bar/Plus.kt rename to ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/Plus.kt index ae1268d6..42eec6c3 100644 --- a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/Plus.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/Plus.kt @@ -1,4 +1,4 @@ -package com.example.note.ui.bottom_bar +package city.zouitel.note.ui.bottom_bar import android.Manifest.permission import android.annotation.SuppressLint @@ -26,27 +26,31 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.PopupProperties -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.* -import com.example.common_ui.Cons.DRAW_ROUTE -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.Cons.KEY_STANDARD -import com.example.common_ui.Icons.CAMERA_ICON -import com.example.common_ui.Icons.GESTURE_ICON -import com.example.common_ui.Icons.IMAGE_ICON -import com.example.common_ui.Icons.LIST_CHECK_ICON -import com.example.common_ui.Icons.MIC_ICON -import com.example.common_ui.Icons.TAGS_ICON -import com.example.note.model.Data +import city.zouitel.note.model.Data +import city.zouitel.systemDesign.Cons.DRAW_ROUTE +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.Cons.KEY_STANDARD +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.CAMERA_ICON +import city.zouitel.systemDesign.Icons.GESTURE_ICON +import city.zouitel.systemDesign.Icons.IMAGE_ICON +import city.zouitel.systemDesign.Icons.LIST_CHECK_ICON +import city.zouitel.systemDesign.Icons.MIC_ICON +import city.zouitel.systemDesign.Icons.TAGS_ICON +import city.zouitel.systemDesign.SoundEffect +import city.zouitel.systemDesign.getColorOfPriority +import city.zouitel.systemDesign.getPriorityOfColor +import city.zouitel.systemDesign.listOfPriorityColors import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberMultiplePermissionsState +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalPermissionsApi::class) @SuppressLint("SuspiciousIndentation") @Composable internal fun Plus( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), isShow: MutableState, note: Data, navController: NavController, diff --git a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/PriorityList.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/PriorityList.kt similarity index 88% rename from ui/features/note/src/main/java/com/example/note/ui/bottom_bar/PriorityList.kt rename to ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/PriorityList.kt index 355b6a18..74e27aa8 100644 --- a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/PriorityList.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/PriorityList.kt @@ -1,4 +1,4 @@ -package com.example.note.ui.bottom_bar +package city.zouitel.note.ui.bottom_bar import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem @@ -11,12 +11,12 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.sp import androidx.compose.ui.window.PopupProperties -import com.example.common_ui.Cons.IMPORTANT -import com.example.common_ui.Cons.LOW -import com.example.common_ui.Cons.NON -import com.example.common_ui.Cons.NORMAL -import com.example.common_ui.Cons.URGENT -import com.example.common_ui.Icons.CIRCLE_ICON +import city.zouitel.systemDesign.Cons.IMPORTANT +import city.zouitel.systemDesign.Cons.LOW +import city.zouitel.systemDesign.Cons.NON +import city.zouitel.systemDesign.Cons.NORMAL +import city.zouitel.systemDesign.Cons.URGENT +import city.zouitel.systemDesign.Icons.CIRCLE_ICON @Deprecated("dispensed with!") @Composable diff --git a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/UndoRedo.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/UndoRedo.kt similarity index 89% rename from ui/features/note/src/main/java/com/example/note/ui/bottom_bar/UndoRedo.kt rename to ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/UndoRedo.kt index 27af9194..e265e1da 100644 --- a/ui/features/note/src/main/java/com/example/note/ui/bottom_bar/UndoRedo.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/ui/bottom_bar/UndoRedo.kt @@ -1,4 +1,4 @@ -package com.example.note.ui.bottom_bar +package city.zouitel.note.ui.bottom_bar import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -12,20 +12,20 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.REDO_ICON -import com.example.common_ui.Icons.UNDO_ICON -import com.example.common_ui.MaterialColors -import com.example.common_ui.MaterialColors.Companion.SURFACE_VARIANT -import com.example.common_ui.SoundEffect +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.REDO_ICON +import city.zouitel.systemDesign.Icons.UNDO_ICON +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE_VARIANT +import city.zouitel.systemDesign.SoundEffect +import org.koin.androidx.compose.koinViewModel // TODO: need improvement. @OptIn(ExperimentalFoundationApi::class) @Composable fun UndoRedo( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), titleFieldState: MutableState, descriptionFieldState: MutableState, isTitleFieldSelected : MutableState, diff --git a/ui/features/note/src/main/java/com/example/note/ui/edit_screen/EditNote.kt b/ui/features/note/src/main/java/city/zouitel/note/ui/edit_screen/EditNote.kt similarity index 88% rename from ui/features/note/src/main/java/com/example/note/ui/edit_screen/EditNote.kt rename to ui/features/note/src/main/java/city/zouitel/note/ui/edit_screen/EditNote.kt index 2d6329ad..c4068ed6 100644 --- a/ui/features/note/src/main/java/com/example/note/ui/edit_screen/EditNote.kt +++ b/ui/features/note/src/main/java/city/zouitel/note/ui/edit_screen/EditNote.kt @@ -1,4 +1,4 @@ -package com.example.note.ui.edit_screen +package city.zouitel.note.ui.edit_screen import android.annotation.SuppressLint import android.graphics.Bitmap @@ -41,37 +41,43 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.net.toUri -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.* -import com.example.common_ui.Cons.AUDIOS -import com.example.common_ui.Cons.HOME_ROUTE -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.common_ui.Cons.KEY_STANDARD -import com.example.common_ui.Cons.MP3 -import com.example.common_ui.Cons.NUL -import com.example.common_ui.Icons.CIRCLE_ICON_18 -import com.example.common_ui.Icons.EDIT_ICON -import com.example.common_ui.MaterialColors.Companion.OUT_LINE_VARIANT -import com.example.links.model.NoteAndLink -import com.example.links.ui.CacheLinks -import com.example.links.ui.LinkPart -import com.example.links.ui.LinkVM -import com.example.links.ui.NoteAndLinkVM -import com.example.media_player.MediaPlayerViewModel -import com.example.note.ui.bottom_bar.AddEditBottomBar -import com.example.record.RecordingNote -import com.example.note.DataViewModel -import com.example.note.model.Data -import com.example.tags.viewmodel.NoteAndTagViewModel -import com.example.tags.viewmodel.TagViewModel -import com.example.tags.model.NoteAndTag -import com.example.tasks.NoteAndTaskViewModel -import com.example.tasks.TaskViewModel -import com.example.tasks.model.NoteAndTask -import com.example.tasks.model.Task +import city.zouitel.links.model.NoteAndLink +import city.zouitel.links.ui.CacheLinks +import city.zouitel.links.ui.LinkPart +import city.zouitel.links.ui.LinkVM +import city.zouitel.links.ui.NoteAndLinkVM +import city.zouitel.audios.MediaPlayerViewModel +import city.zouitel.note.ui.bottom_bar.AddEditBottomBar +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.recoder.ui.RecordingNote +import city.zouitel.reminder.ui.RemindingNote +import city.zouitel.systemDesign.Cons.AUDIOS +import city.zouitel.systemDesign.Cons.HOME_ROUTE +import city.zouitel.systemDesign.Cons.IMAGES +import city.zouitel.systemDesign.Cons.JPEG +import city.zouitel.systemDesign.Cons.KEY_STANDARD +import city.zouitel.systemDesign.Cons.MP3 +import city.zouitel.systemDesign.Cons.NUL +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18 +import city.zouitel.systemDesign.Icons.EDIT_ICON +import city.zouitel.systemDesign.ImageDisplayed +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.OUT_LINE_VARIANT +import city.zouitel.systemDesign.SoundEffect +import city.zouitel.systemDesign.decodeUrl +import city.zouitel.systemDesign.findUrlLink +import city.zouitel.tags.viewmodel.NoteAndTagViewModel +import city.zouitel.tags.viewmodel.TagViewModel +import city.zouitel.tags.model.NoteAndTag +import city.zouitel.tasks.viewmodel.NoteAndTaskViewModel +import city.zouitel.tasks.viewmodel.TaskViewModel +import city.zouitel.tasks.model.NoteAndTask +import city.zouitel.tasks.model.Task import com.google.accompanist.flowlayout.FlowRow +import org.koin.androidx.compose.koinViewModel import java.io.File @SuppressLint( @@ -86,15 +92,15 @@ import java.io.File @Composable fun NoteEdit( navController: NavController, - dataViewModel: DataViewModel = hiltViewModel(), - exoViewModule: MediaPlayerViewModel = hiltViewModel(), - noteAndLabelVM: NoteAndTagViewModel = hiltViewModel(), - tagViewModel: TagViewModel = hiltViewModel(), - taskViewModel: TaskViewModel = hiltViewModel(), - noteAndTodoVM: NoteAndTaskViewModel = hiltViewModel(), - dataStoreVM: DataStoreVM = hiltViewModel(), - linkVM: LinkVM = hiltViewModel(), - noteAndLinkVM: NoteAndLinkVM = hiltViewModel(), + dataViewModel: DataViewModel = koinViewModel(), + exoViewModule: MediaPlayerViewModel = koinViewModel(), + noteAndLabelVM: NoteAndTagViewModel = koinViewModel(), + tagViewModel: TagViewModel = koinViewModel(), + taskViewModel: TaskViewModel = koinViewModel(), + noteAndTodoVM: NoteAndTaskViewModel = koinViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), + linkVM: LinkVM = koinViewModel(), + noteAndLinkVM: NoteAndLinkVM = koinViewModel(), uid:String, title:String?, description:String?, @@ -135,16 +141,12 @@ fun NoteEdit( if(title == NUL || title.isNullOrEmpty()) null else decodeUrl.invoke(title) ) } -// .filterBadWords() -// .filterBadEmoji() val descriptionState = rememberSaveable { mutableStateOf( if(description == NUL) null else decodeUrl.invoke(description) ) } -// .filterBadWords() -// .filterBadEmoji() val backgroundColorState = rememberSaveable { mutableStateOf(color) } val textColorState = rememberSaveable { mutableStateOf(textColor) } @@ -250,7 +252,7 @@ fun NoteEdit( // reminding dialog visibility. if (remindingDialogState.value) { - com.example.reminder.RemindingNote( + RemindingNote( dialogState = remindingDialogState, remindingValue = remindingValue, title = titleState.value, @@ -270,7 +272,7 @@ fun NoteEdit( if ( File(mediaFile).exists() && !recordDialogState.value ) { - com.example.media_player.NoteMediaPlayer(localMediaUid = uid) + city.zouitel.audios.NoteMediaPlayer(localMediaUid = uid) audioDurationState.value = exoViewModule.getMediaDuration(ctx,mediaFile).toInt() } diff --git a/ui/features/note/src/main/java/com/example/note/di/NoteModule.kt b/ui/features/note/src/main/java/com/example/note/di/NoteModule.kt deleted file mode 100644 index 965557fd..00000000 --- a/ui/features/note/src/main/java/com/example/note/di/NoteModule.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.example.note.di - -import com.example.links.mapper.LinkMapper -import com.example.note.mapper.DataMapper -import com.example.note.mapper.NoteMapper -import com.example.tags.mapper.TagMapper -import com.example.tasks.mapper.TaskMapper -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -object NoteModule { - - @Singleton - @Provides - fun provideDataMapper() = DataMapper() - - @Singleton - @Provides - fun provideNoteMapper( - dataMapper: DataMapper, - tagMapper: TagMapper, - taskMapper: TaskMapper, - linkMapper: LinkMapper - ) = NoteMapper(dataMapper, tagMapper, taskMapper, linkMapper) -} \ No newline at end of file diff --git a/ui/features/note/src/test/java/city/zouitel/note/ExampleUnitTest.kt b/ui/features/note/src/test/java/city/zouitel/note/ExampleUnitTest.kt new file mode 100644 index 00000000..59a43de2 --- /dev/null +++ b/ui/features/note/src/test/java/city/zouitel/note/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.note + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/quick-note/build.gradle.kts b/ui/features/quick-note/build.gradle.kts deleted file mode 100644 index a4426462..00000000 --- a/ui/features/quick-note/build.gradle.kts +++ /dev/null @@ -1,26 +0,0 @@ -plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.quick_note" -} - -dependencies { - //Projects. - implementation(projects.domain) - implementation(projects.data.datastore) - implementation(projects.ui.features.note) - implementation(projects.common.ui) - - //AndroidX. - implementation(libs.androidx.constraintlayout) - - //LiveData. - implementation(libs.livedatakts) - - //Accompanist. - implementation(libs.accompanist.systemuicontroller) -} \ No newline at end of file diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/di/QuickDataModule.kt b/ui/features/quick-note/src/main/java/com/example/quick_note/di/QuickDataModule.kt deleted file mode 100644 index d9545689..00000000 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/di/QuickDataModule.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.quick_note.di - -import com.example.quick_note.mapper.QuickDataMapper -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -object QuickDataModule { - - @Singleton - @Provides - fun provideQuickDataMapper() = QuickDataMapper() -} \ No newline at end of file diff --git a/service/notification/.gitignore b/ui/features/quickNote/.gitignore similarity index 100% rename from service/notification/.gitignore rename to ui/features/quickNote/.gitignore diff --git a/ui/features/quickNote/build.gradle.kts b/ui/features/quickNote/build.gradle.kts new file mode 100644 index 00000000..c0df3e61 --- /dev/null +++ b/ui/features/quickNote/build.gradle.kts @@ -0,0 +1,82 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.quicknote" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) + + //Projects. + implementation(projects.domain) + implementation(projects.core.datastore) + implementation(projects.ui.features.note) + + //AndroidX. + implementation(libs.constraintlayout) + + //LiveData. + implementation(libs.lifecycle.livedata) + + //Accompanist. + implementation(libs.accompanist.systemuicontroller) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) +} \ No newline at end of file diff --git a/ui/features/quickNote/consumer-rules.pro b/ui/features/quickNote/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/quickNote/proguard-rules.pro b/ui/features/quickNote/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/quickNote/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/quickNote/src/androidTest/java/city/zouitel/quicknote/ExampleInstrumentedTest.kt b/ui/features/quickNote/src/androidTest/java/city/zouitel/quicknote/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..7061d777 --- /dev/null +++ b/ui/features/quickNote/src/androidTest/java/city/zouitel/quicknote/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.quicknote + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.quicknote.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/media-player/src/main/AndroidManifest.xml b/ui/features/quickNote/src/main/AndroidManifest.xml similarity index 100% rename from ui/features/media-player/src/main/AndroidManifest.xml rename to ui/features/quickNote/src/main/AndroidManifest.xml diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/Quick.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/Quick.kt similarity index 92% rename from ui/features/quick-note/src/main/java/com/example/quick_note/Quick.kt rename to ui/features/quickNote/src/main/java/city/zouitel/quicknote/Quick.kt index c3fa37d7..e8f84b4e 100644 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/Quick.kt +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/Quick.kt @@ -1,4 +1,4 @@ -package com.example.quick_note +package city.zouitel.quicknote import android.annotation.SuppressLint import androidx.compose.foundation.background @@ -29,19 +29,19 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons -import com.example.common_ui.Icons -import com.example.common_ui.MaterialColors -import com.example.common_ui.MaterialColors.Companion.OUT_LINE_VARIANT -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.quick_note.model.QuickData +import city.zouitel.quicknote.model.QuickData +import city.zouitel.systemDesign.Cons +import city.zouitel.systemDesign.Icons +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.OUT_LINE_VARIANT +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import org.koin.androidx.compose.koinViewModel import java.util.UUID @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @OptIn(ExperimentalMaterial3Api::class) @Composable fun Quick( - quickDataViewModel: QuickDataViewModel = hiltViewModel(), + quickDataViewModel: QuickDataViewModel = koinViewModel(), action:() -> (Unit) ) { val descriptionState = remember { mutableStateOf("") } diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/QuickActivity.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickActivity.kt similarity index 84% rename from ui/features/quick-note/src/main/java/com/example/quick_note/QuickActivity.kt rename to ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickActivity.kt index b698be1d..86432c5b 100644 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/QuickActivity.kt +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickActivity.kt @@ -1,9 +1,8 @@ -package com.example.quick_note +package city.zouitel.quicknote import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent -import androidx.activity.viewModels import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme @@ -13,13 +12,11 @@ import androidx.compose.runtime.SideEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalContext -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.DataStoreVM +import city.zouitel.systemDesign.DataStoreVM import com.google.accompanist.systemuicontroller.rememberSystemUiController -import dagger.hilt.android.AndroidEntryPoint +import org.koin.androidx.compose.koinViewModel -@AndroidEntryPoint +//@AndroidEntryPoint class QuickActivity: ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -34,7 +31,7 @@ class QuickActivity: ComponentActivity() { @Composable private fun AppTheme( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), content: @Composable () -> Unit ) { val currentTheme = remember(dataStoreVM, dataStoreVM::getTheme).collectAsState() diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/QuickDataViewModel.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickDataViewModel.kt similarity index 52% rename from ui/features/quick-note/src/main/java/com/example/quick_note/QuickDataViewModel.kt rename to ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickDataViewModel.kt index ceae71cc..32f0e580 100644 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/QuickDataViewModel.kt +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickDataViewModel.kt @@ -1,20 +1,18 @@ -package com.example.quick_note +package city.zouitel.quicknote import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.usecase.DataUseCase -import com.example.quick_note.mapper.QuickDataMapper -import com.example.quick_note.model.QuickData -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.DataUseCase +import city.zouitel.quicknote.mapper.QuickDataMapper +import city.zouitel.quicknote.model.QuickData import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import javax.inject.Inject -@HiltViewModel -class QuickDataViewModel @Inject constructor( +//@HiltViewModel +class QuickDataViewModel /*@Inject*/ constructor( private val add: DataUseCase.AddData, private val mapper: QuickDataMapper -) : ViewModel() { +): ViewModel() { fun addQuickData(data: QuickData) = viewModelScope.launch(Dispatchers.IO) { add.invoke(mapper.toDomain(data)) } diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/QuickTileService.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickTileService.kt similarity index 77% rename from ui/features/quick-note/src/main/java/com/example/quick_note/QuickTileService.kt rename to ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickTileService.kt index 107f90fc..4700a0fd 100644 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/QuickTileService.kt +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/QuickTileService.kt @@ -1,10 +1,12 @@ -package com.example.quick_note +package city.zouitel.quicknote +import android.annotation.SuppressLint import android.content.Intent import android.service.quicksettings.TileService class QuickTileService: TileService() { + @SuppressLint("StartActivityAndCollapseDeprecated") override fun onClick() { super.onClick() val intent = Intent(applicationContext, QuickActivity::class.java) diff --git a/ui/features/quickNote/src/main/java/city/zouitel/quicknote/di/QuickDataModule.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/di/QuickDataModule.kt new file mode 100644 index 00000000..70f19527 --- /dev/null +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/di/QuickDataModule.kt @@ -0,0 +1,12 @@ +package city.zouitel.quicknote.di + +import city.zouitel.quicknote.mapper.QuickDataMapper + +//@Module +//@InstallIn(SingletonComponent::class) +object QuickDataModule { + +// @Singleton +// @Provides + fun provideQuickDataMapper() = QuickDataMapper() +} \ No newline at end of file diff --git a/ui/features/quickNote/src/main/java/city/zouitel/quicknote/di/QuickNoteDI.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/di/QuickNoteDI.kt new file mode 100644 index 00000000..d72cfb59 --- /dev/null +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/di/QuickNoteDI.kt @@ -0,0 +1,12 @@ +package city.zouitel.quicknote.di + +import org.koin.core.module.dsl.factoryOf +import org.koin.dsl.module +import city.zouitel.quicknote.mapper.QuickDataMapper +import city.zouitel.quicknote.* +import org.koin.androidx.viewmodel.dsl.viewModelOf + +val quickNoteKoinModule = module { + factoryOf(::QuickDataMapper) + viewModelOf(::QuickDataViewModel) +} \ No newline at end of file diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/mapper/QuickDataMapper.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/mapper/QuickDataMapper.kt similarity index 71% rename from ui/features/quick-note/src/main/java/com/example/quick_note/mapper/QuickDataMapper.kt rename to ui/features/quickNote/src/main/java/city/zouitel/quicknote/mapper/QuickDataMapper.kt index 7be9c611..36258cbe 100644 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/mapper/QuickDataMapper.kt +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/mapper/QuickDataMapper.kt @@ -1,8 +1,8 @@ -package com.example.quick_note.mapper +package city.zouitel.quicknote.mapper -import com.example.domain.model.Data as OutData -import com.example.quick_note.mapper.base.Mapper -import com.example.quick_note.model.QuickData as InData +import city.zouitel.domain.model.Data as OutData +import city.zouitel.quicknote.mapper.base.Mapper +import city.zouitel.quicknote.model.QuickData as InData class QuickDataMapper: Mapper.Base { override fun toView(data: OutData): InData = with(data) { diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/mapper/base/Mapper.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/mapper/base/Mapper.kt similarity index 83% rename from ui/features/quick-note/src/main/java/com/example/quick_note/mapper/base/Mapper.kt rename to ui/features/quickNote/src/main/java/city/zouitel/quicknote/mapper/base/Mapper.kt index d2d27e17..8d533af5 100644 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/mapper/base/Mapper.kt +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/mapper/base/Mapper.kt @@ -1,4 +1,4 @@ -package com.example.quick_note.mapper.base +package city.zouitel.quicknote.mapper.base sealed interface Mapper { interface Base { diff --git a/ui/features/quick-note/src/main/java/com/example/quick_note/model/QuickData.kt b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/model/QuickData.kt similarity index 83% rename from ui/features/quick-note/src/main/java/com/example/quick_note/model/QuickData.kt rename to ui/features/quickNote/src/main/java/city/zouitel/quicknote/model/QuickData.kt index 2876b726..2a230133 100644 --- a/ui/features/quick-note/src/main/java/com/example/quick_note/model/QuickData.kt +++ b/ui/features/quickNote/src/main/java/city/zouitel/quicknote/model/QuickData.kt @@ -1,7 +1,6 @@ -package com.example.quick_note.model - -import com.example.common_ui.Cons.NON +package city.zouitel.quicknote.model +import city.zouitel.systemDesign.Cons.NON data class QuickData( var uid: String = "", diff --git a/ui/features/quickNote/src/test/java/city/zouitel/quicknote/ExampleUnitTest.kt b/ui/features/quickNote/src/test/java/city/zouitel/quicknote/ExampleUnitTest.kt new file mode 100644 index 00000000..2547dd09 --- /dev/null +++ b/ui/features/quickNote/src/test/java/city/zouitel/quicknote/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.quicknote + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/record/.gitignore b/ui/features/record/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/ui/features/record/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/ui/features/record/build.gradle.kts b/ui/features/record/build.gradle.kts deleted file mode 100644 index 20f34e6f..00000000 --- a/ui/features/record/build.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ -plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.record" -} - -dependencies { - //Projects. - implementation(projects.common.ui) - implementation(projects.domain) - implementation(projects.data.datastore) - - //AndroidX. - implementation(libs.androidx.constraintlayout) -} \ No newline at end of file diff --git a/ui/features/media-player/.gitignore b/ui/features/recorder/.gitignore similarity index 100% rename from ui/features/media-player/.gitignore rename to ui/features/recorder/.gitignore diff --git a/ui/features/recorder/build.gradle.kts b/ui/features/recorder/build.gradle.kts new file mode 100644 index 00000000..7490f951 --- /dev/null +++ b/ui/features/recorder/build.gradle.kts @@ -0,0 +1,75 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.recorder" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) + + //Projects. + implementation(projects.domain) + implementation(projects.core.datastore) + + //AndroidX. + implementation(libs.constraintlayout) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) +} \ No newline at end of file diff --git a/ui/features/recorder/consumer-rules.pro b/ui/features/recorder/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/recorder/proguard-rules.pro b/ui/features/recorder/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/recorder/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/recorder/src/androidTest/java/city/zouitel/recoder/ExampleInstrumentedTest.kt b/ui/features/recorder/src/androidTest/java/city/zouitel/recoder/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..7d13f07a --- /dev/null +++ b/ui/features/recorder/src/androidTest/java/city/zouitel/recoder/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.recoder + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.recoder.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/record/src/main/AndroidManifest.xml b/ui/features/recorder/src/main/AndroidManifest.xml similarity index 100% rename from ui/features/record/src/main/AndroidManifest.xml rename to ui/features/recorder/src/main/AndroidManifest.xml diff --git a/ui/features/recorder/src/main/java/city/zouitel/recoder/di/recorderDI.kt b/ui/features/recorder/src/main/java/city/zouitel/recoder/di/recorderDI.kt new file mode 100644 index 00000000..70d7eade --- /dev/null +++ b/ui/features/recorder/src/main/java/city/zouitel/recoder/di/recorderDI.kt @@ -0,0 +1,11 @@ +package city.zouitel.recoder.di + +import city.zouitel.recoder.viewmodel.MediaRecordVM +import city.zouitel.recoder.viewmodel.RecorderVM +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.dsl.module + +val recorderKoinModule = module { + viewModelOf(::MediaRecordVM) + viewModelOf(::RecorderVM) +} \ No newline at end of file diff --git a/ui/features/record/src/main/java/com/example/record/RecordController.kt b/ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordController.kt similarity index 90% rename from ui/features/record/src/main/java/com/example/record/RecordController.kt rename to ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordController.kt index caf38d39..eef4961c 100644 --- a/ui/features/record/src/main/java/com/example/record/RecordController.kt +++ b/ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordController.kt @@ -1,9 +1,8 @@ -package com.example.record +package city.zouitel.recoder.ui import android.annotation.SuppressLint import android.media.MediaRecorder import androidx.compose.animation.AnimatedVisibility -import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.scaleIn import androidx.compose.animation.scaleOut import androidx.compose.foundation.clickable @@ -14,14 +13,13 @@ import androidx.compose.runtime.MutableState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource -import com.example.common_ui.AdaptingRow -import com.example.common_ui.Icons.MIC_ICON_36 -import com.example.common_ui.Icons.PAUSE_CIRCLE_FILLED_ICON_36 -import com.example.common_ui.Icons.PLAY_CIRCLE_FILLED_ICON_36 -import com.example.common_ui.Icons.STOP_CIRCLE_ICON_36 +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.Icons.MIC_ICON_36 +import city.zouitel.systemDesign.Icons.PAUSE_CIRCLE_FILLED_ICON_36 +import city.zouitel.systemDesign.Icons.PLAY_CIRCLE_FILLED_ICON_36 +import city.zouitel.systemDesign.Icons.STOP_CIRCLE_ICON_36 @SuppressLint("UnusedMaterialScaffoldPaddingParameter") -@OptIn(ExperimentalAnimationApi::class) @Composable fun RecordController( isRecording: MutableState, diff --git a/ui/features/record/src/main/java/com/example/record/RecordTimer.kt b/ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordTimer.kt similarity index 92% rename from ui/features/record/src/main/java/com/example/record/RecordTimer.kt rename to ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordTimer.kt index 4d9062a6..0b18ead6 100644 --- a/ui/features/record/src/main/java/com/example/record/RecordTimer.kt +++ b/ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordTimer.kt @@ -1,4 +1,4 @@ -package com.example.record +package city.zouitel.recoder.ui import androidx.compose.animation.* import androidx.compose.foundation.layout.Row @@ -23,7 +23,7 @@ fun RecordTimer( modifier = Modifier .height(100.dp) ) { - val numberTransitionSpec: AnimatedContentTransitionScope.() -> ContentTransform = { + val numberTransitionSpec: AnimatedContentTransitionScope.() -> ContentTransform = { (slideInVertically( initialOffsetY = { it } ) + fadeIn()).togetherWith(slideOutVertically( diff --git a/ui/features/record/src/main/java/com/example/record/RecordingNote.kt b/ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordingNote.kt similarity index 68% rename from ui/features/record/src/main/java/com/example/record/RecordingNote.kt rename to ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordingNote.kt index 603f51ce..cafe09b4 100644 --- a/ui/features/record/src/main/java/com/example/record/RecordingNote.kt +++ b/ui/features/recorder/src/main/java/city/zouitel/recoder/ui/RecordingNote.kt @@ -1,4 +1,4 @@ -package com.example.record +package city.zouitel.recoder.ui import android.annotation.SuppressLint import androidx.compose.material3.AlertDialog @@ -7,10 +7,12 @@ import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext -import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.viewmodel.compose.viewModel -import com.example.common_ui.Cons.AUDIOS -import com.example.common_ui.Cons.MP3 +import city.zouitel.recoder.viewmodel.MediaRecordVM +import city.zouitel.recoder.viewmodel.RecorderVM +import city.zouitel.systemDesign.Cons.AUDIOS +import city.zouitel.systemDesign.Cons.MP3 +import org.koin.androidx.compose.koinViewModel import java.io.File import kotlin.time.ExperimentalTime @@ -21,7 +23,7 @@ import kotlin.time.ExperimentalTime ) @Composable fun RecordingNote( - noteMediaRecordVM: MediaRecordVM = hiltViewModel(), + noteMediaRecordVM: MediaRecordVM = koinViewModel(), dialogState: MutableState, uid: String? ) { @@ -30,7 +32,7 @@ fun RecordingNote( val isRecording = remember { mutableStateOf(false) } val isPause = remember { mutableStateOf(false) } - val recordVm = viewModel(RecordVM::class.java) + val recorderVm = viewModel(RecorderVM::class.java) val path = File( ctx.filesDir.path + "/$AUDIOS/" + uid + "." + MP3 @@ -47,7 +49,7 @@ fun RecordingNote( record.stop() record.reset() record.release() - recordVm.stop() + recorderVm.stop() } dialogState.value = false }, @@ -58,12 +60,12 @@ fun RecordingNote( isPause = isPause, dialogState = dialogState, mediaRecorder = record, - seconds = recordVm.seconds, - minutes = recordVm.minutes, - hours = recordVm.hours, - onStart = { recordVm.start() }, - onPause = { recordVm.pause() }, - onStop = { recordVm.stop() } + seconds = recorderVm.seconds, + minutes = recorderVm.minutes, + hours = recorderVm.hours, + onStart = { recorderVm.start() }, + onPause = { recorderVm.pause() }, + onStop = { recorderVm.stop() } ) } ) diff --git a/ui/features/record/src/main/java/com/example/record/MediaRecordVM.kt b/ui/features/recorder/src/main/java/city/zouitel/recoder/viewmodel/MediaRecordVM.kt similarity index 94% rename from ui/features/record/src/main/java/com/example/record/MediaRecordVM.kt rename to ui/features/recorder/src/main/java/city/zouitel/recoder/viewmodel/MediaRecordVM.kt index f03002a7..16ed27f7 100644 --- a/ui/features/record/src/main/java/com/example/record/MediaRecordVM.kt +++ b/ui/features/recorder/src/main/java/city/zouitel/recoder/viewmodel/MediaRecordVM.kt @@ -1,4 +1,4 @@ -package com.example.record +package city.zouitel.recoder.viewmodel import android.media.MediaRecorder import androidx.lifecycle.ViewModel diff --git a/ui/features/record/src/main/java/com/example/record/RecordVM.kt b/ui/features/recorder/src/main/java/city/zouitel/recoder/viewmodel/RecorderVM.kt similarity index 80% rename from ui/features/record/src/main/java/com/example/record/RecordVM.kt rename to ui/features/recorder/src/main/java/city/zouitel/recoder/viewmodel/RecorderVM.kt index 869dd90e..d3e14726 100644 --- a/ui/features/record/src/main/java/com/example/record/RecordVM.kt +++ b/ui/features/recorder/src/main/java/city/zouitel/recoder/viewmodel/RecorderVM.kt @@ -1,4 +1,4 @@ -package com.example.record +package city.zouitel.recoder.viewmodel import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -8,10 +8,8 @@ import java.util.* import kotlin.concurrent.fixedRateTimer import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds -import kotlin.time.ExperimentalTime -@ExperimentalTime -class RecordVM : ViewModel() { +class RecorderVM : ViewModel() { private var time: Duration = Duration.ZERO private lateinit var timer: Timer @@ -31,9 +29,9 @@ class RecordVM : ViewModel() { private fun updateTimeStates() { time.toComponents { hours, minutes, seconds, _ -> - this@RecordVM.seconds = seconds.pad() - this@RecordVM.minutes = minutes.pad() - this@RecordVM.hours = hours.toInt().pad() + this@RecorderVM.seconds = seconds.pad() + this@RecorderVM.minutes = minutes.pad() + this@RecorderVM.hours = hours.toInt().pad() } } diff --git a/ui/features/recorder/src/test/java/city/zouitel/recoder/ExampleUnitTest.kt b/ui/features/recorder/src/test/java/city/zouitel/recoder/ExampleUnitTest.kt new file mode 100644 index 00000000..7c5651e5 --- /dev/null +++ b/ui/features/recorder/src/test/java/city/zouitel/recoder/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.recoder + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/reminder/build.gradle.kts b/ui/features/reminder/build.gradle.kts index f29d6f81..9d702574 100644 --- a/ui/features/reminder/build.gradle.kts +++ b/ui/features/reminder/build.gradle.kts @@ -1,19 +1,74 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.reminder" + namespace = "city.zouitel.reminder" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { - //Projects. - implementation(projects.common.ui) - implementation(projects.service.notification) - implementation(projects.data.datastore) + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) + + implementation(projects.services.notifications) + implementation(projects.core.datastore) //AndroidX. - implementation(libs.androidx.constraintlayout) + implementation(libs.constraintlayout) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) } \ No newline at end of file diff --git a/ui/features/reminder/consumer-rules.pro b/ui/features/reminder/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/reminder/proguard-rules.pro b/ui/features/reminder/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/reminder/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/reminder/src/androidTest/java/city/zouitel/reminder/ExampleInstrumentedTest.kt b/ui/features/reminder/src/androidTest/java/city/zouitel/reminder/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..337a3870 --- /dev/null +++ b/ui/features/reminder/src/androidTest/java/city/zouitel/reminder/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.reminder + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.reminder.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/reminder/src/main/java/city/zouitel/reminder/di/reminderKoinModule.kt b/ui/features/reminder/src/main/java/city/zouitel/reminder/di/reminderKoinModule.kt new file mode 100644 index 00000000..b37b5f21 --- /dev/null +++ b/ui/features/reminder/src/main/java/city/zouitel/reminder/di/reminderKoinModule.kt @@ -0,0 +1,9 @@ +package city.zouitel.reminder.di + +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.dsl.module +import city.zouitel.reminder.viewmodel.ReminderVM + +val reminderKoinModule = module { + viewModelOf(::ReminderVM) +} \ No newline at end of file diff --git a/ui/features/reminder/src/main/java/com/example/reminder/RemindingNote.kt b/ui/features/reminder/src/main/java/city/zouitel/reminder/ui/RemindingNote.kt similarity index 87% rename from ui/features/reminder/src/main/java/com/example/reminder/RemindingNote.kt rename to ui/features/reminder/src/main/java/city/zouitel/reminder/ui/RemindingNote.kt index a246959f..ddc11ada 100644 --- a/ui/features/reminder/src/main/java/com/example/reminder/RemindingNote.kt +++ b/ui/features/reminder/src/main/java/city/zouitel/reminder/ui/RemindingNote.kt @@ -1,4 +1,4 @@ -package com.example.reminder +package city.zouitel.reminder.ui import android.annotation.SuppressLint import androidx.compose.foundation.layout.* @@ -15,18 +15,19 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.viewmodel.compose.viewModel -import com.example.common_ui.AdaptingRow -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.Cons.KEY_STANDARD -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.CALENDAR_ICON -import com.example.common_ui.Icons.CLOCK_ICON -import com.example.common_ui.MaterialColors -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.common_ui.SoundEffect -import com.example.notification.viewmodel.NotificationVM +import city.zouitel.notifications.viewmodel.NotificationVM +import city.zouitel.reminder.viewmodel.ReminderVM +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.Cons.KEY_STANDARD +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.CALENDAR_ICON +import city.zouitel.systemDesign.Icons.CLOCK_ICON +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.SoundEffect +import org.koin.androidx.compose.koinViewModel @SuppressLint( "UnspecifiedImmutableFlag", @@ -34,7 +35,7 @@ import com.example.notification.viewmodel.NotificationVM ) @Composable fun RemindingNote( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), dialogState: MutableState, title: String?, message: String?, diff --git a/ui/features/reminder/src/main/java/com/example/reminder/ReminderVM.kt b/ui/features/reminder/src/main/java/city/zouitel/reminder/viewmodel/ReminderVM.kt similarity index 97% rename from ui/features/reminder/src/main/java/com/example/reminder/ReminderVM.kt rename to ui/features/reminder/src/main/java/city/zouitel/reminder/viewmodel/ReminderVM.kt index 0ebef879..43f19936 100644 --- a/ui/features/reminder/src/main/java/com/example/reminder/ReminderVM.kt +++ b/ui/features/reminder/src/main/java/city/zouitel/reminder/viewmodel/ReminderVM.kt @@ -1,4 +1,4 @@ -package com.example.reminder +package city.zouitel.reminder.viewmodel import android.app.DatePickerDialog import android.app.TimePickerDialog diff --git a/ui/features/reminder/src/test/java/city/zouitel/reminder/ExampleUnitTest.kt b/ui/features/reminder/src/test/java/city/zouitel/reminder/ExampleUnitTest.kt new file mode 100644 index 00000000..28e35365 --- /dev/null +++ b/ui/features/reminder/src/test/java/city/zouitel/reminder/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.reminder + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/tags/build.gradle.kts b/ui/features/tags/build.gradle.kts index 55ec513f..c38c7974 100644 --- a/ui/features/tags/build.gradle.kts +++ b/ui/features/tags/build.gradle.kts @@ -1,29 +1,85 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.tags" + namespace = "city.zouitel.tags" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) + //Projects. - implementation(projects.common.ui) implementation(projects.domain) - implementation(projects.data.datastore) + implementation(projects.core.datastore) //AndroidX. - implementation(libs.androidx.constraintlayout) + implementation(libs.constraintlayout) //LiveData. - implementation(libs.livedatakts) + implementation(libs.lifecycle.livedata) //Lifecycle. - implementation(libs.androidx.lifecycle.runtime.compose) - implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.lifecycle.compose.viewmodel) //Accompanist. implementation(libs.accompanist.flowlayout) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) } \ No newline at end of file diff --git a/ui/features/tags/consumer-rules.pro b/ui/features/tags/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/tags/proguard-rules.pro b/ui/features/tags/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/tags/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/tags/src/androidTest/java/city/zouitel/tags/ExampleInstrumentedTest.kt b/ui/features/tags/src/androidTest/java/city/zouitel/tags/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..c7ed2fd8 --- /dev/null +++ b/ui/features/tags/src/androidTest/java/city/zouitel/tags/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.tags + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.tags.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/tags/src/main/java/city/zouitel/tags/di/TagModule.kt b/ui/features/tags/src/main/java/city/zouitel/tags/di/TagModule.kt new file mode 100644 index 00000000..26190016 --- /dev/null +++ b/ui/features/tags/src/main/java/city/zouitel/tags/di/TagModule.kt @@ -0,0 +1,29 @@ +package city.zouitel.tags.di + +import city.zouitel.tags.mapper.NoteAndTagMapper +import city.zouitel.tags.mapper.TagMapper +import city.zouitel.tags.viewmodel.* +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.core.module.dsl.factoryOf +import org.koin.dsl.module + +//@Module +//@InstallIn(SingletonComponent::class) +object TagModule { + +// @Singleton +// @Provides + fun provideTagMapper() = TagMapper() + +// @Singleton +// @Provides + fun provideNoteAndTagMapper() = NoteAndTagMapper() +} + +val tagsKoinModule = module { + factoryOf(::TagMapper) + factoryOf(::NoteAndTagMapper) + + viewModelOf(::NoteAndTagViewModel) + viewModelOf(::TagViewModel) +} \ No newline at end of file diff --git a/ui/features/tags/src/main/java/com/example/tags/mapper/NoteAndTagMapper.kt b/ui/features/tags/src/main/java/city/zouitel/tags/mapper/NoteAndTagMapper.kt similarity index 61% rename from ui/features/tags/src/main/java/com/example/tags/mapper/NoteAndTagMapper.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/mapper/NoteAndTagMapper.kt index 4be308bc..5dec190c 100644 --- a/ui/features/tags/src/main/java/com/example/tags/mapper/NoteAndTagMapper.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/mapper/NoteAndTagMapper.kt @@ -1,8 +1,8 @@ -package com.example.tags.mapper +package city.zouitel.tags.mapper -import com.example.domain.model.NoteAndTag as OutNoteAndTag -import com.example.tags.mapper.base.Mapper -import com.example.tags.model.NoteAndTag as InNoteAndTag +import city.zouitel.domain.model.NoteAndTag as OutNoteAndTag +import city.zouitel.tags.mapper.base.Mapper +import city.zouitel.tags.model.NoteAndTag as InNoteAndTag class NoteAndTagMapper: Mapper.Base { override fun toView(data: OutNoteAndTag): InNoteAndTag = with(data) { diff --git a/ui/features/tags/src/main/java/com/example/tags/mapper/TagMapper.kt b/ui/features/tags/src/main/java/city/zouitel/tags/mapper/TagMapper.kt similarity index 59% rename from ui/features/tags/src/main/java/com/example/tags/mapper/TagMapper.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/mapper/TagMapper.kt index f2225600..7de105a9 100644 --- a/ui/features/tags/src/main/java/com/example/tags/mapper/TagMapper.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/mapper/TagMapper.kt @@ -1,8 +1,8 @@ -package com.example.tags.mapper +package city.zouitel.tags.mapper -import com.example.domain.model.Tag as OutTag -import com.example.tags.mapper.base.Mapper -import com.example.tags.model.Tag as InTag +import city.zouitel.domain.model.Tag as OutTag +import city.zouitel.tags.mapper.base.Mapper +import city.zouitel.tags.model.Tag as InTag class TagMapper: Mapper.Base { override fun toView(data: OutTag): InTag = with(data) { diff --git a/ui/features/links/src/main/java/com/example/links/mapper/base/Mapper.kt b/ui/features/tags/src/main/java/city/zouitel/tags/mapper/base/Mapper.kt similarity index 84% rename from ui/features/links/src/main/java/com/example/links/mapper/base/Mapper.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/mapper/base/Mapper.kt index 899780cd..491f7f0b 100644 --- a/ui/features/links/src/main/java/com/example/links/mapper/base/Mapper.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/mapper/base/Mapper.kt @@ -1,4 +1,4 @@ -package com.example.links.mapper.base +package city.zouitel.tags.mapper.base sealed interface Mapper { interface Base { diff --git a/ui/features/tags/src/main/java/com/example/tags/model/NoteAndTag.kt b/ui/features/tags/src/main/java/city/zouitel/tags/model/NoteAndTag.kt similarity index 77% rename from ui/features/tags/src/main/java/com/example/tags/model/NoteAndTag.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/model/NoteAndTag.kt index 3ada0bd3..803ac407 100644 --- a/ui/features/tags/src/main/java/com/example/tags/model/NoteAndTag.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/model/NoteAndTag.kt @@ -1,4 +1,4 @@ -package com.example.tags.model +package city.zouitel.tags.model import androidx.annotation.Keep diff --git a/ui/features/tags/src/main/java/com/example/tags/model/Tag.kt b/ui/features/tags/src/main/java/city/zouitel/tags/model/Tag.kt similarity index 81% rename from ui/features/tags/src/main/java/com/example/tags/model/Tag.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/model/Tag.kt index bcdfaca1..a6711205 100644 --- a/ui/features/tags/src/main/java/com/example/tags/model/Tag.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/model/Tag.kt @@ -1,4 +1,4 @@ -package com.example.tags.model +package city.zouitel.tags.model import androidx.annotation.Keep diff --git a/ui/features/tags/src/main/java/com/example/tags/state/State.kt b/ui/features/tags/src/main/java/city/zouitel/tags/state/State.kt similarity index 69% rename from ui/features/tags/src/main/java/com/example/tags/state/State.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/state/State.kt index e660a4d4..ca5255e4 100644 --- a/ui/features/tags/src/main/java/com/example/tags/state/State.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/state/State.kt @@ -1,11 +1,11 @@ -package com.example.tags.state +package city.zouitel.tags.state import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable +import androidx.compose.runtime.collectAsState import androidx.compose.runtime.remember -import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.example.tags.viewmodel.NoteAndTagViewModel -import com.example.tags.viewmodel.TagViewModel +import city.zouitel.tags.viewmodel.NoteAndTagViewModel +import city.zouitel.tags.viewmodel.TagViewModel internal sealed class State { @@ -18,7 +18,7 @@ internal sealed class State { remember( viewModel, viewModel::getAllLTags - ).collectAsStateWithLifecycle().value + ).collectAsState().value } @@ -32,6 +32,6 @@ internal sealed class State { remember( viewModel, viewModel::getAllNotesAndTags - ).collectAsStateWithLifecycle().value + ).collectAsState().value } } diff --git a/ui/features/tags/src/main/java/com/example/tags/ui/Tags.kt b/ui/features/tags/src/main/java/city/zouitel/tags/ui/Tags.kt similarity index 91% rename from ui/features/tags/src/main/java/com/example/tags/ui/Tags.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/ui/Tags.kt index f7583f71..d8cec01e 100644 --- a/ui/features/tags/src/main/java/com/example/tags/ui/Tags.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/ui/Tags.kt @@ -1,4 +1,4 @@ -package com.example.tags.ui +package city.zouitel.tags.ui import android.annotation.SuppressLint import androidx.compose.foundation.background @@ -22,20 +22,20 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.NUL -import com.example.common_ui.Icons.CIRCLE_ICON_18 -import com.example.common_ui.Icons.FULL_LABEL_ICON -import com.example.common_ui.Icons.OUTLINE_LABEL_ICON -import com.example.common_ui.MaterialColors -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.common_ui.MaterialColors.Companion.SURFACE_TINT -import com.example.tags.state.State -import com.example.tags.viewmodel.NoteAndTagViewModel -import com.example.tags.viewmodel.TagViewModel -import com.example.tags.model.Tag as InTag -import com.example.tags.model.NoteAndTag as InNoteAndTag +import city.zouitel.systemDesign.Cons.NUL +import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18 +import city.zouitel.systemDesign.Icons.FULL_LABEL_ICON +import city.zouitel.systemDesign.Icons.OUTLINE_LABEL_ICON +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE_TINT +import city.zouitel.tags.state.State +import city.zouitel.tags.viewmodel.NoteAndTagViewModel +import city.zouitel.tags.viewmodel.TagViewModel import com.google.accompanist.flowlayout.FlowRow +import org.koin.androidx.compose.koinViewModel +import city.zouitel.tags.model.NoteAndTag as InNoteAndTag +import city.zouitel.tags.model.Tag as InTag @SuppressLint( "UnusedMaterial3ScaffoldPaddingParameter", @@ -48,8 +48,8 @@ import com.google.accompanist.flowlayout.FlowRow ) @Composable fun Tags( - tagViewModel: TagViewModel = hiltViewModel(), - noteAndTagViewModel: NoteAndTagViewModel = hiltViewModel(), + tagViewModel: TagViewModel = koinViewModel(), + noteAndTagViewModel: NoteAndTagViewModel = koinViewModel(), noteUid: String?, ) { val tagState = State.Tag(tagViewModel) diff --git a/ui/features/tags/src/main/java/com/example/tags/utils/HashTagLayout.kt b/ui/features/tags/src/main/java/city/zouitel/tags/utils/HashTagLayout.kt similarity index 88% rename from ui/features/tags/src/main/java/com/example/tags/utils/HashTagLayout.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/utils/HashTagLayout.kt index 2cb3a01e..566146d6 100644 --- a/ui/features/tags/src/main/java/com/example/tags/utils/HashTagLayout.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/utils/HashTagLayout.kt @@ -1,4 +1,4 @@ -package com.example.tags.ui +package city.zouitel.tags.ui import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.clickable @@ -12,17 +12,17 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Icons.CIRCLE_ICON_18 -import com.example.common_ui.Icons.CROSS_CIRCLE_ICON -import com.example.tags.viewmodel.TagViewModel -import com.example.tags.model.Tag as InTag +import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18 +import city.zouitel.systemDesign.Icons.CROSS_CIRCLE_ICON +import city.zouitel.tags.viewmodel.TagViewModel +import city.zouitel.tags.model.Tag as InTag import com.google.accompanist.flowlayout.FlowRow +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable internal fun HashTagLayout( - tagViewModel: TagViewModel = hiltViewModel(), + tagViewModel: TagViewModel = koinViewModel(), labelDialogState: MutableState, hashTags: Collection, idState: MutableState, diff --git a/ui/features/tags/src/main/java/com/example/tags/utils/LableDialogColors.kt b/ui/features/tags/src/main/java/city/zouitel/tags/utils/LableDialogColors.kt similarity index 62% rename from ui/features/tags/src/main/java/com/example/tags/utils/LableDialogColors.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/utils/LableDialogColors.kt index bd2ef88e..e0b82b93 100644 --- a/ui/features/tags/src/main/java/com/example/tags/utils/LableDialogColors.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/utils/LableDialogColors.kt @@ -1,4 +1,4 @@ -package com.example.tags.ui +package city.zouitel.tags.ui import androidx.compose.foundation.Canvas import androidx.compose.foundation.clickable @@ -13,14 +13,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.drawscope.Fill import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.listOfBackgroundColors -import com.example.tags.viewmodel.TagViewModel -import com.example.tags.model.Tag as InTag +import city.zouitel.systemDesign.listOfBackgroundColors +import city.zouitel.tags.viewmodel.TagViewModel +import org.koin.androidx.compose.koinViewModel +import city.zouitel.tags.model.Tag as InTag @Composable internal fun DialogColors( - tagViewModel: TagViewModel = hiltViewModel(), + tagViewModel: TagViewModel = koinViewModel(), dialogState:MutableState, idState: MutableState, labelState: MutableState, @@ -39,14 +39,20 @@ internal fun DialogColors( .padding(2.dp) .clickable { // colorState.value = it.toArgb() - tagViewModel.updateTag( - InTag(id = idState.value, label = labelState.value, color = it.toArgb()) - ).invokeOnCompletion { - dialogState.value = false - colorState.value = 0x0000 - labelState.value = "" - idState.value = -1L - } + tagViewModel + .updateTag( + InTag( + id = idState.value, + label = labelState.value, + color = it.toArgb() + ) + ) + .invokeOnCompletion { + dialogState.value = false + colorState.value = 0x0000 + labelState.value = "" + idState.value = -1L + } } ) { drawArc( diff --git a/ui/features/tags/src/main/java/com/example/tags/viewmodel/NoteAndTagViewModel.kt b/ui/features/tags/src/main/java/city/zouitel/tags/viewmodel/NoteAndTagViewModel.kt similarity index 77% rename from ui/features/tags/src/main/java/com/example/tags/viewmodel/NoteAndTagViewModel.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/viewmodel/NoteAndTagViewModel.kt index 3bf36c47..cf7f1c3b 100644 --- a/ui/features/tags/src/main/java/com/example/tags/viewmodel/NoteAndTagViewModel.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/viewmodel/NoteAndTagViewModel.kt @@ -1,19 +1,16 @@ -package com.example.tags.viewmodel +package city.zouitel.tags.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.model.NoteAndTag as OutNoteAndTag -import com.example.domain.usecase.NoteAndTagUseCase -import com.example.tags.mapper.NoteAndTagMapper -import com.example.tags.model.NoteAndTag as InNoteAndTag -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.NoteAndTagUseCase +import city.zouitel.tags.mapper.NoteAndTagMapper +import city.zouitel.tags.model.NoteAndTag as InNoteAndTag import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.* import kotlinx.coroutines.launch -import javax.inject.Inject -@HiltViewModel -class NoteAndTagViewModel @Inject constructor( +//@HiltViewModel +class NoteAndTagViewModel /*@Inject*/ constructor( private val getAll: NoteAndTagUseCase.GetAllNotesAndTags, private val add: NoteAndTagUseCase.AddNoteAndTag, private val delete: NoteAndTagUseCase.DeleteNoteAndTag, diff --git a/ui/features/tags/src/main/java/com/example/tags/viewmodel/TagViewModel.kt b/ui/features/tags/src/main/java/city/zouitel/tags/viewmodel/TagViewModel.kt similarity index 80% rename from ui/features/tags/src/main/java/com/example/tags/viewmodel/TagViewModel.kt rename to ui/features/tags/src/main/java/city/zouitel/tags/viewmodel/TagViewModel.kt index 4d741eb7..dc5bc8fc 100644 --- a/ui/features/tags/src/main/java/com/example/tags/viewmodel/TagViewModel.kt +++ b/ui/features/tags/src/main/java/city/zouitel/tags/viewmodel/TagViewModel.kt @@ -1,22 +1,19 @@ -package com.example.tags.viewmodel +package city.zouitel.tags.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.usecase.TagUseCase -import com.example.tags.mapper.TagMapper -import com.example.tags.model.NoteAndTag -import com.example.tags.model.Tag as InTag -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.TagUseCase +import city.zouitel.tags.mapper.TagMapper +import city.zouitel.tags.model.Tag as InTag import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import javax.inject.Inject -@HiltViewModel -class TagViewModel @Inject constructor( +//@HiltViewModel +class TagViewModel /*@Inject*/ constructor( getAllTags: TagUseCase.GetAllTags, private val add: TagUseCase.AddTag, private val update: TagUseCase.UpdateTag, diff --git a/ui/features/tags/src/main/java/com/example/tags/di/TagModule.kt b/ui/features/tags/src/main/java/com/example/tags/di/TagModule.kt deleted file mode 100644 index 69ff253d..00000000 --- a/ui/features/tags/src/main/java/com/example/tags/di/TagModule.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.tags.di - -import com.example.tags.mapper.NoteAndTagMapper -import com.example.tags.mapper.TagMapper -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -object TagModule { - - @Singleton - @Provides - fun provideTagMapper() = TagMapper() - - @Singleton - @Provides - fun provideNoteAndTagMapper() = NoteAndTagMapper() -} \ No newline at end of file diff --git a/ui/features/tags/src/test/java/city/zouitel/tags/ExampleUnitTest.kt b/ui/features/tags/src/test/java/city/zouitel/tags/ExampleUnitTest.kt new file mode 100644 index 00000000..7093634c --- /dev/null +++ b/ui/features/tags/src/test/java/city/zouitel/tags/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.tags + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/tasks/build.gradle.kts b/ui/features/tasks/build.gradle.kts index 36d1535b..661c265a 100644 --- a/ui/features/tasks/build.gradle.kts +++ b/ui/features/tasks/build.gradle.kts @@ -1,21 +1,75 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.tasks" + namespace = "city.zouitel.tasks" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { - //Projects. + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) implementation(projects.domain) - implementation(projects.common.ui) //AndroidX. - implementation(libs.androidx.constraintlayout) + implementation(libs.constraintlayout) //Swipe. implementation (libs.swipe) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) } \ No newline at end of file diff --git a/ui/features/tasks/consumer-rules.pro b/ui/features/tasks/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/tasks/proguard-rules.pro b/ui/features/tasks/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/tasks/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/tasks/src/androidTest/java/city/zouitel/tasks/ExampleInstrumentedTest.kt b/ui/features/tasks/src/androidTest/java/city/zouitel/tasks/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..ee709bd7 --- /dev/null +++ b/ui/features/tasks/src/androidTest/java/city/zouitel/tasks/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.tasks + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.tasks.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/tasks/src/main/java/com/example/tasks/TaskList.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/TaskList.kt similarity index 91% rename from ui/features/tasks/src/main/java/com/example/tasks/TaskList.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/TaskList.kt index 7c25b0fd..2d1c66b9 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/TaskList.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/TaskList.kt @@ -1,4 +1,4 @@ -package com.example.tasks +package city.zouitel.tasks import android.annotation.SuppressLint import androidx.compose.foundation.background @@ -24,17 +24,19 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Icons.DELETE_OUTLINE_ICON -import com.example.common_ui.MaterialColors -import com.example.common_ui.MaterialColors.Companion.ON_SURFACE -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.tasks.model.NoteAndTask as InNoteAndTask -import com.example.tasks.model.Task as InTask +import city.zouitel.systemDesign.Icons.DELETE_OUTLINE_ICON +import city.zouitel.systemDesign.MaterialColors +import city.zouitel.systemDesign.MaterialColors.Companion.ON_SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.tasks.viewmodel.NoteAndTaskViewModel +import city.zouitel.tasks.viewmodel.TaskViewModel +import city.zouitel.tasks.model.NoteAndTask as InNoteAndTask +import city.zouitel.tasks.model.Task as InTask import kotlinx.coroutines.Job import me.saket.swipe.SwipeAction import me.saket.swipe.SwipeableActionsBox import me.saket.swipe.rememberSwipeableActionsState +import org.koin.androidx.compose.koinViewModel import kotlin.random.Random private val getMatColor = MaterialColors().getMaterialColor @@ -43,8 +45,8 @@ private val getMatColor = MaterialColors().getMaterialColor @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") @Composable fun TaskList( - taskViewModel: TaskViewModel = hiltViewModel(), - noteAndTodoVM: NoteAndTaskViewModel = hiltViewModel(), + taskViewModel: TaskViewModel = koinViewModel(), + noteAndTodoVM: NoteAndTaskViewModel = koinViewModel(), noteUid:String ) { val observeTaskList = remember(taskViewModel, taskViewModel::getAllTaskList).collectAsState() diff --git a/ui/features/tasks/src/main/java/city/zouitel/tasks/di/TaskModule.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/di/TaskModule.kt new file mode 100644 index 00000000..762a723c --- /dev/null +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/di/TaskModule.kt @@ -0,0 +1,29 @@ +package city.zouitel.tasks.di + +import city.zouitel.tasks.mapper.NoteAndTaskMapper +import city.zouitel.tasks.mapper.TaskMapper +import city.zouitel.tasks.viewmodel.* +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.core.module.dsl.factoryOf +import org.koin.dsl.module + +//@Module +//@InstallIn(SingletonComponent::class) +object TaskModule { + +// @Singleton +// @Provides + fun provideTaskMapper() = TaskMapper() + +// @Singleton +// @Provides + fun provideNoteAndTaskMapper() = NoteAndTaskMapper() +} + +val tasksKoinModule = module { + factoryOf(::TaskMapper) + factoryOf(::NoteAndTaskMapper) + + viewModelOf(::TaskViewModel) + viewModelOf(::NoteAndTaskViewModel) +} \ No newline at end of file diff --git a/ui/features/tasks/src/main/java/com/example/tasks/mapper/NoteAndTaskMapper.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/NoteAndTaskMapper.kt similarity index 61% rename from ui/features/tasks/src/main/java/com/example/tasks/mapper/NoteAndTaskMapper.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/NoteAndTaskMapper.kt index ed40e631..cd7bcaa0 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/mapper/NoteAndTaskMapper.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/NoteAndTaskMapper.kt @@ -1,8 +1,8 @@ -package com.example.tasks.mapper +package city.zouitel.tasks.mapper -import com.example.domain.model.NoteAndTask as OutNoteAndTask -import com.example.tasks.mapper.base.Mapper -import com.example.tasks.model.NoteAndTask as InNoteAndTask +import city.zouitel.domain.model.NoteAndTask as OutNoteAndTask +import city.zouitel.tasks.mapper.base.Mapper +import city.zouitel.tasks.model.NoteAndTask as InNoteAndTask class NoteAndTaskMapper: Mapper.Base { diff --git a/ui/features/tasks/src/main/java/com/example/tasks/mapper/TaskMapper.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/TaskMapper.kt similarity index 59% rename from ui/features/tasks/src/main/java/com/example/tasks/mapper/TaskMapper.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/TaskMapper.kt index 58bb0e9d..26be61fa 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/mapper/TaskMapper.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/TaskMapper.kt @@ -1,8 +1,8 @@ -package com.example.tasks.mapper +package city.zouitel.tasks.mapper -import com.example.domain.model.Task as OutTask -import com.example.tasks.mapper.base.Mapper -import com.example.tasks.model.Task as InTask +import city.zouitel.domain.model.Task as OutTask +import city.zouitel.tasks.mapper.base.Mapper +import city.zouitel.tasks.model.Task as InTask class TaskMapper: Mapper.Base { override fun toView(data: OutTask): InTask = with((data)) { diff --git a/ui/features/tasks/src/main/java/com/example/tasks/mapper/base/Mapper.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/base/Mapper.kt similarity index 84% rename from ui/features/tasks/src/main/java/com/example/tasks/mapper/base/Mapper.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/base/Mapper.kt index 21ca9346..fa70445f 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/mapper/base/Mapper.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/mapper/base/Mapper.kt @@ -1,4 +1,4 @@ -package com.example.tasks.mapper.base +package city.zouitel.tasks.mapper.base sealed interface Mapper { interface Base { diff --git a/ui/features/tasks/src/main/java/com/example/tasks/model/NoteAndTask.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/model/NoteAndTask.kt similarity index 76% rename from ui/features/tasks/src/main/java/com/example/tasks/model/NoteAndTask.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/model/NoteAndTask.kt index f20b855b..f2b0fbe8 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/model/NoteAndTask.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/model/NoteAndTask.kt @@ -1,4 +1,4 @@ -package com.example.tasks.model +package city.zouitel.tasks.model import androidx.annotation.Keep diff --git a/domain/src/main/java/com/example/domain/model/Task.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/model/Task.kt similarity index 81% rename from domain/src/main/java/com/example/domain/model/Task.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/model/Task.kt index 97ca872e..c46387cf 100644 --- a/domain/src/main/java/com/example/domain/model/Task.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/model/Task.kt @@ -1,4 +1,4 @@ -package com.example.domain.model +package city.zouitel.tasks.model import androidx.annotation.Keep diff --git a/ui/features/tasks/src/main/java/com/example/tasks/NoteAndTaskViewModel.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/viewmodel/NoteAndTaskViewModel.kt similarity index 80% rename from ui/features/tasks/src/main/java/com/example/tasks/NoteAndTaskViewModel.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/viewmodel/NoteAndTaskViewModel.kt index e3ab6a1b..cf74a290 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/NoteAndTaskViewModel.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/viewmodel/NoteAndTaskViewModel.kt @@ -1,21 +1,19 @@ -package com.example.tasks +package city.zouitel.tasks.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.usecase.NoteAndTaskUseCase -import com.example.tasks.mapper.NoteAndTaskMapper -import com.example.tasks.model.NoteAndTask as InNoteAndTask -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.NoteAndTaskUseCase +import city.zouitel.tasks.mapper.NoteAndTaskMapper +import city.zouitel.tasks.model.NoteAndTask as InNoteAndTask import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import javax.inject.Inject -@HiltViewModel -class NoteAndTaskViewModel @Inject constructor( +//@HiltViewModel +class NoteAndTaskViewModel /*@Inject*/ constructor( getAll: NoteAndTaskUseCase.GetAllNotesAndTask, private val add: NoteAndTaskUseCase.AddNoteAndTask, private val delete: NoteAndTaskUseCase.DeleteNoteAndTask, diff --git a/ui/features/tasks/src/main/java/com/example/tasks/TaskViewModel.kt b/ui/features/tasks/src/main/java/city/zouitel/tasks/viewmodel/TaskViewModel.kt similarity index 81% rename from ui/features/tasks/src/main/java/com/example/tasks/TaskViewModel.kt rename to ui/features/tasks/src/main/java/city/zouitel/tasks/viewmodel/TaskViewModel.kt index a4b0882d..497de73b 100644 --- a/ui/features/tasks/src/main/java/com/example/tasks/TaskViewModel.kt +++ b/ui/features/tasks/src/main/java/city/zouitel/tasks/viewmodel/TaskViewModel.kt @@ -1,22 +1,19 @@ -package com.example.tasks +package city.zouitel.tasks.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.example.domain.usecase.TaskUseCase -import com.example.tasks.mapper.TaskMapper -import com.example.tasks.model.Task as InTask -import com.example.domain.model.Task as OutTask -import dagger.hilt.android.lifecycle.HiltViewModel +import city.zouitel.domain.usecase.TaskUseCase +import city.zouitel.tasks.mapper.TaskMapper +import city.zouitel.tasks.model.Task as InTask import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch -import javax.inject.Inject -@HiltViewModel -class TaskViewModel @Inject constructor( +//@HiltViewModel +class TaskViewModel /*@Inject*/ constructor( private val getAll: TaskUseCase.GetAllTaskItems, private val add: TaskUseCase.AddTaskItem, private val update: TaskUseCase.UpdateTaskItem, diff --git a/ui/features/tasks/src/main/java/com/example/tasks/di/TaskModule.kt b/ui/features/tasks/src/main/java/com/example/tasks/di/TaskModule.kt deleted file mode 100644 index 904faffb..00000000 --- a/ui/features/tasks/src/main/java/com/example/tasks/di/TaskModule.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.example.tasks.di - -import com.example.tasks.mapper.NoteAndTaskMapper -import com.example.tasks.mapper.TaskMapper -import dagger.Module -import dagger.Provides -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent -import javax.inject.Singleton - -@Module -@InstallIn(SingletonComponent::class) -object TaskModule { - - @Singleton - @Provides - fun provideTaskMapper() = TaskMapper() - - @Singleton - @Provides - fun provideNoteAndTaskMapper() = NoteAndTaskMapper() -} \ No newline at end of file diff --git a/ui/features/tasks/src/test/java/city/zouitel/tasks/ExampleUnitTest.kt b/ui/features/tasks/src/test/java/city/zouitel/tasks/ExampleUnitTest.kt new file mode 100644 index 00000000..f1460c84 --- /dev/null +++ b/ui/features/tasks/src/test/java/city/zouitel/tasks/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.tasks + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/features/widget/build.gradle.kts b/ui/features/widget/build.gradle.kts index 4ec052ca..ebf9394a 100644 --- a/ui/features/widget/build.gradle.kts +++ b/ui/features/widget/build.gradle.kts @@ -1,19 +1,75 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) } android { - namespace = "com.example.glance" + namespace = "city.zouitel.widget" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } } dependencies { + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + implementation(libs.compose.constraintlayout) + implementation(libs.compose.navigation) + + implementation(projects.ui.common.systemDesign) + //Projects. implementation(projects.domain) - implementation(projects.common.ui) //AndroidX. - implementation(libs.androidx.constraintlayout) - implementation(libs.androidx.glance) + implementation(libs.constraintlayout) + implementation(libs.glance) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.android) + implementation(libs.koin.compose) } \ No newline at end of file diff --git a/ui/features/widget/consumer-rules.pro b/ui/features/widget/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/features/widget/proguard-rules.pro b/ui/features/widget/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/features/widget/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/features/widget/src/androidTest/java/city/zouitel/widget/ExampleInstrumentedTest.kt b/ui/features/widget/src/androidTest/java/city/zouitel/widget/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..0e248905 --- /dev/null +++ b/ui/features/widget/src/androidTest/java/city/zouitel/widget/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.widget + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.widget.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/widget/src/main/AndroidManifest.xml b/ui/features/widget/src/main/AndroidManifest.xml index 610e27a0..4a8b8e3f 100644 --- a/ui/features/widget/src/main/AndroidManifest.xml +++ b/ui/features/widget/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - - \ No newline at end of file diff --git a/ui/features/widget/src/main/java/city/zouitel/widget/EntryPoint.kt b/ui/features/widget/src/main/java/city/zouitel/widget/EntryPoint.kt new file mode 100644 index 00000000..51b710c7 --- /dev/null +++ b/ui/features/widget/src/main/java/city/zouitel/widget/EntryPoint.kt @@ -0,0 +1,10 @@ +package city.zouitel.widget + +import city.zouitel.widget.ui.WidgetViewModel + +//@EntryPoint +//@InstallIn(SingletonComponent::class) +interface EntryPoint { + + fun vm(): WidgetViewModel +} \ No newline at end of file diff --git a/ui/features/widget/src/main/java/com/example/glance/WidgetReceiver.kt b/ui/features/widget/src/main/java/city/zouitel/widget/WidgetReceiver.kt similarity index 91% rename from ui/features/widget/src/main/java/com/example/glance/WidgetReceiver.kt rename to ui/features/widget/src/main/java/city/zouitel/widget/WidgetReceiver.kt index b769c35e..2e050c86 100644 --- a/ui/features/widget/src/main/java/com/example/glance/WidgetReceiver.kt +++ b/ui/features/widget/src/main/java/city/zouitel/widget/WidgetReceiver.kt @@ -1,4 +1,4 @@ -package com.example.glance +package city.zouitel.widget import android.appwidget.AppWidgetManager import android.content.ComponentName @@ -6,10 +6,9 @@ import android.content.Context import android.content.Intent import androidx.glance.appwidget.GlanceAppWidget import androidx.glance.appwidget.GlanceAppWidgetReceiver -import com.example.glance.ui.AppWidget -import dagger.hilt.android.AndroidEntryPoint +import city.zouitel.widget.ui.AppWidget -@AndroidEntryPoint +//@AndroidEntryPoint class WidgetReceiver: GlanceAppWidgetReceiver() { override val glanceAppWidget: GlanceAppWidget get() = AppWidget() diff --git a/ui/features/widget/src/main/java/city/zouitel/widget/di/WidgetModule.kt b/ui/features/widget/src/main/java/city/zouitel/widget/di/WidgetModule.kt new file mode 100644 index 00000000..484e31f0 --- /dev/null +++ b/ui/features/widget/src/main/java/city/zouitel/widget/di/WidgetModule.kt @@ -0,0 +1,16 @@ +package city.zouitel.widget.di + +import city.zouitel.domain.usecase.WidgetUseCase +import city.zouitel.widget.ui.WidgetViewModel +import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.androidx.viewmodel.dsl.viewModelOf +import org.koin.core.module.Module +import org.koin.dsl.module + +val widgetKoinModule = module { + viewModel { param -> + WidgetViewModel( + param.get() + ) + } +} \ No newline at end of file diff --git a/ui/features/widget/src/main/java/com/example/glance/ui/AppWidget.kt b/ui/features/widget/src/main/java/city/zouitel/widget/ui/AppWidget.kt similarity index 90% rename from ui/features/widget/src/main/java/com/example/glance/ui/AppWidget.kt rename to ui/features/widget/src/main/java/city/zouitel/widget/ui/AppWidget.kt index 9de25d82..1df1508d 100644 --- a/ui/features/widget/src/main/java/com/example/glance/ui/AppWidget.kt +++ b/ui/features/widget/src/main/java/city/zouitel/widget/ui/AppWidget.kt @@ -1,4 +1,4 @@ -package com.example.glance.ui +package city.zouitel.widget.ui import android.content.Context import androidx.compose.runtime.* @@ -13,20 +13,19 @@ import androidx.glance.appwidget.lazy.items import androidx.glance.layout.* import androidx.glance.text.Text import androidx.glance.unit.ColorProvider -import com.example.glance.EntryPoint -import dagger.hilt.EntryPoints +import org.koin.androidx.compose.koinViewModel class AppWidget: GlanceAppWidget() { @Composable - fun Content() { - + override fun Content() { + val viewModel = koinViewModel() val ctx = LocalContext.current.applicationContext - val viewModel = EntryPoints.get( - ctx, - EntryPoint::class.java - ).vm() +// val viewModel = EntryPoints.get( +// ctx, +// EntryPoint::class.java +// ).vm() WidgetListNotes(ctx = ctx, widgetViewModel = viewModel) } @@ -97,8 +96,4 @@ class AppWidget: GlanceAppWidget() { } } } - - override suspend fun provideGlance(context: Context, id: GlanceId) { - TODO("Not yet implemented") - } } \ No newline at end of file diff --git a/ui/features/widget/src/main/java/com/example/glance/ui/WidgetViewModel.kt b/ui/features/widget/src/main/java/city/zouitel/widget/ui/WidgetViewModel.kt similarity index 74% rename from ui/features/widget/src/main/java/com/example/glance/ui/WidgetViewModel.kt rename to ui/features/widget/src/main/java/city/zouitel/widget/ui/WidgetViewModel.kt index 489c692f..a42f46ac 100644 --- a/ui/features/widget/src/main/java/com/example/glance/ui/WidgetViewModel.kt +++ b/ui/features/widget/src/main/java/city/zouitel/widget/ui/WidgetViewModel.kt @@ -1,17 +1,17 @@ -package com.example.glance.ui +package city.zouitel.widget.ui import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory import androidx.annotation.WorkerThread -import com.example.common_ui.Cons -import com.example.domain.usecase.WidgetUseCase +import androidx.lifecycle.ViewModel +import city.zouitel.domain.usecase.WidgetUseCase +import city.zouitel.systemDesign.Cons import java.io.File -import javax.inject.Inject -class WidgetViewModel @Inject constructor( +class WidgetViewModel /*@Inject*/ constructor( private val getAll: WidgetUseCase.GetAllWidgetMainEntityById -) { +): ViewModel() { @WorkerThread fun getAllEntities() = getAll diff --git a/ui/features/widget/src/main/java/com/example/glance/utils.kt b/ui/features/widget/src/main/java/city/zouitel/widget/utils.kt similarity index 76% rename from ui/features/widget/src/main/java/com/example/glance/utils.kt rename to ui/features/widget/src/main/java/city/zouitel/widget/utils.kt index 2a50f7f2..f77b5d0b 100644 --- a/ui/features/widget/src/main/java/com/example/glance/utils.kt +++ b/ui/features/widget/src/main/java/city/zouitel/widget/utils.kt @@ -1,4 +1,4 @@ -package com.example.glance +package city.zouitel.widget import androidx.core.net.toUri diff --git a/ui/features/widget/src/main/java/com/example/glance/EntryPoint.kt b/ui/features/widget/src/main/java/com/example/glance/EntryPoint.kt deleted file mode 100644 index 4732bb68..00000000 --- a/ui/features/widget/src/main/java/com/example/glance/EntryPoint.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.glance - -import com.example.glance.ui.WidgetViewModel -import dagger.hilt.InstallIn -import dagger.hilt.EntryPoint -import dagger.hilt.components.SingletonComponent - - -@EntryPoint -@InstallIn(SingletonComponent::class) -interface EntryPoint { - - fun vm(): WidgetViewModel -} \ No newline at end of file diff --git a/ui/features/widget/src/main/java/com/example/glance/di/WidgetModule.kt b/ui/features/widget/src/main/java/com/example/glance/di/WidgetModule.kt deleted file mode 100644 index 84845e47..00000000 --- a/ui/features/widget/src/main/java/com/example/glance/di/WidgetModule.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.glance.di - -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent - -@Module -@InstallIn(SingletonComponent::class) -object WidgetModule { - -} \ No newline at end of file diff --git a/ui/features/widget/src/test/java/city/zouitel/widget/ExampleUnitTest.kt b/ui/features/widget/src/test/java/city/zouitel/widget/ExampleUnitTest.kt new file mode 100644 index 00000000..efd52c14 --- /dev/null +++ b/ui/features/widget/src/test/java/city/zouitel/widget/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.widget + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/ui/graph/.gitignore b/ui/graph/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/ui/graph/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/ui/graph/build.gradle.kts b/ui/graph/build.gradle.kts deleted file mode 100644 index 152f05bf..00000000 --- a/ui/graph/build.gradle.kts +++ /dev/null @@ -1,65 +0,0 @@ -plugins { - id("city.android-lib") - id("city.compose-lib") - id("city.dagger-hilt") -} - -android { - namespace = "com.example.graph" -} - -dependencies { - //Projects. - implementation(projects.data.datastore) - implementation(projects.data.local) - implementation(projects.domain) - implementation(projects.service.notification) - implementation(projects.common.ui) - implementation(projects.ui.features.widget) - implementation(projects.ui.features.tags) - implementation(projects.ui.features.camera) - implementation(projects.ui.features.record) - implementation(projects.ui.features.tasks) - implementation(projects.ui.features.mediaPlayer) - implementation(projects.ui.features.reminder) - implementation(projects.ui.features.note) - implementation(projects.ui.features.quickNote) - implementation(projects.ui.features.links) - - //AndroidX. - implementation(libs.androidx.constraintlayout) - - //LiveData. - implementation(libs.livedatakts) - - //Accompanist. - implementation(libs.accompanist.permissions) - implementation(libs.accompanist.pager) - implementation(libs.accompanist.pager.indicators) - implementation(libs.accompanist.systemuicontroller) - implementation(libs.accompanist.navigation.animation) - implementation(libs.accompanist.swiperefresh) - implementation(libs.accompanist.flowlayout) - implementation(libs.accompanist.insets) - - //Sketchbook. - implementation (libs.sketchbook) - //Balloon. - implementation ("com.github.skydoves:balloon-compose:1.5.3") - - //Swipe. - implementation (libs.swipe) - - //Coil. - implementation(libs.coil.compose) - implementation(libs.coil.svg) - - //License. - implementation (libs.aboutlibraries.comp) - - //Baha-UrlPreview. - implementation(libs.url.preview) - - //Beetle. - implementation(libs.beetle) -} \ No newline at end of file diff --git a/ui/graph/src/main/AndroidManifest.xml b/ui/graph/src/main/AndroidManifest.xml deleted file mode 100644 index a5918e68..00000000 --- a/ui/graph/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ui/graph/src/main/java/com/example/graph/CONS.kt b/ui/graph/src/main/java/com/example/graph/CONS.kt deleted file mode 100644 index 8032351d..00000000 --- a/ui/graph/src/main/java/com/example/graph/CONS.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.graph - -object CONS { - - const val ADD_ROUTE = "add_screen" - const val IMAGES = "images_folder" - const val AUDIOS = "records_folder" - const val NUL = "null" - -} diff --git a/ui/graph/src/main/java/com/example/graph/getMaterialColor.kt b/ui/graph/src/main/java/com/example/graph/getMaterialColor.kt deleted file mode 100644 index e94246aa..00000000 --- a/ui/graph/src/main/java/com/example/graph/getMaterialColor.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.graph - -import com.example.common_ui.MaterialColors - -internal val getMaterialColor = MaterialColors().getMaterialColor \ No newline at end of file diff --git a/ui/graph/src/main/java/com/example/graph/sound.kt b/ui/graph/src/main/java/com/example/graph/sound.kt deleted file mode 100644 index 87f3360a..00000000 --- a/ui/graph/src/main/java/com/example/graph/sound.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.graph - -import com.example.common_ui.SoundEffect - -val sound = SoundEffect() \ No newline at end of file diff --git a/ui/features/quick-note/.gitignore b/ui/navigation/.gitignore similarity index 100% rename from ui/features/quick-note/.gitignore rename to ui/navigation/.gitignore diff --git a/ui/navigation/build.gradle.kts b/ui/navigation/build.gradle.kts new file mode 100644 index 00000000..f81930d2 --- /dev/null +++ b/ui/navigation/build.gradle.kts @@ -0,0 +1,117 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + alias(libs.plugins.androidLibrary) + alias(libs.plugins.kotlinAndroid) +} + +android { + namespace = "city.zouitel.navigation" + compileSdk = 34 + + defaultConfig { + minSdk = 26 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.4" + } +} + +dependencies { + + implementation(libs.core.ktx) + implementation(libs.lifecycle.runtime.ktx) + implementation(libs.activity.compose) + implementation(platform(libs.compose.bom)) + implementation(libs.ui) + implementation(libs.ui.graphics) + implementation(libs.ui.tooling.preview) + implementation(libs.material3) + + implementation(libs.core.ktx) + implementation(libs.appcompat) + implementation(libs.material) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.espresso.core) + + //Projects. + implementation(projects.core.datastore) + implementation(projects.core.database) + implementation(projects.domain) + implementation(projects.services.notifications) + implementation(projects.ui.common.systemDesign) + api(projects.ui.features.tags) + api(projects.ui.features.camera) + api(projects.ui.features.recorder) + api(projects.ui.features.tasks) + api(projects.ui.features.audios) + api(projects.ui.features.reminder) + api(projects.ui.features.note) + api(projects.ui.features.quickNote) + api(projects.ui.features.links) + api(projects.ui.features.widget) + + //AndroidX. + implementation(libs.constraintlayout) + + //LiveData. + implementation(libs.lifecycle.livedata) + + //Accompanist. + implementation(libs.accompanist.permissions) + implementation(libs.accompanist.pager) + implementation(libs.accompanist.pager.indicators) + implementation(libs.accompanist.systemuicontroller) + implementation(libs.accompanist.navigation.animation) + implementation(libs.accompanist.swiperefresh) + implementation(libs.accompanist.flowlayout) + implementation(libs.accompanist.insets) + + //Sketchbook. + implementation (libs.sketchbook) + //Balloon. + implementation ("com.github.skydoves:balloon-compose:1.5.3") + + //Swipe. + implementation (libs.swipe) + + //Coil. + implementation(libs.coil.compose) + implementation(libs.coil.svg) + + //License. + implementation (libs.licenses) + + //Baha-UrlPreview. + implementation(libs.url.preview) + + //Beetle. + implementation(libs.beetle) + + //Koin. + implementation(libs.koin.core) + implementation(libs.koin.compose) +} \ No newline at end of file diff --git a/ui/navigation/consumer-rules.pro b/ui/navigation/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/ui/navigation/proguard-rules.pro b/ui/navigation/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/ui/navigation/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/ui/navigation/src/androidTest/java/city/zouitel/navigation/ExampleInstrumentedTest.kt b/ui/navigation/src/androidTest/java/city/zouitel/navigation/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..27acf13f --- /dev/null +++ b/ui/navigation/src/androidTest/java/city/zouitel/navigation/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package city.zouitel.navigation + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("city.zouitel.navigation.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/ui/features/quick-note/src/main/AndroidManifest.xml b/ui/navigation/src/main/AndroidManifest.xml similarity index 60% rename from ui/features/quick-note/src/main/AndroidManifest.xml rename to ui/navigation/src/main/AndroidManifest.xml index 74b7379f..972f3b97 100644 --- a/ui/features/quick-note/src/main/AndroidManifest.xml +++ b/ui/navigation/src/main/AndroidManifest.xml @@ -1,3 +1,4 @@ + \ No newline at end of file diff --git a/ui/graph/src/main/java/com/example/graph/Graph.kt b/ui/navigation/src/main/java/city/zouitel/navigation/Graph.kt similarity index 81% rename from ui/graph/src/main/java/com/example/graph/Graph.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/Graph.kt index fe6df0e6..8725bf59 100644 --- a/ui/graph/src/main/java/com/example/graph/Graph.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/Graph.kt @@ -1,4 +1,4 @@ -package com.example.graph +package city.zouitel.navigation import androidx.compose.runtime.Composable import androidx.navigation.NavHostController @@ -6,32 +6,32 @@ import androidx.navigation.NavType import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.navArgument -import com.example.common_ui.Cons.ADD_ROUTE -import com.example.common_ui.Cons.AUDIO_DURATION -import com.example.common_ui.Cons.CAMERA_ROUTE -import com.example.common_ui.Cons.COLOR -import com.example.common_ui.Cons.DESCRIPTION -import com.example.common_ui.Cons.DRAW_ROUTE -import com.example.common_ui.Cons.EDIT_ROUTE -import com.example.common_ui.Cons.HOME_ROUTE -import com.example.common_ui.Cons.NON -import com.example.common_ui.Cons.PRIORITY -import com.example.common_ui.Cons.REMINDING -import com.example.common_ui.Cons.SETTING_ROUTE -import com.example.common_ui.Cons.TEXT_COLOR -import com.example.common_ui.Cons.TITLE -import com.example.common_ui.Cons.TRASH_ROUTE -import com.example.common_ui.Cons.UID -import com.example.graph.about_screen.AppAbout -import com.example.graph.draw_screen.DrawingNote -import com.example.graph.home_screen.NoteHome -import com.example.graph.settings_screen.Licenses -import com.example.graph.settings_screen.Settings -import com.example.graph.trash_screen.TrashScreen -import com.example.note.ui.add_screen.NoteAdd -import com.example.note.ui.edit_screen.NoteEdit -import com.example.tags.ui.Tags -import com.example.tasks.TaskList +import city.zouitel.navigation.about_screen.AppAbout +import city.zouitel.navigation.draw_screen.DrawingNote +import city.zouitel.navigation.home_screen.NoteHome +import city.zouitel.navigation.settings_screen.Licenses +import city.zouitel.navigation.settings_screen.Settings +import city.zouitel.navigation.trash_screen.TrashScreen +import city.zouitel.note.ui.add_screen.NoteAdd +import city.zouitel.note.ui.edit_screen.NoteEdit +import city.zouitel.systemDesign.Cons.ADD_ROUTE +import city.zouitel.systemDesign.Cons.AUDIO_DURATION +import city.zouitel.systemDesign.Cons.CAMERA_ROUTE +import city.zouitel.systemDesign.Cons.COLOR +import city.zouitel.systemDesign.Cons.DESCRIPTION +import city.zouitel.systemDesign.Cons.DRAW_ROUTE +import city.zouitel.systemDesign.Cons.EDIT_ROUTE +import city.zouitel.systemDesign.Cons.HOME_ROUTE +import city.zouitel.systemDesign.Cons.NON +import city.zouitel.systemDesign.Cons.PRIORITY +import city.zouitel.systemDesign.Cons.REMINDING +import city.zouitel.systemDesign.Cons.SETTING_ROUTE +import city.zouitel.systemDesign.Cons.TEXT_COLOR +import city.zouitel.systemDesign.Cons.TITLE +import city.zouitel.systemDesign.Cons.TRASH_ROUTE +import city.zouitel.systemDesign.Cons.UID +import city.zouitel.tags.ui.Tags +import city.zouitel.tasks.TaskList @Composable fun Graph( diff --git a/common/ui/src/main/java/com/example/common_ui/ImageDisplay.kt b/ui/navigation/src/main/java/city/zouitel/navigation/ImageDisplay.kt similarity index 96% rename from common/ui/src/main/java/com/example/common_ui/ImageDisplay.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/ImageDisplay.kt index cdc91f7b..b307d362 100644 --- a/common/ui/src/main/java/com/example/common_ui/ImageDisplay.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/ImageDisplay.kt @@ -1,4 +1,4 @@ -package com.example.common_ui +package city.zouitel.navigation import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* diff --git a/ui/graph/src/main/java/com/example/graph/NoteTextField.kt b/ui/navigation/src/main/java/city/zouitel/navigation/NoteTextField.kt similarity index 94% rename from ui/graph/src/main/java/com/example/graph/NoteTextField.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/NoteTextField.kt index f938a8f1..ff61760d 100644 --- a/ui/graph/src/main/java/com/example/graph/NoteTextField.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/NoteTextField.kt @@ -1,4 +1,4 @@ -package com.example.graph +package city.zouitel.navigation import android.net.Uri import android.view.OnReceiveContentListener @@ -12,12 +12,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.viewinterop.AndroidView import androidx.core.view.inputmethod.EditorInfoCompat import androidx.core.view.inputmethod.InputConnectionCompat -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.note.DataViewModel +import city.zouitel.note.DataViewModel +import org.koin.androidx.compose.koinViewModel @Composable fun NoteTextField( - dataViewModel: DataViewModel = hiltViewModel(), + dataViewModel: DataViewModel = koinViewModel(), uid: String, txtHint: String = "", txtSize: Float = 20f, diff --git a/ui/graph/src/main/java/com/example/graph/about_screen/AboutDescription.kt b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutDescription.kt similarity index 75% rename from ui/graph/src/main/java/com/example/graph/about_screen/AboutDescription.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutDescription.kt index 1c086452..241d208e 100644 --- a/ui/graph/src/main/java/com/example/graph/about_screen/AboutDescription.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutDescription.kt @@ -1,4 +1,4 @@ -package com.example.graph.about_screen +package city.zouitel.navigation.about_screen import androidx.compose.foundation.layout.padding import androidx.compose.material.Text @@ -6,10 +6,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.example.common_ui.Cons.APP_NAME -import com.example.common_ui.Cons.APP_VERSION -import com.example.common_ui.MaterialColors.Companion.ON_SURFACE -import com.example.graph.getMaterialColor +import city.zouitel.systemDesign.Cons.APP_NAME +import city.zouitel.systemDesign.Cons.APP_VERSION +import city.zouitel.systemDesign.MaterialColors.Companion.ON_SURFACE +import city.zouitel.navigation.getMaterialColor @Composable fun AboutDescription() { diff --git a/ui/graph/src/main/java/com/example/graph/about_screen/AboutLabel.kt b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutLabel.kt similarity index 85% rename from ui/graph/src/main/java/com/example/graph/about_screen/AboutLabel.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutLabel.kt index db67dc0d..5d125335 100644 --- a/ui/graph/src/main/java/com/example/graph/about_screen/AboutLabel.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutLabel.kt @@ -1,4 +1,4 @@ -package com.example.graph.about_screen +package city.zouitel.navigation.about_screen import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth @@ -13,11 +13,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import city.zouitel.navigation.R +import city.zouitel.systemDesign.Cons.APP_NAME import coil.compose.AsyncImage -import com.example.common_ui.Cons.APP_NAME -import com.example.common_ui.MaterialColors.Companion.ON_SURFACE -import com.example.common_ui.R -import com.example.graph.getMaterialColor @Composable diff --git a/ui/graph/src/main/java/com/example/graph/about_screen/AboutSources.kt b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutSources.kt similarity index 79% rename from ui/graph/src/main/java/com/example/graph/about_screen/AboutSources.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutSources.kt index 987f0665..72d5481c 100644 --- a/ui/graph/src/main/java/com/example/graph/about_screen/AboutSources.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AboutSources.kt @@ -1,4 +1,4 @@ -package com.example.graph.about_screen +package city.zouitel.navigation.about_screen import androidx.compose.foundation.layout.* import androidx.compose.material3.Button @@ -15,18 +15,18 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.GITHUB_ICON -import com.example.common_ui.MaterialColors.Companion.ON_SURFACE -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.graph.getMaterialColor -import com.example.graph.sound +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.GITHUB_ICON +import city.zouitel.systemDesign.MaterialColors.Companion.ON_SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.navigation.getMaterialColor +import city.zouitel.navigation.sound +import org.koin.androidx.compose.koinViewModel @Composable fun AboutSources( - dataStoreVM: DataStoreVM = hiltViewModel() + dataStoreVM: DataStoreVM = koinViewModel() ) { val uri = LocalUriHandler.current diff --git a/ui/graph/src/main/java/com/example/graph/about_screen/AppAbout.kt b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AppAbout.kt similarity index 87% rename from ui/graph/src/main/java/com/example/graph/about_screen/AppAbout.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AppAbout.kt index 3fd9ee1d..c4ed15a3 100644 --- a/ui/graph/src/main/java/com/example/graph/about_screen/AppAbout.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/about_screen/AppAbout.kt @@ -1,4 +1,4 @@ -package com.example.graph.about_screen +package city.zouitel.navigation.about_screen import android.annotation.SuppressLint import androidx.compose.foundation.layout.* @@ -10,10 +10,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.navigation.NavController -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.graph.getMaterialColor -import com.example.graph.navigation_drawer.NavigationDrawer -import com.example.graph.top_action_bar.CustomTopAppBar +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.navigation.getMaterialColor +import city.zouitel.navigation.navigation_drawer.NavigationDrawer +import city.zouitel.navigation.top_action_bar.CustomTopAppBar @SuppressLint("UnusedMaterialScaffoldPaddingParameter") diff --git a/ui/graph/src/main/java/com/example/graph/codeUrl.kt b/ui/navigation/src/main/java/city/zouitel/navigation/codeUrl.kt similarity index 88% rename from ui/graph/src/main/java/com/example/graph/codeUrl.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/codeUrl.kt index c2eeea76..4ac0ea8d 100644 --- a/ui/graph/src/main/java/com/example/graph/codeUrl.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/codeUrl.kt @@ -1,4 +1,4 @@ -package com.example.graph +package city.zouitel.navigation // val codeUrl: (String?) -> String? diff --git a/ui/graph/src/main/java/com/example/graph/copyNote.kt b/ui/navigation/src/main/java/city/zouitel/navigation/copyNote.kt similarity index 69% rename from ui/graph/src/main/java/com/example/graph/copyNote.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/copyNote.kt index 420fb687..c1965dca 100644 --- a/ui/graph/src/main/java/com/example/graph/copyNote.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/copyNote.kt @@ -1,12 +1,12 @@ -package com.example.graph +package city.zouitel.navigation import android.content.Context -import com.example.common_ui.Cons.AUDIOS -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.common_ui.Cons.MP3 -import com.example.note.DataViewModel -import com.example.note.model.Data +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.systemDesign.Cons.AUDIOS +import city.zouitel.systemDesign.Cons.IMAGES +import city.zouitel.systemDesign.Cons.JPEG +import city.zouitel.systemDesign.Cons.MP3 import java.io.File import java.util.* diff --git a/ui/navigation/src/main/java/city/zouitel/navigation/di/modulesPackage.kt b/ui/navigation/src/main/java/city/zouitel/navigation/di/modulesPackage.kt new file mode 100644 index 00000000..16f4ca58 --- /dev/null +++ b/ui/navigation/src/main/java/city/zouitel/navigation/di/modulesPackage.kt @@ -0,0 +1,17 @@ +package city.zouitel.navigation.di + +import city.zouitel.audios.di.exoPlayerKoinModule +import city.zouitel.links.di.linksKoinModule +import city.zouitel.note.di.noteKoinModule +import city.zouitel.notifications.di.notificationKoinModule +import city.zouitel.quicknote.di.quickNoteKoinModule +import city.zouitel.recoder.di.recorderKoinModule +import city.zouitel.reminder.di.reminderKoinModule +import city.zouitel.tags.di.tagsKoinModule +import city.zouitel.tasks.di.tasksKoinModule +import city.zouitel.widget.di.widgetKoinModule +import org.koin.dsl.module + +val featuresKoinModule = module { + +} \ No newline at end of file diff --git a/ui/graph/src/main/java/com/example/graph/draw_screen/DrawingNote.kt b/ui/navigation/src/main/java/city/zouitel/navigation/draw_screen/DrawingNote.kt similarity index 90% rename from ui/graph/src/main/java/com/example/graph/draw_screen/DrawingNote.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/draw_screen/DrawingNote.kt index 4de68548..90382075 100644 --- a/ui/graph/src/main/java/com/example/graph/draw_screen/DrawingNote.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/draw_screen/DrawingNote.kt @@ -1,4 +1,4 @@ -package com.example.graph.draw_screen +package city.zouitel.navigation.draw_screen import android.annotation.SuppressLint import android.graphics.Bitmap @@ -22,34 +22,34 @@ import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.AdaptingRow -import com.example.common_ui.Cons.ADD_ROUTE -import com.example.common_ui.Cons.EDIT_ROUTE -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.common_ui.Icons.CIRCLE_ICON -import com.example.common_ui.Icons.DISK_ICON -import com.example.common_ui.Icons.ERASER_BLACK_ICON -import com.example.common_ui.Icons.REDO_ICON -import com.example.common_ui.Icons.UNDO_ICON -import com.example.common_ui.MaterialColors.Companion.ON_SURFACE -import com.example.common_ui.MaterialColors.Companion.OUTLINE -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.graph.getMaterialColor -import com.example.note.DataViewModel +import city.zouitel.note.DataViewModel +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.Cons.ADD_ROUTE +import city.zouitel.systemDesign.Cons.EDIT_ROUTE +import city.zouitel.systemDesign.Cons.IMAGES +import city.zouitel.systemDesign.Cons.JPEG +import city.zouitel.systemDesign.Icons.CIRCLE_ICON +import city.zouitel.systemDesign.Icons.DISK_ICON +import city.zouitel.systemDesign.Icons.ERASER_BLACK_ICON +import city.zouitel.systemDesign.Icons.REDO_ICON +import city.zouitel.systemDesign.Icons.UNDO_ICON +import city.zouitel.systemDesign.MaterialColors.Companion.ON_SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.OUTLINE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.navigation.getMaterialColor import io.getstream.sketchbook.ColorPickerDialog import io.getstream.sketchbook.PaintColorPalette import io.getstream.sketchbook.Sketchbook import io.getstream.sketchbook.rememberSketchbookController +import org.koin.androidx.compose.koinViewModel import java.io.File @SuppressLint("RememberReturnType") @OptIn(ExperimentalMaterialApi::class) @Composable fun DrawingNote( - viewModule: DataViewModel = hiltViewModel(), + viewModule: DataViewModel = koinViewModel(), navController: NavController, title: String, description: String, @@ -91,7 +91,7 @@ fun DrawingNote( ) { // Icon( - painterResource(UNDO_ICON), + painter = painterResource(id = UNDO_ICON), null, modifier = Modifier .size(20.dp) diff --git a/ui/navigation/src/main/java/city/zouitel/navigation/getMaterialColor.kt b/ui/navigation/src/main/java/city/zouitel/navigation/getMaterialColor.kt new file mode 100644 index 00000000..15d671af --- /dev/null +++ b/ui/navigation/src/main/java/city/zouitel/navigation/getMaterialColor.kt @@ -0,0 +1,5 @@ +package city.zouitel.navigation + +import city.zouitel.systemDesign.MaterialColors + +internal val getMaterialColor = MaterialColors().getMaterialColor \ No newline at end of file diff --git a/ui/graph/src/main/java/com/example/graph/home_screen/NoteHome.kt b/ui/navigation/src/main/java/city/zouitel/navigation/home_screen/NoteHome.kt similarity index 86% rename from ui/graph/src/main/java/com/example/graph/home_screen/NoteHome.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/home_screen/NoteHome.kt index a0d62fe4..49cb3480 100644 --- a/ui/graph/src/main/java/com/example/graph/home_screen/NoteHome.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/home_screen/NoteHome.kt @@ -1,4 +1,4 @@ -package com.example.graph.home_screen +package city.zouitel.navigation.home_screen import android.annotation.SuppressLint import androidx.compose.foundation.layout.* @@ -18,35 +18,35 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.Cons.ADD_ROUTE -import com.example.common_ui.Cons.HOME_ROUTE -import com.example.common_ui.Cons.KEY_STANDARD -import com.example.common_ui.Cons.NUL -import com.example.common_ui.Cons.BY_NAME -import com.example.common_ui.Cons.ORDER_BY_NEWEST -import com.example.common_ui.Cons.ORDER_BY_OLDEST -import com.example.common_ui.Cons.ORDER_BY_PRIORITY -import com.example.common_ui.Cons.ORDER_BY_REMINDER -import com.example.common_ui.Cons.SEARCH_IN_LOCAL -import com.example.common_ui.Icons.PLUS_ICON -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.common_ui.MaterialColors.Companion.SURFACE_VARIANT -import com.example.common_ui.VerticalGrid -import com.example.graph.sound -import com.example.common_ui.DataStoreVM -import com.example.graph.getMaterialColor -import com.example.graph.navigation_drawer.NavigationDrawer -import com.example.graph.navigation_drawer.Screens -import com.example.graph.note_card.NoteCard -import com.example.graph.top_action_bar.NoteTopAppBar -import com.example.graph.top_action_bar.selection_bars.HomeSelectionTopAppBar -import com.example.note.NoteViewModel -import com.example.note.DataViewModel -import com.example.note.model.Data -import com.example.note.model.Note -import com.example.tags.model.Tag +import city.zouitel.note.DataViewModel +import city.zouitel.note.NoteViewModel +import city.zouitel.note.model.Data +import city.zouitel.note.model.Note +import city.zouitel.systemDesign.Cons.ADD_ROUTE +import city.zouitel.systemDesign.Cons.BY_NAME +import city.zouitel.systemDesign.Cons.HOME_ROUTE +import city.zouitel.systemDesign.Cons.KEY_STANDARD +import city.zouitel.systemDesign.Cons.NUL +import city.zouitel.systemDesign.Cons.ORDER_BY_NEWEST +import city.zouitel.systemDesign.Cons.ORDER_BY_OLDEST +import city.zouitel.systemDesign.Cons.ORDER_BY_PRIORITY +import city.zouitel.systemDesign.Cons.ORDER_BY_REMINDER +import city.zouitel.systemDesign.Cons.SEARCH_IN_LOCAL +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.PLUS_ICON +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE_VARIANT +import city.zouitel.systemDesign.VerticalGrid +import city.zouitel.tags.model.Tag +import city.zouitel.navigation.getMaterialColor +import city.zouitel.navigation.navigation_drawer.NavigationDrawer +import city.zouitel.navigation.navigation_drawer.Screens +import city.zouitel.navigation.note_card.NoteCard +import city.zouitel.navigation.sound +import city.zouitel.navigation.top_action_bar.NoteTopAppBar +import city.zouitel.navigation.top_action_bar.selection_bars.HomeSelectionTopAppBar +import org.koin.androidx.compose.koinViewModel import java.util.* @SuppressLint( @@ -60,9 +60,9 @@ import java.util.* ) @Composable fun NoteHome( - dataViewModel: DataViewModel = hiltViewModel(), - entityVM: NoteViewModel = hiltViewModel(), - dataStoreVM: DataStoreVM = hiltViewModel(), + dataViewModel: DataViewModel = koinViewModel(), + entityVM: NoteViewModel = koinViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), navController: NavController, ) { val ctx = LocalContext.current diff --git a/ui/graph/src/main/java/com/example/graph/home_screen/UndoSnackbar.kt b/ui/navigation/src/main/java/city/zouitel/navigation/home_screen/UndoSnackbar.kt similarity index 87% rename from ui/graph/src/main/java/com/example/graph/home_screen/UndoSnackbar.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/home_screen/UndoSnackbar.kt index 0b7dfde4..399adf8d 100644 --- a/ui/graph/src/main/java/com/example/graph/home_screen/UndoSnackbar.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/home_screen/UndoSnackbar.kt @@ -1,13 +1,13 @@ -package com.example.graph.home_screen +package city.zouitel.navigation.home_screen import androidx.compose.material.ScaffoldState import androidx.compose.material.SnackbarResult import androidx.compose.runtime.State -import com.example.common_ui.Cons.TRASH_MESSAGE -import com.example.common_ui.Cons.UNDO -import com.example.note.DataViewModel -import com.example.note.model.Data -import com.example.note.model.Note +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.note.model.Note +import city.zouitel.systemDesign.Cons.TRASH_MESSAGE +import city.zouitel.systemDesign.Cons.UNDO import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/ui/graph/src/main/java/com/example/graph/intentHandler.kt b/ui/navigation/src/main/java/city/zouitel/navigation/intentHandler.kt similarity index 91% rename from ui/graph/src/main/java/com/example/graph/intentHandler.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/intentHandler.kt index a3d83ed3..cc6e068c 100644 --- a/ui/graph/src/main/java/com/example/graph/intentHandler.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/intentHandler.kt @@ -1,11 +1,11 @@ -package com.example.graph +package city.zouitel.navigation import android.content.Context import android.content.Intent import android.widget.Toast import androidx.navigation.NavHostController -import com.example.graph.CONS.ADD_ROUTE -import com.example.graph.CONS.NUL +import city.zouitel.systemDesign.Cons.ADD_ROUTE +import city.zouitel.systemDesign.Cons.NUL import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import java.util.* diff --git a/ui/graph/src/main/java/com/example/graph/navigation_drawer/NavigationDrawer.kt b/ui/navigation/src/main/java/city/zouitel/navigation/navigation_drawer/NavigationDrawer.kt similarity index 85% rename from ui/graph/src/main/java/com/example/graph/navigation_drawer/NavigationDrawer.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/navigation_drawer/NavigationDrawer.kt index 9816a0cb..0f32b3fb 100644 --- a/ui/graph/src/main/java/com/example/graph/navigation_drawer/NavigationDrawer.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/navigation_drawer/NavigationDrawer.kt @@ -1,4 +1,4 @@ -package com.example.graph.navigation_drawer +package city.zouitel.navigation.navigation_drawer import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* @@ -15,33 +15,33 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.Cons.APP_NAME -import com.example.common_ui.Cons.HOME_ROUTE -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.Cons.SETTING_ROUTE -import com.example.common_ui.Cons.TRASH_ROUTE -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.CIRCLE_ICON_18 -import com.example.common_ui.Icons.COMMENT_EXCLAMATION -import com.example.common_ui.Icons.HOME_ICON -import com.example.common_ui.Icons.INTERROGATION_ICON -import com.example.common_ui.Icons.SETTINGS_ICON -import com.example.common_ui.Icons.SHARE_ICON -import com.example.common_ui.Icons.TRASH_ICON -import com.example.common_ui.sharApp -import com.example.graph.sound -import com.example.tags.viewmodel.TagViewModel -import com.example.tags.model.Tag +import city.zouitel.systemDesign.Cons.APP_NAME +import city.zouitel.systemDesign.Cons.HOME_ROUTE +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.Cons.SETTING_ROUTE +import city.zouitel.systemDesign.Cons.TRASH_ROUTE +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18 +import city.zouitel.systemDesign.Icons.COMMENT_EXCLAMATION +import city.zouitel.systemDesign.Icons.HOME_ICON +import city.zouitel.systemDesign.Icons.INTERROGATION_ICON +import city.zouitel.systemDesign.Icons.SETTINGS_ICON +import city.zouitel.systemDesign.Icons.SHARE_ICON +import city.zouitel.systemDesign.Icons.TRASH_ICON +import city.zouitel.systemDesign.sharApp +import city.zouitel.tags.viewmodel.TagViewModel +import city.zouitel.tags.model.Tag +import city.zouitel.navigation.sound import com.karacca.beetle.Beetle import kotlinx.coroutines.launch +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterial3Api::class) @Composable fun NavigationDrawer( - tagViewModel: TagViewModel = hiltViewModel(), - dataStoreVM: DataStoreVM = hiltViewModel(), + tagViewModel: TagViewModel = koinViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), drawerState: DrawerState, navController: NavController, searchTitle: MutableState?, @@ -76,7 +76,7 @@ fun NavigationDrawer( selected = false, onClick = { navController.navigate(HOME_ROUTE) - sound .makeSound(ctx, KEY_CLICK, thereIsSoundEffect.value) + sound.makeSound(ctx, KEY_CLICK, thereIsSoundEffect.value) } ) } @@ -104,7 +104,7 @@ fun NavigationDrawer( .padding(15.dp) .clickable { navController.navigate("tagEntities/${null}") - sound.makeSound(ctx, KEY_CLICK,thereIsSoundEffect.value) + sound.makeSound(ctx, KEY_CLICK, thereIsSoundEffect.value) } ) } diff --git a/ui/graph/src/main/java/com/example/graph/navigation_drawer/Screens.kt b/ui/navigation/src/main/java/city/zouitel/navigation/navigation_drawer/Screens.kt similarity index 70% rename from ui/graph/src/main/java/com/example/graph/navigation_drawer/Screens.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/navigation_drawer/Screens.kt index 46b5174d..3ba34c99 100644 --- a/ui/graph/src/main/java/com/example/graph/navigation_drawer/Screens.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/navigation_drawer/Screens.kt @@ -1,4 +1,4 @@ -package com.example.graph.navigation_drawer +package city.zouitel.navigation.navigation_drawer enum class Screens { HOME_SCREEN, diff --git a/ui/graph/src/main/java/com/example/graph/note_card/NoteCard.kt b/ui/navigation/src/main/java/city/zouitel/navigation/note_card/NoteCard.kt similarity index 89% rename from ui/graph/src/main/java/com/example/graph/note_card/NoteCard.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/note_card/NoteCard.kt index 345f293f..106f65f2 100644 --- a/ui/graph/src/main/java/com/example/graph/note_card/NoteCard.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/note_card/NoteCard.kt @@ -1,4 +1,4 @@ -package com.example.graph.note_card +package city.zouitel.navigation.note_card import android.net.Uri import android.text.format.DateFormat @@ -31,46 +31,46 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.net.toUri -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.Cons.AUDIOS -import com.example.common_ui.Cons.EDIT_ROUTE -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.Cons.MP3 -import com.example.common_ui.Cons.NON -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.ANGLE_DOWN_ICON -import com.example.common_ui.Icons.ANGLE_UP_ICON -import com.example.common_ui.Icons.CIRCLE_ICON_18 -import com.example.common_ui.Icons.CLOCK_ICON -import com.example.common_ui.Icons.RESET_ICON -import com.example.common_ui.codeUrl -import com.example.graph.ImageDisplayed -import com.example.graph.navigation_drawer.Screens -import com.example.graph.navigation_drawer.Screens.* -import com.example.graph.sound -import com.example.links.model.NoteAndLink -import com.example.links.ui.LinkPart -import com.example.links.ui.LinkVM -import com.example.links.ui.NoteAndLinkVM -import com.example.note.DataViewModel -import com.example.note.model.Data -import com.example.note.model.Note -import com.example.tasks.NoteAndTaskViewModel -import com.example.tasks.TaskViewModel -import com.example.tasks.model.NoteAndTask -import com.example.tasks.model.Task +import city.zouitel.links.model.NoteAndLink +import city.zouitel.links.ui.LinkPart +import city.zouitel.links.ui.LinkVM +import city.zouitel.links.ui.NoteAndLinkVM +import city.zouitel.navigation.navigation_drawer.Screens +import city.zouitel.navigation.navigation_drawer.Screens.* +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.note.model.Note +import city.zouitel.systemDesign.Cons.AUDIOS +import city.zouitel.systemDesign.Cons.EDIT_ROUTE +import city.zouitel.systemDesign.Cons.IMAGES +import city.zouitel.systemDesign.Cons.JPEG +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.Cons.MP3 +import city.zouitel.systemDesign.Cons.NON +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.ANGLE_DOWN_ICON +import city.zouitel.systemDesign.Icons.ANGLE_UP_ICON +import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18 +import city.zouitel.systemDesign.Icons.CLOCK_ICON +import city.zouitel.systemDesign.Icons.RESET_ICON +import city.zouitel.systemDesign.ImageDisplayed +import city.zouitel.tasks.viewmodel.NoteAndTaskViewModel +import city.zouitel.tasks.viewmodel.TaskViewModel +import city.zouitel.tasks.model.NoteAndTask +import city.zouitel.tasks.model.Task +import city.zouitel.navigation.codeUrl +import city.zouitel.navigation.sound import me.saket.swipe.SwipeAction import me.saket.swipe.SwipeableActionsBox import me.saket.swipe.rememberSwipeableActionsState +import org.koin.androidx.compose.koinViewModel import java.io.File import java.util.* @Composable fun NoteCard( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), screen: Screens, noteEntity: Note, navController: NavController, @@ -122,12 +122,12 @@ fun NoteCard( @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable private fun Card( - taskViewModel: TaskViewModel = hiltViewModel(), - noteAndTodoVM: NoteAndTaskViewModel = hiltViewModel(), - dataViewModel: DataViewModel = hiltViewModel(), - dataStoreVM: DataStoreVM = hiltViewModel(), - linkVM: LinkVM = hiltViewModel(), - noteAndLinkVM: NoteAndLinkVM = hiltViewModel(), + taskViewModel: TaskViewModel = koinViewModel(), + noteAndTodoVM: NoteAndTaskViewModel = koinViewModel(), + dataViewModel: DataViewModel = koinViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), + linkVM: LinkVM = koinViewModel(), + noteAndLinkVM: NoteAndLinkVM = koinViewModel(), noteEntity: Note, navController: NavController, screen: Screens, @@ -171,9 +171,11 @@ private fun Card( HOME_SCREEN -> { homeSelectionState?.value = true } + TRASH_SCREEN -> { trashSelectionState?.value = true } + else -> {} } selectedNotes?.add(note) @@ -258,7 +260,7 @@ private fun Card( if ( File(mediaPath).exists() ) { - com.example.media_player.NoteMediaPlayer(localMediaUid = note.uid) + city.zouitel.audios.NoteMediaPlayer(localMediaUid = note.uid) } // tagEntities. diff --git a/ui/graph/src/main/java/com/example/graph/note_card/utils.kt b/ui/navigation/src/main/java/city/zouitel/navigation/note_card/utils.kt similarity index 94% rename from ui/graph/src/main/java/com/example/graph/note_card/utils.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/note_card/utils.kt index 68fa3395..5ed7a7b3 100644 --- a/ui/graph/src/main/java/com/example/graph/note_card/utils.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/note_card/utils.kt @@ -1,4 +1,4 @@ -package com.example.graph.note_card +package city.zouitel.navigation.note_card import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset @@ -14,8 +14,8 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.graphics.ColorUtils -import com.example.common_ui.getColorOfPriority -import com.example.note.model.Data +import city.zouitel.note.model.Data +import city.zouitel.systemDesign.getColorOfPriority val DrawScope.clipNotePath: (Data) -> Unit get() = { clipPath( diff --git a/ui/graph/src/main/java/com/example/graph/settings_screen/Licenses.kt b/ui/navigation/src/main/java/city/zouitel/navigation/settings_screen/Licenses.kt similarity index 96% rename from ui/graph/src/main/java/com/example/graph/settings_screen/Licenses.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/settings_screen/Licenses.kt index fe07d0e7..f30eef30 100644 --- a/ui/graph/src/main/java/com/example/graph/settings_screen/Licenses.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/settings_screen/Licenses.kt @@ -1,4 +1,4 @@ -package com.example.graph.settings_screen +package city.zouitel.navigation.settings_screen import android.annotation.SuppressLint import androidx.compose.foundation.layout.fillMaxSize diff --git a/ui/graph/src/main/java/com/example/graph/settings_screen/Settings.kt b/ui/navigation/src/main/java/city/zouitel/navigation/settings_screen/Settings.kt similarity index 89% rename from ui/graph/src/main/java/com/example/graph/settings_screen/Settings.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/settings_screen/Settings.kt index 6b9f0f34..02be6591 100644 --- a/ui/graph/src/main/java/com/example/graph/settings_screen/Settings.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/settings_screen/Settings.kt @@ -1,4 +1,4 @@ -package com.example.graph.settings_screen +package city.zouitel.navigation.settings_screen import android.annotation.SuppressLint import androidx.compose.foundation.Canvas @@ -20,17 +20,17 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.AdaptingRowBetween -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.DataStoreVM -import com.example.common_ui.MaterialColors.Companion.ON_SURFACE -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.graph.getMaterialColor -import com.example.graph.navigation_drawer.NavigationDrawer -import com.example.graph.sound -import com.example.graph.top_action_bar.CustomTopAppBar +import city.zouitel.navigation.getMaterialColor +import city.zouitel.navigation.navigation_drawer.NavigationDrawer +import city.zouitel.systemDesign.AdaptingRowBetween +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.MaterialColors.Companion.ON_SURFACE +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.navigation.sound +import city.zouitel.navigation.top_action_bar.CustomTopAppBar +import org.koin.androidx.compose.koinViewModel @SuppressLint( "UnusedMaterial3ScaffoldPaddingParameter", @@ -39,7 +39,7 @@ import com.example.graph.top_action_bar.CustomTopAppBar @OptIn(ExperimentalMaterial3Api::class) @Composable fun Settings( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), navC: NavController ) { val ctx = LocalContext.current diff --git a/ui/graph/src/main/java/com/example/graph/shortcuts.kt b/ui/navigation/src/main/java/city/zouitel/navigation/shortcuts.kt similarity index 97% rename from ui/graph/src/main/java/com/example/graph/shortcuts.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/shortcuts.kt index 57782b24..12a795a6 100644 --- a/ui/graph/src/main/java/com/example/graph/shortcuts.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/shortcuts.kt @@ -1,4 +1,4 @@ -package com.example.graph +package city.zouitel.navigation import android.content.Context import android.content.Intent diff --git a/ui/navigation/src/main/java/city/zouitel/navigation/sound.kt b/ui/navigation/src/main/java/city/zouitel/navigation/sound.kt new file mode 100644 index 00000000..4692a2e1 --- /dev/null +++ b/ui/navigation/src/main/java/city/zouitel/navigation/sound.kt @@ -0,0 +1,5 @@ +package city.zouitel.navigation + +import city.zouitel.systemDesign.SoundEffect + +val sound = SoundEffect() \ No newline at end of file diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/BroomData.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/BroomData.kt similarity index 90% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/BroomData.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/BroomData.kt index a45dfecc..67665af3 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/BroomData.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/BroomData.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar +package city.zouitel.navigation.top_action_bar import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -9,8 +9,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource -import com.example.common_ui.Icons -import com.example.common_ui.PopupTip +import city.zouitel.systemDesign.Icons +import city.zouitel.systemDesign.PopupTip @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/CustomTopAppBar.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/CustomTopAppBar.kt similarity index 90% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/CustomTopAppBar.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/CustomTopAppBar.kt index 1108ee5c..1502ad0f 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/CustomTopAppBar.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/CustomTopAppBar.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar +package city.zouitel.navigation.top_action_bar import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding @@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.example.common_ui.AdaptingRow +import city.zouitel.systemDesign.AdaptingRow @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/Layout.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/Layout.kt similarity index 79% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/Layout.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/Layout.kt index 0f7db2a0..cf9c384e 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/Layout.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/Layout.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar +package city.zouitel.navigation.top_action_bar import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -11,19 +11,18 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.Icons.DASHBOARD_ICON -import com.example.common_ui.Icons.LIST_VIEW_ICON_1 -import com.example.graph.sound -import com.example.common_ui.DataStoreVM -import com.example.common_ui.PopupTip -import com.skydoves.balloon.Balloon +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.DASHBOARD_ICON +import city.zouitel.systemDesign.Icons.LIST_VIEW_ICON_1 +import city.zouitel.systemDesign.PopupTip +import city.zouitel.navigation.sound +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalFoundationApi::class) @Composable internal fun Layout( - dataStoreVM: DataStoreVM = hiltViewModel() + dataStoreVM: DataStoreVM = koinViewModel() ) { val ctx = LocalContext.current val haptic = LocalHapticFeedback.current diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/SearchField.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/SearchField.kt similarity index 85% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/SearchField.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/SearchField.kt index 60e9d7e1..7bdecc27 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/SearchField.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/SearchField.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar +package city.zouitel.navigation.top_action_bar import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.fillMaxWidth @@ -20,20 +20,20 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.KEY_INVALID -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.CIRCLE_ICON_18 -import com.example.common_ui.Icons.CROSS_ICON -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.graph.getMaterialColor -import com.example.graph.sound -import com.example.tags.model.Tag +import city.zouitel.systemDesign.Cons.KEY_INVALID +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.CIRCLE_ICON_18 +import city.zouitel.systemDesign.Icons.CROSS_ICON +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.tags.model.Tag +import city.zouitel.navigation.getMaterialColor +import city.zouitel.navigation.sound +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class) @Composable internal fun SearchField( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), title: MutableState, placeholder: String, tagEntity: MutableState? diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/SortBy.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/SortBy.kt similarity index 77% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/SortBy.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/SortBy.kt index cf8579c4..bd7927f0 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/SortBy.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/SortBy.kt @@ -1,8 +1,7 @@ -package com.example.graph.top_action_bar +package city.zouitel.navigation.top_action_bar import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.size import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem @@ -10,7 +9,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.* import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalHapticFeedback @@ -18,34 +16,35 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.window.PopupProperties -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.DEFAULT_ORDER -import com.example.common_ui.Cons.FOCUS_NAVIGATION -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.Cons.NAME_ORDER -import com.example.common_ui.Cons.NEWEST_ORDER -import com.example.common_ui.Cons.OLDEST_ORDER -import com.example.common_ui.Cons.BY_NAME -import com.example.common_ui.Cons.ORDER_BY_NEWEST -import com.example.common_ui.Cons.ORDER_BY_OLDEST -import com.example.common_ui.Cons.ORDER_BY_PRIORITY -import com.example.common_ui.Cons.ORDER_BY_REMINDER -import com.example.common_ui.Cons.PRIORITY_ORDER -import com.example.common_ui.Cons.REMINDING_ORDER -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.INTERLINING_ICON -import com.example.common_ui.Icons.SORT_ALPHA_DOWN_ICON -import com.example.common_ui.Icons.SORT_AMOUNT_DOWN_ICON -import com.example.common_ui.Icons.SORT_AMOUNT_UP_ICON -import com.example.common_ui.Icons.SORT_ICON -import com.example.common_ui.Icons.SORT_NUMERIC_ICON -import com.example.graph.sound -import com.example.common_ui.PopupTip +import city.zouitel.systemDesign.Cons +import city.zouitel.systemDesign.Cons.BY_NAME +import city.zouitel.systemDesign.Cons.DEFAULT_ORDER +import city.zouitel.systemDesign.Cons.FOCUS_NAVIGATION +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.Cons.NAME_ORDER +import city.zouitel.systemDesign.Cons.NEWEST_ORDER +import city.zouitel.systemDesign.Cons.OLDEST_ORDER +import city.zouitel.systemDesign.Cons.ORDER_BY_NEWEST +import city.zouitel.systemDesign.Cons.ORDER_BY_OLDEST +import city.zouitel.systemDesign.Cons.ORDER_BY_PRIORITY +import city.zouitel.systemDesign.Cons.ORDER_BY_REMINDER +import city.zouitel.systemDesign.Cons.PRIORITY_ORDER +import city.zouitel.systemDesign.Cons.REMINDING_ORDER +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.INTERLINING_ICON +import city.zouitel.systemDesign.Icons.SORT_ALPHA_DOWN_ICON +import city.zouitel.systemDesign.Icons.SORT_AMOUNT_DOWN_ICON +import city.zouitel.systemDesign.Icons.SORT_AMOUNT_UP_ICON +import city.zouitel.systemDesign.Icons.SORT_ICON +import city.zouitel.systemDesign.Icons.SORT_NUMERIC_ICON +import city.zouitel.systemDesign.PopupTip +import city.zouitel.navigation.sound +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalFoundationApi::class) @Composable internal fun SortBy( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), isShow: MutableState? ) { val ctx = LocalContext.current @@ -102,7 +101,7 @@ internal fun SortBy( onClick = { sound.makeSound.invoke(ctx, KEY_CLICK, thereIsSoundEffect.value) isShow.value = false - dataStoreVM.setOrdination(com.example.common_ui.Cons.BY_ID) + dataStoreVM.setOrdination(Cons.BY_ID) } ) DropdownMenuItem( @@ -111,7 +110,7 @@ internal fun SortBy( onClick = { sound.makeSound.invoke(ctx, KEY_CLICK, thereIsSoundEffect.value) isShow.value = false - dataStoreVM.setOrdination(com.example.common_ui.Cons.ORDER_BY_NEWEST) + dataStoreVM.setOrdination(Cons.ORDER_BY_NEWEST) } ) DropdownMenuItem( diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/TopAppBar.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/TopAppBar.kt similarity index 90% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/TopAppBar.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/TopAppBar.kt index 160533e8..99c1c825 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/TopAppBar.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/TopAppBar.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar +package city.zouitel.navigation.top_action_bar import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.ExperimentalFoundationApi @@ -10,10 +10,10 @@ import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.example.common_ui.AdaptingRow -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.graph.getMaterialColor -import com.example.tags.model.Tag +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.tags.model.Tag +import city.zouitel.navigation.getMaterialColor @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/dialogs/EraseDialog.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/dialogs/EraseDialog.kt similarity index 82% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/dialogs/EraseDialog.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/dialogs/EraseDialog.kt index 30a2ec28..e72af82e 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/dialogs/EraseDialog.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/dialogs/EraseDialog.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar.dialogs +package city.zouitel.navigation.top_action_bar.dialogs import androidx.compose.foundation.text.ClickableText import androidx.compose.material3.AlertDialog @@ -11,16 +11,16 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.sp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.DataStoreVM -import com.example.common_ui.MaterialColors.Companion.SURFACE_TINT -import com.example.graph.getMaterialColor -import com.example.graph.sound +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE_TINT +import city.zouitel.navigation.getMaterialColor +import city.zouitel.navigation.sound +import org.koin.androidx.compose.koinViewModel @Composable fun EraseDialog( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), dialogState: MutableState, confirmation : () -> Unit, ) { diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/HomeSelectionTopAppBar.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/HomeSelectionTopAppBar.kt similarity index 84% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/HomeSelectionTopAppBar.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/HomeSelectionTopAppBar.kt index a3cc5767..de9f5967 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/HomeSelectionTopAppBar.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/HomeSelectionTopAppBar.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar.selection_bars +package city.zouitel.navigation.top_action_bar.selection_bars import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.ExperimentalFoundationApi @@ -14,38 +14,38 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.AdaptingRow -import com.example.common_ui.Cons.KEY_CLICK -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons.COPY_ICON -import com.example.common_ui.Icons.SHARE_ICON -import com.example.common_ui.Icons.TRASH_ICON -import com.example.common_ui.PopupTip -import com.example.common_ui.sharNote -import com.example.graph.copyNote -import com.example.graph.sound -import com.example.note.DataViewModel -import com.example.note.model.Data -import com.example.tags.viewmodel.TagViewModel -import com.example.tags.viewmodel.NoteAndTagViewModel -import com.example.tags.model.NoteAndTag -import com.example.tasks.NoteAndTaskViewModel -import com.example.tasks.TaskViewModel -import com.example.tasks.model.NoteAndTask -import com.example.tasks.model.Task +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.Cons.KEY_CLICK +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons.COPY_ICON +import city.zouitel.systemDesign.Icons.SHARE_ICON +import city.zouitel.systemDesign.Icons.TRASH_ICON +import city.zouitel.systemDesign.PopupTip +import city.zouitel.systemDesign.sharNote +import city.zouitel.tags.model.NoteAndTag +import city.zouitel.tags.viewmodel.NoteAndTagViewModel +import city.zouitel.tags.viewmodel.TagViewModel +import city.zouitel.tasks.viewmodel.NoteAndTaskViewModel +import city.zouitel.tasks.viewmodel.TaskViewModel +import city.zouitel.tasks.model.NoteAndTask +import city.zouitel.tasks.model.Task +import city.zouitel.navigation.copyNote +import city.zouitel.navigation.sound +import org.koin.androidx.compose.koinViewModel import java.util.* import kotlin.random.Random.Default.nextLong @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable fun HomeSelectionTopAppBar( - dataViewModel: DataViewModel = hiltViewModel(), - noteAndTagViewModel: NoteAndTagViewModel = hiltViewModel(), - tagViewModel: TagViewModel = hiltViewModel(), - taskViewModel: TaskViewModel = hiltViewModel(), - noteAndTodoVM: NoteAndTaskViewModel = hiltViewModel(), - dataStoreVM: DataStoreVM = hiltViewModel(), + dataViewModel: DataViewModel = koinViewModel(), + noteAndTagViewModel: NoteAndTagViewModel = koinViewModel(), + tagViewModel: TagViewModel = koinViewModel(), + taskViewModel: TaskViewModel = koinViewModel(), + noteAndTodoVM: NoteAndTaskViewModel = koinViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), homeSelectionState: MutableState?, selectedNotes: SnapshotStateList?, undo: (Data) -> Unit @@ -144,7 +144,12 @@ fun HomeSelectionTopAppBar( thereIsSoundEffect.value ) - copyNote(ctx, dataViewModel, selectedNotes?.single()!!, newUid) { + copyNote( + ctx, + dataViewModel, + selectedNotes?.single()!!, + newUid + ) { // copy each label. observeLabels.value .filter { diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/TrashSelectionTopAppBar.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/TrashSelectionTopAppBar.kt similarity index 81% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/TrashSelectionTopAppBar.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/TrashSelectionTopAppBar.kt index b3b52173..4ea4c3b3 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/TrashSelectionTopAppBar.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/TrashSelectionTopAppBar.kt @@ -1,4 +1,4 @@ -package com.example.graph.top_action_bar.selection_bars +package city.zouitel.navigation.top_action_bar.selection_bars import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.combinedClickable @@ -15,17 +15,21 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.* -import com.example.graph.sound -import com.example.note.DataViewModel -import com.example.note.model.Data +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.systemDesign.AdaptingRow +import city.zouitel.systemDesign.Cons +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons +import city.zouitel.systemDesign.PopupTip +import city.zouitel.navigation.sound +import org.koin.androidx.compose.koinViewModel @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) @Composable fun TrashSelectionTopAppBar( - dataStoreVM: DataStoreVM = hiltViewModel(), - dataViewModel: DataViewModel = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), + dataViewModel: DataViewModel = koinViewModel(), trashSelectionState: MutableState?, selectedNotes: SnapshotStateList?, diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/utils.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/utils.kt similarity index 86% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/utils.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/utils.kt index 0fd078ff..bd5cbda0 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/selection_bars/utils.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/selection_bars/utils.kt @@ -1,7 +1,6 @@ -package com.example.graph.top_action_bar.selection_bars +package city.zouitel.navigation.top_action_bar.selection_bars import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.padding import androidx.compose.material3.Icon @@ -13,9 +12,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.example.common_ui.Icons -import com.example.common_ui.PopupTip -import com.example.note.model.Data +import city.zouitel.note.model.Data +import city.zouitel.systemDesign.Icons +import city.zouitel.systemDesign.PopupTip @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/ui/graph/src/main/java/com/example/graph/top_action_bar/utils.kt b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/utils.kt similarity index 75% rename from ui/graph/src/main/java/com/example/graph/top_action_bar/utils.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/utils.kt index e2a0356a..af48fe49 100644 --- a/ui/graph/src/main/java/com/example/graph/top_action_bar/utils.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/top_action_bar/utils.kt @@ -1,10 +1,8 @@ -package com.example.graph.top_action_bar +package city.zouitel.navigation.top_action_bar import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.clickable import androidx.compose.foundation.combinedClickable import androidx.compose.material3.DrawerState -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState @@ -15,18 +13,18 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.res.painterResource -import androidx.hilt.navigation.compose.hiltViewModel -import com.example.common_ui.Cons -import com.example.common_ui.DataStoreVM -import com.example.common_ui.Icons -import com.example.common_ui.PopupTip -import com.example.graph.sound +import city.zouitel.systemDesign.Cons +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.Icons +import city.zouitel.systemDesign.PopupTip +import city.zouitel.navigation.sound import kotlinx.coroutines.launch +import org.koin.androidx.compose.koinViewModel -@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class) +@OptIn(ExperimentalFoundationApi::class) @Composable internal fun Open_Drawer( - dataStoreVM: DataStoreVM = hiltViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), drawerState: DrawerState, ) { val ctx = LocalContext.current diff --git a/ui/graph/src/main/java/com/example/graph/trash_screen/TrashScreen.kt b/ui/navigation/src/main/java/city/zouitel/navigation/trash_screen/TrashScreen.kt similarity index 78% rename from ui/graph/src/main/java/com/example/graph/trash_screen/TrashScreen.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/trash_screen/TrashScreen.kt index b68ecdec..9ce70924 100644 --- a/ui/graph/src/main/java/com/example/graph/trash_screen/TrashScreen.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/trash_screen/TrashScreen.kt @@ -1,4 +1,4 @@ -package com.example.graph.trash_screen +package city.zouitel.navigation.trash_screen import android.annotation.SuppressLint import androidx.compose.foundation.layout.fillMaxSize @@ -12,33 +12,33 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController -import com.example.common_ui.Cons.AUDIOS -import com.example.common_ui.Cons.IMAGES -import com.example.common_ui.Cons.JPEG -import com.example.common_ui.Cons.MP3 -import com.example.common_ui.Cons.SEARCH_IN_TRASH -import com.example.common_ui.DataStoreVM -import com.example.common_ui.MaterialColors.Companion.SURFACE -import com.example.common_ui.VerticalGrid -import com.example.graph.getMaterialColor -import com.example.graph.navigation_drawer.NavigationDrawer -import com.example.graph.navigation_drawer.Screens.* -import com.example.graph.note_card.NoteCard -import com.example.graph.top_action_bar.NoteTopAppBar -import com.example.graph.top_action_bar.selection_bars.TrashSelectionTopAppBar -import com.example.graph.top_action_bar.dialogs.EraseDialog -import com.example.links.model.NoteAndLink -import com.example.links.ui.LinkVM -import com.example.links.ui.NoteAndLinkVM -import com.example.note.NoteViewModel -import com.example.note.DataViewModel -import com.example.note.model.Data -import com.example.note.model.Note -import com.example.tags.model.Tag -import com.example.tasks.NoteAndTaskViewModel -import com.example.tasks.TaskViewModel +import city.zouitel.navigation.navigation_drawer.NavigationDrawer +import city.zouitel.navigation.navigation_drawer.Screens.* +import city.zouitel.navigation.note_card.NoteCard +import city.zouitel.navigation.top_action_bar.NoteTopAppBar +import city.zouitel.navigation.top_action_bar.selection_bars.TrashSelectionTopAppBar +import city.zouitel.navigation.top_action_bar.dialogs.EraseDialog +import city.zouitel.links.model.NoteAndLink +import city.zouitel.links.ui.LinkVM +import city.zouitel.links.ui.NoteAndLinkVM +import city.zouitel.note.NoteViewModel +import city.zouitel.note.DataViewModel +import city.zouitel.note.model.Data +import city.zouitel.note.model.Note +import city.zouitel.systemDesign.Cons.AUDIOS +import city.zouitel.systemDesign.Cons.IMAGES +import city.zouitel.systemDesign.Cons.SEARCH_IN_TRASH +import city.zouitel.systemDesign.DataStoreVM +import city.zouitel.systemDesign.MaterialColors.Companion.SURFACE +import city.zouitel.systemDesign.VerticalGrid +import city.zouitel.tags.model.Tag +import city.zouitel.tasks.viewmodel.NoteAndTaskViewModel +import city.zouitel.tasks.viewmodel.TaskViewModel +import city.zouitel.navigation.getMaterialColor +import city.zouitel.systemDesign.Cons.JPEG +import city.zouitel.systemDesign.Cons.MP3 +import org.koin.androidx.compose.koinViewModel import java.io.File @SuppressLint( @@ -48,13 +48,13 @@ import java.io.File @OptIn(ExperimentalMaterial3Api::class) @Composable fun TrashScreen( - viewModule: DataViewModel = hiltViewModel(), - entityVM: NoteViewModel = hiltViewModel(), - dataStoreVM: DataStoreVM = hiltViewModel(), - linkVM: LinkVM = hiltViewModel(), - noteAndLinkVM: NoteAndLinkVM = hiltViewModel(), - taskViewModel: TaskViewModel = hiltViewModel(), - noteAndTodoVM: NoteAndTaskViewModel = hiltViewModel(), + viewModule: DataViewModel = koinViewModel(), + entityVM: NoteViewModel = koinViewModel(), + dataStoreVM: DataStoreVM = koinViewModel(), + linkVM: LinkVM = koinViewModel(), + noteAndLinkVM: NoteAndLinkVM = koinViewModel(), + taskViewModel: TaskViewModel = koinViewModel(), + noteAndTodoVM: NoteAndTaskViewModel = koinViewModel(), navController: NavController, ) { val ctx = LocalContext.current diff --git a/ui/graph/src/main/java/com/example/graph/urlPreview.kt b/ui/navigation/src/main/java/city/zouitel/navigation/urlPreview.kt similarity index 97% rename from ui/graph/src/main/java/com/example/graph/urlPreview.kt rename to ui/navigation/src/main/java/city/zouitel/navigation/urlPreview.kt index 69dcf2ed..1de8d1ae 100644 --- a/ui/graph/src/main/java/com/example/graph/urlPreview.kt +++ b/ui/navigation/src/main/java/city/zouitel/navigation/urlPreview.kt @@ -1,4 +1,4 @@ -package com.example.graph +package city.zouitel.navigation import android.content.Context import android.widget.Toast diff --git a/ui/graph/src/main/res/drawable/baseline_add_24.xml b/ui/navigation/src/main/res/drawable/baseline_add_24.xml similarity index 100% rename from ui/graph/src/main/res/drawable/baseline_add_24.xml rename to ui/navigation/src/main/res/drawable/baseline_add_24.xml diff --git a/ui/navigation/src/main/res/drawable/mat.jpg b/ui/navigation/src/main/res/drawable/mat.jpg new file mode 100644 index 00000000..921b3c2b Binary files /dev/null and b/ui/navigation/src/main/res/drawable/mat.jpg differ diff --git a/ui/graph/src/main/res/drawable/plus_24.xml b/ui/navigation/src/main/res/drawable/plus_24.xml similarity index 100% rename from ui/graph/src/main/res/drawable/plus_24.xml rename to ui/navigation/src/main/res/drawable/plus_24.xml diff --git a/ui/navigation/src/test/java/city/zouitel/navigation/ExampleUnitTest.kt b/ui/navigation/src/test/java/city/zouitel/navigation/ExampleUnitTest.kt new file mode 100644 index 00000000..7bb3df66 --- /dev/null +++ b/ui/navigation/src/test/java/city/zouitel/navigation/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package city.zouitel.navigation + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file