From 6fff2e9d9af3ed03231395b3ca0b3c9a1f9d1836 Mon Sep 17 00:00:00 2001 From: Christian Schmitz Date: Fri, 11 Jun 2021 16:51:07 +0200 Subject: [PATCH] refactor: move extension modules into common submodule --- {appcompat => example/base}/.gitignore | 0 example/{common => base}/build.gradle | 2 +- .../src/main/AndroidManifest.xml | 2 +- .../tynn/astring/example/base}/AStrings.kt | 2 +- .../main/res/drawable-hdpi/ic_error_icon.png | Bin .../main/res/drawable-mdpi/ic_error_icon.png | Bin .../drawable-v24/ic_launcher_foreground.xml | 0 .../main/res/drawable-xhdpi/ic_error_icon.png | Bin .../res/drawable-xxhdpi/ic_error_icon.png | Bin .../res/drawable/ic_launcher_background.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../src/main/res/values/colors.xml | 0 .../src/main/res/values/plurals.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 example/java/build.gradle | 2 +- .../astring/example/java/MainActivity.java | 40 +++++++++--------- example/kotlin/build.gradle | 2 +- .../astring/example/kotlin/MainActivity.kt | 10 ++--- {core => extension/appcompat}/.gitignore | 0 .../appcompat}/build.gradle | 2 +- .../appcompat}/src/main/AndroidManifest.xml | 0 .../astring/appcompat/AStringAlertDialog.kt | 0 .../appcompat/AStringAlertDialogBuilder.kt | 0 .../tynn/astring/appcompat/AStringToolbar.kt | 0 .../AStringAlertDialogBuilderTest.java | 0 .../appcompat/AStringAlertDialogTest.java | 0 .../astring/appcompat/AStringToolbarTest.java | 0 .../AStringAlertDialogBuilderKtTest.kt | 0 .../appcompat/AStringAlertDialogKtTest.kt | 0 .../astring/appcompat/AStringToolbarKtTest.kt | 0 {example/common => extension/core}/.gitignore | 0 {core => extension/core}/build.gradle | 0 .../core}/src/main/AndroidManifest.xml | 0 .../tynn/astring/core/AStringAlertDialog.kt | 0 .../astring/core/AStringAlertDialogBuilder.kt | 0 .../xyz/tynn/astring/core/AStringSwitch.kt | 0 .../tynn/astring/core/AStringTextSwitcher.kt | 0 .../xyz/tynn/astring/core/AStringTextView.kt | 0 .../xyz/tynn/astring/core/AStringToast.kt | 0 .../tynn/astring/core/AStringToggleButton.kt | 0 .../xyz/tynn/astring/core/AStringToolbar.kt | 0 .../xyz/tynn/astring/core/AStringView.kt | 0 .../core/AStringAlertDialogBuilderTest.java | 0 .../astring/core/AStringAlertDialogTest.java | 0 .../tynn/astring/core/AStringSwitchTest.java | 0 .../astring/core/AStringTextSwitcherTest.java | 0 .../astring/core/AStringTextViewTest.java | 0 .../tynn/astring/core/AStringToastTest.java | 0 .../astring/core/AStringToggleButtonTest.java | 0 .../tynn/astring/core/AStringToolbarTest.java | 0 .../tynn/astring/core/AStringViewTest.java | 0 .../xyz/tynn/astring/core/MockkDefinitions.kt | 0 .../core/AStringAlertDialogBuilderKtTest.kt | 0 .../astring/core/AStringAlertDialogKtTest.kt | 0 .../tynn/astring/core/AStringSwitchKtTest.kt | 0 .../astring/core/AStringTextSwitcherKtTest.kt | 0 .../astring/core/AStringTextViewKtTest.kt | 0 .../astring/core/AStringToggleButtonKtTest.kt | 0 .../tynn/astring/core/AStringToolbarKtTest.kt | 0 .../tynn/astring/core/AStringViewKtTest.kt | 0 {material => extension/material}/.gitignore | 0 {material => extension/material}/build.gradle | 2 +- .../material}/src/main/AndroidManifest.xml | 0 .../tynn/astring/material/AStringSnackbar.kt | 0 .../material/AStringTextInputLayout.kt | 0 ...AStringMaterialAlertDialogBuilderTest.java | 0 .../astring/material/AStringSnackbarTest.java | 0 .../material/AStringTextInputLayoutTest.java | 0 .../tynn/astring/material/MockkDefinitions.kt | 0 ...AStringMaterialAlertDialogBuilderKtTest.kt | 0 .../material/AStringTextInputLayoutKtTest.kt | 0 settings.gradle | 8 ++-- 79 files changed, 36 insertions(+), 36 deletions(-) rename {appcompat => example/base}/.gitignore (100%) rename example/{common => base}/build.gradle (75%) rename example/{common => base}/src/main/AndroidManifest.xml (84%) rename example/{common/src/main/kotlin/xyz/tynn/astring/example/common => base/src/main/kotlin/xyz/tynn/astring/example/base}/AStrings.kt (96%) rename example/{common => base}/src/main/res/drawable-hdpi/ic_error_icon.png (100%) rename example/{common => base}/src/main/res/drawable-mdpi/ic_error_icon.png (100%) rename example/{common => base}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename example/{common => base}/src/main/res/drawable-xhdpi/ic_error_icon.png (100%) rename example/{common => base}/src/main/res/drawable-xxhdpi/ic_error_icon.png (100%) rename example/{common => base}/src/main/res/drawable/ic_launcher_background.xml (100%) rename example/{common => base}/src/main/res/layout/activity_main.xml (100%) rename example/{common => base}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename example/{common => base}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename example/{common => base}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename example/{common => base}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename example/{common => base}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename example/{common => base}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename example/{common => base}/src/main/res/values/colors.xml (100%) rename example/{common => base}/src/main/res/values/plurals.xml (100%) rename example/{common => base}/src/main/res/values/strings.xml (100%) rename example/{common => base}/src/main/res/values/styles.xml (100%) rename {core => extension/appcompat}/.gitignore (100%) rename {appcompat => extension/appcompat}/build.gradle (83%) rename {appcompat => extension/appcompat}/src/main/AndroidManifest.xml (100%) rename {appcompat => extension/appcompat}/src/main/kotlin/xyz/tynn/astring/appcompat/AStringAlertDialog.kt (100%) rename {appcompat => extension/appcompat}/src/main/kotlin/xyz/tynn/astring/appcompat/AStringAlertDialogBuilder.kt (100%) rename {appcompat => extension/appcompat}/src/main/kotlin/xyz/tynn/astring/appcompat/AStringToolbar.kt (100%) rename {appcompat => extension/appcompat}/src/test/java/xyz/tynn/astring/appcompat/AStringAlertDialogBuilderTest.java (100%) rename {appcompat => extension/appcompat}/src/test/java/xyz/tynn/astring/appcompat/AStringAlertDialogTest.java (100%) rename {appcompat => extension/appcompat}/src/test/java/xyz/tynn/astring/appcompat/AStringToolbarTest.java (100%) rename {appcompat => extension/appcompat}/src/test/kotlin/xyz/tynn/astring/appcompat/AStringAlertDialogBuilderKtTest.kt (100%) rename {appcompat => extension/appcompat}/src/test/kotlin/xyz/tynn/astring/appcompat/AStringAlertDialogKtTest.kt (100%) rename {appcompat => extension/appcompat}/src/test/kotlin/xyz/tynn/astring/appcompat/AStringToolbarKtTest.kt (100%) rename {example/common => extension/core}/.gitignore (100%) rename {core => extension/core}/build.gradle (100%) rename {core => extension/core}/src/main/AndroidManifest.xml (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringAlertDialog.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringAlertDialogBuilder.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringSwitch.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringTextSwitcher.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringTextView.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringToast.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringToggleButton.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringToolbar.kt (100%) rename {core => extension/core}/src/main/kotlin/xyz/tynn/astring/core/AStringView.kt (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringAlertDialogBuilderTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringAlertDialogTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringSwitchTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringTextSwitcherTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringTextViewTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringToastTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringToggleButtonTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringToolbarTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/AStringViewTest.java (100%) rename {core => extension/core}/src/test/java/xyz/tynn/astring/core/MockkDefinitions.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringAlertDialogBuilderKtTest.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringAlertDialogKtTest.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringSwitchKtTest.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringTextSwitcherKtTest.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringTextViewKtTest.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringToggleButtonKtTest.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringToolbarKtTest.kt (100%) rename {core => extension/core}/src/test/kotlin/xyz/tynn/astring/core/AStringViewKtTest.kt (100%) rename {material => extension/material}/.gitignore (100%) rename {material => extension/material}/build.gradle (81%) rename {material => extension/material}/src/main/AndroidManifest.xml (100%) rename {material => extension/material}/src/main/kotlin/xyz/tynn/astring/material/AStringSnackbar.kt (100%) rename {material => extension/material}/src/main/kotlin/xyz/tynn/astring/material/AStringTextInputLayout.kt (100%) rename {material => extension/material}/src/test/java/xyz/tynn/astring/material/AStringMaterialAlertDialogBuilderTest.java (100%) rename {material => extension/material}/src/test/java/xyz/tynn/astring/material/AStringSnackbarTest.java (100%) rename {material => extension/material}/src/test/java/xyz/tynn/astring/material/AStringTextInputLayoutTest.java (100%) rename {material => extension/material}/src/test/java/xyz/tynn/astring/material/MockkDefinitions.kt (100%) rename {material => extension/material}/src/test/kotlin/xyz/tynn/astring/material/AStringMaterialAlertDialogBuilderKtTest.kt (100%) rename {material => extension/material}/src/test/kotlin/xyz/tynn/astring/material/AStringTextInputLayoutKtTest.kt (100%) diff --git a/appcompat/.gitignore b/example/base/.gitignore similarity index 100% rename from appcompat/.gitignore rename to example/base/.gitignore diff --git a/example/common/build.gradle b/example/base/build.gradle similarity index 75% rename from example/common/build.gradle rename to example/base/build.gradle index ceffba6..ddebdcb 100644 --- a/example/common/build.gradle +++ b/example/base/build.gradle @@ -9,5 +9,5 @@ android { } dependencies { - api project(':material') + api project(':extension:material') } diff --git a/example/common/src/main/AndroidManifest.xml b/example/base/src/main/AndroidManifest.xml similarity index 84% rename from example/common/src/main/AndroidManifest.xml rename to example/base/src/main/AndroidManifest.xml index c72cde6..d33a130 100644 --- a/example/common/src/main/AndroidManifest.xml +++ b/example/base/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="xyz.tynn.astring.example.base">