Code review #2

Labyrinth/app/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -26,6 +27,11 @@ dependencies {
     })
     compile 'com.android.support:appcompat-v7:26.+'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.google.code.gson:gson:2.8.2'
+    compile 'com.android.support:design:26.+'
+    compile 'com.android.support:support-vector-drawable:26.+'
     testCompile 'junit:junit:4.12'
+    implementation 'com.google.android.gms:play-services-games:11.6.0'
+    implementation 'com.google.android.gms:play-services-auth:11.6.0'
 }
 apply plugin: 'com.android.application'

Labyrinth/app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"ru.spbau.labyrinth","split":"","minSdkVersion":"16"}}]

Labyrinth/app/src/androidTest/java/ru/spbau/labyrinth/ExampleInstrumentedTest.java

@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumentation test, which will execute on an Android device.

Labyrinth/app/src/main/AndroidManifest.xml

@@ -2,21 +2,39 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ru.spbau.labyrinth">
 
-<application
-    android:allowBackup="true"
-    android:icon="@mipmap/ic_launcher"
-    android:label="@string/app_name"
-    android:roundIcon="@mipmap/ic_launcher_round"
-    android:supportsRtl="true"
-    android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-    <activity android:name=".MainActivity">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher_round"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        <activity
+            android:name=".LocalGameActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".OnlineGameActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".LogActivity" />
+        <activity android:name=".StartActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-    </activity>
-    <activity android:name=".LogActivity"></activity>
-</application>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".InitActivity" />
+        <activity
+            android:name=".EditorActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".LevelSelectActivity"/>
+        <activity android:name=".EndGameActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".networkMultiplayer.MultiplayerActivity"/>
+        <meta-data android:name="com.google.android.gms.games.APP_ID"
+            android:value="@string/app_id" />
+        <meta-data android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version"/>
+    </application>
 
 </manifest>

Labyrinth/app/src/main/java/ru/spbau/labyrinth/EditorActivity.java

@@ -0,0 +1,140 @@
+package ru.spbau.labyrinth;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.HorizontalScrollView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import ru.spbau.labyrinth.customviews.EditFieldView;
+import ru.spbau.labyrinth.customviews.OuterScrollView;
+import ru.spbau.labyrinth.db.DBHelper;
+import ru.spbau.labyrinth.model.field.Field;
+
+public class EditorActivity extends AppCompatActivity implements View.OnClickListener {
+    private static final int MAZE_REQUEST = 2;
+    static DBHelper dbHelper;
+    static EditFieldView editFieldView;
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == MAZE_REQUEST) {
+            if (data == null || resultCode != RESULT_OK) {
+                return;
+            }
+            String maze = data.getStringExtra("maze");
+            if (maze != null) {
+                setEditFieldView(maze);
+                checkField();
+            }
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_editor);
+
+        final OuterScrollView outerScrollView = findViewById(R.id.outerScroll);
+        final HorizontalScrollView horizontalScrollView = findViewById(R.id.horizontalScroll);
+        editFieldView = findViewById(R.id.fieldView);
+
+        outerScrollView.post(new Runnable() {
+            public void run() {
+                outerScrollView.scrollTo(0, 650);
+            }
+        });
+        horizontalScrollView.post(new Runnable() {
+            public void run() {
+                horizontalScrollView.scrollTo(650, 0);
+            }
+        });
+
+        Button saveButton = findViewById(R.id.saveButton);
+        Button loadButton = findViewById(R.id.loadButton);
+        Button checkButton = findViewById(R.id.checkButton);
+
+        saveButton.setOnClickListener(this);
+        loadButton.setOnClickListener(this);
+        checkButton.setOnClickListener(this);
+
+        dbHelper = new DBHelper(this);
+    }
+
+    private void saveMaze(final Field field) {
+        if (!checkField())
+            return;
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        final EditText input = new EditText(this);
+        input.setHint("Maze name...");
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.MATCH_PARENT);
+        input.setLayoutParams(lp);
+        builder.setView(input);
+        builder.setPositiveButton("SAVE", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialogInterface, int i) {
+                String name = input.getText().toString();
+                if (!name.equals("")) {
+                    dbHelper.saveField(field, name);
+                }
+            }
+        });
+        builder.show();
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.saveButton: {
+                saveMaze(editFieldView.getField());
+                break;
+            }
+            case R.id.loadButton: {
+                Intent intent = new Intent(EditorActivity.this, LevelSelectActivity.class);
+                startActivityForResult(intent, MAZE_REQUEST);
+                break;
+            }
+            case R.id.checkButton: {
+                checkField();
+                break;
+            }
+        }
+        dbHelper.close();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        checkField();
+    }
+
+    public boolean checkField() {
+        editFieldView = findViewById(R.id.fieldView);
+        final ImageView backgroundImageView = findViewById(R.id.background);
+
+        Field.ErrorType error = editFieldView.getField().isCorrect();
+        if (error == Field.ErrorType.NO_ERROR) {
+            backgroundImageView.setImageResource(R.drawable.labyrinth_green);
+            return true;
+        } else {
+            Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_SHORT).show();
+            backgroundImageView.setImageResource(R.drawable.labyrinth_red);
+            return false;
+        }
+    }
+
+    public static void setEditFieldView(String json) {
+        editFieldView.setField(Field.deserialize(json));
+    }
+}

Labyrinth/app/src/main/java/ru/spbau/labyrinth/EndGameActivity.java

@@ -0,0 +1,41 @@
+package ru.spbau.labyrinth;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+public class EndGameActivity extends AppCompatActivity {
+    private final int[] backgrounds = {
+            R.drawable.labyrinth_red,
+            R.drawable.labyrinth_blue,
+            R.drawable.labyrinth_green,
+            R.drawable.labyrinth_yellow};
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_endgame);
+        Intent intent = getIntent();
+        int winner = intent.getIntExtra("winnerId", 0);
+        String name = intent.getStringExtra("winnerName");
+
+        ImageView background = findViewById(R.id.background);
+        background.setImageResource(backgrounds[winner]);
+        TextView endTextView = findViewById(R.id.endTextView);
+
+        endTextView.setText("GAME OVER\nWinner:\n" + name);
+
+        Button menuButton = findViewById(R.id.menuButton);
+        menuButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+    }
+
+}