Upgraded Versions and Image Compressed

README.md

@@ -10,14 +10,6 @@ We just wanted a simple memory game for kids 4+ age. No ads, no complicated scre
 
 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:
 
-<img src="http://www.sromku.com/static/img/pregnancy_memorygame_preview.png"/>
-
-### Download It
-
-<a href="https://play.google.com/store/apps/details?id=com.snatik.matches">
-  <img alt="Android app on Google Play" src="https://developer.android.com/images/brand/en_app_rgb_wo_45.png" />
-</a>
-
 ### Next
 
 - [ ] 2 player game

app/build.gradle

@@ -1,27 +1,31 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
-        applicationId "com.snatik.matches"
-        minSdkVersion 14
-        targetSdkVersion 28
-        versionCode 1007
-        versionName "1.01.001007"
+        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 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
 }

app/src/main/java/com/snatik/matches/GameApplication.java

@@ -10,6 +10,5 @@ public class GameApplication extends Application {
 	public void onCreate() {
 		super.onCreate();
 		FontLoader.loadFonts(this);
-
 	}
 }

app/src/main/java/com/snatik/matches/MainActivity.java

@@ -3,7 +3,7 @@
 
 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;

app/src/main/java/com/snatik/matches/common/Shared.java

@@ -1,7 +1,7 @@
 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;

app/src/main/java/com/snatik/matches/engine/Engine.java

@@ -96,19 +96,8 @@ public void onEvent(ResetBackgroundEvent event) {
 		if (drawable != null) {
 			((TransitionDrawable) drawable).reverseTransition(2000);
 		} else {
-			new AsyncTask<Void, Void, Bitmap>() {
-
-				@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<Void, Void, TransitionDrawable> task = new AsyncTask<Void, Void, TransitionDrawable>() {
-
-			@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

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;

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;

app/src/main/java/com/snatik/matches/fragments/DifficultySelectFragment.java

@@ -5,7 +5,7 @@
 import android.animation.ObjectAnimator;
 import android.graphics.Typeface;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

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;
@@ -49,7 +49,7 @@ public void onClick(View v) {
 		mGooglePlayGameButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				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);

app/src/main/java/com/snatik/matches/fragments/ThemeSelectFragment.java

@@ -3,7 +3,8 @@
 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;
@@ -22,7 +23,7 @@
 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);
@@ -52,7 +53,7 @@ public void onClick(View v) {
 		emoji.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-				Shared.eventBus.notify(new ThemeSelectedEvent(themeEmoji));
+				Shared.eventBus.notify(new  ThemeSelectedEvent(themeEmoji));
 			}
 		});
 

app/src/main/java/com/snatik/matches/themes/Themes.java

@@ -53,8 +53,7 @@ public static Theme createEmojiTheme() {
 	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());
 	}
 
 }