From 47b3b429493d56fedf74fda002fc8e9ceded5253 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 23 Nov 2020 18:32:14 +0600 Subject: [PATCH] replaces --- CHANGELOG.md | 6 +++--- android/alerts/{ => common}/build.gradle | 0 android/alerts/common/src/main/AndroidManifest.xml | 1 + .../inmo/micro_utils/android/alerts/common}/AlertDialog.kt | 2 +- .../android/alerts/common}/CustomAlertDialog.kt | 2 +- .../micro_utils/android/alerts/common}/SimpleTextAlert.kt | 2 +- .../alerts => alerts/recyclerview}/build.gradle | 2 +- android/alerts/recyclerview/src/main/AndroidManifest.xml | 1 + .../android/alerts/recyclerview}/ActionsAlerts.kt | 4 ++-- .../android/alerts/recyclerview}/RecyclerViewDialog.kt | 7 +++---- android/alerts/src/main/AndroidManifest.xml | 1 - android/recyclerview/alerts/src/main/AndroidManifest.xml | 1 - settings.gradle | 4 ++-- 13 files changed, 16 insertions(+), 17 deletions(-) rename android/alerts/{ => common}/build.gradle (100%) create mode 100644 android/alerts/common/src/main/AndroidManifest.xml rename android/alerts/{src/main/kotlin/dev/inmo/micro_utils/android/alerts => common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common}/AlertDialog.kt (97%) rename android/alerts/{src/main/kotlin/dev/inmo/micro_utils/android/alerts => common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common}/CustomAlertDialog.kt (96%) rename android/alerts/{src/main/kotlin/dev/inmo/micro_utils/android/alerts => common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common}/SimpleTextAlert.kt (96%) rename android/{recyclerview/alerts => alerts/recyclerview}/build.gradle (83%) create mode 100644 android/alerts/recyclerview/src/main/AndroidManifest.xml rename android/{recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts => alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview}/ActionsAlerts.kt (93%) rename android/{recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts => alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview}/RecyclerViewDialog.kt (84%) delete mode 100644 android/alerts/src/main/AndroidManifest.xml delete mode 100644 android/recyclerview/alerts/src/main/AndroidManifest.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index d042aaa7e3d..1d78a750c5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ * `Android` * `Alerts` - * Project has been created - * `RecyclerView` - * `Alerts` + * `Common` + * Project has been created + * `RecyclerView` * Project has been created * `Common` * Annotation `PreviewFeature` has been added diff --git a/android/alerts/build.gradle b/android/alerts/common/build.gradle similarity index 100% rename from android/alerts/build.gradle rename to android/alerts/common/build.gradle diff --git a/android/alerts/common/src/main/AndroidManifest.xml b/android/alerts/common/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..59c21c66815 --- /dev/null +++ b/android/alerts/common/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/AlertDialog.kt b/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/AlertDialog.kt similarity index 97% rename from android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/AlertDialog.kt rename to android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/AlertDialog.kt index 6ce0871c331..7277b23c819 100644 --- a/android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/AlertDialog.kt +++ b/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/AlertDialog.kt @@ -1,6 +1,6 @@ @file:Suppress("NOTHING_TO_INLINE", "unused") -package dev.inmo.micro_utils.android.alerts +package dev.inmo.micro_utils.android.alerts.common import android.app.AlertDialog import android.content.Context diff --git a/android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/CustomAlertDialog.kt b/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/CustomAlertDialog.kt similarity index 96% rename from android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/CustomAlertDialog.kt rename to android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/CustomAlertDialog.kt index 594de2cd760..9fc8b180a94 100644 --- a/android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/CustomAlertDialog.kt +++ b/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/CustomAlertDialog.kt @@ -1,6 +1,6 @@ @file:Suppress("NOTHING_TO_INLINE", "unused") -package dev.inmo.micro_utils.android.alerts +package dev.inmo.micro_utils.android.alerts.common import android.app.AlertDialog import android.content.Context diff --git a/android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/SimpleTextAlert.kt b/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/SimpleTextAlert.kt similarity index 96% rename from android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/SimpleTextAlert.kt rename to android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/SimpleTextAlert.kt index 094d9969a7d..36f7b6bb7a7 100644 --- a/android/alerts/src/main/kotlin/dev/inmo/micro_utils/android/alerts/SimpleTextAlert.kt +++ b/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/SimpleTextAlert.kt @@ -1,6 +1,6 @@ @file:Suppress("NOTHING_TO_INLINE", "unused") -package dev.inmo.micro_utils.android.alerts +package dev.inmo.micro_utils.android.alerts.common import android.app.AlertDialog import android.content.Context diff --git a/android/recyclerview/alerts/build.gradle b/android/alerts/recyclerview/build.gradle similarity index 83% rename from android/recyclerview/alerts/build.gradle rename to android/alerts/recyclerview/build.gradle index b658bed4b93..af7d2b0b2cc 100644 --- a/android/recyclerview/alerts/build.gradle +++ b/android/alerts/recyclerview/build.gradle @@ -10,8 +10,8 @@ kotlin { sourceSets { commonMain { dependencies { + api internalProject("micro_utils.android.alerts.common") api internalProject("micro_utils.android.recyclerview") - api internalProject("micro_utils.android.alerts") } } } diff --git a/android/alerts/recyclerview/src/main/AndroidManifest.xml b/android/alerts/recyclerview/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..41c01e3ee69 --- /dev/null +++ b/android/alerts/recyclerview/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/android/recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts/ActionsAlerts.kt b/android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt similarity index 93% rename from android/recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts/ActionsAlerts.kt rename to android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt index be4abb0c667..99efd6ebe41 100644 --- a/android/recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts/ActionsAlerts.kt +++ b/android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt @@ -1,13 +1,13 @@ @file:Suppress("unused") -package dev.inmo.micro_utils.android.recyclerview.alerts +package dev.inmo.micro_utils.android.alerts.recyclerview import android.app.AlertDialog import android.content.Context import android.content.DialogInterface import android.view.ViewGroup import android.widget.TextView -import dev.inmo.micro_utils.android.alerts.AlertDialogCallback +import dev.inmo.micro_utils.android.alerts.common.AlertDialogCallback import dev.inmo.micro_utils.android.recyclerview.* data class AlertAction( diff --git a/android/recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts/RecyclerViewDialog.kt b/android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt similarity index 84% rename from android/recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts/RecyclerViewDialog.kt rename to android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt index cd706deeb36..24e53dda218 100644 --- a/android/recyclerview/alerts/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/alerts/RecyclerViewDialog.kt +++ b/android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt @@ -1,13 +1,12 @@ -package dev.inmo.micro_utils.android.recyclerview.alerts +package dev.inmo.micro_utils.android.alerts.recyclerview import android.app.AlertDialog import android.content.Context -import android.content.DialogInterface import android.widget.LinearLayout import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import dev.inmo.micro_utils.android.alerts.AlertDialogCallback -import dev.inmo.micro_utils.android.alerts.createCustomViewAlertDialogWithResources +import dev.inmo.micro_utils.android.alerts.common.AlertDialogCallback +import dev.inmo.micro_utils.android.alerts.common.createCustomViewAlertDialogWithResources fun Context.createRecyclerViewDialog( title: Int? = null, diff --git a/android/alerts/src/main/AndroidManifest.xml b/android/alerts/src/main/AndroidManifest.xml deleted file mode 100644 index 19c94569d08..00000000000 --- a/android/alerts/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/android/recyclerview/alerts/src/main/AndroidManifest.xml b/android/recyclerview/alerts/src/main/AndroidManifest.xml deleted file mode 100644 index 952927d0f89..00000000000 --- a/android/recyclerview/alerts/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 64c4d626af0..320b82da2da 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,9 +17,9 @@ String[] includes = [ ":ktor:common", ":ktor:client", ":coroutines", - ":android:alerts", ":android:recyclerview", - ":android:recyclerview:alerts", + ":android:alerts:common", + ":android:alerts:recyclerview", ":dokka" ]