diff --git a/.gitignore b/.gitignore index c68c11a7..f5c27adf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ -bin -gen -Release -proguard +*.iml +.gradle +/local.properties +.idea .DS_Store -*.class +/build +/captures +Release \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..e06d2081 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/Memory Game/.classpath b/Memory Game/.classpath deleted file mode 100644 index 51769745..00000000 --- a/Memory Game/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Memory Game/.project b/Memory Game/.project deleted file mode 100644 index b258b287..00000000 --- a/Memory Game/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Memory Game - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/Memory Game/build.xml b/Memory Game/build.xml deleted file mode 100644 index 3f57646d..00000000 --- a/Memory Game/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Memory Game/custom_rules.xml b/Memory Game/custom_rules.xml deleted file mode 100644 index 970bfbd6..00000000 --- a/Memory Game/custom_rules.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Memory Game/libs/mint-4.0.5.jar b/Memory Game/libs/mint-4.0.5.jar deleted file mode 100644 index 58985c1d..00000000 Binary files a/Memory Game/libs/mint-4.0.5.jar and /dev/null differ diff --git a/Memory Game/local.properties b/Memory Game/local.properties deleted file mode 100644 index 4962fa3b..00000000 --- a/Memory Game/local.properties +++ /dev/null @@ -1,10 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -# location of the SDK. This is only used by Ant -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=/Users/sromku/android/adt/sdk diff --git a/Memory Game/proguard-project.txt b/Memory Game/proguard-project.txt deleted file mode 100644 index 0095cb30..00000000 --- a/Memory Game/proguard-project.txt +++ /dev/null @@ -1,76 +0,0 @@ --optimizationpasses 25 --dontskipnonpubliclibraryclassmembers --allowaccessmodification --renamesourcefileattribute SourceFile --keepattributes SourceFile,LineNumberTable - --libraryjars /Users/sromku/android/adt/sdk/platforms/android-19/android.jar --libraryjars libs/mint-4.0.5.jar - -# Bugsense --keep class com.splunk.** { *; } --dontwarn com.splunk.** - -# ----------- GENERAL ---------- --keepattributes *Annotation* --keepattributes InnerClasses --keepattributes Signature --keepattributes SourceFile - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.content.SherlockActivity --keep public class * extends android.content.SherlockFragmentActivity - -# Explicitly preserve all serialization members. The Serializable interface --keepnames class * implements java.io.Serializable --keepclassmembers class * implements java.io.Serializable { - static final long serialVersionUID; - private static final java.io.ObjectStreamField[] serialPersistentFields; - !static !transient ; - private void writeObject(java.io.ObjectOutputStream); - private void readObject(java.io.ObjectInputStream); - java.lang.Object writeReplace(); - java.lang.Object readResolve(); -} - -# Preserve the special static methods that are required in all enumeration classes. --keepclassmembers enum * { - **[] $VALUES; - public *; -} - -# Gson specific classes --keep class sun.misc.Unsafe { *; } - --keep public class * extends android.view.View { - public (android.content.Context); - public (android.content.Context, android.util.AttributeSet); - public (android.content.Context, android.util.AttributeSet, int); - public void set*(...); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class * extends android.content.Context { - public void *(android.view.View); - public void *(android.view.MenuItem); -} - --keepclassmembers class * implements android.os.Parcelable { - static ** CREATOR; -} - --keepclassmembers class **.R$* { - public static ; -} - diff --git a/Memory Game/project.properties b/Memory Game/project.properties deleted file mode 100644 index 3f98ec4b..00000000 --- a/Memory Game/project.properties +++ /dev/null @@ -1,16 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-19 -android.library.reference.1=../../android/sromku/appcompat_v7 -android.library.reference.2=../../android/adt/sdk/extras/google/google_play_services/libproject/google-play-services_lib diff --git a/Memory Game/res/drawable-hdpi/animals_theme_star_0.png b/Memory Game/res/drawable-hdpi/animals_theme_star_0.png deleted file mode 100644 index ecebcb5e..00000000 Binary files a/Memory Game/res/drawable-hdpi/animals_theme_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/animals_theme_star_1.png b/Memory Game/res/drawable-hdpi/animals_theme_star_1.png deleted file mode 100644 index e10c1269..00000000 Binary files a/Memory Game/res/drawable-hdpi/animals_theme_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/animals_theme_star_2.png b/Memory Game/res/drawable-hdpi/animals_theme_star_2.png deleted file mode 100644 index 4517b303..00000000 Binary files a/Memory Game/res/drawable-hdpi/animals_theme_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/animals_theme_star_3.png b/Memory Game/res/drawable-hdpi/animals_theme_star_3.png deleted file mode 100644 index f4b471d8..00000000 Binary files a/Memory Game/res/drawable-hdpi/animals_theme_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_0.png b/Memory Game/res/drawable-hdpi/button_difficulty_1_star_0.png deleted file mode 100644 index 383ef021..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_1.png b/Memory Game/res/drawable-hdpi/button_difficulty_1_star_1.png deleted file mode 100644 index 11900060..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_2.png b/Memory Game/res/drawable-hdpi/button_difficulty_1_star_2.png deleted file mode 100644 index 683ffe7c..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_3.png b/Memory Game/res/drawable-hdpi/button_difficulty_1_star_3.png deleted file mode 100644 index 01bf8e13..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_1_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_0.png b/Memory Game/res/drawable-hdpi/button_difficulty_2_star_0.png deleted file mode 100644 index e15081c6..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_1.png b/Memory Game/res/drawable-hdpi/button_difficulty_2_star_1.png deleted file mode 100644 index 9db4878a..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_2.png b/Memory Game/res/drawable-hdpi/button_difficulty_2_star_2.png deleted file mode 100644 index 2cb19fd3..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_3.png b/Memory Game/res/drawable-hdpi/button_difficulty_2_star_3.png deleted file mode 100644 index 50f675af..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_2_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_0.png b/Memory Game/res/drawable-hdpi/button_difficulty_3_star_0.png deleted file mode 100644 index 505b7f8e..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_1.png b/Memory Game/res/drawable-hdpi/button_difficulty_3_star_1.png deleted file mode 100644 index 5b2949c4..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_2.png b/Memory Game/res/drawable-hdpi/button_difficulty_3_star_2.png deleted file mode 100644 index dde6582c..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_3.png b/Memory Game/res/drawable-hdpi/button_difficulty_3_star_3.png deleted file mode 100644 index 656b81b8..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_3_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_0.png b/Memory Game/res/drawable-hdpi/button_difficulty_4_star_0.png deleted file mode 100644 index b6289d6f..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_1.png b/Memory Game/res/drawable-hdpi/button_difficulty_4_star_1.png deleted file mode 100644 index 9583aa65..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_2.png b/Memory Game/res/drawable-hdpi/button_difficulty_4_star_2.png deleted file mode 100644 index df271ba2..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_3.png b/Memory Game/res/drawable-hdpi/button_difficulty_4_star_3.png deleted file mode 100644 index 998a8f2c..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_4_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_0.png b/Memory Game/res/drawable-hdpi/button_difficulty_5_star_0.png deleted file mode 100644 index 48e16447..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_1.png b/Memory Game/res/drawable-hdpi/button_difficulty_5_star_1.png deleted file mode 100644 index 745e6607..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_2.png b/Memory Game/res/drawable-hdpi/button_difficulty_5_star_2.png deleted file mode 100644 index aa568002..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_3.png b/Memory Game/res/drawable-hdpi/button_difficulty_5_star_3.png deleted file mode 100644 index a973bb6f..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_5_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_0.png b/Memory Game/res/drawable-hdpi/button_difficulty_6_star_0.png deleted file mode 100644 index caa1cad1..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_1.png b/Memory Game/res/drawable-hdpi/button_difficulty_6_star_1.png deleted file mode 100644 index 29103dbf..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_2.png b/Memory Game/res/drawable-hdpi/button_difficulty_6_star_2.png deleted file mode 100644 index 0cefa61e..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_3.png b/Memory Game/res/drawable-hdpi/button_difficulty_6_star_3.png deleted file mode 100644 index 6ec9d0cb..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_difficulty_6_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_google_play.png b/Memory Game/res/drawable-hdpi/button_google_play.png deleted file mode 100644 index 4582cbec..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_google_play.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_music_off.png b/Memory Game/res/drawable-hdpi/button_music_off.png deleted file mode 100644 index e1bbc708..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_music_off.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_music_on.png b/Memory Game/res/drawable-hdpi/button_music_on.png deleted file mode 100644 index ede9cdd8..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_music_on.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_rate.png b/Memory Game/res/drawable-hdpi/button_rate.png deleted file mode 100644 index fc100f1b..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_rate.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_settings.png b/Memory Game/res/drawable-hdpi/button_settings.png deleted file mode 100644 index a1d35dee..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_settings.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_start.png b/Memory Game/res/drawable-hdpi/button_start.png deleted file mode 100644 index cf18fe01..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_start.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/button_start_lights.png b/Memory Game/res/drawable-hdpi/button_start_lights.png deleted file mode 100644 index c2158dfa..00000000 Binary files a/Memory Game/res/drawable-hdpi/button_start_lights.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/monsters_theme_star_0.png b/Memory Game/res/drawable-hdpi/monsters_theme_star_0.png deleted file mode 100644 index f19fcf86..00000000 Binary files a/Memory Game/res/drawable-hdpi/monsters_theme_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/monsters_theme_star_1.png b/Memory Game/res/drawable-hdpi/monsters_theme_star_1.png deleted file mode 100644 index af701914..00000000 Binary files a/Memory Game/res/drawable-hdpi/monsters_theme_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/monsters_theme_star_2.png b/Memory Game/res/drawable-hdpi/monsters_theme_star_2.png deleted file mode 100644 index 303c2a9b..00000000 Binary files a/Memory Game/res/drawable-hdpi/monsters_theme_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/monsters_theme_star_3.png b/Memory Game/res/drawable-hdpi/monsters_theme_star_3.png deleted file mode 100644 index c5f7013c..00000000 Binary files a/Memory Game/res/drawable-hdpi/monsters_theme_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-hdpi/tooltip_play.png b/Memory Game/res/drawable-hdpi/tooltip_play.png deleted file mode 100644 index 6fc57748..00000000 Binary files a/Memory Game/res/drawable-hdpi/tooltip_play.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_1.png b/Memory Game/res/drawable-nodpi/animals_1.png deleted file mode 100644 index 40b5bf76..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_10.png b/Memory Game/res/drawable-nodpi/animals_10.png deleted file mode 100644 index 0fb3aa34..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_10.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_11.png b/Memory Game/res/drawable-nodpi/animals_11.png deleted file mode 100644 index a99f585f..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_11.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_12.png b/Memory Game/res/drawable-nodpi/animals_12.png deleted file mode 100644 index 48f4be20..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_12.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_13.png b/Memory Game/res/drawable-nodpi/animals_13.png deleted file mode 100644 index ebe031c5..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_13.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_14.png b/Memory Game/res/drawable-nodpi/animals_14.png deleted file mode 100644 index 95496637..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_14.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_15.png b/Memory Game/res/drawable-nodpi/animals_15.png deleted file mode 100644 index 329f0220..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_15.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_16.png b/Memory Game/res/drawable-nodpi/animals_16.png deleted file mode 100644 index 5dac5f03..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_16.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_17.png b/Memory Game/res/drawable-nodpi/animals_17.png deleted file mode 100644 index cda813f7..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_17.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_18.png b/Memory Game/res/drawable-nodpi/animals_18.png deleted file mode 100644 index 7425dd60..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_18.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_19.png b/Memory Game/res/drawable-nodpi/animals_19.png deleted file mode 100644 index 28859850..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_19.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_2.png b/Memory Game/res/drawable-nodpi/animals_2.png deleted file mode 100644 index e8aeb62c..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_20.png b/Memory Game/res/drawable-nodpi/animals_20.png deleted file mode 100644 index de293b90..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_20.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_21.png b/Memory Game/res/drawable-nodpi/animals_21.png deleted file mode 100644 index 1b61c317..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_21.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_22.png b/Memory Game/res/drawable-nodpi/animals_22.png deleted file mode 100644 index 783ace01..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_22.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_23.png b/Memory Game/res/drawable-nodpi/animals_23.png deleted file mode 100644 index 4360efb6..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_23.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_24.png b/Memory Game/res/drawable-nodpi/animals_24.png deleted file mode 100644 index b3c376ad..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_24.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_25.png b/Memory Game/res/drawable-nodpi/animals_25.png deleted file mode 100644 index 3ceaef6b..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_25.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_26.png b/Memory Game/res/drawable-nodpi/animals_26.png deleted file mode 100644 index dbaef0b0..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_26.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_27.png b/Memory Game/res/drawable-nodpi/animals_27.png deleted file mode 100644 index 2dd3e7ae..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_27.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_28.png b/Memory Game/res/drawable-nodpi/animals_28.png deleted file mode 100644 index fc3d8d2c..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_28.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_3.png b/Memory Game/res/drawable-nodpi/animals_3.png deleted file mode 100644 index 5176996c..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_4.png b/Memory Game/res/drawable-nodpi/animals_4.png deleted file mode 100644 index 1095e981..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_4.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_5.png b/Memory Game/res/drawable-nodpi/animals_5.png deleted file mode 100644 index ad320e31..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_5.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_6.png b/Memory Game/res/drawable-nodpi/animals_6.png deleted file mode 100644 index 58f36bf3..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_6.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_7.png b/Memory Game/res/drawable-nodpi/animals_7.png deleted file mode 100644 index 2a9b6321..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_7.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_8.png b/Memory Game/res/drawable-nodpi/animals_8.png deleted file mode 100644 index bc8f3130..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_8.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/animals_9.png b/Memory Game/res/drawable-nodpi/animals_9.png deleted file mode 100644 index 6bc0e6bb..00000000 Binary files a/Memory Game/res/drawable-nodpi/animals_9.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/back_animals.png b/Memory Game/res/drawable-nodpi/back_animals.png deleted file mode 100755 index 6b1b5e34..00000000 Binary files a/Memory Game/res/drawable-nodpi/back_animals.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/back_horror.png b/Memory Game/res/drawable-nodpi/back_horror.png deleted file mode 100644 index a21d0665..00000000 Binary files a/Memory Game/res/drawable-nodpi/back_horror.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/background.png b/Memory Game/res/drawable-nodpi/background.png deleted file mode 100644 index 08fe0ef9..00000000 Binary files a/Memory Game/res/drawable-nodpi/background.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_1.png b/Memory Game/res/drawable-nodpi/mosters_1.png deleted file mode 100644 index 79716e02..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_10.png b/Memory Game/res/drawable-nodpi/mosters_10.png deleted file mode 100644 index bf20fd72..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_10.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_11.png b/Memory Game/res/drawable-nodpi/mosters_11.png deleted file mode 100644 index 903ff2c4..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_11.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_12.png b/Memory Game/res/drawable-nodpi/mosters_12.png deleted file mode 100644 index 5f0f9c60..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_12.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_13.png b/Memory Game/res/drawable-nodpi/mosters_13.png deleted file mode 100644 index 262892ff..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_13.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_14.png b/Memory Game/res/drawable-nodpi/mosters_14.png deleted file mode 100644 index f3949b73..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_14.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_15.png b/Memory Game/res/drawable-nodpi/mosters_15.png deleted file mode 100644 index cc1bbb5b..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_15.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_16.png b/Memory Game/res/drawable-nodpi/mosters_16.png deleted file mode 100644 index 6914c423..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_16.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_17.png b/Memory Game/res/drawable-nodpi/mosters_17.png deleted file mode 100644 index 2de40367..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_17.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_18.png b/Memory Game/res/drawable-nodpi/mosters_18.png deleted file mode 100644 index 8f94bfa9..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_18.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_19.png b/Memory Game/res/drawable-nodpi/mosters_19.png deleted file mode 100644 index 75cb2b4f..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_19.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_2.png b/Memory Game/res/drawable-nodpi/mosters_2.png deleted file mode 100644 index 3c335015..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_20.png b/Memory Game/res/drawable-nodpi/mosters_20.png deleted file mode 100644 index 4fc647d0..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_20.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_21.png b/Memory Game/res/drawable-nodpi/mosters_21.png deleted file mode 100644 index b6c048da..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_21.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_22.png b/Memory Game/res/drawable-nodpi/mosters_22.png deleted file mode 100644 index 5fcfc164..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_22.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_23.png b/Memory Game/res/drawable-nodpi/mosters_23.png deleted file mode 100644 index 071818f4..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_23.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_24.png b/Memory Game/res/drawable-nodpi/mosters_24.png deleted file mode 100644 index aaa9b9e1..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_24.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_25.png b/Memory Game/res/drawable-nodpi/mosters_25.png deleted file mode 100644 index d3791ecc..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_25.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_26.png b/Memory Game/res/drawable-nodpi/mosters_26.png deleted file mode 100644 index c36b5bdd..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_26.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_27.png b/Memory Game/res/drawable-nodpi/mosters_27.png deleted file mode 100644 index 2df95c27..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_27.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_28.png b/Memory Game/res/drawable-nodpi/mosters_28.png deleted file mode 100644 index b81ea026..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_28.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_29.png b/Memory Game/res/drawable-nodpi/mosters_29.png deleted file mode 100644 index ac9a2711..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_29.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_3.png b/Memory Game/res/drawable-nodpi/mosters_3.png deleted file mode 100644 index e6f799bd..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_30.png b/Memory Game/res/drawable-nodpi/mosters_30.png deleted file mode 100644 index 1316bb78..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_30.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_31.png b/Memory Game/res/drawable-nodpi/mosters_31.png deleted file mode 100644 index d378e436..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_31.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_32.png b/Memory Game/res/drawable-nodpi/mosters_32.png deleted file mode 100644 index 3f1c3f74..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_32.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_33.png b/Memory Game/res/drawable-nodpi/mosters_33.png deleted file mode 100644 index 95831d75..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_33.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_34.png b/Memory Game/res/drawable-nodpi/mosters_34.png deleted file mode 100644 index 281e47e7..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_34.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_35.png b/Memory Game/res/drawable-nodpi/mosters_35.png deleted file mode 100644 index a488cb4b..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_35.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_36.png b/Memory Game/res/drawable-nodpi/mosters_36.png deleted file mode 100644 index 6ebc2f85..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_36.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_37.png b/Memory Game/res/drawable-nodpi/mosters_37.png deleted file mode 100644 index fd520190..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_37.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_38.png b/Memory Game/res/drawable-nodpi/mosters_38.png deleted file mode 100644 index 8114b6a3..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_38.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_39.png b/Memory Game/res/drawable-nodpi/mosters_39.png deleted file mode 100644 index 63af390a..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_39.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_4.png b/Memory Game/res/drawable-nodpi/mosters_4.png deleted file mode 100644 index 553c70c1..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_4.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_40.png b/Memory Game/res/drawable-nodpi/mosters_40.png deleted file mode 100644 index 54f9365f..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_40.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_5.png b/Memory Game/res/drawable-nodpi/mosters_5.png deleted file mode 100644 index 064d65b4..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_5.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_6.png b/Memory Game/res/drawable-nodpi/mosters_6.png deleted file mode 100644 index e5b90510..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_6.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_7.png b/Memory Game/res/drawable-nodpi/mosters_7.png deleted file mode 100644 index edd8509e..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_7.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_8.png b/Memory Game/res/drawable-nodpi/mosters_8.png deleted file mode 100644 index afccdd3a..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_8.png and /dev/null differ diff --git a/Memory Game/res/drawable-nodpi/mosters_9.png b/Memory Game/res/drawable-nodpi/mosters_9.png deleted file mode 100644 index fadc6821..00000000 Binary files a/Memory Game/res/drawable-nodpi/mosters_9.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_0.png deleted file mode 100644 index 13cf6101..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_1.png deleted file mode 100644 index bcfe8371..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_2.png deleted file mode 100644 index 44404e35..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_3.png deleted file mode 100644 index d056444f..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/animals_theme_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_0.png deleted file mode 100644 index fb368382..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_1.png deleted file mode 100644 index fa0ff6f6..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_2.png deleted file mode 100644 index e92028d1..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_3.png deleted file mode 100644 index 53800e9b..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_1_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_0.png deleted file mode 100644 index abb7e054..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_1.png deleted file mode 100644 index bb6ad976..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_2.png deleted file mode 100644 index a1c8e57b..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_3.png deleted file mode 100644 index d2d55156..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_2_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_0.png deleted file mode 100644 index d4ba718c..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_1.png deleted file mode 100644 index 6600ed4d..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_2.png deleted file mode 100644 index 507ad3cb..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_3.png deleted file mode 100644 index 5f4b774c..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_3_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_0.png deleted file mode 100644 index 3f7fe760..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_1.png deleted file mode 100644 index 981f566c..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_2.png deleted file mode 100644 index 9cf298ae..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_3.png deleted file mode 100644 index 1270de3f..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_4_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_0.png deleted file mode 100644 index 7ea385a3..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_1.png deleted file mode 100644 index 5fa28481..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_2.png deleted file mode 100644 index 81b75b11..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_3.png deleted file mode 100644 index c6e8f0e0..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_5_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_0.png deleted file mode 100644 index c3228148..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_1.png deleted file mode 100644 index eb917509..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_2.png deleted file mode 100644 index fae5b273..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_3.png deleted file mode 100644 index 5db3ff7b..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/button_difficulty_6_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_0.png b/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_0.png deleted file mode 100644 index e9afc477..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_1.png b/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_1.png deleted file mode 100644 index 1d81f228..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_2.png b/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_2.png deleted file mode 100644 index 7d89181b..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_3.png b/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_3.png deleted file mode 100644 index 6e9649a3..00000000 Binary files a/Memory Game/res/drawable-sw600dp-hdpi/monsters_theme_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/animals_theme_star_0.png b/Memory Game/res/drawable-xhdpi/animals_theme_star_0.png deleted file mode 100644 index fb5ac68d..00000000 Binary files a/Memory Game/res/drawable-xhdpi/animals_theme_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/animals_theme_star_1.png b/Memory Game/res/drawable-xhdpi/animals_theme_star_1.png deleted file mode 100644 index adc2f0d9..00000000 Binary files a/Memory Game/res/drawable-xhdpi/animals_theme_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/animals_theme_star_2.png b/Memory Game/res/drawable-xhdpi/animals_theme_star_2.png deleted file mode 100644 index d2d1f16c..00000000 Binary files a/Memory Game/res/drawable-xhdpi/animals_theme_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/animals_theme_star_3.png b/Memory Game/res/drawable-xhdpi/animals_theme_star_3.png deleted file mode 100644 index 346e9f76..00000000 Binary files a/Memory Game/res/drawable-xhdpi/animals_theme_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/button_google_play.png b/Memory Game/res/drawable-xhdpi/button_google_play.png deleted file mode 100644 index 6e767cda..00000000 Binary files a/Memory Game/res/drawable-xhdpi/button_google_play.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/button_music_off.png b/Memory Game/res/drawable-xhdpi/button_music_off.png deleted file mode 100644 index 7fdb46a5..00000000 Binary files a/Memory Game/res/drawable-xhdpi/button_music_off.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/button_music_on.png b/Memory Game/res/drawable-xhdpi/button_music_on.png deleted file mode 100644 index 134522db..00000000 Binary files a/Memory Game/res/drawable-xhdpi/button_music_on.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/button_rate.png b/Memory Game/res/drawable-xhdpi/button_rate.png deleted file mode 100644 index c90ffefa..00000000 Binary files a/Memory Game/res/drawable-xhdpi/button_rate.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/button_settings.png b/Memory Game/res/drawable-xhdpi/button_settings.png deleted file mode 100644 index 7f73fa6b..00000000 Binary files a/Memory Game/res/drawable-xhdpi/button_settings.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/button_start.png b/Memory Game/res/drawable-xhdpi/button_start.png deleted file mode 100644 index 8d1da487..00000000 Binary files a/Memory Game/res/drawable-xhdpi/button_start.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/button_start_lights.png b/Memory Game/res/drawable-xhdpi/button_start_lights.png deleted file mode 100644 index 9aac5e73..00000000 Binary files a/Memory Game/res/drawable-xhdpi/button_start_lights.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/monsters_theme_star_0.png b/Memory Game/res/drawable-xhdpi/monsters_theme_star_0.png deleted file mode 100644 index 0668d9c4..00000000 Binary files a/Memory Game/res/drawable-xhdpi/monsters_theme_star_0.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/monsters_theme_star_1.png b/Memory Game/res/drawable-xhdpi/monsters_theme_star_1.png deleted file mode 100644 index 535a4f83..00000000 Binary files a/Memory Game/res/drawable-xhdpi/monsters_theme_star_1.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/monsters_theme_star_2.png b/Memory Game/res/drawable-xhdpi/monsters_theme_star_2.png deleted file mode 100644 index 5c768fda..00000000 Binary files a/Memory Game/res/drawable-xhdpi/monsters_theme_star_2.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/monsters_theme_star_3.png b/Memory Game/res/drawable-xhdpi/monsters_theme_star_3.png deleted file mode 100644 index 981f40ac..00000000 Binary files a/Memory Game/res/drawable-xhdpi/monsters_theme_star_3.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/title.png b/Memory Game/res/drawable-xhdpi/title.png deleted file mode 100644 index d534ff17..00000000 Binary files a/Memory Game/res/drawable-xhdpi/title.png and /dev/null differ diff --git a/Memory Game/res/drawable-xhdpi/tooltip_play.png b/Memory Game/res/drawable-xhdpi/tooltip_play.png deleted file mode 100644 index d6e386f2..00000000 Binary files a/Memory Game/res/drawable-xhdpi/tooltip_play.png and /dev/null differ diff --git a/Memory Game/res/drawable-xxhdpi/button_google_play.png b/Memory Game/res/drawable-xxhdpi/button_google_play.png deleted file mode 100644 index f07a34c5..00000000 Binary files a/Memory Game/res/drawable-xxhdpi/button_google_play.png and /dev/null differ diff --git a/Memory Game/res/drawable-xxhdpi/button_settings.png b/Memory Game/res/drawable-xxhdpi/button_settings.png deleted file mode 100644 index a96b7f22..00000000 Binary files a/Memory Game/res/drawable-xxhdpi/button_settings.png and /dev/null differ diff --git a/Memory Game/res/drawable-xxhdpi/button_start.png b/Memory Game/res/drawable-xxhdpi/button_start.png deleted file mode 100644 index 06f46afc..00000000 Binary files a/Memory Game/res/drawable-xxhdpi/button_start.png and /dev/null differ diff --git a/Memory Game/res/drawable-xxhdpi/tooltip_play.png b/Memory Game/res/drawable-xxhdpi/tooltip_play.png deleted file mode 100644 index 7325f41c..00000000 Binary files a/Memory Game/res/drawable-xxhdpi/tooltip_play.png and /dev/null differ diff --git a/Memory Game/res/drawable/button_again.png b/Memory Game/res/drawable/button_again.png deleted file mode 100644 index 9c89755b..00000000 Binary files a/Memory Game/res/drawable/button_again.png and /dev/null differ diff --git a/Memory Game/res/drawable/button_back.png b/Memory Game/res/drawable/button_back.png deleted file mode 100644 index 5df86fa5..00000000 Binary files a/Memory Game/res/drawable/button_back.png and /dev/null differ diff --git a/Memory Game/res/drawable/level_complete.png b/Memory Game/res/drawable/level_complete.png deleted file mode 100644 index 91dd46b5..00000000 Binary files a/Memory Game/res/drawable/level_complete.png and /dev/null differ diff --git a/Memory Game/res/drawable/level_complete_star.png b/Memory Game/res/drawable/level_complete_star.png deleted file mode 100644 index 8680f0c5..00000000 Binary files a/Memory Game/res/drawable/level_complete_star.png and /dev/null differ diff --git a/Memory Game/res/drawable/settings_popup.png b/Memory Game/res/drawable/settings_popup.png deleted file mode 100644 index f06a21b1..00000000 Binary files a/Memory Game/res/drawable/settings_popup.png and /dev/null differ diff --git a/Memory Game/res/drawable/tile_back_star.png b/Memory Game/res/drawable/tile_back_star.png deleted file mode 100644 index 7a2f4053..00000000 Binary files a/Memory Game/res/drawable/tile_back_star.png and /dev/null differ diff --git a/Memory Game/res/drawable/time_bar.png b/Memory Game/res/drawable/time_bar.png deleted file mode 100644 index 0b54f784..00000000 Binary files a/Memory Game/res/drawable/time_bar.png and /dev/null differ diff --git a/Memory Game/res/drawable/title.png b/Memory Game/res/drawable/title.png deleted file mode 100644 index 1e48781f..00000000 Binary files a/Memory Game/res/drawable/title.png and /dev/null differ diff --git a/Memory Game/res/layout/difficulty_select_fragment.xml b/Memory Game/res/layout/difficulty_select_fragment.xml deleted file mode 100644 index e7ad5b68..00000000 --- a/Memory Game/res/layout/difficulty_select_fragment.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Memory Game/res/layout/theme_select_fragment.xml b/Memory Game/res/layout/theme_select_fragment.xml deleted file mode 100644 index c04d29a8..00000000 --- a/Memory Game/res/layout/theme_select_fragment.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Memory Game/res/values/strings.xml b/Memory Game/res/values/strings.xml deleted file mode 100644 index 2fadaf71..00000000 --- a/Memory Game/res/values/strings.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - Memory Game - regular - - - memory game - kid - kids - memory - educational - game - - - diff --git a/Memory Game/res/xml/app_tracker.xml b/Memory Game/res/xml/app_tracker.xml deleted file mode 100644 index 95d743c5..00000000 --- a/Memory Game/res/xml/app_tracker.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - true - - - UA-52548196-5 - diff --git a/Memory Game/src/com/snatik/matches/common/Ads.java b/Memory Game/src/com/snatik/matches/common/Ads.java deleted file mode 100644 index 43d0b5cc..00000000 --- a/Memory Game/src/com/snatik/matches/common/Ads.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.snatik.matches.common; - -import java.util.Arrays; -import java.util.List; - -import android.content.Context; -import android.view.View; - -import com.google.android.gms.ads.AdListener; -import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.AdRequest.Builder; -import com.google.android.gms.ads.AdView; -import com.google.android.gms.ads.InterstitialAd; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GooglePlayServicesUtil; -import com.snatik.matches.R; - -/** - * @author sromku - * @see https://developers.google.com/mobile-ads-sdk/docs/admob/fundamentals - */ -public class Ads { - - private static final String AD_UNIT_ID = "ca-app-pub-8150157395642941/8649170010"; - private static Ads mInstnace = null; - private AdView mAdView; - private List keywords; - private boolean enableAds = true; - private final boolean mGooglePlayServiceAvailable; - - private Ads() { - mGooglePlayServiceAvailable = GooglePlayServicesUtil.isGooglePlayServicesAvailable(Shared.context) == ConnectionResult.SUCCESS; - } - - public static Ads getInstance() { - if (mInstnace == null) { - mInstnace = new Ads(); - } - return mInstnace; - } - - public Ads setEnabled(boolean enabled) { - enableAds = enabled; - return this; - } - - public Ads setBannerView(AdView adView) { - mAdView = adView; - mAdView.setAdUnitId(AD_UNIT_ID); - String[] stringArray = Shared.context.getResources().getStringArray(R.array.ad_kewords); - keywords = Arrays.asList(stringArray); - return this; - } - - public static InterstitialAd createInterstitialAd(Context context) { - InterstitialAd interstitialAd = new InterstitialAd(context); - interstitialAd.setAdUnitId(AD_UNIT_ID); - return interstitialAd; - } - - public void showBannerAd() { - if (enableAds) { - mAdView.loadAd(createAdRequest()); - } else { - if (mAdView != null) { - mAdView.setVisibility(View.GONE); - } - } - } - - public void showInterstitialAd() { - if (enableAds && mGooglePlayServiceAvailable) { - final InterstitialAd interstitialAd = createInterstitialAd(Shared.activity); - interstitialAd.setAdListener(new AdListener() { - @Override - public void onAdLoaded() { - interstitialAd.show(); - } - }); - interstitialAd.loadAd(createAdRequest()); - } - } - - private AdRequest createAdRequest() { - Builder builder = new AdRequest.Builder(); - for (String keyword : keywords) { - builder.addKeyword(keyword); - } - AdRequest adRequest = builder.build(); - return adRequest; - } -} diff --git a/Memory Game/src/com/snatik/matches/common/Memory.java b/Memory Game/src/com/snatik/matches/common/Memory.java deleted file mode 100644 index 093b775a..00000000 --- a/Memory Game/src/com/snatik/matches/common/Memory.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.snatik.matches.common; - -import android.content.Context; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; - - -public class Memory { - - private static final String SHARED_PREFERENCES_NAME = "com.snatik.matches"; - private static String highStartKey = "theme_%d_difficulty_%d"; - - public static void save(int theme, int difficulty, int stars) { - int highStars = getHighStars(theme, difficulty); - if (stars > highStars) { - SharedPreferences sharedPreferences = Shared.context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE); - Editor edit = sharedPreferences.edit(); - String key = String.format(highStartKey, theme, difficulty); - edit.putInt(key, stars).commit(); - } - } - - public static int getHighStars(int theme, int difficulty) { - SharedPreferences sharedPreferences = Shared.context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE); - String key = String.format(highStartKey, theme, difficulty); - return sharedPreferences.getInt(key, 0); - } -} diff --git a/Memory Game/src/com/snatik/matches/common/Stats.java b/Memory Game/src/com/snatik/matches/common/Stats.java deleted file mode 100644 index 1434c524..00000000 --- a/Memory Game/src/com/snatik/matches/common/Stats.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.snatik.matches.common; - -import android.content.Context; - -import com.google.android.gms.analytics.GoogleAnalytics; -import com.google.android.gms.analytics.HitBuilders; -import com.google.android.gms.analytics.Tracker; -import com.snatik.matches.R; - -public class Stats { - - private static Stats mInstance = null; - private Context mContext; - private Tracker mTracker; - - public static class Event { - public static final String SCREEN_MENU = "Menu screen"; - public static final String SCREEN_ANIMALS_THEME = "Animals difficulty screen"; - public static final String SCREEN_MONSTERS_THEME = "Monsters difficulty screen"; - public static final String SCREEN_GAME = "Game screen"; - public static final String POPUP_SETTINGS = "Popup settings"; - public static final String POPUP_GOOGLE_PLAY = "Popup google play"; - } - - private Stats() { - } - - public static Stats getInstance() { - if (mInstance == null) { - mInstance = new Stats(); - } - return mInstance; - } - - public Stats setContext(Context context) { - mContext = context; - return this; - } - - public synchronized Tracker getTracker() { - if (mTracker == null) { - GoogleAnalytics analytics = GoogleAnalytics.getInstance(mContext); - mTracker = analytics.newTracker(R.xml.app_tracker); - mTracker.enableAdvertisingIdCollection(true); - } - return mTracker; - } - - /** - * Send this event when user saw the screen. - * - * @param path - * is a String representing the screen name. - */ - public void sendScreenView(String screenName) { - Tracker tracker = getTracker(); - tracker.setScreenName(screenName); - tracker.send(new HitBuilders.AppViewBuilder().build()); - } -} diff --git a/Memory Game/src/com/snatik/matches/fragments/DifficultySelectFragment.java b/Memory Game/src/com/snatik/matches/fragments/DifficultySelectFragment.java deleted file mode 100644 index 42cbe7fe..00000000 --- a/Memory Game/src/com/snatik/matches/fragments/DifficultySelectFragment.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.snatik.matches.fragments; - -import android.animation.AnimatorSet; -import android.animation.AnimatorSet.Builder; -import android.animation.ObjectAnimator; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.animation.BounceInterpolator; - -import com.snatik.matches.R; -import com.snatik.matches.common.Memory; -import com.snatik.matches.common.Shared; -import com.snatik.matches.common.Stats; -import com.snatik.matches.events.ui.DifficultySelectedEvent; -import com.snatik.matches.themes.Theme; -import com.snatik.matches.ui.DifficultyView; - -public class DifficultySelectFragment extends Fragment { - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = LayoutInflater.from(Shared.context).inflate(R.layout.difficulty_select_fragment, container, false); - Theme theme = Shared.engine.getSelectedTheme(); - if (theme.id == 1) { - Stats.getInstance().sendScreenView(Stats.Event.SCREEN_ANIMALS_THEME); - } else { - Stats.getInstance().sendScreenView(Stats.Event.SCREEN_MONSTERS_THEME); - } - DifficultyView difficulty1 = (DifficultyView) view.findViewById(R.id.select_difficulty_1); - difficulty1.setDifficulty(1, Memory.getHighStars(theme.id, 1)); - setOnClick(difficulty1, 1); - - DifficultyView difficulty2 = (DifficultyView) view.findViewById(R.id.select_difficulty_2); - difficulty2.setDifficulty(2, Memory.getHighStars(theme.id, 2)); - setOnClick(difficulty2, 2); - - DifficultyView difficulty3 = (DifficultyView) view.findViewById(R.id.select_difficulty_3); - difficulty3.setDifficulty(3, Memory.getHighStars(theme.id, 3)); - setOnClick(difficulty3, 3); - - DifficultyView difficulty4 = (DifficultyView) view.findViewById(R.id.select_difficulty_4); - difficulty4.setDifficulty(4, Memory.getHighStars(theme.id, 4)); - setOnClick(difficulty4, 4); - - DifficultyView difficulty5 = (DifficultyView) view.findViewById(R.id.select_difficulty_5); - difficulty5.setDifficulty(5, Memory.getHighStars(theme.id, 5)); - setOnClick(difficulty5, 5); - - DifficultyView difficulty6 = (DifficultyView) view.findViewById(R.id.select_difficulty_6); - difficulty6.setDifficulty(6, Memory.getHighStars(theme.id, 6)); - setOnClick(difficulty6, 6); - - animate(difficulty1, difficulty2, difficulty3, difficulty4, difficulty5, difficulty6); - - return view; - } - - private void animate(View... view) { - AnimatorSet animatorSet = new AnimatorSet(); - Builder builder = animatorSet.play(new AnimatorSet()); - for (int i = 0; i < view.length; i++) { - ObjectAnimator scaleX = ObjectAnimator.ofFloat(view[i], "scaleX", 0.8f, 1f); - ObjectAnimator scaleY = ObjectAnimator.ofFloat(view[i], "scaleY", 0.8f, 1f); - builder.with(scaleX).with(scaleY); - } - animatorSet.setDuration(500); - animatorSet.setInterpolator(new BounceInterpolator()); - animatorSet.start(); - } - - private void setOnClick(View view, final int difficulty) { - view.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Shared.eventBus.notify(new DifficultySelectedEvent(difficulty)); - } - }); - } -} diff --git a/Memory Game/src/com/snatik/matches/model/Model.java b/Memory Game/src/com/snatik/matches/model/Model.java deleted file mode 100644 index 98e09ac5..00000000 --- a/Memory Game/src/com/snatik/matches/model/Model.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.snatik.matches.model; - -public class Model { - -} diff --git a/README.md b/README.md new file mode 100644 index 00000000..32ff808f --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +# Memory Game + +We just wanted a simple memory game for kids 4+ age. No ads, no complicated screens, but a straightforward nice looking, working and open source game. + +### Features + +- 3 Themes : `Animals` :cat2: `Monsters` :octopus: & `Emojis` :smile: +- 6 types of difficulties :star2: +- Sounds on winning :musical_note: + +If you have more ideas or you want to add more options / themes / sounds or whatever, fill free to update the source for yourself or open a pull request. :sparkles: + +### Next + +- [ ] 2 player game +- [x] Add one more theme +- [ ] Add more sounds +- [ ] Add Game Services support + +### License + +- The code is: `Apache License 2.0` (See [LICENSE](./LICENSE.md) for details.) +- For UI assets please check the licenses here: + - http://graphicriver.net/item/animals-collection-farm-and-domestic-set/7177721 + - http://graphicriver.net/item/monster-creation-kit-and-large-pack/8851390 + - http://graphicriver.net/item/10-fresh-game-backgrounds/9137937 + - http://graphicriver.net/item/cartoon-games-gui-pack-11-/6056785 + diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 00000000..a7747886 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,2 @@ +/build + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 00000000..804fe990 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,31 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 30 + buildToolsVersion '30.0.2' + + defaultConfig { + applicationId 'com.swastik.mind.game' + minSdkVersion 19 + targetSdkVersion 30 + versionCode 1 + versionName '1.0' + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.2.0' + + testImplementation 'junit:junit:4.13' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 00000000..ec26f798 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/sromku/android/adt/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/Memory Game/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 51% rename from Memory Game/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index 46e82ff9..4bd9a208 100644 --- a/Memory Game/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,15 +1,6 @@ - - - - - + package="com.snatik.matches" > - - - \ No newline at end of file diff --git a/Memory Game/assets/fonts/grobold.ttf b/app/src/main/assets/fonts/grobold.ttf similarity index 100% rename from Memory Game/assets/fonts/grobold.ttf rename to app/src/main/assets/fonts/grobold.ttf diff --git a/Memory Game/src/com/snatik/matches/GameApplication.java b/app/src/main/java/com/snatik/matches/GameApplication.java similarity index 75% rename from Memory Game/src/com/snatik/matches/GameApplication.java rename to app/src/main/java/com/snatik/matches/GameApplication.java index 394f8c03..7feacff4 100644 --- a/Memory Game/src/com/snatik/matches/GameApplication.java +++ b/app/src/main/java/com/snatik/matches/GameApplication.java @@ -2,7 +2,6 @@ import android.app.Application; -import com.snatik.matches.common.Stats; import com.snatik.matches.utils.FontLoader; public class GameApplication extends Application { @@ -10,8 +9,6 @@ public class GameApplication extends Application { @Override public void onCreate() { super.onCreate(); - FontLoader.loadFonts(this); - Stats.getInstance().setContext(this); } } diff --git a/Memory Game/src/com/snatik/matches/MainActivity.java b/app/src/main/java/com/snatik/matches/MainActivity.java similarity index 92% rename from Memory Game/src/com/snatik/matches/MainActivity.java rename to app/src/main/java/com/snatik/matches/MainActivity.java index c8c0499f..7f7fd209 100644 --- a/Memory Game/src/com/snatik/matches/MainActivity.java +++ b/app/src/main/java/com/snatik/matches/MainActivity.java @@ -1,8 +1,9 @@ package com.snatik.matches; + import android.graphics.Bitmap; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.widget.ImageView; import com.snatik.matches.common.Shared; @@ -13,7 +14,6 @@ import com.snatik.matches.events.ui.BackGameEvent; import com.snatik.matches.ui.PopupManager; import com.snatik.matches.utils.Utils; -import com.splunk.mint.Mint; public class MainActivity extends FragmentActivity { @@ -22,12 +22,11 @@ public class MainActivity extends FragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - Mint.initAndStartSession(MainActivity.this, "1d80072c"); + Shared.context = getApplicationContext(); Shared.engine = Engine.getInstance(); Shared.eventBus = EventBus.getInstance(); - + setContentView(R.layout.activity_main); mBackgroundImage = (ImageView) findViewById(R.id.background_image); @@ -40,6 +39,8 @@ protected void onCreate(Bundle savedInstanceState) { // set menu ScreenController.getInstance().openScreen(Screen.MENU); + + } @Override @@ -66,4 +67,5 @@ private void setBackgroundImage() { bitmap = Utils.downscaleBitmap(bitmap, 2); mBackgroundImage.setImageBitmap(bitmap); } + } diff --git a/app/src/main/java/com/snatik/matches/common/Memory.java b/app/src/main/java/com/snatik/matches/common/Memory.java new file mode 100644 index 00000000..546ed1b0 --- /dev/null +++ b/app/src/main/java/com/snatik/matches/common/Memory.java @@ -0,0 +1,54 @@ +package com.snatik.matches.common; + +import android.content.Context; +import android.content.SharedPreferences; + +public class Memory { + + private static final String SHARED_PREFERENCES_NAME = "com.snatik.matches"; + private static String highStartKey = "theme_%d_difficulty_%d"; + private static String bestTimeKey = "themetime_%d_difficultytime_%d"; + + public static void save(int theme, int difficulty, int stars) { + + int highStars = getHighStars(theme, difficulty); + + if (stars > highStars) { + SharedPreferences sharedPreferences = Shared.context.getSharedPreferences(SHARED_PREFERENCES_NAME, + Context.MODE_PRIVATE); + SharedPreferences.Editor edit = sharedPreferences.edit(); + String key = String.format(highStartKey, theme, difficulty); + edit.putInt(key, stars).commit(); + } + } + + public static void saveTime(int theme, int difficulty, int passedSecs) { + + int bestTime = getBestTime(theme, difficulty); + + if (passedSecs < bestTime || bestTime == -1) { + SharedPreferences sharedPreferences = Shared.context.getSharedPreferences(SHARED_PREFERENCES_NAME, + Context.MODE_PRIVATE); + SharedPreferences.Editor editor = sharedPreferences.edit(); + String timeKey = String.format(bestTimeKey, theme, difficulty); + editor.putInt(timeKey, passedSecs); + editor.commit(); + } + } + + public static int getHighStars(int theme, int difficulty) { + + SharedPreferences sharedPreferences = Shared.context.getSharedPreferences(SHARED_PREFERENCES_NAME, + Context.MODE_PRIVATE); + String key = String.format(highStartKey, theme, difficulty); + return sharedPreferences.getInt(key, 0); + } + + public static int getBestTime(int theme, int difficulty) { + + SharedPreferences sharedPreferences = Shared.context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE); + String key = String.format(bestTimeKey, theme, difficulty); + return sharedPreferences.getInt(key, -1); + } + +} diff --git a/Memory Game/src/com/snatik/matches/common/Music.java b/app/src/main/java/com/snatik/matches/common/Music.java similarity index 100% rename from Memory Game/src/com/snatik/matches/common/Music.java rename to app/src/main/java/com/snatik/matches/common/Music.java diff --git a/Memory Game/src/com/snatik/matches/common/Shared.java b/app/src/main/java/com/snatik/matches/common/Shared.java similarity index 56% rename from Memory Game/src/com/snatik/matches/common/Shared.java rename to app/src/main/java/com/snatik/matches/common/Shared.java index fcba4f42..3df2622a 100644 --- a/Memory Game/src/com/snatik/matches/common/Shared.java +++ b/app/src/main/java/com/snatik/matches/common/Shared.java @@ -1,20 +1,16 @@ package com.snatik.matches.common; import android.content.Context; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import com.snatik.matches.engine.Engine; import com.snatik.matches.events.EventBus; -import com.snatik.matches.model.Model; public class Shared { public static Context context; - public static FragmentActivity activity; + public static FragmentActivity activity; // it's fine for this app, but better move to weak reference public static Engine engine; public static EventBus eventBus; - public static Stats stats; - public static Ads ads; - public static Model model; - + } diff --git a/Memory Game/src/com/snatik/matches/engine/Engine.java b/app/src/main/java/com/snatik/matches/engine/Engine.java similarity index 85% rename from Memory Game/src/com/snatik/matches/engine/Engine.java rename to app/src/main/java/com/snatik/matches/engine/Engine.java index a7c2e4af..43a79292 100644 --- a/Memory Game/src/com/snatik/matches/engine/Engine.java +++ b/app/src/main/java/com/snatik/matches/engine/Engine.java @@ -1,10 +1,5 @@ package com.snatik.matches.engine; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; @@ -39,6 +34,11 @@ import com.snatik.matches.utils.Clock; import com.snatik.matches.utils.Utils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + public class Engine extends EventObserverAdapter { private static Engine mInstance = null; @@ -96,19 +96,8 @@ public void onEvent(ResetBackgroundEvent event) { if (drawable != null) { ((TransitionDrawable) drawable).reverseTransition(2000); } else { - new AsyncTask() { - - @Override - protected Bitmap doInBackground(Void... params) { - Bitmap bitmap = Utils.scaleDown(R.drawable.background, Utils.screenWidth(), Utils.screenHeight()); - return bitmap; - } - - protected void onPostExecute(Bitmap bitmap) { - mBackgroundImage.setImageBitmap(bitmap); - }; - - }.execute(); + Bitmap bitmap = Utils.scaleDown(R.drawable.background, Utils.screenWidth(), Utils.screenHeight()); + mBackgroundImage.setImageBitmap(bitmap); } } @@ -137,28 +126,15 @@ public void onEvent(BackGameEvent event) { public void onEvent(ThemeSelectedEvent event) { mSelectedTheme = event.theme; mScreenController.openScreen(Screen.DIFFICULTY); - AsyncTask task = new AsyncTask() { - - @Override - protected TransitionDrawable doInBackground(Void... params) { - Bitmap bitmap = Utils.scaleDown(R.drawable.background, Utils.screenWidth(), Utils.screenHeight()); - Bitmap backgroundImage = Themes.getBackgroundImage(mSelectedTheme); - backgroundImage = Utils.crop(backgroundImage, Utils.screenHeight(), Utils.screenWidth()); - Drawable backgrounds[] = new Drawable[2]; - backgrounds[0] = new BitmapDrawable(Shared.context.getResources(), bitmap); - backgrounds[1] = new BitmapDrawable(Shared.context.getResources(), backgroundImage); - TransitionDrawable crossfader = new TransitionDrawable(backgrounds); - return crossfader; - } - - @Override - protected void onPostExecute(TransitionDrawable result) { - super.onPostExecute(result); - mBackgroundImage.setImageDrawable(result); - result.startTransition(2000); - } - }; - task.execute(); + Bitmap bitmap = Utils.scaleDown(R.drawable.background, Utils.screenWidth(), Utils.screenHeight()); + Bitmap backgroundImage = Themes.getBackgroundImage(mSelectedTheme); + backgroundImage = Utils.crop(backgroundImage, Utils.screenHeight(), Utils.screenWidth()); + Drawable[] backgrounds = new Drawable[2]; + backgrounds[0] = new BitmapDrawable(Shared.context.getResources(), bitmap); + backgrounds[1] = new BitmapDrawable(Shared.context.getResources(), backgroundImage); + TransitionDrawable crossfader = new TransitionDrawable(backgrounds); + mBackgroundImage.setImageDrawable(crossfader); + crossfader.startTransition(2000); } @Override @@ -242,6 +218,7 @@ public void run() { mPlayingGame.gameState = gameState; // remained seconds gameState.remainedSeconds = totalTime - passedSeconds; + gameState.passedSeconds = passedSeconds; // calc stars if (passedSeconds <= totalTime / 2) { @@ -259,6 +236,9 @@ public void run() { // save to memory Memory.save(mPlayingGame.theme.id, mPlayingGame.boardConfiguration.difficulty, gameState.achievedStars); + Memory.saveTime(mPlayingGame.theme.id, mPlayingGame.boardConfiguration.difficulty ,gameState.passedSeconds); + + Shared.eventBus.notify(new GameWonEvent(gameState), 1200); } diff --git a/Memory Game/src/com/snatik/matches/engine/ScreenController.java b/app/src/main/java/com/snatik/matches/engine/ScreenController.java similarity index 95% rename from Memory Game/src/com/snatik/matches/engine/ScreenController.java rename to app/src/main/java/com/snatik/matches/engine/ScreenController.java index cb44dd45..57f03ee0 100644 --- a/Memory Game/src/com/snatik/matches/engine/ScreenController.java +++ b/app/src/main/java/com/snatik/matches/engine/ScreenController.java @@ -3,9 +3,9 @@ import java.util.ArrayList; import java.util.List; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import com.snatik.matches.R; import com.snatik.matches.common.Shared; diff --git a/Memory Game/src/com/snatik/matches/events/AbstractEvent.java b/app/src/main/java/com/snatik/matches/events/AbstractEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/AbstractEvent.java rename to app/src/main/java/com/snatik/matches/events/AbstractEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/Event.java b/app/src/main/java/com/snatik/matches/events/Event.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/Event.java rename to app/src/main/java/com/snatik/matches/events/Event.java diff --git a/Memory Game/src/com/snatik/matches/events/EventBus.java b/app/src/main/java/com/snatik/matches/events/EventBus.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/EventBus.java rename to app/src/main/java/com/snatik/matches/events/EventBus.java diff --git a/Memory Game/src/com/snatik/matches/events/EventObserver.java b/app/src/main/java/com/snatik/matches/events/EventObserver.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/EventObserver.java rename to app/src/main/java/com/snatik/matches/events/EventObserver.java diff --git a/Memory Game/src/com/snatik/matches/events/EventObserverAdapter.java b/app/src/main/java/com/snatik/matches/events/EventObserverAdapter.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/EventObserverAdapter.java rename to app/src/main/java/com/snatik/matches/events/EventObserverAdapter.java diff --git a/Memory Game/src/com/snatik/matches/events/engine/FlipDownCardsEvent.java b/app/src/main/java/com/snatik/matches/events/engine/FlipDownCardsEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/engine/FlipDownCardsEvent.java rename to app/src/main/java/com/snatik/matches/events/engine/FlipDownCardsEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/engine/GameWonEvent.java b/app/src/main/java/com/snatik/matches/events/engine/GameWonEvent.java similarity index 99% rename from Memory Game/src/com/snatik/matches/events/engine/GameWonEvent.java rename to app/src/main/java/com/snatik/matches/events/engine/GameWonEvent.java index da58733c..108f52a0 100644 --- a/Memory Game/src/com/snatik/matches/events/engine/GameWonEvent.java +++ b/app/src/main/java/com/snatik/matches/events/engine/GameWonEvent.java @@ -12,6 +12,7 @@ public class GameWonEvent extends AbstractEvent { public static final String TYPE = GameWonEvent.class.getName(); public GameState gameState; + public GameWonEvent(GameState gameState) { this.gameState = gameState; diff --git a/Memory Game/src/com/snatik/matches/events/engine/HidePairCardsEvent.java b/app/src/main/java/com/snatik/matches/events/engine/HidePairCardsEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/engine/HidePairCardsEvent.java rename to app/src/main/java/com/snatik/matches/events/engine/HidePairCardsEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/ui/BackGameEvent.java b/app/src/main/java/com/snatik/matches/events/ui/BackGameEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/ui/BackGameEvent.java rename to app/src/main/java/com/snatik/matches/events/ui/BackGameEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/ui/DifficultySelectedEvent.java b/app/src/main/java/com/snatik/matches/events/ui/DifficultySelectedEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/ui/DifficultySelectedEvent.java rename to app/src/main/java/com/snatik/matches/events/ui/DifficultySelectedEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/ui/FlipCardEvent.java b/app/src/main/java/com/snatik/matches/events/ui/FlipCardEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/ui/FlipCardEvent.java rename to app/src/main/java/com/snatik/matches/events/ui/FlipCardEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/ui/NextGameEvent.java b/app/src/main/java/com/snatik/matches/events/ui/NextGameEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/ui/NextGameEvent.java rename to app/src/main/java/com/snatik/matches/events/ui/NextGameEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/ui/ResetBackgroundEvent.java b/app/src/main/java/com/snatik/matches/events/ui/ResetBackgroundEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/ui/ResetBackgroundEvent.java rename to app/src/main/java/com/snatik/matches/events/ui/ResetBackgroundEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/ui/StartEvent.java b/app/src/main/java/com/snatik/matches/events/ui/StartEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/ui/StartEvent.java rename to app/src/main/java/com/snatik/matches/events/ui/StartEvent.java diff --git a/Memory Game/src/com/snatik/matches/events/ui/ThemeSelectedEvent.java b/app/src/main/java/com/snatik/matches/events/ui/ThemeSelectedEvent.java similarity index 100% rename from Memory Game/src/com/snatik/matches/events/ui/ThemeSelectedEvent.java rename to app/src/main/java/com/snatik/matches/events/ui/ThemeSelectedEvent.java diff --git a/Memory Game/src/com/snatik/matches/fragments/BaseFragment.java b/app/src/main/java/com/snatik/matches/fragments/BaseFragment.java similarity index 97% rename from Memory Game/src/com/snatik/matches/fragments/BaseFragment.java rename to app/src/main/java/com/snatik/matches/fragments/BaseFragment.java index c368e445..87979165 100644 --- a/Memory Game/src/com/snatik/matches/fragments/BaseFragment.java +++ b/app/src/main/java/com/snatik/matches/fragments/BaseFragment.java @@ -1,6 +1,6 @@ package com.snatik.matches.fragments; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.snatik.matches.events.EventObserver; import com.snatik.matches.events.engine.FlipDownCardsEvent; diff --git a/app/src/main/java/com/snatik/matches/fragments/DifficultySelectFragment.java b/app/src/main/java/com/snatik/matches/fragments/DifficultySelectFragment.java new file mode 100644 index 00000000..b4ae41b5 --- /dev/null +++ b/app/src/main/java/com/snatik/matches/fragments/DifficultySelectFragment.java @@ -0,0 +1,129 @@ +package com.snatik.matches.fragments; + +import android.animation.AnimatorSet; +import android.animation.AnimatorSet.Builder; +import android.animation.ObjectAnimator; +import android.graphics.Typeface; +import android.os.Bundle; +import androidx.fragment.app.Fragment; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.animation.BounceInterpolator; +import android.widget.TextView; + +import com.snatik.matches.R; +import com.snatik.matches.common.Memory; +import com.snatik.matches.common.Shared; +import com.snatik.matches.events.ui.DifficultySelectedEvent; +import com.snatik.matches.themes.Theme; +import com.snatik.matches.ui.DifficultyView; + +public class DifficultySelectFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = LayoutInflater.from(Shared.context).inflate(R.layout.difficulty_select_fragment, container, false); + Theme theme = Shared.engine.getSelectedTheme(); + + DifficultyView difficulty1 = (DifficultyView) view.findViewById(R.id.select_difficulty_1); + difficulty1.setDifficulty(1, Memory.getHighStars(theme.id, 1)); + setOnClick(difficulty1, 1); + + DifficultyView difficulty2 = (DifficultyView) view.findViewById(R.id.select_difficulty_2); + difficulty2.setDifficulty(2, Memory.getHighStars(theme.id, 2)); + setOnClick(difficulty2, 2); + + DifficultyView difficulty3 = (DifficultyView) view.findViewById(R.id.select_difficulty_3); + difficulty3.setDifficulty(3, Memory.getHighStars(theme.id, 3)); + setOnClick(difficulty3, 3); + + DifficultyView difficulty4 = (DifficultyView) view.findViewById(R.id.select_difficulty_4); + difficulty4.setDifficulty(4, Memory.getHighStars(theme.id, 4)); + setOnClick(difficulty4, 4); + + DifficultyView difficulty5 = (DifficultyView) view.findViewById(R.id.select_difficulty_5); + difficulty5.setDifficulty(5, Memory.getHighStars(theme.id, 5)); + setOnClick(difficulty5, 5); + + DifficultyView difficulty6 = (DifficultyView) view.findViewById(R.id.select_difficulty_6); + difficulty6.setDifficulty(6, Memory.getHighStars(theme.id, 6)); + setOnClick(difficulty6, 6); + + animate(difficulty1, difficulty2, difficulty3, difficulty4, difficulty5, difficulty6); + + Typeface type = Typeface.createFromAsset(Shared.context.getAssets(), "fonts/grobold.ttf"); + + + TextView text1 = (TextView) view.findViewById(R.id.time_difficulty_1); + text1.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); + text1.setTypeface(type); + text1.setText(getBestTimeForStage(theme.id, 1)); + + TextView text2 = (TextView) view.findViewById(R.id.time_difficulty_2); + text2.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); + text2.setTypeface(type); + text2.setText(getBestTimeForStage(theme.id, 2)); + + TextView text3 = (TextView) view.findViewById(R.id.time_difficulty_3); + text3.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); + text3.setTypeface(type); + text3.setText(getBestTimeForStage(theme.id, 3)); + + TextView text4 = (TextView) view.findViewById(R.id.time_difficulty_4); + text4.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); + text4.setTypeface(type); + text4.setText(getBestTimeForStage(theme.id, 4)); + + TextView text5 = (TextView) view.findViewById(R.id.time_difficulty_5); + text5.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); + text5.setTypeface(type); + text5.setText(getBestTimeForStage(theme.id, 5)); + + TextView text6 = (TextView) view.findViewById(R.id.time_difficulty_6); + text6.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); + text6.setTypeface(type); + text6.setText(getBestTimeForStage(theme.id, 6)); + + return view; + + } + + private String getBestTimeForStage(int theme, int difficulty) { + int bestTime = Memory.getBestTime(theme, difficulty); + if (bestTime != -1) { + int minutes = (bestTime % 3600) / 60; + int seconds = (bestTime) % 60; + String result = String.format("BEST : %02d:%02d", minutes, seconds); + return result; + } else { + String result = "BEST : -"; + return result; + } + } + + private void animate(View... view) { + AnimatorSet animatorSet = new AnimatorSet(); + Builder builder = animatorSet.play(new AnimatorSet()); + for (int i = 0; i < view.length; i++) { + ObjectAnimator scaleX = ObjectAnimator.ofFloat(view[i], "scaleX", 0.8f, 1f); + ObjectAnimator scaleY = ObjectAnimator.ofFloat(view[i], "scaleY", 0.8f, 1f); + builder.with(scaleX).with(scaleY); + } + animatorSet.setDuration(500); + animatorSet.setInterpolator(new BounceInterpolator()); + animatorSet.start(); + } + + private void setOnClick(View view, final int difficulty) { + view.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Shared.eventBus.notify(new DifficultySelectedEvent(difficulty)); + } + }); + } + + +} diff --git a/Memory Game/src/com/snatik/matches/fragments/GameFragment.java b/app/src/main/java/com/snatik/matches/fragments/GameFragment.java similarity index 84% rename from Memory Game/src/com/snatik/matches/fragments/GameFragment.java rename to app/src/main/java/com/snatik/matches/fragments/GameFragment.java index d3cc9462..db65f04e 100644 --- a/Memory Game/src/com/snatik/matches/fragments/GameFragment.java +++ b/app/src/main/java/com/snatik/matches/fragments/GameFragment.java @@ -9,12 +9,8 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.google.android.gms.ads.AdSize; -import com.google.android.gms.ads.AdView; import com.snatik.matches.R; -import com.snatik.matches.common.Ads; import com.snatik.matches.common.Shared; -import com.snatik.matches.common.Stats; import com.snatik.matches.events.engine.FlipDownCardsEvent; import com.snatik.matches.events.engine.GameWonEvent; import com.snatik.matches.events.engine.HidePairCardsEvent; @@ -52,23 +48,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa Shared.eventBus.listen(HidePairCardsEvent.TYPE, this); Shared.eventBus.listen(GameWonEvent.TYPE, this); - ads = (LinearLayout) view.findViewById(R.id.public_ads_layout); - setAds(); - Stats.getInstance().sendScreenView(Stats.Event.SCREEN_GAME); return view; } - private void setAds() { - // Look up the AdView as a resource and load a request. - AdView adView = new AdView(getActivity()); - adView.setAdSize(AdSize.BANNER); - - ads.removeAllViews(); - ads.addView(adView); - Ads.getInstance().setBannerView(adView); - Ads.getInstance().showBannerAd(); - } - @Override public void onDestroy() { Shared.eventBus.unlisten(FlipDownCardsEvent.TYPE, this); diff --git a/Memory Game/src/com/snatik/matches/fragments/MenuFragment.java b/app/src/main/java/com/snatik/matches/fragments/MenuFragment.java similarity index 89% rename from Memory Game/src/com/snatik/matches/fragments/MenuFragment.java rename to app/src/main/java/com/snatik/matches/fragments/MenuFragment.java index f0c2bb17..42d244d4 100644 --- a/Memory Game/src/com/snatik/matches/fragments/MenuFragment.java +++ b/app/src/main/java/com/snatik/matches/fragments/MenuFragment.java @@ -6,7 +6,7 @@ import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,7 +19,6 @@ import com.snatik.matches.R; import com.snatik.matches.common.Music; import com.snatik.matches.common.Shared; -import com.snatik.matches.common.Stats; import com.snatik.matches.events.ui.StartEvent; import com.snatik.matches.ui.PopupManager; import com.snatik.matches.utils.Utils; @@ -43,21 +42,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mSettingsGameButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Stats.getInstance().sendScreenView(Stats.Event.POPUP_SETTINGS); PopupManager.showPopupSettings(); - // GameState gameState = new GameState(); - // gameState.achievedScore = 345; - // gameState.achievedStars = 3; - // gameState.remainedSeconds = 50; - // PopupManager.showPopupWon(gameState ); } }); mGooglePlayGameButton = (ImageView) view.findViewById(R.id.google_play_button); mGooglePlayGameButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Stats.getInstance().sendScreenView(Stats.Event.POPUP_GOOGLE_PLAY); - Toast.makeText(getActivity(), "Leaderboards will be available in the next game updates", Toast.LENGTH_LONG).show(); + Toast.makeText(getActivity(), "Leader boards will be available in the next game updates", Toast.LENGTH_LONG).show(); } }); mStartButtonLights = (ImageView) view.findViewById(R.id.start_game_button_lights); @@ -82,7 +74,6 @@ public void onAnimationEnd(Animator animation) { // play background music Music.playBackgroundMusic(); - Stats.getInstance().sendScreenView(Stats.Event.SCREEN_MENU); return view; } diff --git a/Memory Game/src/com/snatik/matches/fragments/ThemeSelectFragment.java b/app/src/main/java/com/snatik/matches/fragments/ThemeSelectFragment.java similarity index 82% rename from Memory Game/src/com/snatik/matches/fragments/ThemeSelectFragment.java rename to app/src/main/java/com/snatik/matches/fragments/ThemeSelectFragment.java index 3a89851b..ebbc7ffe 100644 --- a/Memory Game/src/com/snatik/matches/fragments/ThemeSelectFragment.java +++ b/app/src/main/java/com/snatik/matches/fragments/ThemeSelectFragment.java @@ -1,11 +1,10 @@ package com.snatik.matches.fragments; -import java.util.Locale; - import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,18 +18,23 @@ import com.snatik.matches.themes.Theme; import com.snatik.matches.themes.Themes; +import java.util.Locale; + public class ThemeSelectFragment extends Fragment { @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = LayoutInflater.from(Shared.context).inflate(R.layout.theme_select_fragment, container, false); View animals = view.findViewById(R.id.theme_animals_container); View monsters = view.findViewById(R.id.theme_monsters_container); + View emoji = view.findViewById(R.id.theme_emoji_container); final Theme themeAnimals = Themes.createAnimalsTheme(); setStars((ImageView) animals.findViewById(R.id.theme_animals), themeAnimals, "animals"); final Theme themeMonsters = Themes.createMosterTheme(); setStars((ImageView) monsters.findViewById(R.id.theme_monsters), themeMonsters, "monsters"); + final Theme themeEmoji = Themes.createEmojiTheme(); + setStars((ImageView) emoji.findViewById(R.id.theme_emoji), themeEmoji, "emoji"); animals.setOnClickListener(new View.OnClickListener() { @Override @@ -46,11 +50,19 @@ public void onClick(View v) { } }); + emoji.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Shared.eventBus.notify(new ThemeSelectedEvent(themeEmoji)); + } + }); + /** * Imporove performance first!!! */ animateShow(animals); animateShow(monsters); + animateShow(emoji); return view; } diff --git a/Memory Game/src/com/snatik/matches/model/BoardArrangment.java b/app/src/main/java/com/snatik/matches/model/BoardArrangment.java similarity index 100% rename from Memory Game/src/com/snatik/matches/model/BoardArrangment.java rename to app/src/main/java/com/snatik/matches/model/BoardArrangment.java diff --git a/Memory Game/src/com/snatik/matches/model/BoardConfiguration.java b/app/src/main/java/com/snatik/matches/model/BoardConfiguration.java similarity index 100% rename from Memory Game/src/com/snatik/matches/model/BoardConfiguration.java rename to app/src/main/java/com/snatik/matches/model/BoardConfiguration.java diff --git a/Memory Game/src/com/snatik/matches/model/Game.java b/app/src/main/java/com/snatik/matches/model/Game.java similarity index 100% rename from Memory Game/src/com/snatik/matches/model/Game.java rename to app/src/main/java/com/snatik/matches/model/Game.java diff --git a/Memory Game/src/com/snatik/matches/model/GameState.java b/app/src/main/java/com/snatik/matches/model/GameState.java similarity index 84% rename from Memory Game/src/com/snatik/matches/model/GameState.java rename to app/src/main/java/com/snatik/matches/model/GameState.java index 69177a94..405adb9a 100644 --- a/Memory Game/src/com/snatik/matches/model/GameState.java +++ b/app/src/main/java/com/snatik/matches/model/GameState.java @@ -5,4 +5,5 @@ public class GameState { public int remainedSeconds; public int achievedStars; public int achievedScore; + public int passedSeconds; } diff --git a/Memory Game/src/com/snatik/matches/themes/Theme.java b/app/src/main/java/com/snatik/matches/themes/Theme.java similarity index 100% rename from Memory Game/src/com/snatik/matches/themes/Theme.java rename to app/src/main/java/com/snatik/matches/themes/Theme.java diff --git a/Memory Game/src/com/snatik/matches/themes/Themes.java b/app/src/main/java/com/snatik/matches/themes/Themes.java similarity index 74% rename from Memory Game/src/com/snatik/matches/themes/Themes.java rename to app/src/main/java/com/snatik/matches/themes/Themes.java index bba9b5b0..9a0cb89f 100644 --- a/Memory Game/src/com/snatik/matches/themes/Themes.java +++ b/app/src/main/java/com/snatik/matches/themes/Themes.java @@ -1,12 +1,12 @@ package com.snatik.matches.themes; -import java.util.ArrayList; - import android.graphics.Bitmap; import com.snatik.matches.common.Shared; import com.snatik.matches.utils.Utils; +import java.util.ArrayList; + public class Themes { public static String URI_DRAWABLE = "drawable://"; @@ -36,12 +36,24 @@ public static Theme createMosterTheme() { } return theme; } + + public static Theme createEmojiTheme() { + Theme theme = new Theme(); + theme.id = 3; + theme.name = "Emoji"; + theme.backgroundImageUrl = URI_DRAWABLE + "background"; + theme.tileImageUrls = new ArrayList(); + // 40 drawables + for (int i = 1; i <= 40; i++) { + theme.tileImageUrls.add(URI_DRAWABLE + String.format("emoji_%d", i)); + } + return theme; + } public static Bitmap getBackgroundImage(Theme theme) { String drawableResourceName = theme.backgroundImageUrl.substring(Themes.URI_DRAWABLE.length()); int drawableResourceId = Shared.context.getResources().getIdentifier(drawableResourceName, "drawable", Shared.context.getPackageName()); - Bitmap bitmap = Utils.scaleDown(drawableResourceId, Utils.screenWidth(), Utils.screenHeight()); - return bitmap; + return Utils.scaleDown(drawableResourceId, Utils.screenWidth(), Utils.screenHeight()); } } diff --git a/Memory Game/src/com/snatik/matches/ui/BoardView.java b/app/src/main/java/com/snatik/matches/ui/BoardView.java similarity index 100% rename from Memory Game/src/com/snatik/matches/ui/BoardView.java rename to app/src/main/java/com/snatik/matches/ui/BoardView.java diff --git a/Memory Game/src/com/snatik/matches/ui/DifficultyView.java b/app/src/main/java/com/snatik/matches/ui/DifficultyView.java similarity index 100% rename from Memory Game/src/com/snatik/matches/ui/DifficultyView.java rename to app/src/main/java/com/snatik/matches/ui/DifficultyView.java diff --git a/Memory Game/src/com/snatik/matches/ui/PopupManager.java b/app/src/main/java/com/snatik/matches/ui/PopupManager.java similarity index 100% rename from Memory Game/src/com/snatik/matches/ui/PopupManager.java rename to app/src/main/java/com/snatik/matches/ui/PopupManager.java diff --git a/Memory Game/src/com/snatik/matches/ui/PopupSettingsView.java b/app/src/main/java/com/snatik/matches/ui/PopupSettingsView.java similarity index 100% rename from Memory Game/src/com/snatik/matches/ui/PopupSettingsView.java rename to app/src/main/java/com/snatik/matches/ui/PopupSettingsView.java diff --git a/Memory Game/src/com/snatik/matches/ui/PopupWonView.java b/app/src/main/java/com/snatik/matches/ui/PopupWonView.java similarity index 100% rename from Memory Game/src/com/snatik/matches/ui/PopupWonView.java rename to app/src/main/java/com/snatik/matches/ui/PopupWonView.java diff --git a/Memory Game/src/com/snatik/matches/ui/TileView.java b/app/src/main/java/com/snatik/matches/ui/TileView.java similarity index 100% rename from Memory Game/src/com/snatik/matches/ui/TileView.java rename to app/src/main/java/com/snatik/matches/ui/TileView.java diff --git a/Memory Game/src/com/snatik/matches/utils/Clock.java b/app/src/main/java/com/snatik/matches/utils/Clock.java similarity index 100% rename from Memory Game/src/com/snatik/matches/utils/Clock.java rename to app/src/main/java/com/snatik/matches/utils/Clock.java diff --git a/Memory Game/src/com/snatik/matches/utils/CountDownClock.java b/app/src/main/java/com/snatik/matches/utils/CountDownClock.java similarity index 100% rename from Memory Game/src/com/snatik/matches/utils/CountDownClock.java rename to app/src/main/java/com/snatik/matches/utils/CountDownClock.java diff --git a/Memory Game/src/com/snatik/matches/utils/FontLoader.java b/app/src/main/java/com/snatik/matches/utils/FontLoader.java similarity index 100% rename from Memory Game/src/com/snatik/matches/utils/FontLoader.java rename to app/src/main/java/com/snatik/matches/utils/FontLoader.java diff --git a/Memory Game/src/com/snatik/matches/utils/Utils.java b/app/src/main/java/com/snatik/matches/utils/Utils.java similarity index 100% rename from Memory Game/src/com/snatik/matches/utils/Utils.java rename to app/src/main/java/com/snatik/matches/utils/Utils.java diff --git a/app/src/main/res/drawable-hdpi/animals_theme_star_0.webp b/app/src/main/res/drawable-hdpi/animals_theme_star_0.webp new file mode 100644 index 00000000..54333793 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/animals_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/animals_theme_star_1.webp b/app/src/main/res/drawable-hdpi/animals_theme_star_1.webp new file mode 100644 index 00000000..f79dd9b8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/animals_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/animals_theme_star_2.webp b/app/src/main/res/drawable-hdpi/animals_theme_star_2.webp new file mode 100644 index 00000000..27a1aee3 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/animals_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/animals_theme_star_3.webp b/app/src/main/res/drawable-hdpi/animals_theme_star_3.webp new file mode 100644 index 00000000..8abc36d1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/animals_theme_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_1_star_0.webp b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_0.webp new file mode 100644 index 00000000..f373c175 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_1_star_1.webp b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_1.webp new file mode 100644 index 00000000..91436f66 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_1_star_2.webp b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_2.webp new file mode 100644 index 00000000..49ed9af8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_1_star_3.webp b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_3.webp new file mode 100644 index 00000000..52599471 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_1_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_2_star_0.webp b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_0.webp new file mode 100644 index 00000000..5e9cc251 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_2_star_1.webp b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_1.webp new file mode 100644 index 00000000..efe3b034 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_2_star_2.webp b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_2.webp new file mode 100644 index 00000000..5f8b8ee6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_2_star_3.webp b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_3.webp new file mode 100644 index 00000000..6f9c5fd7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_2_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_3_star_0.webp b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_0.webp new file mode 100644 index 00000000..39f448bd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_3_star_1.webp b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_1.webp new file mode 100644 index 00000000..779b268f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_3_star_2.webp b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_2.webp new file mode 100644 index 00000000..4d80a976 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_3_star_3.webp b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_3.webp new file mode 100644 index 00000000..f89f6d71 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_3_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_4_star_0.webp b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_0.webp new file mode 100644 index 00000000..3921aa6a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_4_star_1.webp b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_1.webp new file mode 100644 index 00000000..08c394cd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_4_star_2.webp b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_2.webp new file mode 100644 index 00000000..53e787db Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_4_star_3.webp b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_3.webp new file mode 100644 index 00000000..0bf68b4b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_4_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_5_star_0.webp b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_0.webp new file mode 100644 index 00000000..fd2482aa Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_5_star_1.webp b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_1.webp new file mode 100644 index 00000000..e8c49fa6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_5_star_2.webp b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_2.webp new file mode 100644 index 00000000..1c044d4c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_5_star_3.webp b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_3.webp new file mode 100644 index 00000000..188f445d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_5_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_6_star_0.webp b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_0.webp new file mode 100644 index 00000000..ecf32996 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_6_star_1.webp b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_1.webp new file mode 100644 index 00000000..4bb874ae Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_6_star_2.webp b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_2.webp new file mode 100644 index 00000000..ae161a2a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_difficulty_6_star_3.webp b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_3.webp new file mode 100644 index 00000000..69431cbd Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_difficulty_6_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_google_play.webp b/app/src/main/res/drawable-hdpi/button_google_play.webp new file mode 100644 index 00000000..a0ec049f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_google_play.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_music_off.webp b/app/src/main/res/drawable-hdpi/button_music_off.webp new file mode 100644 index 00000000..2970bb03 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_music_off.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_music_on.webp b/app/src/main/res/drawable-hdpi/button_music_on.webp new file mode 100644 index 00000000..04346f6f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_music_on.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_rate.webp b/app/src/main/res/drawable-hdpi/button_rate.webp new file mode 100644 index 00000000..db152030 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_rate.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_settings.webp b/app/src/main/res/drawable-hdpi/button_settings.webp new file mode 100644 index 00000000..fa3c7f66 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_settings.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_start.webp b/app/src/main/res/drawable-hdpi/button_start.webp new file mode 100644 index 00000000..bd63041a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_start.webp differ diff --git a/app/src/main/res/drawable-hdpi/button_start_lights.webp b/app/src/main/res/drawable-hdpi/button_start_lights.webp new file mode 100644 index 00000000..8757218d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/button_start_lights.webp differ diff --git a/app/src/main/res/drawable-hdpi/emoji_theme_star_0.webp b/app/src/main/res/drawable-hdpi/emoji_theme_star_0.webp new file mode 100644 index 00000000..c1dae1c7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/emoji_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/emoji_theme_star_1.webp b/app/src/main/res/drawable-hdpi/emoji_theme_star_1.webp new file mode 100644 index 00000000..0aae9156 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/emoji_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/emoji_theme_star_2.webp b/app/src/main/res/drawable-hdpi/emoji_theme_star_2.webp new file mode 100644 index 00000000..b411b5c1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/emoji_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/emoji_theme_star_3.webp b/app/src/main/res/drawable-hdpi/emoji_theme_star_3.webp new file mode 100644 index 00000000..5613ed7d Binary files /dev/null and b/app/src/main/res/drawable-hdpi/emoji_theme_star_3.webp differ diff --git a/Memory Game/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from Memory Game/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/Memory Game/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from Memory Game/res/drawable-hdpi/icon.png rename to app/src/main/res/drawable-hdpi/icon.png diff --git a/app/src/main/res/drawable-hdpi/monsters_theme_star_0.webp b/app/src/main/res/drawable-hdpi/monsters_theme_star_0.webp new file mode 100644 index 00000000..6c2c6405 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/monsters_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-hdpi/monsters_theme_star_1.webp b/app/src/main/res/drawable-hdpi/monsters_theme_star_1.webp new file mode 100644 index 00000000..d22e61ad Binary files /dev/null and b/app/src/main/res/drawable-hdpi/monsters_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-hdpi/monsters_theme_star_2.webp b/app/src/main/res/drawable-hdpi/monsters_theme_star_2.webp new file mode 100644 index 00000000..c0d4f655 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/monsters_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-hdpi/monsters_theme_star_3.webp b/app/src/main/res/drawable-hdpi/monsters_theme_star_3.webp new file mode 100644 index 00000000..04fca58a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/monsters_theme_star_3.webp differ diff --git a/app/src/main/res/drawable-hdpi/tooltip_play.webp b/app/src/main/res/drawable-hdpi/tooltip_play.webp new file mode 100644 index 00000000..30c21426 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/tooltip_play.webp differ diff --git a/Memory Game/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from Memory Game/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/app/src/main/res/drawable-nodpi/animals_1.webp b/app/src/main/res/drawable-nodpi/animals_1.webp new file mode 100644 index 00000000..b034c381 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_1.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_10.webp b/app/src/main/res/drawable-nodpi/animals_10.webp new file mode 100644 index 00000000..5bb9b710 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_10.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_11.webp b/app/src/main/res/drawable-nodpi/animals_11.webp new file mode 100644 index 00000000..4c083b73 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_11.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_12.webp b/app/src/main/res/drawable-nodpi/animals_12.webp new file mode 100644 index 00000000..ff319e71 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_12.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_13.webp b/app/src/main/res/drawable-nodpi/animals_13.webp new file mode 100644 index 00000000..7e4572b7 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_13.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_14.webp b/app/src/main/res/drawable-nodpi/animals_14.webp new file mode 100644 index 00000000..85794e89 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_14.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_15.webp b/app/src/main/res/drawable-nodpi/animals_15.webp new file mode 100644 index 00000000..0f24c583 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_15.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_16.webp b/app/src/main/res/drawable-nodpi/animals_16.webp new file mode 100644 index 00000000..f9e942ad Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_16.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_17.webp b/app/src/main/res/drawable-nodpi/animals_17.webp new file mode 100644 index 00000000..f9fdf7fc Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_17.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_18.webp b/app/src/main/res/drawable-nodpi/animals_18.webp new file mode 100644 index 00000000..f4a3afc5 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_18.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_19.webp b/app/src/main/res/drawable-nodpi/animals_19.webp new file mode 100644 index 00000000..0e383d3c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_19.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_2.webp b/app/src/main/res/drawable-nodpi/animals_2.webp new file mode 100644 index 00000000..70d6b569 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_2.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_20.webp b/app/src/main/res/drawable-nodpi/animals_20.webp new file mode 100644 index 00000000..41a0e09d Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_20.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_21.webp b/app/src/main/res/drawable-nodpi/animals_21.webp new file mode 100644 index 00000000..345de2e1 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_21.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_22.webp b/app/src/main/res/drawable-nodpi/animals_22.webp new file mode 100644 index 00000000..3cfea74e Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_22.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_23.webp b/app/src/main/res/drawable-nodpi/animals_23.webp new file mode 100644 index 00000000..2b2fde27 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_23.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_24.webp b/app/src/main/res/drawable-nodpi/animals_24.webp new file mode 100644 index 00000000..90fd4829 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_24.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_25.webp b/app/src/main/res/drawable-nodpi/animals_25.webp new file mode 100644 index 00000000..f5541f9b Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_25.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_26.webp b/app/src/main/res/drawable-nodpi/animals_26.webp new file mode 100644 index 00000000..158221c1 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_26.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_27.webp b/app/src/main/res/drawable-nodpi/animals_27.webp new file mode 100644 index 00000000..4affdab8 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_27.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_28.webp b/app/src/main/res/drawable-nodpi/animals_28.webp new file mode 100644 index 00000000..b4cfb54e Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_28.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_3.webp b/app/src/main/res/drawable-nodpi/animals_3.webp new file mode 100644 index 00000000..cdacc535 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_3.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_4.webp b/app/src/main/res/drawable-nodpi/animals_4.webp new file mode 100644 index 00000000..df8f9eac Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_4.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_5.webp b/app/src/main/res/drawable-nodpi/animals_5.webp new file mode 100644 index 00000000..6e28918c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_5.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_6.webp b/app/src/main/res/drawable-nodpi/animals_6.webp new file mode 100644 index 00000000..36c58cd6 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_6.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_7.webp b/app/src/main/res/drawable-nodpi/animals_7.webp new file mode 100644 index 00000000..f7641d5b Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_7.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_8.webp b/app/src/main/res/drawable-nodpi/animals_8.webp new file mode 100644 index 00000000..37740b6a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_8.webp differ diff --git a/app/src/main/res/drawable-nodpi/animals_9.webp b/app/src/main/res/drawable-nodpi/animals_9.webp new file mode 100644 index 00000000..57900a1a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/animals_9.webp differ diff --git a/app/src/main/res/drawable-nodpi/back_animals.webp b/app/src/main/res/drawable-nodpi/back_animals.webp new file mode 100644 index 00000000..7d815339 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/back_animals.webp differ diff --git a/app/src/main/res/drawable-nodpi/back_horror.webp b/app/src/main/res/drawable-nodpi/back_horror.webp new file mode 100644 index 00000000..40f5a47d Binary files /dev/null and b/app/src/main/res/drawable-nodpi/back_horror.webp differ diff --git a/app/src/main/res/drawable-nodpi/background.webp b/app/src/main/res/drawable-nodpi/background.webp new file mode 100644 index 00000000..c6d7a774 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/background.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_1.webp b/app/src/main/res/drawable-nodpi/emoji_1.webp new file mode 100644 index 00000000..dc910b88 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_1.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_10.webp b/app/src/main/res/drawable-nodpi/emoji_10.webp new file mode 100644 index 00000000..a0907dd7 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_10.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_11.webp b/app/src/main/res/drawable-nodpi/emoji_11.webp new file mode 100644 index 00000000..66e56c80 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_11.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_12.webp b/app/src/main/res/drawable-nodpi/emoji_12.webp new file mode 100644 index 00000000..168da938 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_12.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_13.webp b/app/src/main/res/drawable-nodpi/emoji_13.webp new file mode 100644 index 00000000..e18f4964 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_13.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_14.webp b/app/src/main/res/drawable-nodpi/emoji_14.webp new file mode 100644 index 00000000..be214598 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_14.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_15.webp b/app/src/main/res/drawable-nodpi/emoji_15.webp new file mode 100644 index 00000000..3ba67252 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_15.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_16.webp b/app/src/main/res/drawable-nodpi/emoji_16.webp new file mode 100644 index 00000000..d432a607 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_16.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_17.webp b/app/src/main/res/drawable-nodpi/emoji_17.webp new file mode 100644 index 00000000..377530cd Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_17.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_18.webp b/app/src/main/res/drawable-nodpi/emoji_18.webp new file mode 100644 index 00000000..ccb3ca93 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_18.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_19.webp b/app/src/main/res/drawable-nodpi/emoji_19.webp new file mode 100644 index 00000000..a0bd62a4 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_19.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_2.webp b/app/src/main/res/drawable-nodpi/emoji_2.webp new file mode 100644 index 00000000..480431aa Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_2.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_20.webp b/app/src/main/res/drawable-nodpi/emoji_20.webp new file mode 100644 index 00000000..c4c943f6 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_20.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_21.webp b/app/src/main/res/drawable-nodpi/emoji_21.webp new file mode 100644 index 00000000..13be3c7e Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_21.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_22.webp b/app/src/main/res/drawable-nodpi/emoji_22.webp new file mode 100644 index 00000000..e90621ce Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_22.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_23.webp b/app/src/main/res/drawable-nodpi/emoji_23.webp new file mode 100644 index 00000000..a591d3e0 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_23.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_24.webp b/app/src/main/res/drawable-nodpi/emoji_24.webp new file mode 100644 index 00000000..bc7fbc9d Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_24.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_25.webp b/app/src/main/res/drawable-nodpi/emoji_25.webp new file mode 100644 index 00000000..4f9d7134 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_25.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_26.webp b/app/src/main/res/drawable-nodpi/emoji_26.webp new file mode 100644 index 00000000..a59dd69f Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_26.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_27.webp b/app/src/main/res/drawable-nodpi/emoji_27.webp new file mode 100644 index 00000000..1b098db6 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_27.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_28.webp b/app/src/main/res/drawable-nodpi/emoji_28.webp new file mode 100644 index 00000000..3372b64d Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_28.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_29.webp b/app/src/main/res/drawable-nodpi/emoji_29.webp new file mode 100644 index 00000000..af916884 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_29.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_3.webp b/app/src/main/res/drawable-nodpi/emoji_3.webp new file mode 100644 index 00000000..02834112 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_3.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_30.webp b/app/src/main/res/drawable-nodpi/emoji_30.webp new file mode 100644 index 00000000..19e29f6c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_30.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_31.webp b/app/src/main/res/drawable-nodpi/emoji_31.webp new file mode 100644 index 00000000..fe3cf51a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_31.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_32.webp b/app/src/main/res/drawable-nodpi/emoji_32.webp new file mode 100644 index 00000000..f8b91cee Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_32.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_33.webp b/app/src/main/res/drawable-nodpi/emoji_33.webp new file mode 100644 index 00000000..7fd1e4ed Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_33.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_34.webp b/app/src/main/res/drawable-nodpi/emoji_34.webp new file mode 100644 index 00000000..d1d27145 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_34.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_35.webp b/app/src/main/res/drawable-nodpi/emoji_35.webp new file mode 100644 index 00000000..3c84a4ea Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_35.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_36.webp b/app/src/main/res/drawable-nodpi/emoji_36.webp new file mode 100644 index 00000000..d9a16a84 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_36.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_37.webp b/app/src/main/res/drawable-nodpi/emoji_37.webp new file mode 100644 index 00000000..d2799bc5 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_37.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_38.webp b/app/src/main/res/drawable-nodpi/emoji_38.webp new file mode 100644 index 00000000..5f2db0fc Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_38.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_39.webp b/app/src/main/res/drawable-nodpi/emoji_39.webp new file mode 100644 index 00000000..e5becfa8 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_39.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_4.webp b/app/src/main/res/drawable-nodpi/emoji_4.webp new file mode 100644 index 00000000..77d3d225 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_4.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_40.webp b/app/src/main/res/drawable-nodpi/emoji_40.webp new file mode 100644 index 00000000..f6cb3cda Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_40.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_41.webp b/app/src/main/res/drawable-nodpi/emoji_41.webp new file mode 100644 index 00000000..4185740e Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_41.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_42.webp b/app/src/main/res/drawable-nodpi/emoji_42.webp new file mode 100644 index 00000000..d01daee8 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_42.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_43.webp b/app/src/main/res/drawable-nodpi/emoji_43.webp new file mode 100644 index 00000000..aec83fca Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_43.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_44.webp b/app/src/main/res/drawable-nodpi/emoji_44.webp new file mode 100644 index 00000000..7fbf7b71 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_44.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_45.webp b/app/src/main/res/drawable-nodpi/emoji_45.webp new file mode 100644 index 00000000..6ac31d0e Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_45.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_46.webp b/app/src/main/res/drawable-nodpi/emoji_46.webp new file mode 100644 index 00000000..00e798a9 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_46.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_47.webp b/app/src/main/res/drawable-nodpi/emoji_47.webp new file mode 100644 index 00000000..178507dd Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_47.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_48.webp b/app/src/main/res/drawable-nodpi/emoji_48.webp new file mode 100644 index 00000000..8bf9809d Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_48.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_5.webp b/app/src/main/res/drawable-nodpi/emoji_5.webp new file mode 100644 index 00000000..0b39727f Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_5.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_6.webp b/app/src/main/res/drawable-nodpi/emoji_6.webp new file mode 100644 index 00000000..b9a1682f Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_6.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_7.webp b/app/src/main/res/drawable-nodpi/emoji_7.webp new file mode 100644 index 00000000..ee702531 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_7.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_8.webp b/app/src/main/res/drawable-nodpi/emoji_8.webp new file mode 100644 index 00000000..a4af7fa2 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_8.webp differ diff --git a/app/src/main/res/drawable-nodpi/emoji_9.webp b/app/src/main/res/drawable-nodpi/emoji_9.webp new file mode 100644 index 00000000..ef4ebd80 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/emoji_9.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_1.webp b/app/src/main/res/drawable-nodpi/mosters_1.webp new file mode 100644 index 00000000..9e346220 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_1.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_10.webp b/app/src/main/res/drawable-nodpi/mosters_10.webp new file mode 100644 index 00000000..76accf5d Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_10.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_11.webp b/app/src/main/res/drawable-nodpi/mosters_11.webp new file mode 100644 index 00000000..c3dedd23 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_11.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_12.webp b/app/src/main/res/drawable-nodpi/mosters_12.webp new file mode 100644 index 00000000..d36c0939 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_12.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_13.webp b/app/src/main/res/drawable-nodpi/mosters_13.webp new file mode 100644 index 00000000..df6232d9 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_13.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_14.webp b/app/src/main/res/drawable-nodpi/mosters_14.webp new file mode 100644 index 00000000..5ea9f431 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_14.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_15.webp b/app/src/main/res/drawable-nodpi/mosters_15.webp new file mode 100644 index 00000000..779809df Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_15.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_16.webp b/app/src/main/res/drawable-nodpi/mosters_16.webp new file mode 100644 index 00000000..1516040c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_16.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_17.webp b/app/src/main/res/drawable-nodpi/mosters_17.webp new file mode 100644 index 00000000..0d7c266c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_17.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_18.webp b/app/src/main/res/drawable-nodpi/mosters_18.webp new file mode 100644 index 00000000..6e79d306 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_18.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_19.webp b/app/src/main/res/drawable-nodpi/mosters_19.webp new file mode 100644 index 00000000..99b935f0 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_19.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_2.webp b/app/src/main/res/drawable-nodpi/mosters_2.webp new file mode 100644 index 00000000..ce533f39 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_2.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_20.webp b/app/src/main/res/drawable-nodpi/mosters_20.webp new file mode 100644 index 00000000..39f44add Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_20.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_21.webp b/app/src/main/res/drawable-nodpi/mosters_21.webp new file mode 100644 index 00000000..4788c7d3 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_21.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_22.webp b/app/src/main/res/drawable-nodpi/mosters_22.webp new file mode 100644 index 00000000..44e77196 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_22.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_23.webp b/app/src/main/res/drawable-nodpi/mosters_23.webp new file mode 100644 index 00000000..1920f7aa Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_23.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_24.webp b/app/src/main/res/drawable-nodpi/mosters_24.webp new file mode 100644 index 00000000..3918f157 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_24.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_25.webp b/app/src/main/res/drawable-nodpi/mosters_25.webp new file mode 100644 index 00000000..b7231ac6 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_25.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_26.webp b/app/src/main/res/drawable-nodpi/mosters_26.webp new file mode 100644 index 00000000..c354a3bf Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_26.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_27.webp b/app/src/main/res/drawable-nodpi/mosters_27.webp new file mode 100644 index 00000000..04597d82 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_27.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_28.webp b/app/src/main/res/drawable-nodpi/mosters_28.webp new file mode 100644 index 00000000..04f0c688 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_28.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_29.webp b/app/src/main/res/drawable-nodpi/mosters_29.webp new file mode 100644 index 00000000..d2a7d7c7 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_29.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_3.webp b/app/src/main/res/drawable-nodpi/mosters_3.webp new file mode 100644 index 00000000..ce73b111 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_3.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_30.webp b/app/src/main/res/drawable-nodpi/mosters_30.webp new file mode 100644 index 00000000..8a45304a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_30.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_31.webp b/app/src/main/res/drawable-nodpi/mosters_31.webp new file mode 100644 index 00000000..413a8d1e Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_31.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_32.webp b/app/src/main/res/drawable-nodpi/mosters_32.webp new file mode 100644 index 00000000..07889bef Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_32.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_33.webp b/app/src/main/res/drawable-nodpi/mosters_33.webp new file mode 100644 index 00000000..a6af42c1 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_33.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_34.webp b/app/src/main/res/drawable-nodpi/mosters_34.webp new file mode 100644 index 00000000..0a3fd37a Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_34.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_35.webp b/app/src/main/res/drawable-nodpi/mosters_35.webp new file mode 100644 index 00000000..bb8c7820 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_35.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_36.webp b/app/src/main/res/drawable-nodpi/mosters_36.webp new file mode 100644 index 00000000..25661965 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_36.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_37.webp b/app/src/main/res/drawable-nodpi/mosters_37.webp new file mode 100644 index 00000000..3e8b8e34 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_37.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_38.webp b/app/src/main/res/drawable-nodpi/mosters_38.webp new file mode 100644 index 00000000..fa79f5f6 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_38.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_39.webp b/app/src/main/res/drawable-nodpi/mosters_39.webp new file mode 100644 index 00000000..841fb74c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_39.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_4.webp b/app/src/main/res/drawable-nodpi/mosters_4.webp new file mode 100644 index 00000000..54acadc0 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_4.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_40.webp b/app/src/main/res/drawable-nodpi/mosters_40.webp new file mode 100644 index 00000000..b5a6184c Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_40.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_5.webp b/app/src/main/res/drawable-nodpi/mosters_5.webp new file mode 100644 index 00000000..427deaa1 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_5.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_6.webp b/app/src/main/res/drawable-nodpi/mosters_6.webp new file mode 100644 index 00000000..92222fef Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_6.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_7.webp b/app/src/main/res/drawable-nodpi/mosters_7.webp new file mode 100644 index 00000000..675e2294 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_7.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_8.webp b/app/src/main/res/drawable-nodpi/mosters_8.webp new file mode 100644 index 00000000..63aadcf9 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_8.webp differ diff --git a/app/src/main/res/drawable-nodpi/mosters_9.webp b/app/src/main/res/drawable-nodpi/mosters_9.webp new file mode 100644 index 00000000..1449ba40 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/mosters_9.webp differ diff --git a/Memory Game/res/drawable-nodpi/tile_back.xml b/app/src/main/res/drawable-nodpi/tile_back.xml similarity index 100% rename from Memory Game/res/drawable-nodpi/tile_back.xml rename to app/src/main/res/drawable-nodpi/tile_back.xml diff --git a/app/src/main/res/drawable-nodpi/time_border.webp b/app/src/main/res/drawable-nodpi/time_border.webp new file mode 100644 index 00000000..a8010e47 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/time_border.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_0.webp new file mode 100644 index 00000000..94835a5d Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_1.webp new file mode 100644 index 00000000..ab2a38bd Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_2.webp new file mode 100644 index 00000000..fe7bb2ce Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_3.webp new file mode 100644 index 00000000..94d3f5d8 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/animals_theme_star_3.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_0.webp new file mode 100644 index 00000000..07bac9ea Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_1.webp new file mode 100644 index 00000000..c0d47f12 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_2.webp new file mode 100644 index 00000000..71f5b3da Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_3.webp new file mode 100644 index 00000000..d01a3ea3 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_1_star_3.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_0.webp new file mode 100644 index 00000000..1592bd1c Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_1.webp new file mode 100644 index 00000000..07bf9edb Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_2.webp new file mode 100644 index 00000000..307a58b6 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_3.webp new file mode 100644 index 00000000..05181027 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_2_star_3.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_0.webp new file mode 100644 index 00000000..7b9df514 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_1.webp new file mode 100644 index 00000000..504ba4d7 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_2.webp new file mode 100644 index 00000000..c251b43d Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_3.webp new file mode 100644 index 00000000..5fc8281f Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_3_star_3.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_0.webp new file mode 100644 index 00000000..0557558e Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_1.webp new file mode 100644 index 00000000..0f93f77f Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_2.webp new file mode 100644 index 00000000..7287ab81 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_3.webp new file mode 100644 index 00000000..a945c9c7 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_4_star_3.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_0.webp new file mode 100644 index 00000000..e19757f3 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_1.webp new file mode 100644 index 00000000..f55d0c9a Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_2.webp new file mode 100644 index 00000000..a4db8fe5 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_3.webp new file mode 100644 index 00000000..fb94ba2c Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_5_star_3.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_0.webp new file mode 100644 index 00000000..a985c4df Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_1.webp new file mode 100644 index 00000000..2b7e9d83 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_2.webp new file mode 100644 index 00000000..a476cc7f Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_3.webp new file mode 100644 index 00000000..1430e5af Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/button_difficulty_6_star_3.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_0.webp new file mode 100644 index 00000000..c1dae1c7 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_1.webp new file mode 100644 index 00000000..0aae9156 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_2.webp new file mode 100644 index 00000000..b411b5c1 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_3.webp new file mode 100644 index 00000000..5613ed7d Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/emoji_theme_star_3.webp differ diff --git a/Memory Game/res/drawable-sw600dp-hdpi/icon.png b/app/src/main/res/drawable-sw600dp-hdpi/icon.png similarity index 100% rename from Memory Game/res/drawable-sw600dp-hdpi/icon.png rename to app/src/main/res/drawable-sw600dp-hdpi/icon.png diff --git a/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_0.webp b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_0.webp new file mode 100644 index 00000000..e6737064 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_1.webp b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_1.webp new file mode 100644 index 00000000..c1cae730 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_2.webp b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_2.webp new file mode 100644 index 00000000..b63ac146 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_3.webp b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_3.webp new file mode 100644 index 00000000..16636a52 Binary files /dev/null and b/app/src/main/res/drawable-sw600dp-hdpi/monsters_theme_star_3.webp differ diff --git a/app/src/main/res/drawable-xhdpi/animals_theme_star_0.webp b/app/src/main/res/drawable-xhdpi/animals_theme_star_0.webp new file mode 100644 index 00000000..a3b79a87 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/animals_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-xhdpi/animals_theme_star_1.webp b/app/src/main/res/drawable-xhdpi/animals_theme_star_1.webp new file mode 100644 index 00000000..4fde8997 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/animals_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-xhdpi/animals_theme_star_2.webp b/app/src/main/res/drawable-xhdpi/animals_theme_star_2.webp new file mode 100644 index 00000000..b4127ea9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/animals_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-xhdpi/animals_theme_star_3.webp b/app/src/main/res/drawable-xhdpi/animals_theme_star_3.webp new file mode 100644 index 00000000..cb1497be Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/animals_theme_star_3.webp differ diff --git a/app/src/main/res/drawable-xhdpi/button_google_play.webp b/app/src/main/res/drawable-xhdpi/button_google_play.webp new file mode 100644 index 00000000..e2be68fd Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/button_google_play.webp differ diff --git a/app/src/main/res/drawable-xhdpi/button_music_off.webp b/app/src/main/res/drawable-xhdpi/button_music_off.webp new file mode 100644 index 00000000..2b45e42d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/button_music_off.webp differ diff --git a/app/src/main/res/drawable-xhdpi/button_music_on.webp b/app/src/main/res/drawable-xhdpi/button_music_on.webp new file mode 100644 index 00000000..72e2a56f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/button_music_on.webp differ diff --git a/app/src/main/res/drawable-xhdpi/button_rate.webp b/app/src/main/res/drawable-xhdpi/button_rate.webp new file mode 100644 index 00000000..455e39f1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/button_rate.webp differ diff --git a/app/src/main/res/drawable-xhdpi/button_settings.webp b/app/src/main/res/drawable-xhdpi/button_settings.webp new file mode 100644 index 00000000..f1ebb1a2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/button_settings.webp differ diff --git a/app/src/main/res/drawable-xhdpi/button_start.webp b/app/src/main/res/drawable-xhdpi/button_start.webp new file mode 100644 index 00000000..e6d3b50e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/button_start.webp differ diff --git a/app/src/main/res/drawable-xhdpi/button_start_lights.webp b/app/src/main/res/drawable-xhdpi/button_start_lights.webp new file mode 100644 index 00000000..67b83075 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/button_start_lights.webp differ diff --git a/app/src/main/res/drawable-xhdpi/emoji_theme_star_0.webp b/app/src/main/res/drawable-xhdpi/emoji_theme_star_0.webp new file mode 100644 index 00000000..c1dae1c7 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/emoji_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-xhdpi/emoji_theme_star_1.webp b/app/src/main/res/drawable-xhdpi/emoji_theme_star_1.webp new file mode 100644 index 00000000..0aae9156 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/emoji_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-xhdpi/emoji_theme_star_2.webp b/app/src/main/res/drawable-xhdpi/emoji_theme_star_2.webp new file mode 100644 index 00000000..b411b5c1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/emoji_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-xhdpi/emoji_theme_star_3.webp b/app/src/main/res/drawable-xhdpi/emoji_theme_star_3.webp new file mode 100644 index 00000000..5613ed7d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/emoji_theme_star_3.webp differ diff --git a/Memory Game/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from Memory Game/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/Memory Game/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from Memory Game/res/drawable-xhdpi/icon.png rename to app/src/main/res/drawable-xhdpi/icon.png diff --git a/app/src/main/res/drawable-xhdpi/monsters_theme_star_0.webp b/app/src/main/res/drawable-xhdpi/monsters_theme_star_0.webp new file mode 100644 index 00000000..25158724 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/monsters_theme_star_0.webp differ diff --git a/app/src/main/res/drawable-xhdpi/monsters_theme_star_1.webp b/app/src/main/res/drawable-xhdpi/monsters_theme_star_1.webp new file mode 100644 index 00000000..ac4fd287 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/monsters_theme_star_1.webp differ diff --git a/app/src/main/res/drawable-xhdpi/monsters_theme_star_2.webp b/app/src/main/res/drawable-xhdpi/monsters_theme_star_2.webp new file mode 100644 index 00000000..6a8ec4e4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/monsters_theme_star_2.webp differ diff --git a/app/src/main/res/drawable-xhdpi/monsters_theme_star_3.webp b/app/src/main/res/drawable-xhdpi/monsters_theme_star_3.webp new file mode 100644 index 00000000..57504fd0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/monsters_theme_star_3.webp differ diff --git a/app/src/main/res/drawable-xhdpi/title.webp b/app/src/main/res/drawable-xhdpi/title.webp new file mode 100644 index 00000000..23e1989d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/title.webp differ diff --git a/app/src/main/res/drawable-xhdpi/tooltip_play.webp b/app/src/main/res/drawable-xhdpi/tooltip_play.webp new file mode 100644 index 00000000..766576aa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/tooltip_play.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/button_google_play.webp b/app/src/main/res/drawable-xxhdpi/button_google_play.webp new file mode 100644 index 00000000..75eb716b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/button_google_play.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/button_settings.webp b/app/src/main/res/drawable-xxhdpi/button_settings.webp new file mode 100644 index 00000000..beed7f7a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/button_settings.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/button_start.webp b/app/src/main/res/drawable-xxhdpi/button_start.webp new file mode 100644 index 00000000..c9871b33 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/button_start.webp differ diff --git a/Memory Game/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from Memory Game/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/Memory Game/res/drawable-xxhdpi/icon.png b/app/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from Memory Game/res/drawable-xxhdpi/icon.png rename to app/src/main/res/drawable-xxhdpi/icon.png diff --git a/app/src/main/res/drawable-xxhdpi/tooltip_play.webp b/app/src/main/res/drawable-xxhdpi/tooltip_play.webp new file mode 100644 index 00000000..27f9a8f7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/tooltip_play.webp differ diff --git a/app/src/main/res/drawable/button_again.webp b/app/src/main/res/drawable/button_again.webp new file mode 100644 index 00000000..22e2b1bb Binary files /dev/null and b/app/src/main/res/drawable/button_again.webp differ diff --git a/app/src/main/res/drawable/button_back.webp b/app/src/main/res/drawable/button_back.webp new file mode 100644 index 00000000..bd09b29c Binary files /dev/null and b/app/src/main/res/drawable/button_back.webp differ diff --git a/app/src/main/res/drawable/level_complete.webp b/app/src/main/res/drawable/level_complete.webp new file mode 100644 index 00000000..75b349fa Binary files /dev/null and b/app/src/main/res/drawable/level_complete.webp differ diff --git a/app/src/main/res/drawable/level_complete_star.webp b/app/src/main/res/drawable/level_complete_star.webp new file mode 100644 index 00000000..19310123 Binary files /dev/null and b/app/src/main/res/drawable/level_complete_star.webp differ diff --git a/app/src/main/res/drawable/settings_popup.webp b/app/src/main/res/drawable/settings_popup.webp new file mode 100644 index 00000000..de79574f Binary files /dev/null and b/app/src/main/res/drawable/settings_popup.webp differ diff --git a/Memory Game/res/drawable/tile.9.png b/app/src/main/res/drawable/tile.9.png similarity index 100% rename from Memory Game/res/drawable/tile.9.png rename to app/src/main/res/drawable/tile.9.png diff --git a/app/src/main/res/drawable/tile_back_star.webp b/app/src/main/res/drawable/tile_back_star.webp new file mode 100644 index 00000000..a2154d0e Binary files /dev/null and b/app/src/main/res/drawable/tile_back_star.webp differ diff --git a/app/src/main/res/drawable/time_bar.webp b/app/src/main/res/drawable/time_bar.webp new file mode 100644 index 00000000..aa7ad739 Binary files /dev/null and b/app/src/main/res/drawable/time_bar.webp differ diff --git a/app/src/main/res/drawable/title.webp b/app/src/main/res/drawable/title.webp new file mode 100644 index 00000000..fb0b65d5 Binary files /dev/null and b/app/src/main/res/drawable/title.webp differ diff --git a/Memory Game/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from Memory Game/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/Memory Game/res/layout/board_view.xml b/app/src/main/res/layout/board_view.xml similarity index 100% rename from Memory Game/res/layout/board_view.xml rename to app/src/main/res/layout/board_view.xml diff --git a/Memory Game/res/layout/difficult_view.xml b/app/src/main/res/layout/difficult_view.xml similarity index 100% rename from Memory Game/res/layout/difficult_view.xml rename to app/src/main/res/layout/difficult_view.xml diff --git a/app/src/main/res/layout/difficulty_select_fragment.xml b/app/src/main/res/layout/difficulty_select_fragment.xml new file mode 100644 index 00000000..fa6c411b --- /dev/null +++ b/app/src/main/res/layout/difficulty_select_fragment.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Memory Game/res/layout/game_fragment.xml b/app/src/main/res/layout/game_fragment.xml similarity index 83% rename from Memory Game/res/layout/game_fragment.xml rename to app/src/main/res/layout/game_fragment.xml index 4a3c544a..16f1b150 100644 --- a/Memory Game/res/layout/game_fragment.xml +++ b/app/src/main/res/layout/game_fragment.xml @@ -39,16 +39,6 @@ android:textColor="#FFFFFF" android:textSize="@dimen/clock_text_size" /> - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Memory Game/res/layout/tile_view.xml b/app/src/main/res/layout/tile_view.xml similarity index 100% rename from Memory Game/res/layout/tile_view.xml rename to app/src/main/res/layout/tile_view.xml diff --git a/Memory Game/res/raw/background_music.mp3 b/app/src/main/res/raw/background_music.mp3 similarity index 100% rename from Memory Game/res/raw/background_music.mp3 rename to app/src/main/res/raw/background_music.mp3 diff --git a/Memory Game/res/raw/correct_answer.mp3 b/app/src/main/res/raw/correct_answer.mp3 similarity index 100% rename from Memory Game/res/raw/correct_answer.mp3 rename to app/src/main/res/raw/correct_answer.mp3 diff --git a/Memory Game/res/raw/star.mp3 b/app/src/main/res/raw/star.mp3 similarity index 100% rename from Memory Game/res/raw/star.mp3 rename to app/src/main/res/raw/star.mp3 diff --git a/Memory Game/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml similarity index 98% rename from Memory Game/res/values-sw600dp/dimens.xml rename to app/src/main/res/values-sw600dp/dimens.xml index 9bc21b59..28a317f7 100644 --- a/Memory Game/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -22,7 +22,8 @@ 60dp 30dp - + 15dp + 40dp 15dp diff --git a/Memory Game/res/values-sw600dp/strings.xml b/app/src/main/res/values-sw600dp/strings.xml similarity index 100% rename from Memory Game/res/values-sw600dp/strings.xml rename to app/src/main/res/values-sw600dp/strings.xml diff --git a/Memory Game/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml similarity index 98% rename from Memory Game/res/values-sw720dp/dimens.xml rename to app/src/main/res/values-sw720dp/dimens.xml index a23e30e8..3987dd5c 100644 --- a/Memory Game/res/values-sw720dp/dimens.xml +++ b/app/src/main/res/values-sw720dp/dimens.xml @@ -21,7 +21,8 @@ 80dp 40dp - + 20dp + 80dp 20dp diff --git a/Memory Game/res/values-sw720dp/strings.xml b/app/src/main/res/values-sw720dp/strings.xml similarity index 100% rename from Memory Game/res/values-sw720dp/strings.xml rename to app/src/main/res/values-sw720dp/strings.xml diff --git a/Memory Game/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from Memory Game/res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/Memory Game/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml similarity index 100% rename from Memory Game/res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/Memory Game/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 98% rename from Memory Game/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml index b4b2a27b..14cc4fd4 100644 --- a/Memory Game/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -21,7 +21,8 @@ 40dp 20dp - + 10dp + 40dp 10dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..881b3c98 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,7 @@ + + + + Mind Game + regular + + diff --git a/Memory Game/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from Memory Game/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/app/src/test/java/com/snatik/matches/ExampleUnitTest.java b/app/src/test/java/com/snatik/matches/ExampleUnitTest.java new file mode 100644 index 00000000..910ddee5 --- /dev/null +++ b/app/src/test/java/com/snatik/matches/ExampleUnitTest.java @@ -0,0 +1,15 @@ +package com.snatik.matches; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * To work on unit tests, switch the Test Artifact in the Build Variants view. + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..52011eb7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,25 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + google() + } + dependencies { + classpath 'com.android.tools.build:gradle:4.0.1' + } +} + +allprojects { + repositories { + jcenter() + maven { + url "https://maven.google.com" + } + google() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..915f0e66 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,20 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..05ef575b Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2190e153 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Sep 15 14:32:12 IST 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..9d82f789 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..aec99730 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'