First code review of the client part

app/build.gradle

@@ -6,24 +6,30 @@ android {
     defaultConfig {
         applicationId "ru.spbau.resemblance"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    productFlavors {
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:support-vector-drawable:24.2.1'
     testCompile 'junit:junit:4.12'
 }

app/src/main/AndroidManifest.xml

@@ -2,19 +2,85 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ru.spbau.resemblance">
 
+    <!-- To auto-complete the email text field in the login form with the user's emails -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_PROFILE" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".CreateGameActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".JoinGameActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".LoginActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/title_activity_settings"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".RegistrationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".PasswordChangeActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".CardSetsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ListOfSetsActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GameIntermediateActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".LeadingAssociationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".CardPickerActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".CardViewerActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GameExpectationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GamePreparationActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GameFinishActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GalleryActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GalleryCardViewerActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ChatActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".CreateSetActivity"></activity>
     </application>
 
 </manifest>

app/src/main/java/ru/spbau/resemblance/CardPickerActivity.java

@@ -0,0 +1,144 @@
+package ru.spbau.resemblance;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.GridView;
+import android.widget.ListAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class CardPickerActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+    public static final String PICTURE_PARAM = "picture_id";
+    public static final String OUR_CARDS_PARAM = "our_cards";
+    public static final String SUGGESTION_PARAM = "suggestion";
+    public static final String TITLE_PARAM = "title";
+    public static final String EXPECTATION_TIME_PARAM = "expectation_time";
+    public static final String LEADING_PARAM = "leading";
+    private final static int COLUMNS_NUMBER = 2;
+    private final static int CARD_REQUEST = 1;
+    private final static int LEADING_CARD_REQUEST = 2;
+    private final static long SECOND = 1000;
+
+    private TextView timeView;
+    private Timer timer;
+    private long deadline;
+    private boolean leading;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_card_picker);
+
+        GridView grid = (GridView) findViewById(R.id.cardPickedGrid);
+        TextView suggestion = (TextView) findViewById(R.id.cardPickerText);
+        timeView = (TextView) findViewById(R.id.cardPickerTimeView);
+
+        Intent callingIntent = getIntent();
+
+        leading = callingIntent.getBooleanExtra(LEADING_PARAM, false);
+        suggestion.setText(callingIntent.getStringExtra(SUGGESTION_PARAM));
+        setTitle(callingIntent.getStringExtra(TITLE_PARAM));
+        long timeout = callingIntent.getLongExtra(EXPECTATION_TIME_PARAM, -1);
+
+        List <Long> cardIds = new ArrayList<>();
+        long[] cardsArr = callingIntent.getLongArrayExtra(OUR_CARDS_PARAM);
+        for(long card: cardsArr) {
+            cardIds.add(card);
+        }
+
+        ArrayList<ImageStorage.ImageWrapped> cardViews = new ArrayList<>();
+        for (int i = 0; i < cardIds.size(); i++) {
+            cardViews.add(ImageStorage.ImageWrapped.createById((int)(long)cardIds.get(i)));
+        }
+
+        ListAdapter cardsAdapter = new CardsAdapter(this, cardViews,
+                getResources().getDisplayMetrics().widthPixels / COLUMNS_NUMBER);
+        grid.setAdapter(cardsAdapter);
+        grid.setNumColumns(COLUMNS_NUMBER);
+
+        grid.setOnItemClickListener(this);
+
+        timer = new Timer();
+        deadline = System.currentTimeMillis() + timeout;
+        timer.scheduleAtFixedRate(new TimeUpdater(), 10, 200);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        if (leading) {
+            Intent showPicture = new Intent(this, LeadingAssociationActivity.class);
+            showPicture.putExtra(LeadingAssociationActivity.IMAGE_PARAM, id);
+            startActivityForResult(showPicture, LEADING_CARD_REQUEST);
+        } else {
+            Intent showPicture = new Intent(this, CardViewerActivity.class);
+            showPicture.putExtra(LeadingAssociationActivity.IMAGE_PARAM, id);
+            startActivityForResult(showPicture, CARD_REQUEST);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        long pictureId = data.getLongExtra(GameIntermediateActivity.PICTURE_PARAM, -1L);
+        if (pictureId >= 0) {
+            Intent ret = new Intent();
+            ret.putExtra(GameIntermediateActivity.PICTURE_PARAM, pictureId);
+            if (leading) {
+                ret.putExtra(GameIntermediateActivity.ASSOCIATION_PARAM,
+                        data.getStringExtra(GameIntermediateActivity.ASSOCIATION_PARAM));
+            }
+            setResult(RESULT_OK, ret);
+            timer.cancel();
+            finish();
+        }
+    }
+
+    private class TimeUpdater extends TimerTask {
+        final int MINUTE = 60;
+
+        @Override
+        public void run() {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (System.currentTimeMillis() > deadline) {
+                        Intent ret = new Intent();
+                        ret.putExtra(GameIntermediateActivity.PICTURE_PARAM, -1L);
+                        setResult(RESULT_OK, ret);
+                        timer.cancel();
+                        finish();
+                    } else {
+                        long rest = (deadline - System.currentTimeMillis()) / SECOND;
+                        timeView.setText(String.format(getString(R.string.card_picker_time), rest / MINUTE + ":" + rest % MINUTE));
+                    }
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.chat_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        Intent chatIntent = new Intent(this, ChatActivity.class);
+        startActivity(chatIntent);
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        //Doing nothing. Player should submit an association.
+    }
+}

app/src/main/java/ru/spbau/resemblance/CardSetsActivity.java

@@ -0,0 +1,75 @@
+package ru.spbau.resemblance;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+
+//This is an activity for manipulations with cards and sets
+
+public class CardSetsActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+    final private static int GALLERY_REQUEST = 1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_card_sets);
+
+        ListView optionsList = (ListView)findViewById(R.id.cardSetsOptionsList);
+        ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1,
+                getResources().getStringArray(R.array.cards_control_options));
+
+        optionsList.setAdapter(adapter);
+        optionsList.setOnItemClickListener(this);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent imageReturnedIntent) {
+        super.onActivityResult(requestCode, resultCode, imageReturnedIntent);
+
+        ImageView imageView = (ImageView) new ImageView(this);
+
+        switch (requestCode) {
+            case GALLERY_REQUEST:
+                if (resultCode == RESULT_OK) {
+                    Uri selectedImage = imageReturnedIntent.getData();
+                    imageView.setImageURI(selectedImage);
+                    ImageStorage.addImageByUri(selectedImage.toString(), this);
+                }
+        }
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        switch (position) {
+            case 0: {
+                Intent listOfSets = new Intent(this, ListOfSetsActivity.class);
+                startActivity(listOfSets);
+                break;
+            }
+            case 1: {
+                Intent showCards = new Intent(this, GalleryActivity.class);
+                ArrayList<ImageStorage.ImageWrapped> cards = ImageStorage.getAllImages();
+                long[] cardIds = new long[cards.size()];
+                for (int i = 0; i < cardIds.length; i++) {
+                    cardIds[i] = cards.get(i).getIdImage();
+                }
+                showCards.putExtra(GalleryActivity.CARDS_PARAM, cardIds);
+                startActivity(showCards);
+                break;
+            }
+            case 2: {
+                Intent createSet = new Intent(this, CreateSetActivity.class);
+                startActivity(createSet);
+                break;
+            }
+        }
+    }
+}