From 244733c986ede8ef80c59d936b0bcd80153dbbd4 Mon Sep 17 00:00:00 2001 From: AliJalil93 Date: Tue, 11 May 2021 18:32:13 +0300 Subject: [PATCH 1/4] Ali Work --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 2 +- ...__androidx_activity_activity_1_0_0_aar.xml | 5 +- ...tion_annotation_experimental_1_0_0_aar.xml | 5 +- ...androidx_appcompat_appcompat_1_2_0_aar.xml | 8 +-- ...ppcompat_appcompat_resources_1_2_0_aar.xml | 6 +- ...roidx_arch_core_core_runtime_2_0_0_aar.xml | 5 +- ...__androidx_cardview_cardview_1_0_0_aar.xml | 6 +- ...raintlayout_constraintlayout_2_0_4_aar.xml | 6 +- ...atorlayout_coordinatorlayout_1_1_0_aar.xml | 8 +-- ...dle__androidx_core_core_1_5_0_rc01_aar.xml | 8 +-- ...adle__androidx_core_core_ktx_1_3_2_aar.xml | 5 +- ..._cursoradapter_cursoradapter_1_0_0_aar.xml | 5 +- ...droidx_customview_customview_1_0_0_aar.xml | 5 +- ...dx_documentfile_documentfile_1_0_0_aar.xml | 5 +- ...dx_drawerlayout_drawerlayout_1_0_0_aar.xml | 7 +- ...icanimation_dynamicanimation_1_0_0_aar.xml | 5 +- ...__androidx_fragment_fragment_1_1_0_aar.xml | 7 +- ...dx_interpolator_interpolator_1_0_0_aar.xml | 5 +- ...cy_legacy_support_core_utils_1_0_0_aar.xml | 5 +- ...lifecycle_lifecycle_livedata_2_0_0_aar.xml | 5 +- ...ycle_lifecycle_livedata_core_2_0_0_aar.xml | 5 +- ..._lifecycle_lifecycle_runtime_2_1_0_aar.xml | 5 +- ...ifecycle_lifecycle_viewmodel_2_1_0_aar.xml | 5 +- ...adle__androidx_loader_loader_1_0_0_aar.xml | 5 +- ...anager_localbroadcastmanager_1_0_0_aar.xml | 5 +- ...Gradle__androidx_print_print_1_0_0_aar.xml | 7 +- ...dx_recyclerview_recyclerview_1_1_0_aar.xml | 8 +-- ...droidx_savedstate_savedstate_1_0_0_aar.xml | 5 +- .../Gradle__androidx_test_core_1_3_0_aar.xml | 5 +- ..._test_espresso_espresso_core_3_3_0_aar.xml | 5 +- ...sso_espresso_idling_resource_3_3_0_aar.xml | 5 +- ...dle__androidx_test_ext_junit_1_1_2_aar.xml | 5 +- ...radle__androidx_test_monitor_1_3_0_aar.xml | 5 +- ...Gradle__androidx_test_runner_1_3_0_aar.xml | 5 +- ...droidx_transition_transition_1_2_0_aar.xml | 8 +-- ...ectordrawable_vectordrawable_1_1_0_aar.xml | 5 +- ...able_vectordrawable_animated_1_1_0_aar.xml | 5 +- ...rcelable_versionedparcelable_1_1_1_aar.xml | 5 +- ...droidx_viewpager2_viewpager2_1_0_0_aar.xml | 8 +-- ...androidx_viewpager_viewpager_1_0_0_aar.xml | 5 +- ...oid_material_material_1_4_0_beta01_aar.xml | 8 +-- .idea/misc.xml | 2 +- .idea/modules/app/Game.app.iml | 13 ++-- .idea/runConfigurations.xml | 10 +++ .idea/vcs.xml | 6 ++ .../java/com/example/game/MainActivity.kt | 67 +++++++++++++++++-- app/src/main/res/layout/activity_main.xml | 16 ++--- app/src/main/res/values/strings.xml | 4 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- local.properties | 4 +- 52 files changed, 232 insertions(+), 128 deletions(-) create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 18de3ac..ac6b0ae 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ + diff --git a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml index 051fa41..7a86640 100644 --- a/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml index 4f514ff..ca1a988 100644 --- a/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml @@ -4,8 +4,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml index 5ff0573..b417336 100644 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_2_0_aar.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml index 0b489b9..4e714a7 100644 --- a/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_2_0_aar.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml index 02b4f54..f812a60 100644 --- a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml @@ -5,8 +5,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml index e085dc7..1c97d6e 100644 --- a/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml index 2fa6cb9..35dc79d 100644 --- a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml +++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml @@ -1,9 +1,9 @@ - - - + + + diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml index 74dea5a..4be6c02 100644 --- a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/.idea/libraries/Gradle__androidx_core_core_1_5_0_rc01_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_5_0_rc01_aar.xml index 310b12d..f319f92 100644 --- a/.idea/libraries/Gradle__androidx_core_core_1_5_0_rc01_aar.xml +++ b/.idea/libraries/Gradle__androidx_core_core_1_5_0_rc01_aar.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_2_aar.xml b/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_2_aar.xml index cfef2d5..4635e3b 100644 --- a/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_2_aar.xml +++ b/.idea/libraries/Gradle__androidx_core_core_ktx_1_3_2_aar.xml @@ -5,8 +5,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml index d600f51..70561be 100644 --- a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml index 78d9a86..a13c481 100644 --- a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml index 1cf12ec..398df9b 100644 --- a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml index 7467fb0..eaeb621 100644 --- a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml @@ -1,15 +1,16 @@ - + - - + + + diff --git a/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml index 384c61b..44469f3 100644 --- a/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml index e1a3b22..8df5e12 100644 --- a/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_1_0_aar.xml @@ -1,15 +1,16 @@ - + - - + + + diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml index 56dd2a1..e36082b 100644 --- a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml @@ -5,8 +5,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml index 5d17ade..6e539f6 100644 --- a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml index 5daa541..0d8f8a4 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml index 105d815..c7e2bff 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml index 4aa7a0e..e357bc8 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_1_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml index 21b15e9..2e97365 100644 --- a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_1_0_aar.xml @@ -5,8 +5,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml index 4fc6026..19ad008 100644 --- a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml @@ -5,8 +5,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml index 4553f66..172b12d 100644 --- a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml index f602eea..8956c71 100644 --- a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml @@ -1,14 +1,15 @@ - + - - + + + diff --git a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml index 1237787..b39ce9d 100644 --- a/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml index f701948..05a38f3 100644 --- a/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_0_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml index fe65186..299924f 100644 --- a/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_core_1_3_0_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml index 88886bd..8a8a129 100644 --- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_3_0_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml index 7fe3557..b3bc13a 100644 --- a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_3_0_aar.xml @@ -4,8 +4,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml index 70082bb..0a8a860 100644 --- a/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_2_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml index bf25b10..da0f4f5 100644 --- a/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_monitor_1_3_0_aar.xml @@ -4,8 +4,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml index fc601c2..8cf5268 100644 --- a/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_test_runner_1_3_0_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml b/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml index fde22b7..7533ea9 100644 --- a/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml index efeff07..59ae731 100644 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml index 8e97b50..80a97aa 100644 --- a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml @@ -5,8 +5,9 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml index fd65e99..b10e824 100644 --- a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml +++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml @@ -3,9 +3,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml index 83e616d..2be0dad 100644 --- a/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml index b34010a..389e6b0 100644 --- a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml +++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml @@ -4,9 +4,10 @@ - - + + + diff --git a/.idea/libraries/Gradle__com_google_android_material_material_1_4_0_beta01_aar.xml b/.idea/libraries/Gradle__com_google_android_material_material_1_4_0_beta01_aar.xml index c7f221c..1da7216 100644 --- a/.idea/libraries/Gradle__com_google_android_material_material_1_4_0_beta01_aar.xml +++ b/.idea/libraries/Gradle__com_google_android_material_material_1_4_0_beta01_aar.xml @@ -1,12 +1,12 @@ - + - - - + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..860da66 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/modules/app/Game.app.iml b/.idea/modules/app/Game.app.iml index 63aeb27..80e31d7 100644 --- a/.idea/modules/app/Game.app.iml +++ b/.idea/modules/app/Game.app.iml @@ -4,8 +4,8 @@ @@ -31,10 +31,11 @@ - + @@ -81,10 +82,11 @@ + + - @@ -94,7 +96,6 @@ - diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/game/MainActivity.kt b/app/src/main/java/com/example/game/MainActivity.kt index 27c7189..e9c5e83 100644 --- a/app/src/main/java/com/example/game/MainActivity.kt +++ b/app/src/main/java/com/example/game/MainActivity.kt @@ -1,25 +1,78 @@ package com.example.game -import androidx.appcompat.app.AppCompatActivity +import android.app.Activity +import android.app.AlertDialog +import android.content.DialogInterface +import android.content.Intent import android.os.Bundle import android.view.View - +import android.view.inputmethod.InputMethodManager +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import kotlinx.android.synthetic.main.activity_main.* + class MainActivity : AppCompatActivity() { + var rand : Int = 0 + var tryCount = 3 override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - - playagainbttn.visibility = - View.INVISIBLE //start code with invisible play again button (watch video carefully to understand why) - + playagainbttn.visibility = View.INVISIBLE //start code with invisible play again button (watch video carefully to understand why) + rand = (1..10).random() enterbttn.setOnClickListener { - //TODO + val x = number.text.toString().toIntOrNull() ?: 0 + if (x !in 1..10) showAlert("Number must be 1 and 10") + if (tryCount > 1) + { + tryCount -= 1 + if (x == rand) + { + val intent = Intent(this, Main2Activity::class.java) + startActivity(intent) + } + else + { + showAlert("try Again You have ${tryCount - 1} more chance") + } + } + else + { + val view: View = currentFocus ?: View(this) + (getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager).apply { + hideSoftInputFromWindow(view.windowToken, 0) + } + playagainbttn.visibility = View.VISIBLE + textView.visibility = View.INVISIBLE + number.visibility = View.INVISIBLE + enterbttn.visibility = View.INVISIBLE + textView2.visibility = View.INVISIBLE + Toast.makeText(this,"No more attempts",Toast.LENGTH_SHORT).show() + } + } + + playagainbttn.setOnClickListener { + playagainbttn.visibility = View.INVISIBLE + textView.visibility = View.VISIBLE + number.visibility = View.VISIBLE + enterbttn.visibility = View.VISIBLE + textView2.visibility = View.VISIBLE + number.setText("") + tryCount = 3 + rand = (1..10).random() } } + + fun showAlert(msg: String) { + val alertDialog: AlertDialog = AlertDialog.Builder(this@MainActivity).create() + alertDialog.setTitle("Try Again") + alertDialog.setMessage(msg) + alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, "Continue") + { dialog, _ -> dialog.dismiss() } + alertDialog.show() + } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2d6b47a..3c7cc9a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,10 +12,10 @@ android:layout_width="354dp" android:layout_height="78dp" android:layout_marginTop="50dp" - android:text="Here..!! \nFind the secret number.." + android:text="@string/here_nfind_the_secret_number" android:textAlignment="center" android:textColor="@color/darkyellow" - android:textSize="26dp" + android:textSize="26sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -36,8 +36,8 @@ android:layout_width="112dp" android:layout_height="53dp" android:layout_marginTop="50dp" - android:text="Enter" - android:textSize="20dp" + android:text="@string/enter" + android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/number" /> @@ -48,10 +48,10 @@ android:layout_height="71dp" android:layout_marginStart="5dp" android:layout_marginBottom="10dp" - android:text="💡HINT:\t Secret number is in between 1 and 10" + android:text="@string/hint_t_secret_number_is_in_between_1_and_10" android:textAlignment="center" android:textColor="@color/black" - android:textSize="23dp" + android:textSize="23sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.304" @@ -63,8 +63,8 @@ android:layout_height="77dp" android:layout_marginTop="30dp" android:background="@drawable/round_bttn" - android:text="Play Again" - android:textSize="30dp" + android:text="@string/play_again" + android:textSize="30sp" app:layout_constraintEnd_toEndOf="@+id/enterbttn" app:layout_constraintStart_toStartOf="@+id/enterbttn" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab79533..63e06e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,7 @@ Game + Enter + 💡HINT:\t Secret number is in between 1 and 10 + Here..!! \nFind the secret number.. + Play Again diff --git a/build.gradle b/build.gradle index 1275ae1..7b6f352 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3a5c05b..33accf4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip diff --git a/local.properties b/local.properties index 8908504..7cfa3c3 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon May 10 07:35:28 AST 2021 -sdk.dir=C\:\\Users\\AyaPedia.com\\AppData\\Local\\Android\\Sdk +#Mon May 10 20:40:10 AST 2021 +sdk.dir=/Users/apple/Library/Android/sdk From cef3bd33da9907dc68e9ba5392ceecf76dc54eaa Mon Sep 17 00:00:00 2001 From: AliJalil93 Date: Tue, 11 May 2021 18:39:53 +0300 Subject: [PATCH 2/4] Ali Work1 --- app/src/main/java/com/example/game/MainActivity.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/game/MainActivity.kt b/app/src/main/java/com/example/game/MainActivity.kt index e9c5e83..b216fde 100644 --- a/app/src/main/java/com/example/game/MainActivity.kt +++ b/app/src/main/java/com/example/game/MainActivity.kt @@ -24,7 +24,10 @@ class MainActivity : AppCompatActivity() { rand = (1..10).random() enterbttn.setOnClickListener { val x = number.text.toString().toIntOrNull() ?: 0 - if (x !in 1..10) showAlert("Number must be 1 and 10") + if (x !in 1..10) { + showAlert("Number must be 1 and 10") + return@setOnClickListener + } if (tryCount > 1) { tryCount -= 1 @@ -35,7 +38,7 @@ class MainActivity : AppCompatActivity() { } else { - showAlert("try Again You have ${tryCount - 1} more chance") + showAlert("try Again You have $tryCount more chance") } } else From 88d74dae15293a587292fe073104d09afc4b5de3 Mon Sep 17 00:00:00 2001 From: AliJalil93 Date: Wed, 12 May 2021 04:47:53 +0300 Subject: [PATCH 3/4] Add required code, generate random no and compare user input to it. --- app/src/main/java/com/example/.DS_Store | Bin 0 -> 6148 bytes .../main/java/com/example/game/MainActivity.kt | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 app/src/main/java/com/example/.DS_Store diff --git a/app/src/main/java/com/example/.DS_Store b/app/src/main/java/com/example/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7f109e817c8ae4ba224d500bec7a81e3d2e3a55e GIT binary patch literal 6148 zcmeH~K?=e^3`G;|LU7Zi%h`AUZ!n0Spchb3y3q=PuIK3fWP)IIEh0aV{7Gg)>05Lf z5z+PSuo7uSWCk~trG=3x@1?mC<xC+1b{XuyJ79K1T}(S!u1*@b}wNMJ-@TJzTK|1JE}{6A`8N&+PC zX9Tp_belC^D(=>|*R%RAs Date: Wed, 12 May 2021 05:34:00 +0300 Subject: [PATCH 4/4] Add comments to illustrate each line of code --- .../java/com/example/game/MainActivity.kt | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/example/game/MainActivity.kt b/app/src/main/java/com/example/game/MainActivity.kt index bc3dc12..4ff6e06 100644 --- a/app/src/main/java/com/example/game/MainActivity.kt +++ b/app/src/main/java/com/example/game/MainActivity.kt @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { - + var rand : Int = 0 var tryCount = 3 override fun onCreate(savedInstanceState: Bundle?) { @@ -23,54 +23,70 @@ class MainActivity : AppCompatActivity() { setContentView(R.layout.activity_main) playagainbttn.visibility = View.INVISIBLE //start code with invisible play again button (watch video carefully to understand why) - rand = (1..10).random() + rand = (1..10).random() //Generate Random number between 1 and 10 enterbttn.setOnClickListener { - val x = number.text.toString().toIntOrNull() ?: 0 + val x = number.text.toString().toIntOrNull() ?: 0 // Convert user input to double if (x !in 1..10) { showAlert("Number must be 1 and 10") - return@setOnClickListener + return@setOnClickListener // If number not in required range, ask user to input new number in it. } - if (tryCount > 1) + + if (tryCount > 1) //If user have attempts { - tryCount -= 1 - if (x == rand) + tryCount -= 1 //Decrease user attempts by one + if (x == rand) //If user input equal to random number { val intent = Intent(this, Main2Activity::class.java) - startActivity(intent) + startActivity(intent)// Show congratulation activity } else { - showAlert("try Again You have $tryCount more chance") + showAlert("try Again You have $tryCount more chance") //Tell user his left attempts' count } } - else + else // when user fail to guess number { + //Hide Keyboard val view: View = currentFocus ?: View(this) (getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager).apply { hideSoftInputFromWindow(view.windowToken, 0) } - playagainbttn.visibility = View.VISIBLE + + playagainbttn.visibility = View.VISIBLE //Show play again button + + + //Hide other views textView.visibility = View.INVISIBLE number.visibility = View.INVISIBLE enterbttn.visibility = View.INVISIBLE textView2.visibility = View.INVISIBLE - Toast.makeText(this,"No more attempts",Toast.LENGTH_SHORT).show() + + + Toast.makeText(this,"No more attempts",Toast.LENGTH_SHORT).show() //Tell user he consume all his attempts + + } } playagainbttn.setOnClickListener { + //Hide play again button playagainbttn.visibility = View.INVISIBLE + + //Show other views textView.visibility = View.VISIBLE number.visibility = View.VISIBLE enterbttn.visibility = View.VISIBLE textView2.visibility = View.VISIBLE + + //Reinitialize number.setText("") tryCount = 3 rand = (1..10).random() } } - fun showAlert(msg: String) { + //Function to create alert by AlertDialog with arbitrary message + private fun showAlert(msg: String) { val alertDialog: AlertDialog = AlertDialog.Builder(this@MainActivity).create() alertDialog.setTitle("Try Again") alertDialog.setMessage(msg)