diff --git a/.gradle/7.3.3/checksums/checksums.lock b/.gradle/7.3.3/checksums/checksums.lock deleted file mode 100644 index 06049d38..00000000 Binary files a/.gradle/7.3.3/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/7.3.3/checksums/md5-checksums.bin b/.gradle/7.3.3/checksums/md5-checksums.bin deleted file mode 100644 index ecfb59f7..00000000 Binary files a/.gradle/7.3.3/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/7.3.3/checksums/sha1-checksums.bin b/.gradle/7.3.3/checksums/sha1-checksums.bin deleted file mode 100644 index ed2f5537..00000000 Binary files a/.gradle/7.3.3/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index 76431bb2..00000000 Binary files a/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/.gradle/7.3.3/dependencies-accessors/gc.properties b/.gradle/7.3.3/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/.gradle/7.3.3/executionHistory/executionHistory.bin b/.gradle/7.3.3/executionHistory/executionHistory.bin deleted file mode 100644 index e67b000b..00000000 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock deleted file mode 100644 index 97674839..00000000 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/7.3.3/fileChanges/last-build.bin b/.gradle/7.3.3/fileChanges/last-build.bin deleted file mode 100644 index f76dd238..00000000 Binary files a/.gradle/7.3.3/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin deleted file mode 100644 index 5938daf3..00000000 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock deleted file mode 100644 index 3d577ca2..00000000 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 7798d4d1..00000000 Binary files a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/.gradle/7.3.3/gc.properties b/.gradle/7.3.3/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock index e3dfe7a5..a480df55 100644 Binary files a/.gradle/7.4/checksums/checksums.lock and b/.gradle/7.4/checksums/checksums.lock differ diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin index 32c0bbc3..45fbe83b 100644 Binary files a/.gradle/7.4/checksums/md5-checksums.bin and b/.gradle/7.4/checksums/md5-checksums.bin differ diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin index d4d4176f..62359ca6 100644 Binary files a/.gradle/7.4/checksums/sha1-checksums.bin and b/.gradle/7.4/checksums/sha1-checksums.bin differ diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin index 9778947a..a6896e9e 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.bin and b/.gradle/7.4/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock index 83a545cf..f2190f02 100644 Binary files a/.gradle/7.4/executionHistory/executionHistory.lock and b/.gradle/7.4/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin index 256cad87..6990061c 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.bin and b/.gradle/7.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock index ab5cd0e6..2c9a36b3 100644 Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and b/.gradle/7.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.4/fileHashes/resourceHashesCache.bin b/.gradle/7.4/fileHashes/resourceHashesCache.bin index bc381316..15c0cf22 100644 Binary files a/.gradle/7.4/fileHashes/resourceHashesCache.bin and b/.gradle/7.4/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b40d97f0..56177c0c 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index e8a6b11f..ebf99c2f 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 7bb4ec9f..79d3b440 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_2_9_1_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_2_9_1_aar.xml new file mode 100644 index 00000000..84c0ebba --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_2_9_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_core_2_9_1_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_core_2_9_1_aar.xml new file mode 100644 index 00000000..0c15b7f1 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_core_2_9_1_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_utils_2_9_1_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_utils_2_9_1_aar.xml new file mode 100644 index 00000000..e407da06 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_android_utils_2_9_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_2_9_1.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_2_9_1.xml new file mode 100644 index 00000000..57c70a1b --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_2_9_1_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_2_9_1_aar.xml new file mode 100644 index 00000000..e520fd1a --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_2_9_1_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_androidx_2_9_1_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_androidx_2_9_1_aar.xml new file mode 100644 index 00000000..55f47aae --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_androidx_2_9_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_core_2_9_1_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_core_2_9_1_aar.xml new file mode 100644 index 00000000..1599b24d --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_core_2_9_1_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_support_fragments_2_9_1_aar.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_support_fragments_2_9_1_aar.xml new file mode 100644 index 00000000..5db5b8b7 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_leakcanary_object_watcher_android_support_fragments_2_9_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_shark_2_9_1.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_2_9_1.xml new file mode 100644 index 00000000..7a67875a --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_shark_android_2_9_1.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_android_2_9_1.xml new file mode 100644 index 00000000..5bba0829 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_android_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_shark_graph_2_9_1.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_graph_2_9_1.xml new file mode 100644 index 00000000..49cbd8bc --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_graph_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_shark_hprof_2_9_1.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_hprof_2_9_1.xml new file mode 100644 index 00000000..586984c3 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_hprof_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_leakcanary_shark_log_2_9_1.xml b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_log_2_9_1.xml new file mode 100644 index 00000000..6d97df29 --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_leakcanary_shark_log_2_9_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/sample/KAlertDialog-master.sample.androidTest.iml b/.idea/modules/sample/KAlertDialog-master.sample.androidTest.iml index 16678472..0695d8d9 100644 --- a/.idea/modules/sample/KAlertDialog-master.sample.androidTest.iml +++ b/.idea/modules/sample/KAlertDialog-master.sample.androidTest.iml @@ -32,18 +32,31 @@ + + + + + + + + + - - - + + + + + + + diff --git a/.idea/modules/sample/KAlertDialog-master.sample.main.iml b/.idea/modules/sample/KAlertDialog-master.sample.main.iml index e3a2a99c..6c6dda21 100644 --- a/.idea/modules/sample/KAlertDialog-master.sample.main.iml +++ b/.idea/modules/sample/KAlertDialog-master.sample.main.iml @@ -41,18 +41,31 @@ + + + + + + + + + - - - + + + + + + + diff --git a/.idea/modules/sample/KAlertDialog-master.sample.unitTest.iml b/.idea/modules/sample/KAlertDialog-master.sample.unitTest.iml index be5f71aa..9e668f69 100644 --- a/.idea/modules/sample/KAlertDialog-master.sample.unitTest.iml +++ b/.idea/modules/sample/KAlertDialog-master.sample.unitTest.iml @@ -27,18 +27,31 @@ + + + + + + + + + - - - + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 73656dfc..a3d73e1b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -18,6 +18,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -26,220 +54,227 @@ + + + + + + + + - + - - + + + + + + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -360,17 +395,20 @@ + - - + + - + + + @@ -380,7 +418,7 @@ - + diff --git a/README.md b/README.md index 3f8ec05f..d4fa9d47 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ ![](https://github.com/TutorialsAndroid/KAlertDialog/blob/master/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png) -# New version released v20.2.4 on 18-10-2022 +# New version released v20.3.4 on 20-10-2022 ## Changelogs -- Fixed issue in button not changing color in NORMAL_TYPE dialog -- Now you can hide confirm and cancel button on alert dialog type change +- Fixed issue in button sizes on larger text length of buttons ### Read the changes in README Alert Dialog ![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat) [![Known Vulnerabilities](https://snyk.io/test/github/TutorialsAndroid/KAlertDialog/badge.svg?targetFile=library%2Fbuild.gradle)](https://snyk.io/test/github/TutorialsAndroid/KAlertDialog?targetFile=library%2Fbuild.gradle) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-KAlertDiaog-blue.svg?style=flat)](https://android-arsenal.com/details/1/7588) [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://opensource.org/licenses/Apache-2.0) @@ -68,7 +67,7 @@ Add it in your root build.gradle at the end of repositories: Step 2. Add the dependency dependencies { - implementation 'com.github.TutorialsAndroid:KAlertDialog:v20.2.4' + implementation 'com.github.TutorialsAndroid:KAlertDialog:v20.3.4' } ## Usage diff --git a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$1.dex b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$1.dex index 448cfc6c..50747f73 100644 Binary files a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$1.dex and b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$1.dex differ diff --git a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$2.dex b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$2.dex index 9b8f1c2d..6b43c457 100644 Binary files a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$2.dex and b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$2.dex differ diff --git a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$3.dex b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$3.dex index 1ce3c36e..96b76750 100644 Binary files a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$3.dex and b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$3.dex differ diff --git a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$4.dex b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$4.dex index 2b492440..b9fe003e 100644 Binary files a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$4.dex and b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog$4.dex differ diff --git a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog.dex b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog.dex index 7f7cd4cf..526d653b 100644 Binary files a/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog.dex and b/library/build/.transforms/19a5124c99c46089379269cd404f9e54/transformed/debug/com/developer/kalert/KAlertDialog.dex differ diff --git a/library/build/intermediates/compile_library_classes_jar/debug/classes.jar b/library/build/intermediates/compile_library_classes_jar/debug/classes.jar index ba28c093..2de042ee 100644 Binary files a/library/build/intermediates/compile_library_classes_jar/debug/classes.jar and b/library/build/intermediates/compile_library_classes_jar/debug/classes.jar differ diff --git a/library/build/intermediates/compiled_local_resources/debug/out/layout-sw600dp-v13_alert_dialog.xml.flat b/library/build/intermediates/compiled_local_resources/debug/out/layout-sw600dp-v13_alert_dialog.xml.flat index 38be890c..9fdc5024 100644 Binary files a/library/build/intermediates/compiled_local_resources/debug/out/layout-sw600dp-v13_alert_dialog.xml.flat and b/library/build/intermediates/compiled_local_resources/debug/out/layout-sw600dp-v13_alert_dialog.xml.flat differ diff --git a/library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog.xml.flat b/library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog.xml.flat index b27beaf6..34b4d59f 100644 Binary files a/library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog.xml.flat and b/library/build/intermediates/compiled_local_resources/debug/out/layout_alert_dialog.xml.flat differ diff --git a/library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 00e74e6f..e8683f0d 100644 --- a/library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/library/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Tue Oct 18 21:14:49 IST 2022 +#Thu Oct 20 18:02:22 IST 2022 com.developer.kalert.library-pngs-0\:/drawable-xxhdpi/ic_success_tick.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\library\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_success_tick.png com.developer.kalert.library-main-7\:/layout/alert_dialog.xml=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\library\\build\\intermediates\\packaged_res\\debug\\layout\\alert_dialog.xml com.developer.kalert.library-main-7\:/drawable/success_circle.xml=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\library\\build\\intermediates\\packaged_res\\debug\\drawable\\success_circle.xml diff --git a/library/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/library/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 06c790c3..f1f240ad 100644 --- a/library/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/library/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -34,16 +34,22 @@ diff --git a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$1.class b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$1.class index bd2d21e2..51c21517 100644 Binary files a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$1.class and b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$1.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$2.class b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$2.class index 5f6e4aa1..6206583a 100644 Binary files a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$2.class and b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$2.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$3.class b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$3.class index d3bb915e..54334dc6 100644 Binary files a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$3.class and b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$3.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$4.class b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$4.class index a2e6e534..9317d121 100644 Binary files a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$4.class and b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog$4.class differ diff --git a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog.class b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog.class index 26bb15dd..6eb79d26 100644 Binary files a/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog.class and b/library/build/intermediates/javac/debug/classes/com/developer/kalert/KAlertDialog.class differ diff --git a/library/build/intermediates/packaged_res/debug/layout-sw600dp-v13/alert_dialog.xml b/library/build/intermediates/packaged_res/debug/layout-sw600dp-v13/alert_dialog.xml index 0b80f79a..3375c3e4 100644 --- a/library/build/intermediates/packaged_res/debug/layout-sw600dp-v13/alert_dialog.xml +++ b/library/build/intermediates/packaged_res/debug/layout-sw600dp-v13/alert_dialog.xml @@ -3,7 +3,7 @@ xmlns:wheel="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/loading" - android:layout_width="300dp" + android:layout_width="310dp" android:layout_height="wrap_content" android:gravity="center" android:layout_gravity="center" @@ -149,6 +149,12 @@ android:visibility="gone" android:textColor="?attr/alertDialogContentTextColor"/> + + + android:visibility="gone"/> diff --git a/library/build/intermediates/packaged_res/debug/layout/alert_dialog.xml b/library/build/intermediates/packaged_res/debug/layout/alert_dialog.xml index a4353e06..186181a2 100644 --- a/library/build/intermediates/packaged_res/debug/layout/alert_dialog.xml +++ b/library/build/intermediates/packaged_res/debug/layout/alert_dialog.xml @@ -3,7 +3,7 @@ xmlns:wheel="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/loading" - android:layout_width="290dp" + android:layout_width="300dp" android:layout_height="wrap_content" android:gravity="center" android:layout_gravity="center" @@ -185,13 +185,14 @@ + android:visibility="gone"/> diff --git a/library/build/intermediates/packaged_res/debug/values-sw600dp-v13/values-sw600dp-v13.xml b/library/build/intermediates/packaged_res/debug/values-sw600dp-v13/values-sw600dp-v13.xml index 3495c257..b2c13837 100644 --- a/library/build/intermediates/packaged_res/debug/values-sw600dp-v13/values-sw600dp-v13.xml +++ b/library/build/intermediates/packaged_res/debug/values-sw600dp-v13/values-sw600dp-v13.xml @@ -2,9 +2,12 @@ diff --git a/library/build/intermediates/packaged_res/debug/values/values.xml b/library/build/intermediates/packaged_res/debug/values/values.xml index 75b7939d..e11fee39 100644 --- a/library/build/intermediates/packaged_res/debug/values/values.xml +++ b/library/build/intermediates/packaged_res/debug/values/values.xml @@ -59,9 +59,12 @@ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$1.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$1.class index bd2d21e2..51c21517 100644 Binary files a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$1.class and b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$1.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$2.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$2.class index 5f6e4aa1..6206583a 100644 Binary files a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$2.class and b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$2.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$3.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$3.class index d3bb915e..54334dc6 100644 Binary files a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$3.class and b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$3.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$4.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$4.class index a2e6e534..9317d121 100644 Binary files a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$4.class and b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog$4.class differ diff --git a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog.class b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog.class index 26bb15dd..6eb79d26 100644 Binary files a/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog.class and b/library/build/intermediates/runtime_library_classes_dir/debug/com/developer/kalert/KAlertDialog.class differ diff --git a/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 8f9edb68..5120800d 100644 Binary files a/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/library/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/library/src/main/java/com/developer/kalert/KAlertDialog.java b/library/src/main/java/com/developer/kalert/KAlertDialog.java index c67bed62..3ee39f12 100644 --- a/library/src/main/java/com/developer/kalert/KAlertDialog.java +++ b/library/src/main/java/com/developer/kalert/KAlertDialog.java @@ -13,10 +13,13 @@ import android.text.Html; import android.text.util.Linkify; +import android.util.Log; import android.util.TypedValue; import android.view.Gravity; import android.view.View; +import android.view.ViewGroup; +import android.view.ViewTreeObserver; import android.view.WindowManager; import android.view.animation.Animation; import android.view.animation.AnimationSet; @@ -59,6 +62,8 @@ public class KAlertDialog extends AlertDialog implements View.OnClickListener { private Drawable mColor, mCancelColor; private View mDialogView; private FrameLayout mCustomViewContainer; + //private ViewTreeObserver mCancelButtonObserver, mConfirmButtonObserver; + //private ViewTreeObserver.OnGlobalLayoutListener mConfirmButtonGlobalListener, mCancelButtonGlobalListener; private String mTitleText, mContentText, justifyContentText, justifyContentTextColor, justifyContentTextSize, mCancelText, mConfirmText, mInputFieldHint; @@ -70,6 +75,7 @@ public class KAlertDialog extends AlertDialog implements View.OnClickListener { private int drawableColor = 0; private Integer contentAlignment, contentGravity; private int titleTextGravity = Gravity.CENTER; + private Integer cancelButtonHeight, confirmButtonHeight; private boolean mShowCancel, mShowContent, mShowTitleText, mCloseFromCancel, mShowConfirm; private int contentTextSize = 0; @@ -147,6 +153,7 @@ protected void onCreate(Bundle savedInstanceState) { setConfirmText(mConfirmText, confirmTextColor); setConfirmButtonColor(mColor); setCancelButtonColor(mCancelColor); + //setButtonMatchingHeight(); changeAlertType(mAlertType, true); setInputFieldHint(mInputFieldHint); } @@ -486,6 +493,50 @@ public KAlertDialog showConfirmButton (boolean isShow){ return this; } + /* + Method to set the matching height of both confirm and cancel button. It helps + when device font sized is increased or the text of any one button has greater length + the specific button heights also get increased and this leads to un-usual height of both + buttons. So this method set's the height of both button remain same. + + private void setButtonMatchingHeight() { + if (mConfirmButton != null && mCancelButton != null) { + mConfirmButtonObserver = mConfirmButton.getViewTreeObserver(); + mCancelButtonObserver = mCancelButton.getViewTreeObserver(); + + if (mConfirmButton.getVisibility() == View.VISIBLE) { + mConfirmButtonGlobalListener = () -> { + confirmButtonHeight = mConfirmButton.getHeight(); + setMatchingHeight(); + }; + mConfirmButtonObserver.addOnGlobalLayoutListener(mConfirmButtonGlobalListener); + } + + if (mCancelButton.getVisibility() == View.VISIBLE) { + mCancelButtonGlobalListener = () -> { + cancelButtonHeight = mCancelButton.getHeight(); + setMatchingHeight(); + }; + mCancelButtonObserver.addOnGlobalLayoutListener(mCancelButtonGlobalListener); + } + } + } + + private void setMatchingHeight() { + if ( confirmButtonHeight != null && cancelButtonHeight != null ) { + //check which button value is greater + if (confirmButtonHeight.equals(cancelButtonHeight)) { } + else if ( confirmButtonHeight > cancelButtonHeight ) { + mCancelButton.setLayoutParams(new LinearLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, confirmButtonHeight)); + } else { + mConfirmButton.setLayoutParams(new LinearLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, cancelButtonHeight)); + } + } + } + */ + private KAlertDialog dialogTitleFont(String path) { if (context != null) { if (mTitleTextView != null && path != null) { diff --git a/library/src/main/res/layout-sw600dp/alert_dialog.xml b/library/src/main/res/layout-sw600dp/alert_dialog.xml index da6e910e..3375c3e4 100644 --- a/library/src/main/res/layout-sw600dp/alert_dialog.xml +++ b/library/src/main/res/layout-sw600dp/alert_dialog.xml @@ -3,7 +3,7 @@ xmlns:wheel="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/loading" - android:layout_width="300dp" + android:layout_width="310dp" android:layout_height="wrap_content" android:gravity="center" android:layout_gravity="center" @@ -185,13 +185,14 @@ + android:visibility="gone"/> diff --git a/library/src/main/res/layout/alert_dialog.xml b/library/src/main/res/layout/alert_dialog.xml index a4353e06..186181a2 100644 --- a/library/src/main/res/layout/alert_dialog.xml +++ b/library/src/main/res/layout/alert_dialog.xml @@ -3,7 +3,7 @@ xmlns:wheel="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/loading" - android:layout_width="290dp" + android:layout_width="300dp" android:layout_height="wrap_content" android:gravity="center" android:layout_gravity="center" @@ -185,13 +185,14 @@ + android:visibility="gone"/> diff --git a/library/src/main/res/values-sw600dp/styles.xml b/library/src/main/res/values-sw600dp/styles.xml index 3495c257..b2c13837 100644 --- a/library/src/main/res/values-sw600dp/styles.xml +++ b/library/src/main/res/values-sw600dp/styles.xml @@ -2,9 +2,12 @@ diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml index 8fd63f09..0283f962 100644 --- a/library/src/main/res/values/styles.xml +++ b/library/src/main/res/values/styles.xml @@ -31,9 +31,12 @@ diff --git a/sample/build.gradle b/sample/build.gradle index 30357f89..c73bcaa7 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.developer.kalert.alert" minSdkVersion 19 targetSdkVersion 33 - versionCode 31 - versionName "20.2.4" + versionCode 32 + versionName "20.3.4" } @@ -41,8 +41,13 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'com.google.android.material:material:1.8.0-alpha01' + //implementation 'com.intuit.sdp:sdp-android:1.1.0' + implementation project(':library') + + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' } \ No newline at end of file diff --git a/sample/build/generated/source/buildConfig/debug/com/developer/kalert/alert/BuildConfig.java b/sample/build/generated/source/buildConfig/debug/com/developer/kalert/alert/BuildConfig.java index 915ee172..db9b20f0 100644 --- a/sample/build/generated/source/buildConfig/debug/com/developer/kalert/alert/BuildConfig.java +++ b/sample/build/generated/source/buildConfig/debug/com/developer/kalert/alert/BuildConfig.java @@ -7,6 +7,6 @@ public final class BuildConfig { public static final boolean DEBUG = Boolean.parseBoolean("true"); public static final String APPLICATION_ID = "com.developer.kalert.alert"; public static final String BUILD_TYPE = "debug"; - public static final int VERSION_CODE = 30; - public static final String VERSION_NAME = "20.2.3"; + public static final int VERSION_CODE = 32; + public static final String VERSION_NAME = "20.3.4"; } diff --git a/sample/build/intermediates/apk/debug/output-metadata.json b/sample/build/intermediates/apk/debug/output-metadata.json index 03d766fe..d68509f8 100644 --- a/sample/build/intermediates/apk/debug/output-metadata.json +++ b/sample/build/intermediates/apk/debug/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 30, - "versionName": "20.2.3", + "versionCode": 32, + "versionName": "20.3.4", "outputFile": "sample-debug.apk" } ], diff --git a/sample/build/intermediates/apk/debug/sample-debug.apk b/sample/build/intermediates/apk/debug/sample-debug.apk index 4342f950..cb39596f 100644 Binary files a/sample/build/intermediates/apk/debug/sample-debug.apk and b/sample/build/intermediates/apk/debug/sample-debug.apk differ diff --git a/sample/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/sample/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index ea486383..bbc6826e 100644 Binary files a/sample/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/sample/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/sample/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/sample/build/intermediates/dex/debug/mergeDexDebug/classes.dex index ef63524b..3949b86c 100644 Binary files a/sample/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/sample/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/sample/build/intermediates/dex_archive_input_jar_hashes/debug/out b/sample/build/intermediates/dex_archive_input_jar_hashes/debug/out index e29eeaa4..db42bb09 100644 Binary files a/sample/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/sample/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/sample/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex b/sample/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex index 8ecfe980..0a75e017 100644 Binary files a/sample/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex and b/sample/build/intermediates/external_libs_dex/debug/mergeExtDexDebug/classes.dex differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/sample/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 0d160087..61eeb44e 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/sample/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+jzgDJGNX_euGZBVbXmzKdcZXMo= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+jzgDJGNX_euGZBVbXmzKdcZXMo= new file mode 100644 index 00000000..cfbd7d23 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+jzgDJGNX_euGZBVbXmzKdcZXMo= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+u+Od62OAM24gAa5BNzOipZjDKQ= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+u+Od62OAM24gAa5BNzOipZjDKQ= new file mode 100644 index 00000000..56d63d55 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+u+Od62OAM24gAa5BNzOipZjDKQ= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0+dzh8pmn3aYECBVo_zUYWhDwjU= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0+dzh8pmn3aYECBVo_zUYWhDwjU= index 4385785b..1487acd6 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0+dzh8pmn3aYECBVo_zUYWhDwjU= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0+dzh8pmn3aYECBVo_zUYWhDwjU= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0e8iQ6+q8QJ93aHCsRflEMcUync= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0e8iQ6+q8QJ93aHCsRflEMcUync= index de755d1a..4b56a487 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0e8iQ6+q8QJ93aHCsRflEMcUync= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0e8iQ6+q8QJ93aHCsRflEMcUync= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/12SdMMijLAakw2CJRYfEg9Hb8AQ= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/12SdMMijLAakw2CJRYfEg9Hb8AQ= index d0a17a98..2bdfa521 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/12SdMMijLAakw2CJRYfEg9Hb8AQ= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/12SdMMijLAakw2CJRYfEg9Hb8AQ= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1V1_Ubn5MRacwkFU3HFRAjpEk5o= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1V1_Ubn5MRacwkFU3HFRAjpEk5o= index 7fefd793..68841051 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1V1_Ubn5MRacwkFU3HFRAjpEk5o= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1V1_Ubn5MRacwkFU3HFRAjpEk5o= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1cuzHvrbmjw_2oe8JBO8p23Bhv8= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1cuzHvrbmjw_2oe8JBO8p23Bhv8= new file mode 100644 index 00000000..5b497987 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1cuzHvrbmjw_2oe8JBO8p23Bhv8= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1uq+bzhvz8C2Psa78IHfAPYRnPs= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1uq+bzhvz8C2Psa78IHfAPYRnPs= index 846dea11..2f359f51 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1uq+bzhvz8C2Psa78IHfAPYRnPs= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/1uq+bzhvz8C2Psa78IHfAPYRnPs= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2CjAtp7vwnFMo0b4scW1IjRvgIk= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2CjAtp7vwnFMo0b4scW1IjRvgIk= index 5a028163..8582e4d4 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2CjAtp7vwnFMo0b4scW1IjRvgIk= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2CjAtp7vwnFMo0b4scW1IjRvgIk= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2hIIRs8B6jBFUyCZtxge+llLoYU= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2hIIRs8B6jBFUyCZtxge+llLoYU= index 10c7c9d0..071aef0e 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2hIIRs8B6jBFUyCZtxge+llLoYU= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/2hIIRs8B6jBFUyCZtxge+llLoYU= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4sDMpHwUFDdetSQIW2AUb49RKPI= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4sDMpHwUFDdetSQIW2AUb49RKPI= index c68ea7ab..310a04af 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4sDMpHwUFDdetSQIW2AUb49RKPI= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4sDMpHwUFDdetSQIW2AUb49RKPI= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5t7eT22hImamaSQbxM5ZcKH6iNs= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5t7eT22hImamaSQbxM5ZcKH6iNs= new file mode 100644 index 00000000..85a7b636 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5t7eT22hImamaSQbxM5ZcKH6iNs= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7jNTYU4dHlLT1QC5Kni4r+We7zs= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7jNTYU4dHlLT1QC5Kni4r+We7zs= index 5c88b2b7..5fd1e8c1 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7jNTYU4dHlLT1QC5Kni4r+We7zs= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7jNTYU4dHlLT1QC5Kni4r+We7zs= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9dF19hEqfZsb6VDtXUrH8yUMhKw= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9dF19hEqfZsb6VDtXUrH8yUMhKw= index 6ccda32b..398ebb9b 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9dF19hEqfZsb6VDtXUrH8yUMhKw= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9dF19hEqfZsb6VDtXUrH8yUMhKw= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ADCqJHVUJxHV_L_MQoClUqHCRbA= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ADCqJHVUJxHV_L_MQoClUqHCRbA= index 4c9f52f7..b4c6c3e5 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ADCqJHVUJxHV_L_MQoClUqHCRbA= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ADCqJHVUJxHV_L_MQoClUqHCRbA= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BZJwJclMdFQRXGVOvIZAEeirUbk= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BZJwJclMdFQRXGVOvIZAEeirUbk= index ccaef6be..546b204f 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BZJwJclMdFQRXGVOvIZAEeirUbk= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BZJwJclMdFQRXGVOvIZAEeirUbk= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CFG6j0qQnkk7uhwSU9oRBvAlgME= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CFG6j0qQnkk7uhwSU9oRBvAlgME= index dd51769e..b23adcd1 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CFG6j0qQnkk7uhwSU9oRBvAlgME= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CFG6j0qQnkk7uhwSU9oRBvAlgME= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DQHQzDgX1BVJLEQ5jbcEj9Lw2Nk= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DQHQzDgX1BVJLEQ5jbcEj9Lw2Nk= index ba190148..3ba64084 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DQHQzDgX1BVJLEQ5jbcEj9Lw2Nk= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/DQHQzDgX1BVJLEQ5jbcEj9Lw2Nk= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EI0DR1pSzG0FEWyMT8AbMwZ6goI= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EI0DR1pSzG0FEWyMT8AbMwZ6goI= index b0a89050..35c4770e 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EI0DR1pSzG0FEWyMT8AbMwZ6goI= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EI0DR1pSzG0FEWyMT8AbMwZ6goI= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EqkigVD8l4ZJY8bxqztfyX87+1M= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EqkigVD8l4ZJY8bxqztfyX87+1M= new file mode 100644 index 00000000..76ec2fb6 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EqkigVD8l4ZJY8bxqztfyX87+1M= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F57i9MjBNTWH3ws8ok_AUSDsStk= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F57i9MjBNTWH3ws8ok_AUSDsStk= new file mode 100644 index 00000000..945a7c54 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/F57i9MjBNTWH3ws8ok_AUSDsStk= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G+fx0lfKzTAyQrHmaJ8yPN6VYps= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G+fx0lfKzTAyQrHmaJ8yPN6VYps= index bd918c2c..935e0805 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G+fx0lfKzTAyQrHmaJ8yPN6VYps= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/G+fx0lfKzTAyQrHmaJ8yPN6VYps= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GLjeB0beBn4CeQgEvp31mxALOJ0= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GLjeB0beBn4CeQgEvp31mxALOJ0= index 1c472d04..58ec8ba9 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GLjeB0beBn4CeQgEvp31mxALOJ0= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GLjeB0beBn4CeQgEvp31mxALOJ0= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HLvFSeToVpVZPFMarEAZD4GDZtQ= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HLvFSeToVpVZPFMarEAZD4GDZtQ= index 5dd6acd6..facf43ed 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HLvFSeToVpVZPFMarEAZD4GDZtQ= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HLvFSeToVpVZPFMarEAZD4GDZtQ= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JSYnxN_N6EMM7do9GanxzrXjGuY= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JSYnxN_N6EMM7do9GanxzrXjGuY= new file mode 100644 index 00000000..1eae689d Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JSYnxN_N6EMM7do9GanxzrXjGuY= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KaSxRR5vklG1m1kEMRW4ShNeeIU= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KaSxRR5vklG1m1kEMRW4ShNeeIU= index 5c0f9389..f595957f 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KaSxRR5vklG1m1kEMRW4ShNeeIU= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KaSxRR5vklG1m1kEMRW4ShNeeIU= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MDbbctjQjJR7Wj1oGE13LeloixM= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MDbbctjQjJR7Wj1oGE13LeloixM= index 2510a5ae..67a105b6 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MDbbctjQjJR7Wj1oGE13LeloixM= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MDbbctjQjJR7Wj1oGE13LeloixM= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MHBC3Zhz5A+NghNpVwsiI5gnKOw= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MHBC3Zhz5A+NghNpVwsiI5gnKOw= index 2cec677c..1d2c72ac 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MHBC3Zhz5A+NghNpVwsiI5gnKOw= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MHBC3Zhz5A+NghNpVwsiI5gnKOw= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NQPx2mkMwCk4hei_DzKc7+gY3ck= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NQPx2mkMwCk4hei_DzKc7+gY3ck= new file mode 100644 index 00000000..24c146da Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NQPx2mkMwCk4hei_DzKc7+gY3ck= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NxDgq5lpzc3+fUJPS1lpYFK395Q= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NxDgq5lpzc3+fUJPS1lpYFK395Q= new file mode 100644 index 00000000..b0e7bf3a Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NxDgq5lpzc3+fUJPS1lpYFK395Q= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q0rnSU0poLRolgekNmRsn3Czhnw= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q0rnSU0poLRolgekNmRsn3Czhnw= new file mode 100644 index 00000000..cc25d886 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q0rnSU0poLRolgekNmRsn3Czhnw= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QEz2Rw+_D+BdHr7MQXYbcm2g56E= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QEz2Rw+_D+BdHr7MQXYbcm2g56E= index 9f709851..f1055ce7 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QEz2Rw+_D+BdHr7MQXYbcm2g56E= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QEz2Rw+_D+BdHr7MQXYbcm2g56E= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RBkfXOjHHjX6Q5bW5cFv4L9gZBQ= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RBkfXOjHHjX6Q5bW5cFv4L9gZBQ= index dc7b90ea..f86d05d5 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RBkfXOjHHjX6Q5bW5cFv4L9gZBQ= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RBkfXOjHHjX6Q5bW5cFv4L9gZBQ= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RQBcYG3BH42_lmmpByzxlKH69Zo= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RQBcYG3BH42_lmmpByzxlKH69Zo= index 8a1f67eb..0a606491 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RQBcYG3BH42_lmmpByzxlKH69Zo= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RQBcYG3BH42_lmmpByzxlKH69Zo= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZbUFpJuz8qqLsObmayZqx352pE= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZbUFpJuz8qqLsObmayZqx352pE= index da323a95..24120e41 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZbUFpJuz8qqLsObmayZqx352pE= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/SZbUFpJuz8qqLsObmayZqx352pE= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UG8s_eLKsBvKu5BXIwc3WaiXt_w= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UG8s_eLKsBvKu5BXIwc3WaiXt_w= index d791aa10..a3629d1f 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UG8s_eLKsBvKu5BXIwc3WaiXt_w= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UG8s_eLKsBvKu5BXIwc3WaiXt_w= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WYMkODpVY4vS+VfgFh5IRjluLdU= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WYMkODpVY4vS+VfgFh5IRjluLdU= new file mode 100644 index 00000000..1ee93ab6 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WYMkODpVY4vS+VfgFh5IRjluLdU= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Y4JUrdCHQfxJoTQlr1Evz7AHY_Y= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Y4JUrdCHQfxJoTQlr1Evz7AHY_Y= index 21eb3072..79b667ae 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Y4JUrdCHQfxJoTQlr1Evz7AHY_Y= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Y4JUrdCHQfxJoTQlr1Evz7AHY_Y= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_usmnwh1q6ZSJMxcT_uRgslDPlI= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_usmnwh1q6ZSJMxcT_uRgslDPlI= new file mode 100644 index 00000000..aabd458a Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/_usmnwh1q6ZSJMxcT_uRgslDPlI= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/an4bsB5lhmn3PKq0XM0pV1RffxU= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/an4bsB5lhmn3PKq0XM0pV1RffxU= new file mode 100644 index 00000000..94d5f644 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/an4bsB5lhmn3PKq0XM0pV1RffxU= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cvodO48CAIN4O0EcPL7Eu6b17WI= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cvodO48CAIN4O0EcPL7Eu6b17WI= index 6c70cd67..d56e6f03 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cvodO48CAIN4O0EcPL7Eu6b17WI= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cvodO48CAIN4O0EcPL7Eu6b17WI= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8Z638I25oQa+xUcDhKhT50RJdo= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8Z638I25oQa+xUcDhKhT50RJdo= index c703ef41..6956bd66 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8Z638I25oQa+xUcDhKhT50RJdo= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/f8Z638I25oQa+xUcDhKhT50RJdo= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQD3UyF9w2GwLgcxs42Bc78tQ_M= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQD3UyF9w2GwLgcxs42Bc78tQ_M= index 68dbdba3..ca180e65 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQD3UyF9w2GwLgcxs42Bc78tQ_M= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gQD3UyF9w2GwLgcxs42Bc78tQ_M= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVl17_nu+EOxSjsUIKyGAyu_lM0= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVl17_nu+EOxSjsUIKyGAyu_lM0= index 90d5279e..219f2c29 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVl17_nu+EOxSjsUIKyGAyu_lM0= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kVl17_nu+EOxSjsUIKyGAyu_lM0= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/li50zrqNzIrBioIAzlVHZw3hHyY= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/li50zrqNzIrBioIAzlVHZw3hHyY= index 1cd9e7c7..afd86404 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/li50zrqNzIrBioIAzlVHZw3hHyY= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/li50zrqNzIrBioIAzlVHZw3hHyY= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Fd4caj6GeVmTQMOlYJdFseF8w= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Fd4caj6GeVmTQMOlYJdFseF8w= index 4faab6ee..98675e32 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Fd4caj6GeVmTQMOlYJdFseF8w= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/m8Fd4caj6GeVmTQMOlYJdFseF8w= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/o10DZuvPD6YlSoGpSYrVHoZZbo8= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/o10DZuvPD6YlSoGpSYrVHoZZbo8= index 03c80a94..82258050 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/o10DZuvPD6YlSoGpSYrVHoZZbo8= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/o10DZuvPD6YlSoGpSYrVHoZZbo8= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sURMetOMafM66Ea6qdj9MLiBzVs= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sURMetOMafM66Ea6qdj9MLiBzVs= index 761fe3bf..b42ca4fc 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sURMetOMafM66Ea6qdj9MLiBzVs= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sURMetOMafM66Ea6qdj9MLiBzVs= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/safGrvAEw+gTiAPUAsQBVxX14Cw= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/safGrvAEw+gTiAPUAsQBVxX14Cw= new file mode 100644 index 00000000..db256a11 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/safGrvAEw+gTiAPUAsQBVxX14Cw= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/smF782axdsvo5wDp0eG7EhWmoGw= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/smF782axdsvo5wDp0eG7EhWmoGw= new file mode 100644 index 00000000..a334cbe1 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/smF782axdsvo5wDp0eG7EhWmoGw= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t7FpNHRBdOhJZE4zyYS_UMEUC9Q= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t7FpNHRBdOhJZE4zyYS_UMEUC9Q= index 1ffce777..c26eb50f 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t7FpNHRBdOhJZE4zyYS_UMEUC9Q= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/t7FpNHRBdOhJZE4zyYS_UMEUC9Q= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/u2+kFXH391etPESipmo6P6x9lDE= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/u2+kFXH391etPESipmo6P6x9lDE= new file mode 100644 index 00000000..fde9c5e6 Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/u2+kFXH391etPESipmo6P6x9lDE= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wfowtq7IrT0VWwfKJWz02FfEX+U= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wfowtq7IrT0VWwfKJWz02FfEX+U= index 8568b5b7..13914543 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wfowtq7IrT0VWwfKJWz02FfEX+U= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wfowtq7IrT0VWwfKJWz02FfEX+U= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wihGnjeFSTlsv0FyxzWb+Qw+Ymk= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wihGnjeFSTlsv0FyxzWb+Qw+Ymk= index 3f38e229..1d249e4e 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wihGnjeFSTlsv0FyxzWb+Qw+Ymk= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wihGnjeFSTlsv0FyxzWb+Qw+Ymk= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wkwFgtM__q8c_5l5_lPaDVoNv30= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wkwFgtM__q8c_5l5_lPaDVoNv30= new file mode 100644 index 00000000..5541d2fa Binary files /dev/null and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wkwFgtM__q8c_5l5_lPaDVoNv30= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wzUUB0jSRfz2mI6O89DuZgMpFgM= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wzUUB0jSRfz2mI6O89DuZgMpFgM= index 22bdb4e0..3796a09c 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wzUUB0jSRfz2mI6O89DuZgMpFgM= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wzUUB0jSRfz2mI6O89DuZgMpFgM= differ diff --git a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yVrI0OoLm_8AF97UonC7avcJvd0= b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yVrI0OoLm_8AF97UonC7avcJvd0= index 9426e404..37fadce0 100644 Binary files a/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yVrI0OoLm_8AF97UonC7avcJvd0= and b/sample/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yVrI0OoLm_8AF97UonC7avcJvd0= differ diff --git a/sample/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/sample/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index e074a9dd..8bd9a5c8 100644 --- a/sample/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/sample/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,8 +1,15 @@ -#Tue Oct 18 21:14:52 IST 2022 +#Thu Oct 20 18:02:23 IST 2022 com.developer.kalert.alert.sample-main-34\:/mipmap-xxxhdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat -com.developer.kalert.alert.sample-main-34\:/mipmap-hdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat +com.developer.kalert.alert.sample-main-38\:/layout/customedittext.xml=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\layout_customedittext.xml.flat +com.developer.kalert.alert.sample-main-38\:/mipmap-hdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat com.developer.kalert.alert.sample-main-34\:/layout/sample_activity.xml=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\layout_sample_activity.xml.flat -com.developer.kalert.alert.sample-main-34\:/mipmap-mdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.png.flat com.developer.kalert.alert.sample-main-34\:/mipmap-xhdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.png.flat +com.developer.kalert.alert.sample-main-38\:/mipmap-mdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.png.flat +com.developer.kalert.alert.sample-main-34\:/mipmap-hdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat +com.developer.kalert.alert.sample-main-38\:/layout/sample_activity.xml=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\layout_sample_activity.xml.flat +com.developer.kalert.alert.sample-main-38\:/mipmap-xxhdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher.png.flat +com.developer.kalert.alert.sample-main-34\:/mipmap-mdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.png.flat com.developer.kalert.alert.sample-main-34\:/layout/customedittext.xml=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\layout_customedittext.xml.flat +com.developer.kalert.alert.sample-main-38\:/mipmap-xhdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.png.flat com.developer.kalert.alert.sample-main-34\:/mipmap-xxhdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher.png.flat +com.developer.kalert.alert.sample-main-38\:/mipmap-xxxhdpi/ic_launcher.png=D\:\\Projects\\AndroidLibraries\\KAlertDialog-master\\sample\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat diff --git a/sample/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/sample/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 0f1bbfca..96c79fc2 100644 --- a/sample/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/sample/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -50,7 +50,7 @@ @color/cardview_light_background #1f000000#8a000000#ffffffff#ff9e9e9e4dp6dp8dp4dp2dp320dp320dp32dp13sp12dp8dp64dp64dp10dp@dimen/notification_content_margin_start16dp2dp3dp24dp13sp10dp5dp#3333B5E5#0cffffff999999+#1f000000#8a000000#ffffffff#ff9e9e9e4dp6dp8dp4dp2dp320dp320dp32dp13sp12dp8dp64dp64dp10dp@dimen/notification_content_margin_start16dp2dp3dp24dp13sp10dp5dp#3333B5E5#0cffffff999999+ + + truetrue#ff000000#ffffffff#7fa87f@android:color/black@android:color/black@color/material_deep_teal_200@color/material_deep_teal_500@color/material_grey_800@android:color/white@color/material_grey_850@color/material_grey_50#80ffffff#80000000@color/bright_foreground_material_light@color/bright_foreground_material_dark@android:color/white@android:color/black#ff5a595b#ffd6d7d7#80bebebe#80323232#ffbebebe#ff323232#ff7043#ff5722@android:color/white@android:color/black#6680cbc4#66009688#ff37474f#ff263238#ff21272b#ff80cbc4#ff008577#fff5f5f5#ffe0e0e0#fffafafa#ff757575#ff424242#ff303030#ff212121@android:color/black@color/material_grey_600@color/material_grey_900@color/material_grey_100#ffffffff#de000000#4Dffffff#39000000#33ffffff#1f000000#b3ffffff#8a000000#36ffffff#24000000#ff616161#ffbdbdbd#ffbdbdbd#fff1f1f1#e6616161#e6FFFFFF16dp72dp56dp0dp0dp4dp16dp10dp6dp48dp180dp5dp-3dp48dp48dp36dp48dp48dp@dimen/abc_control_inset_material6dp8dp@dimen/abc_control_padding_material720dp320dp2dp4dp4dp2dp80%100%320dp320dp8dp8dp65%95%24dp18dp8dp0.300.2632dip8dip8dip7dp4dp10dp16dp80dp64dp48dp@dimen/abc_action_bar_content_inset_material296dp4dp48dip320dip2dp2dp20dp48dp36dp16dp3dp14sp14sp14sp12sp34sp45sp56sp112sp24sp22sp18sp14sp16sp14sp16sp16dp20sp20dp0.300.260.260.200.120.500.380.700.542dp16dp8dp8dp96dp6.5dp0dp16dp220150127150Navigate homeNavigate upMore optionsDoneSee allChoose an appOFFONAlt+Ctrl+deleteenterFunction+Meta+Shift+spaceSym+Menu+Search…Clear querySearch querySearchSubmit queryVoice searchShare withShare with %sCollapseSearch @@ -9702,9 +9741,12 @@ #000000#FFFFFFFF#4169E1KAlertDialogShow Material ProgressA Basic MessageA title with a text undershow error messageA success messageA warning message, with a listener bind to the Confirm-button…A warning message, with listeners bind to Cancel and Confirm button…A message with a custom iconA message with a custom imageA message with a custom image bigA title with gravity changedEdit text dialog