wip

tills13 · Feb 9, 2017 · c56fc75 · c56fc75
1 parent afd9f20
commit c56fc75
Show file tree

Hide file tree

Showing 48 changed files with 4,691 additions and 1,123 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>AndroiDB</name>
+	<comment>Project AndroiDB created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,8 @@
+connection.arguments=
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.java.home=null
+connection.jvm.arguments=
+connection.project.dir=
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+project.path=\:
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,10 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/.DS_Store": true,
+        "**/*.class": true
+    }
+}
diff --git a/app/.classpath b/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/app/.project b/app/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/app/.settings/org.eclipse.buildship.core.prefs b/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,10 @@
+build.commands=org.eclipse.jdt.core.javabuilder
+connection.arguments=
+connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.java.home=null
+connection.jvm.arguments=
+connection.project.dir=..
+derived.resources=.gradle,build
+eclipse.preferences.version=1
+natures=org.eclipse.jdt.core.javanature
+project.path=\:app
diff --git a/app/app.iml b/app/app.iml
@@ -35,14 +35,14 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -67,14 +67,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,9 +75,16 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars" />
@@ -94,11 +93,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.3.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getkeepsafe.relinker/relinker/1.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.realm/realm-android-library/0.90.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getkeepsafe.relinker/relinker/1.2.2/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.realm/realm-android-library/2.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
@@ -112,17 +110,17 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="realm-android-library-2.0.0" level="project" />
+    <orderEntry type="library" exported="" name="realm-annotations-2.0.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
-    <orderEntry type="library" exported="" name="relinker-1.2.1" level="project" />
-    <orderEntry type="library" exported="" name="realm-android-library-0.90.0" level="project" />
+    <orderEntry type="library" exported="" name="relinker-1.2.2" level="project" />
     <orderEntry type="library" exported="" name="design-23.3.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.3.0" level="project" />
     <orderEntry type="library" exported="" name="postgresql-9.4-1205.jdbc4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
-    <orderEntry type="library" exported="" name="realm-annotations-0.90.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />

diff --git a/app/src/main/java/ca/sbstn/androidb/activity/BaseActivity.java b/app/src/main/java/ca/sbstn/androidb/activity/BaseActivity.java
@@ -17,18 +17,12 @@
 import ca.sbstn.androidb.R;
 import ca.sbstn.androidb.application.AndroiDB;
 import ca.sbstn.androidb.util.Colours;
-import io.realm.Realm;
-import io.realm.RealmConfiguration;
 
-/**
- * Created by tyler on 21/04/16.
- */
 public class BaseActivity extends AppCompatActivity {
     protected Toolbar toolbar;
     protected SharedPreferences sharedPreferences;
     protected FragmentManager fragmentManager;
     private ValueAnimator actionbarAnimator;
-    private Realm realm;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -39,14 +33,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         this.fragmentManager = this.getSupportFragmentManager();
         this.sharedPreferences = this.getSharedPreferences(AndroiDB.SHARED_PREFS_KEY, Context.MODE_PRIVATE);
-
-        //byte[] key = new byte[64];
-        //new SecureRandom().nextBytes(key);
-        RealmConfiguration config = new RealmConfiguration.Builder(this)
-            //.encryptionKey(key)
-            .build();
-
-        this.realm = Realm.getInstance(config);
     }
 
     public SharedPreferences getSharedPreferences() {
@@ -98,10 +84,6 @@ public void putDetailsFragment(Fragment fragment, boolean replaceContext) {
         }
     }
 
-    public Realm getRealm() {
-        return this.realm;
-    }
-
     public void setToolbarTitle(String title) {
         if (this.getSupportActionBar() != null) {
            this.getSupportActionBar().setTitle(title);
@@ -137,15 +119,14 @@ public void setToolbarColor(int color, boolean animate) {
     public void setToolbarColor(int color, boolean animate, final boolean setStatusBar) {
         if (animate) {
             Drawable toolbarBackground = this.toolbar.getBackground();
-            int currentColor;
 
-            if (toolbarBackground instanceof ColorDrawable) {
-                currentColor = ((ColorDrawable) toolbarBackground).getColor();
-            } else {
+            if (!(toolbarBackground instanceof  ColorDrawable)) {
                 this.toolbar.setBackgroundColor(color);
                 return;
             }
 
+            int currentColor = ((ColorDrawable) toolbarBackground).getColor();
+
             if (this.actionbarAnimator != null && this.actionbarAnimator.isRunning()) {
                 currentColor = (Integer) this.actionbarAnimator.getAnimatedValue();
                 this.actionbarAnimator.cancel();

diff --git a/app/src/main/java/ca/sbstn/androidb/activity/DatabaseActivity.java b/app/src/main/java/ca/sbstn/androidb/activity/DatabaseActivity.java
@@ -2,36 +2,38 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 
 import ca.sbstn.androidb.R;
-import ca.sbstn.androidb.callback.Callback;
 import ca.sbstn.androidb.fragment.TableListFragment;
 import ca.sbstn.androidb.sql.Database;
-import ca.sbstn.androidb.sql.SQLDataSet;
+import ca.sbstn.androidb.sql.Server;
 import ca.sbstn.androidb.sql.Table;
-import ca.sbstn.androidb.task.ExecuteQueryTask;
+import io.realm.Realm;
 
-/**
- * Created by tyler on 24/04/16.
- */
 public class DatabaseActivity extends BaseActivity implements TableListFragment.OnTableSelectedListener{
     public static final String DATABASE_PARAM = "DATABASE";
+    public static final String SERVER_PARAM_NAME = "SERVER_NAME";
+
+    protected Server server;
     protected Database database;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.layout_main);
         super.onCreate(savedInstanceState);
 
-        this.database = (Database) getIntent().getSerializableExtra(DATABASE_PARAM);
+        Realm realm = Realm.getDefaultInstance();
+
+        String databaseName = getIntent().getStringExtra(DATABASE_PARAM);
+        String serverName = getIntent().getStringExtra(SERVER_PARAM_NAME);
+
+        this.server = realm.where(Server.class).equalTo("name", serverName).findFirst();
 
-        this.setToolbarTitle(this.database.getName());
-        this.setToolbarSubtitle(this.database.getServer().getName());
-        this.setToolbarColor(this.database.getServer().getColor(), true);
+        this.setToolbarTitle(databaseName);
+        this.setToolbarSubtitle(server.getName());
+        this.setToolbarColor(server.getColor(), true);
 
-        TableListFragment tableListFragment = TableListFragment.newInstance(this.database);
+        TableListFragment tableListFragment = TableListFragment.newInstance(server, databaseName);
         this.putContextFragment(tableListFragment, false);
     }
 
@@ -42,7 +44,8 @@ public Database getDatabase() {
     @Override
     public void onTableSelected(Table table) {
         Intent intent = new Intent(this, ViewDataActivity.class);
-        intent.putExtra(ViewDataActivity.TABLE_PARAM, table);
+        intent.putExtra(ViewDataActivity.PARAM_SERVER_NAME, this.server.getName());
+        intent.putExtra(ViewDataActivity.PARAM_TABLE, table);
         startActivity(intent);
     }
 }
diff --git a/app/src/main/java/ca/sbstn/androidb/activity/MainActivity.java b/app/src/main/java/ca/sbstn/androidb/activity/MainActivity.java
@@ -6,8 +6,8 @@
 import android.support.v7.app.ActionBar;
 
 import ca.sbstn.androidb.R;
-import ca.sbstn.androidb.entity.Server;
 import ca.sbstn.androidb.fragment.ServerListFragment;
+import ca.sbstn.androidb.sql.Server;
 
 public class MainActivity extends BaseActivity implements ServerListFragment.OnServerSelectedListener {
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,7 +29,7 @@ protected void onCreate(Bundle savedInstanceState) {
     public void onServerSelected(Server server) {
         Intent intent = new Intent(this, ServerActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-        intent.putExtra(ServerActivity.SERVER_PARAM_ID, server.getId());
+        intent.putExtra(ServerActivity.SERVER_PARAM_NAME, server.getName());
         startActivity(intent);
     }
 }