DevAndroidMotionAndRelease

.gitignore

@@ -8,3 +8,5 @@
 /captures
 .externalNativeBuild
 /.idea
+/keystores/release.properties
+/keystores/release_keystore.jks

app/build.gradle

@@ -1,5 +1,8 @@
 apply plugin: 'com.android.application'
 
+
+def singingProperties = new Properties()
+
 android {
     compileSdkVersion 26
     defaultConfig {
@@ -10,15 +13,38 @@ android {
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    signingConfigs {
+        debug {
+            singingProperties.load(new FileInputStream(file("..\\keystores\\debug.properties")))
+            keyAlias singingProperties.debugSignKeyAlias
+            keyPassword singingProperties.debugSignKeyPassword
+            storeFile file(singingProperties.debugStoreFilePath)
+            storePassword singingProperties.debugStorePassword
+
+        }
+        release {
+            singingProperties.load(new FileInputStream(file("..\\keystores\\release.properties")))
+            keyAlias singingProperties.releaseSignKeyAlias
+            keyPassword singingProperties.releaseSignKeyPassword
+            storeFile file(singingProperties.releaseStoreFilePath)
+            storePassword singingProperties.releaseStorePassword
+
+        }
+    }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+        debug {
+            signingConfig signingConfigs.debug
         }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 

app/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
     package="com.example.anna.myapplication">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".presentation.MyApplication"
@@ -26,7 +28,14 @@
         <activity android:name=".presentation.CatAsyncTaskActivity" />
         <activity android:name=".presentation.FrescoImageActivity" />
         <activity android:name=".presentation.SQLiteDBActivity" />
-        <activity android:name=".presentation.RoomDB"></activity>
+        <activity android:name=".presentation.RoomDB" />
+
+        <service
+            android:name=".data.LoadDatabaseIntentService"
+            android:exported="false" />
+
+        <activity android:name=".presentation.IntentServiceActivity" />
+        <activity android:name=".presentation.TouchActivity"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/example/anna/myapplication/data/LoadDatabaseIntentService.java

@@ -0,0 +1,36 @@
+package com.example.anna.myapplication.data;
+
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+
+import android.app.IntentService;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.Toast;
+
+import com.example.anna.myapplication.presentation.MyApplication;
+
+public class LoadDatabaseIntentService extends IntentService {
+
+    private FileOutputStream fileOutputStream = null;
+
+    public LoadDatabaseIntentService() {
+        super("LoadDatabaseIntentService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        if (intent != null) {
+            String databaseBackup = MyApplication.getPersonDao().loadAll().toString();
+            String fileName = intent.getStringExtra("fileName");
+            try {
+                fileOutputStream = openFileOutput(fileName, Context.MODE_PRIVATE);
+                fileOutputStream.write(databaseBackup.getBytes());
+                fileOutputStream.close();
+            } catch (Exception e) {
+                Toast toast = Toast.makeText(this, "An error occurred while writing database", Toast.LENGTH_LONG);
+                toast.show();
+            }
+        }
+    }
+}

app/src/main/java/com/example/anna/myapplication/data/PersonContract.java

@@ -4,7 +4,6 @@
 
 public interface PersonContract extends BaseColumns {
 
-
     String TABLE_NAME = "personsTable";
 
     String NAME = "name";

app/src/main/java/com/example/anna/myapplication/domain/Person.java

@@ -71,11 +71,29 @@ public void setBirthday(String birthday) {
 
     @Override
     public String toString() {
+        String returnedString = "Person{id=";
         if (id == NOT_SPECIFIED_LONG) {
-            return "Person{" + "id=?, name='" + name + "\'" + '}';
+            returnedString = returnedString.concat("?");
         } else {
-            return "Person{" + "id=" + id + ", name='" + name + "\'" + '}';
+            returnedString = returnedString.concat("" + id);
         }
+        if (!name.equals(NOT_SPECIFIED_STRING)) {
+            returnedString = returnedString.concat(", name='" + name + "\'");
+        }
+        if (!note.equals(NOT_SPECIFIED_STRING)) {
+            returnedString = returnedString.concat(", note='" + note + "\'");
+        }
+        if (imageRes != NOT_SPECIFIED_INT) {
+            returnedString = returnedString.concat(", imageRes=" + imageRes);
+        }
+        if (!imageLink.equals(NOT_SPECIFIED_STRING)) {
+            returnedString = returnedString.concat(", imageLink='" + imageLink + "\'");
+        }
+        if (!birthday.equals(NOT_SPECIFIED_STRING)) {
+            returnedString = returnedString.concat(", birthday=" + birthday);
+        }
+        returnedString = returnedString.concat("}");
+        return returnedString;
     }
 }
 

app/src/main/java/com/example/anna/myapplication/presentation/IntentServiceActivity.java

@@ -0,0 +1,55 @@
+package com.example.anna.myapplication.presentation;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.example.anna.myapplication.R;
+
+import java.io.FileInputStream;
+
+public class IntentServiceActivity extends AppCompatActivity {
+
+    private TextView DatabaseTextView;
+    private Button DatabaseLoadButton, nextButton, backButton;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.intent_service);
+
+        DatabaseTextView = (TextView) findViewById(R.id.textView);
+
+        DatabaseLoadButton = (Button) findViewById(R.id.loadDatabaseButton);
+        DatabaseLoadButton.setOnClickListener(view -> {
+            StringBuilder stringBuilder = new StringBuilder();
+            try{
+                FileInputStream fstream = openFileInput(MyApplication.getFileName());
+                int i;
+                while ((i = fstream.read())!= -1){
+                    stringBuilder.append((char)i);
+                }
+                fstream.close();
+                DatabaseTextView.setText(stringBuilder.toString());
+            }catch (Exception e){
+                DatabaseTextView.setText(getResources().getString(R.string.error_load_database));
+            }
+
+        });
+
+        nextButton = findViewById(R.id.nextScreenButton);
+        nextButton.setOnClickListener(view -> {
+            Intent startActivity = new Intent(this, TouchActivity.class);
+            startActivity(startActivity);
+        });
+
+        backButton = findViewById(R.id.to_first_activity_button);
+        backButton.setOnClickListener(view -> {
+            Intent startActivity = new Intent(this, MainActivity.class);
+            startActivity(startActivity);
+        });
+    }
+}

app/src/main/java/com/example/anna/myapplication/presentation/MainActivity.java

@@ -48,7 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         buttonTraining = findViewById(R.id.training_thread);
         buttonTraining.setOnClickListener(view -> {
-            Intent startActivity = new Intent(MainActivity.this, RoomDB.class);
+            Intent startActivity = new Intent(MainActivity.this, TouchActivity.class);
             startActivity(startActivity);
         });
     }

app/src/main/java/com/example/anna/myapplication/presentation/MyApplication.java

@@ -2,25 +2,39 @@
 
 import android.app.Application;
 import android.arch.persistence.room.Room;
+import android.content.Intent;
 
+import com.example.anna.myapplication.data.LoadDatabaseIntentService;
 import com.example.anna.myapplication.data.AppDatabase;
 import com.example.anna.myapplication.data.DatabaseHolder;
 import com.example.anna.myapplication.data.PersonDao;
 import com.example.anna.myapplication.data.PersonRepository;
 import com.facebook.drawee.backends.pipeline.Fresco;
 
+import java.util.Date;
+
 public class MyApplication extends Application {
 
     private static AppDatabase database;
     private static PersonRepository personRepository;
     private static DatabaseHolder databaseHolder;
+    private static String fileName;
 
     public static PersonDao getPersonDao(){
         return database.PersonDao();
     }
     public static PersonRepository getRepository(){
         return personRepository;
     }
+    public static String getFileName(){
+        return fileName;
+    }
+
+    private String getFileNameOnCurrentTime(){
+        Date currentDate = new Date();
+        long millisFromStart = currentDate.getTime();
+        return "backup-" + millisFromStart;
+    }
 
     @Override
     public void onCreate() {
@@ -36,6 +50,11 @@ public void onCreate() {
                 .build();
 
         setInitialData();
+
+        // Запускаем IntentService
+        Intent intentMyIntentService = new Intent(this, LoadDatabaseIntentService.class);
+        fileName = getFileNameOnCurrentTime();
+        startService(intentMyIntentService.putExtra("fileName", fileName));
     }
 
     public static void setInitialData(){

app/src/main/java/com/example/anna/myapplication/presentation/PersonListActivity.java

@@ -6,7 +6,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 
 import com.example.anna.myapplication.R;
@@ -18,6 +18,7 @@ public class PersonListActivity extends AppCompatActivity {
     private Fragment fragment;
     private Fragment newFragment;
     private long personId = -1;
+    private float downX, downY;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -132,4 +133,45 @@ public void openFragment2 (long personId_) {
 
         findViewById(R.id.fragmentContainer2).setVisibility(View.VISIBLE);
     }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        super.onTouchEvent(event);
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                downX = event.getX();
+                downY = event.getY();
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                float upX = event.getX();
+                float upY = event.getY();
+
+                float deltaX = downX - upX;
+                float deltaY = downY - upY;
+                if ((Math.abs(deltaY) > Math.abs(deltaX)) && (deltaY < 0)) {
+
+                    personId = -1;
+
+                    if (findViewById(R.id.fragmentContainer2).getVisibility() == View.VISIBLE) {
+                        findViewById(R.id.fragmentContainer2).setVisibility(View.GONE);
+
+                        fragment = fragmentManager.findFragmentById(R.id.fragmentContainer1);
+                        newFragment = new PersonListFragment();
+
+                        if (fragment == null) {
+                            fragmentManager.beginTransaction()
+                                    .addToBackStack(null)
+                                    .add(R.id.fragmentContainer1, newFragment)
+                                    .commit();
+                        }
+
+                        findViewById(R.id.fragmentContainer1).setVisibility(View.VISIBLE);
+                    }
+                }
+                break;
+        }
+        return true;
+    }
 }

app/src/main/java/com/example/anna/myapplication/presentation/RoomDB.java

@@ -37,8 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         nextButton = findViewById(R.id.nextScreenButton);
         nextButton.setOnClickListener(view -> {
-            // Intent startActivity = new Intent(this, RoomDB.class);
-            //startActivity(startActivity);
+            Intent startActivity = new Intent(this, IntentServiceActivity.class);
+            startActivity(startActivity);
         });
 
         backButton = findViewById(R.id.to_first_activity_button);