diff --git a/app/build.gradle b/app/build.gradle index a28d454..fba537b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,7 +39,7 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation project(":res") + implementation project(':base') implementation project(":dialog") implementation project(":webview") diff --git a/res/.gitignore b/base/.gitignore similarity index 100% rename from res/.gitignore rename to base/.gitignore diff --git a/res/build.gradle b/base/build.gradle similarity index 100% rename from res/build.gradle rename to base/build.gradle diff --git a/res/src/main/AndroidManifest.xml b/base/src/main/AndroidManifest.xml similarity index 85% rename from res/src/main/AndroidManifest.xml rename to base/src/main/AndroidManifest.xml index 27693ac..5a8071e 100644 --- a/res/src/main/AndroidManifest.xml +++ b/base/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="moka.land.base"> diff --git a/res/src/main/java/land/moka/res/ViewExt.kt b/base/src/main/java/land/moka/base/ViewExt.kt similarity index 99% rename from res/src/main/java/land/moka/res/ViewExt.kt rename to base/src/main/java/land/moka/base/ViewExt.kt index 8398cf0..1ecbd8f 100644 --- a/res/src/main/java/land/moka/res/ViewExt.kt +++ b/base/src/main/java/land/moka/base/ViewExt.kt @@ -1,4 +1,4 @@ -package land.moka.res +package land.moka.base import android.text.Editable import android.text.TextWatcher diff --git a/res/src/main/res/anim/blink.xml b/base/src/main/res/anim/blink.xml similarity index 100% rename from res/src/main/res/anim/blink.xml rename to base/src/main/res/anim/blink.xml diff --git a/res/src/main/res/anim/fade_in.xml b/base/src/main/res/anim/fade_in.xml similarity index 100% rename from res/src/main/res/anim/fade_in.xml rename to base/src/main/res/anim/fade_in.xml diff --git a/res/src/main/res/anim/fade_in_long.xml b/base/src/main/res/anim/fade_in_long.xml similarity index 100% rename from res/src/main/res/anim/fade_in_long.xml rename to base/src/main/res/anim/fade_in_long.xml diff --git a/res/src/main/res/anim/fade_out.xml b/base/src/main/res/anim/fade_out.xml similarity index 100% rename from res/src/main/res/anim/fade_out.xml rename to base/src/main/res/anim/fade_out.xml diff --git a/res/src/main/res/anim/fade_out_long.xml b/base/src/main/res/anim/fade_out_long.xml similarity index 100% rename from res/src/main/res/anim/fade_out_long.xml rename to base/src/main/res/anim/fade_out_long.xml diff --git a/res/src/main/res/anim/slide_in_right.xml b/base/src/main/res/anim/slide_in_right.xml similarity index 100% rename from res/src/main/res/anim/slide_in_right.xml rename to base/src/main/res/anim/slide_in_right.xml diff --git a/res/src/main/res/anim/slide_out_right.xml b/base/src/main/res/anim/slide_out_right.xml similarity index 100% rename from res/src/main/res/anim/slide_out_right.xml rename to base/src/main/res/anim/slide_out_right.xml diff --git a/res/src/main/res/drawable/mk_vc_left_arrow.xml b/base/src/main/res/drawable/mk_vc_left_arrow.xml similarity index 100% rename from res/src/main/res/drawable/mk_vc_left_arrow.xml rename to base/src/main/res/drawable/mk_vc_left_arrow.xml diff --git a/res/src/main/res/drawable/sh_shadow_bottom.xml b/base/src/main/res/drawable/sh_shadow_bottom.xml similarity index 100% rename from res/src/main/res/drawable/sh_shadow_bottom.xml rename to base/src/main/res/drawable/sh_shadow_bottom.xml diff --git a/res/src/main/res/drawable/sh_shadow_top.xml b/base/src/main/res/drawable/sh_shadow_top.xml similarity index 100% rename from res/src/main/res/drawable/sh_shadow_top.xml rename to base/src/main/res/drawable/sh_shadow_top.xml diff --git a/res/src/main/res/values/colors.xml b/base/src/main/res/values/colors.xml similarity index 100% rename from res/src/main/res/values/colors.xml rename to base/src/main/res/values/colors.xml diff --git a/res/src/main/res/values/styles.xml b/base/src/main/res/values/styles.xml similarity index 100% rename from res/src/main/res/values/styles.xml rename to base/src/main/res/values/styles.xml diff --git a/dialog/build.gradle b/dialog/build.gradle index 94fcef2..eff61d3 100644 --- a/dialog/build.gradle +++ b/dialog/build.gradle @@ -31,7 +31,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(":res") + implementation project(':base') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.appcompat:appcompat:1.1.0" diff --git a/settings.gradle b/settings.gradle index 030b5ad..3a2524d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ rootProject.name='MokaAStd' include ':app' -include ':res' +include ':base' include ':dialog' include ':webview' diff --git a/webview/build.gradle b/webview/build.gradle index 9c95297..ad10dfb 100644 --- a/webview/build.gradle +++ b/webview/build.gradle @@ -29,7 +29,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(":res") + implementation project(':base') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.appcompat:appcompat:1.1.0"