From 04951e048577fcc0a9a3340e5af138947357afbe Mon Sep 17 00:00:00 2001
From: chronvas <chron.vas@outlook.com>
Date: Sun, 1 Apr 2018 13:45:17 +0100
Subject: [PATCH] Updated to Realm 5.0.0 and Android Studio 3.1 Changed package
 name Removed unused test folders

---
 .gitignore                                    |  7 +-
 app/build.gradle                              | 12 ++--
 .../realmtesting/ExampleInstrumentedTest.java | 26 -------
 app/src/main/AndroidManifest.xml              |  2 +-
 .../chronvas/realmtesting/MainActivity.java   |  2 +-
 .../chronvas/realmtesting/People.java         |  2 +-
 .../chronvas/realmtesting/RealmImporter.java  |  2 +-
 .../realmtesting/TransactionTime.java         |  2 +-
 .../com/chronvas/realmtesting/app/App.java    | 70 ++++++++++++++++++
 .../chronvas/realmtesting/app/App.java        | 71 -------------------
 app/src/main/res/layout/activity_main.xml     | 39 +++++-----
 .../realmtesting/ExampleUnitTest.java         | 17 -----
 build.gradle                                  |  5 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 14 files changed, 105 insertions(+), 154 deletions(-)
 delete mode 100644 app/src/androidTest/java/com/example/chronvas/realmtesting/ExampleInstrumentedTest.java
 rename app/src/main/java/com/{example => }/chronvas/realmtesting/MainActivity.java (98%)
 rename app/src/main/java/com/{example => }/chronvas/realmtesting/People.java (89%)
 rename app/src/main/java/com/{example => }/chronvas/realmtesting/RealmImporter.java (96%)
 rename app/src/main/java/com/{example => }/chronvas/realmtesting/TransactionTime.java (90%)
 create mode 100644 app/src/main/java/com/chronvas/realmtesting/app/App.java
 delete mode 100644 app/src/main/java/com/example/chronvas/realmtesting/app/App.java
 delete mode 100644 app/src/test/java/com/example/chronvas/realmtesting/ExampleUnitTest.java

diff --git a/.gitignore b/.gitignore
index 33c90a6..f70771f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-*.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
@@ -21,6 +18,7 @@
 bin/
 gen/
 out/
+app/release/
 
 # Gradle files
 .gradle/
@@ -43,8 +41,7 @@ captures/
 
 # Intellij
 *.iml
-.idea/workspace.xml
-.idea/libraries
+.idea/
 
 # Keystore files
 *.jks
diff --git a/app/build.gradle b/app/build.gradle
index 0dcf4cf..ff61874 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion 27
     buildToolsVersion "27.0.3"
     defaultConfig {
-        applicationId "com.example.chronvas.realmtesting"
+        applicationId "com.chronvas.realmtesting"
         minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
@@ -21,11 +21,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    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:27.0.2'
-    compile 'com.android.support:design:27.0.2'
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:design:27.1.0'
 }
diff --git a/app/src/androidTest/java/com/example/chronvas/realmtesting/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/chronvas/realmtesting/ExampleInstrumentedTest.java
deleted file mode 100644
index 89d96c5..0000000
--- a/app/src/androidTest/java/com/example/chronvas/realmtesting/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.example.chronvas.realmtesting;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.example.chronvas.realmtesting", appContext.getPackageName());
-    }
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 767ee8d..04db1b7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.chronvas.realmtesting">
+    package="com.chronvas.realmtesting">
 
     <application
         android:name=".app.App"
diff --git a/app/src/main/java/com/example/chronvas/realmtesting/MainActivity.java b/app/src/main/java/com/chronvas/realmtesting/MainActivity.java
similarity index 98%
rename from app/src/main/java/com/example/chronvas/realmtesting/MainActivity.java
rename to app/src/main/java/com/chronvas/realmtesting/MainActivity.java
index 7736bff..ebb2711 100644
--- a/app/src/main/java/com/example/chronvas/realmtesting/MainActivity.java
+++ b/app/src/main/java/com/chronvas/realmtesting/MainActivity.java
@@ -1,4 +1,4 @@
-package com.example.chronvas.realmtesting;
+package com.chronvas.realmtesting;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/com/example/chronvas/realmtesting/People.java b/app/src/main/java/com/chronvas/realmtesting/People.java
similarity index 89%
rename from app/src/main/java/com/example/chronvas/realmtesting/People.java
rename to app/src/main/java/com/chronvas/realmtesting/People.java
index a0512c8..a51fde7 100644
--- a/app/src/main/java/com/example/chronvas/realmtesting/People.java
+++ b/app/src/main/java/com/chronvas/realmtesting/People.java
@@ -1,4 +1,4 @@
-package com.example.chronvas.realmtesting;
+package com.chronvas.realmtesting;
 
 import io.realm.RealmObject;
 
diff --git a/app/src/main/java/com/example/chronvas/realmtesting/RealmImporter.java b/app/src/main/java/com/chronvas/realmtesting/RealmImporter.java
similarity index 96%
rename from app/src/main/java/com/example/chronvas/realmtesting/RealmImporter.java
rename to app/src/main/java/com/chronvas/realmtesting/RealmImporter.java
index 4932325..4f030e3 100644
--- a/app/src/main/java/com/example/chronvas/realmtesting/RealmImporter.java
+++ b/app/src/main/java/com/chronvas/realmtesting/RealmImporter.java
@@ -1,4 +1,4 @@
-package com.example.chronvas.realmtesting;
+package com.chronvas.realmtesting;
 
 import android.content.res.Resources;
 import android.util.Log;
diff --git a/app/src/main/java/com/example/chronvas/realmtesting/TransactionTime.java b/app/src/main/java/com/chronvas/realmtesting/TransactionTime.java
similarity index 90%
rename from app/src/main/java/com/example/chronvas/realmtesting/TransactionTime.java
rename to app/src/main/java/com/chronvas/realmtesting/TransactionTime.java
index 7ccf43c..4258c8b 100644
--- a/app/src/main/java/com/example/chronvas/realmtesting/TransactionTime.java
+++ b/app/src/main/java/com/chronvas/realmtesting/TransactionTime.java
@@ -1,4 +1,4 @@
-package com.example.chronvas.realmtesting;
+package com.chronvas.realmtesting;
 
 /**
  * Created by chronvas on 30/9/2016.
diff --git a/app/src/main/java/com/chronvas/realmtesting/app/App.java b/app/src/main/java/com/chronvas/realmtesting/app/App.java
new file mode 100644
index 0000000..967503d
--- /dev/null
+++ b/app/src/main/java/com/chronvas/realmtesting/app/App.java
@@ -0,0 +1,70 @@
+package com.chronvas.realmtesting.app;
+
+import android.app.Application;
+
+import com.chronvas.realmtesting.R;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import io.realm.Realm;
+import io.realm.RealmConfiguration;
+
+public class App extends Application {
+
+    private static final String testDbFileName = "testdb.realm";
+    //Overwrite database on Application startup? - Optional
+    private static final boolean shouldOverwriteDatabaseOnAppStartup = true;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        if (shouldOverwriteDatabaseOnAppStartup) {
+            copyBundledRealmFile(this.getResources().openRawResource(R.raw.testdb), testDbFileName);
+        } else {
+            //check if the db is already in place
+            if (!fileFound(testDbFileName, this.getFilesDir())) {
+                copyBundledRealmFile(this.getResources().openRawResource(R.raw.testdb), testDbFileName);
+            }
+        }
+
+        //Config Realm for the application
+        Realm.init(this);
+        RealmConfiguration realmConfiguration = new RealmConfiguration.Builder()
+                .name(testDbFileName)
+                .build();
+
+        Realm.setDefaultConfiguration(realmConfiguration);
+    }
+
+    private void copyBundledRealmFile(InputStream inputStream, String outFileName) {
+        try {
+            File file = new File(this.getFilesDir(), outFileName);
+            FileOutputStream outputStream = new FileOutputStream(file);
+            byte[] buf = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buf)) > 0) {
+                outputStream.write(buf, 0, bytesRead);
+            }
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public boolean fileFound(String name, File file) {
+        File[] list = file.listFiles();
+        if (list != null)
+            for (File fil : list) {
+                if (fil.isDirectory()) {
+                    fileFound(name, fil);
+                } else if (name.equalsIgnoreCase(fil.getName())) {
+                    return true;
+                }
+            }
+        return false;
+    }
+}
diff --git a/app/src/main/java/com/example/chronvas/realmtesting/app/App.java b/app/src/main/java/com/example/chronvas/realmtesting/app/App.java
deleted file mode 100644
index 59d29d8..0000000
--- a/app/src/main/java/com/example/chronvas/realmtesting/app/App.java
+++ /dev/null
@@ -1,71 +0,0 @@
-    package com.example.chronvas.realmtesting.app;
-
-    import android.app.Application;
-
-    import com.example.chronvas.realmtesting.R;
-
-    import java.io.File;
-    import java.io.FileOutputStream;
-    import java.io.IOException;
-    import java.io.InputStream;
-
-    import io.realm.Realm;
-    import io.realm.RealmConfiguration;
-
-    public class App extends Application {
-
-        @Override
-        public void onCreate() {
-            super.onCreate();
-
-            //Set true to overwrite database - Optional
-            boolean overwriteDatabase = false;
-
-            if (overwriteDatabase){
-                copyBundledRealmFile(this.getResources().openRawResource(R.raw.testdb), "testdb.realm");
-            }else{
-                //check if the db is already in place
-                if (!fileFound("testdb.realm", this.getFilesDir())){
-                    copyBundledRealmFile(this.getResources().openRawResource(R.raw.testdb), "testdb.realm");
-                }
-            }
-
-            //Config Realm for the application
-            Realm.init(this);
-            RealmConfiguration realmConfiguration = new RealmConfiguration.Builder()
-                    .name("testdb.realm")
-                    .build();
-
-            Realm.setDefaultConfiguration(realmConfiguration);
-        }
-
-        private String copyBundledRealmFile(InputStream inputStream, String outFileName) {
-            try {
-                File file = new File(this.getFilesDir(), outFileName);
-                FileOutputStream outputStream = new FileOutputStream(file);
-                byte[] buf = new byte[1024];
-                int bytesRead;
-                while ((bytesRead = inputStream.read(buf)) > 0) {
-                    outputStream.write(buf, 0, bytesRead);
-                }
-                outputStream.close();
-                return file.getAbsolutePath();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-
-        public boolean fileFound(String name, File file) {
-            File[] list = file.listFiles();
-            if (list != null)
-                for (File fil : list) {
-                    if (fil.isDirectory()) {
-                        fileFound(name, fil);
-                    } else if (name.equalsIgnoreCase(fil.getName())) {
-                        return true;
-                    }
-                }
-            return false;
-        }
-    }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 77c3b5a..3cb466b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-
-    android:orientation="vertical"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.chronvas.realmtesting.MainActivity">
-
+    android:orientation="vertical"
+    tools:context="com.chronvas.realmtesting.MainActivity">
 
     <Button
-        android:paddingTop="8dp"
-        android:text="Import from Json"
+        android:id="@+id/importbtn"
+        style="@android:style/Widget.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/importbtn"
-        style="@android:style/Widget.Button" />
+        android:text="Import from Json"
+        />
 
     <Button
-        android:text="count People"
+        android:id="@+id/count"
+        style="@android:style/Widget.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/count"
-        style="@android:style/Widget.Button" />
+        android:text="count People"
+        />
 
     <Button
-        android:text="Change 1st person's name"
+        android:id="@+id/changename"
+        style="@android:style/Widget.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/changename"
-        style="@android:style/Widget.Button" />
+        android:text="Change 1st person's name"
+        />
 
     <Button
-        android:text="View 1st person"
+        android:id="@+id/viewname"
+        style="@android:style/Widget.Button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/viewname"
-        style="@android:style/Widget.Button" />
+        android:text="View 1st person"
+        />
 </LinearLayout>
diff --git a/app/src/test/java/com/example/chronvas/realmtesting/ExampleUnitTest.java b/app/src/test/java/com/example/chronvas/realmtesting/ExampleUnitTest.java
deleted file mode 100644
index 4cb9cee..0000000
--- a/app/src/test/java/com/example/chronvas/realmtesting/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.chronvas.realmtesting;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6d8cb2a..f1b695c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,11 +6,12 @@ buildscript {
         maven { url "https://maven.google.com" }
         mavenCentral()
         mavenLocal()
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath "io.realm:realm-gradle-plugin:4.3.1"
+        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath "io.realm:realm-gradle-plugin:5.0.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb4e668..9c64a7b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip