From d2ef2a958c880ec0b190038608b478dc87e2fceb Mon Sep 17 00:00:00 2001
From: Przemek Grondek <github@nerull7.info>
Date: Mon, 21 Jul 2014 12:36:43 +0200
Subject: [PATCH] Settings handling
---
.../mysqlbrowser/DatabaseActivity.java | 2 +-
.../nerull7/mysqlbrowser/EntriesActivity.java | 21 -------------------
.../nerull7/mysqlbrowser/MainActivity.java | 4 +---
.../info/nerull7/mysqlbrowser/Static.java | 8 +++++++
.../nerull7/mysqlbrowser/TableActivity.java | 2 +-
5 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java
index fd93d7e..0449410 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java
@@ -31,9 +31,9 @@ public class DatabaseActivity extends Activity {
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
- //TODO Handling menu
int id = item.getItemId();
if (id == R.id.action_settings) {
+ Static.startSettings(this);
return true;
}
return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java
index d5bda3e..e295554 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java
@@ -23,25 +23,4 @@ public class EntriesActivity extends Activity {
}
}
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.main, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
-
- //TODO Handling menu
- int id = item.getItemId();
- if (id == R.id.action_settings) {
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
}
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java
index 8f74811..f5c394c 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java
@@ -33,11 +33,9 @@ public class MainActivity extends Activity {
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
- //TODO Handling menu
int id = item.getItemId();
if (id == R.id.action_settings) {
- Intent intent = new Intent(this, SettingsActivity.class);
- startActivity(intent);
+ Static.startSettings(this);
return true;
}
return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/Static.java b/app/src/main/java/info/nerull7/mysqlbrowser/Static.java
index fd10211..2684068 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/Static.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/Static.java
@@ -1,5 +1,8 @@
package info.nerull7.mysqlbrowser;
+import android.content.Context;
+import android.content.Intent;
+
import info.nerull7.mysqlbrowser.db.DatabaseConnector;
/**
@@ -13,4 +16,9 @@ public class Static {
return false;
return true;
}
+
+ public static void startSettings(Context context){
+ Intent intent = new Intent(context, SettingsActivity.class);
+ context.startActivity(intent);
+ }
}
diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java
index f7d6b1c..52d609a 100644
--- a/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java
+++ b/app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java
@@ -35,9 +35,9 @@ public class TableActivity extends Activity {
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
- //TODO Handling menu
int id = item.getItemId();
if (id == R.id.action_settings) {
+ Static.startSettings(this);
return true;
}
return super.onOptionsItemSelected(item);