Merge pull request #37 from Neomer/refactoring/#31-state-pattern

#31-state-pattern !Заработали состояния

app/build.gradle

@@ -21,18 +21,22 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support:cardview-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
-    implementation "com.android.support:customtabs:28.0.0"
-    implementation 'android.arch.lifecycle:extensions:1.1.1'
+    implementation 'com.android.support:design:28.0.0'
+	implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-
     implementation 'com.google.android.gms:play-services-ads:17.2.0'
     implementation 'com.yandex.android:mobmetricalib:3.5.3'
     implementation 'com.android.installreferrer:installreferrer:1.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'android.arch.lifecycle:extensions:1.1.1'
+
+    // ButterKnife
+    implementation 'com.jakewharton:butterknife:8.8.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="my.neomer.sixtyseconds">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -12,19 +13,21 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="UnusedAttribute">
         <activity android:name=".PrivacyPolicyActivity"></activity>
+        <activity android:name=".GameModeSelectionActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
 
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
             android:value="ca-app-pub-5078878060587689~8320307873" />
 
         <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

app/src/main/java/my/neomer/sixtyseconds/GameModeSelectionActivity.java

@@ -0,0 +1,50 @@
+package my.neomer.sixtyseconds;
+
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Button;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import my.neomer.sixtyseconds.gamemodes.IGameMode;
+import my.neomer.sixtyseconds.gamemodes.SinglePlayerGameMode;
+import my.neomer.sixtyseconds.gamemodes.SinglePlayerWithRatesGameMode;
+import my.neomer.sixtyseconds.helpers.ApplicationResources;
+
+public class GameModeSelectionActivity extends AppCompatActivity {
+
+    public static final String GAMEMODE_TAG = "GameModeTag";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_game_mode_selection);
+
+        ApplicationResources.getInstance().setDebug(0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE));
+
+        ApplicationResources.getInstance().loadSounds(this, null);
+        ButterKnife.bind(this);
+    }
+
+    @OnClick(R.id.btnSinglePlayerWithRatesGameMode)
+    void SinglePlayerWithRatesGameMode() {
+        ApplicationResources.getInstance().playClickSound();
+        runGame(new SinglePlayerWithRatesGameMode());
+    }
+
+    @OnClick(R.id.btnSinglePlayerGameMode)
+    void SinglePlayerGameMode() {
+        ApplicationResources.getInstance().playClickSound();
+        runGame(new SinglePlayerGameMode());
+    }
+
+    private void runGame(IGameMode gameMode) {
+        Intent intent = new Intent(this, MainActivity.class);
+        intent.putExtra(GAMEMODE_TAG, gameMode);
+        startActivity(intent);
+    }
+
+}