Skip to content

Commit

Permalink
wep
Browse files Browse the repository at this point in the history
  • Loading branch information
tills13 committed May 11, 2016
1 parent cb14065 commit afd9f20
Show file tree
Hide file tree
Showing 19 changed files with 254 additions and 141 deletions.
19 changes: 13 additions & 6 deletions app/app.iml
Expand Up @@ -28,12 +28,15 @@
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<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" />
Expand All @@ -47,37 +50,41 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<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" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<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" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<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" />
Expand All @@ -87,18 +94,15 @@
<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/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<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" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
Expand All @@ -109,13 +113,16 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<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="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" />
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle
@@ -1,4 +1,5 @@
apply plugin: 'com.android.application'
apply plugin: 'realm-android'

android {
compileSdkVersion 23
Expand Down
16 changes: 15 additions & 1 deletion app/src/main/java/ca/sbstn/androidb/activity/BaseActivity.java
Expand Up @@ -15,9 +15,10 @@
import android.support.v7.widget.Toolbar;

import ca.sbstn.androidb.R;
import ca.sbstn.androidb.application.*;
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.
Expand All @@ -27,6 +28,7 @@ public class BaseActivity extends AppCompatActivity {
protected SharedPreferences sharedPreferences;
protected FragmentManager fragmentManager;
private ValueAnimator actionbarAnimator;
private Realm realm;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -37,6 +39,14 @@ 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() {
Expand Down Expand Up @@ -88,6 +98,10 @@ 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);
Expand Down
10 changes: 2 additions & 8 deletions app/src/main/java/ca/sbstn/androidb/activity/MainActivity.java
@@ -1,19 +1,13 @@
package ca.sbstn.androidb.activity;


import android.animation.ValueAnimator;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;

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) {
Expand All @@ -35,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, server);
intent.putExtra(ServerActivity.SERVER_PARAM_ID, server.getId());
startActivity(intent);
}
}
13 changes: 3 additions & 10 deletions app/src/main/java/ca/sbstn/androidb/activity/ServerActivity.java
Expand Up @@ -25,27 +25,20 @@
import ca.sbstn.androidb.fragment.CreateOrEditServerFragment;
import ca.sbstn.androidb.fragment.DatabaseListFragment;
import ca.sbstn.androidb.sql.Database;
import ca.sbstn.androidb.sql.Server;
import ca.sbstn.androidb.entity.Server;

/**
* Created by tyler on 21/04/16.
*/
public class ServerActivity extends BaseActivity implements DatabaseListFragment.OnDatabaseSelectedListener {
public static final String SERVER_PARAM = "SERVER";
public static final String SERVER_PARAM_ID = "SERVER_ID";
protected Server server;

@Override
protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.layout_main);
super.onCreate(savedInstanceState);

if (savedInstanceState != null) {
if (!savedInstanceState.containsKey(SERVER_PARAM)) finish();
this.server = (Server) savedInstanceState.get(SERVER_PARAM);
} else {
this.server = (Server) getIntent().getSerializableExtra(SERVER_PARAM);
}

this.setToolbarColor(this.server.getColor(), true);

DatabaseListFragment databaseListFragment = DatabaseListFragment.newInstance(this.server);
Expand All @@ -54,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {

@Override
protected void onSaveInstanceState(Bundle outState) {
outState.putSerializable(SERVER_PARAM, this.server);
outState.putSerializable(SERVER_PARAM_ID, this.server.getId());

super.onSaveInstanceState(outState);
}
Expand Down
15 changes: 5 additions & 10 deletions app/src/main/java/ca/sbstn/androidb/adapter/ServerListAdapter.java
Expand Up @@ -9,32 +9,27 @@
import android.widget.TextView;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import ca.sbstn.androidb.R;
import ca.sbstn.androidb.sql.Server;
import ca.sbstn.androidb.entity.Server;

/**
* Created by tills13 on 15-06-26.
*/
public class ServerListAdapter extends BaseAdapter {
public Context context;
public Map<String, Server> servers;
public String[] serverKeys;
public List<Server> servers;

public ServerListAdapter(Context context) {
super();

this.context = context;
this.servers = new HashMap<>();
this.serverKeys = new String[this.servers.size()];
this.servers = new ArrayList<>();
}

public void setServers(Map<String, Server> servers) {
public void setServers(List<Server> servers) {
this.servers = servers;
this.serverKeys = servers.keySet().toArray(this.serverKeys);
}

@Override
Expand Down Expand Up @@ -66,7 +61,7 @@ public int getCount() {

@Override
public Object getItem(int position) {
return this.servers.get(this.serverKeys[position]);
return this.servers.get(position);
}

@Override
Expand Down
23 changes: 23 additions & 0 deletions app/src/main/java/ca/sbstn/androidb/database/RealmUtils.java
@@ -0,0 +1,23 @@
package ca.sbstn.androidb.database;

import android.content.Context;

import io.realm.Realm;
import io.realm.RealmConfiguration;

/**
* Created by tills13 on 2016-05-10.
*/
public class RealmUtils {
public static Realm realm;
//public static Context context;

//public static void initialize(Context context) {
// RealmUtils.context = context;
//}

public static Realm getRealm(Context context) {
RealmConfiguration config = new RealmConfiguration.Builder(context).build();
return Realm.getInstance(config);
}
}
110 changes: 110 additions & 0 deletions app/src/main/java/ca/sbstn/androidb/entity/Server.java
@@ -0,0 +1,110 @@
package ca.sbstn.androidb.entity;

import io.realm.RealmObject;
import io.realm.annotations.PrimaryKey;
import io.realm.annotations.Required;

/**
* Created by tills13 on 2016-05-10.
*/
public class Server extends RealmObject {
public static String[] colors = new String[] {
"#E57373", // red_303
"#64B5F6", // blue_300
"#F06292",
"#BA68C8",
"#9575CD",
"#7986CB",
"#4FC3F7",
"#4DD0E1",
"#4DB6AC",
"#81C784",
"#AED581",
"#FFB300",
"#FF8A65"
};

@PrimaryKey private int id;
@Required private String name;

@Required private String host;
private int port;

private String username;
private String password;

private String color;
private String defaultDatabase;
//private List<Database> databases;

public Server() {
this.defaultDatabase = "postgres";
this.port = 5432;
}

public String getDefaultDatabase() {
return defaultDatabase;
}

public void setDefaultDatabase(String defaultDatabase) {
this.defaultDatabase = defaultDatabase;
}



public String getColor() {
return color;
}

public void setColor(String color) {
this.color = color;
}

public String getHost() {
return host;
}

public void setHost(String host) {
this.host = host;
}

public int getId() {
return id;
}

public void setId(int id) {
this.id = id;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getPassword() {
return password;
}

public void setPassword(String password) {
this.password = password;
}

public int getPort() {
return port;
}

public void setPort(int port) {
this.port = port;
}

public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}
}

0 comments on commit afd9f20

Please sign in to comment.