archive/mysqlbrowser
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleaning and added todo's

Browse source
This commit is contained in:
Przemek Grondek 2014-07-18 12:28:59 +02:00
parent cee9520595
commit 4b61eb675a
16 changed files with 16 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/app.iml
View file

@ -61,6 +61,7 @@
</content>
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
</component>
</module>

5
app/src/main/java/info/nerull7/mysqlbrowser/DatabaseActivity.java
View file

@ -21,8 +21,7 @@ public class DatabaseActivity extends Activity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.database, menu);
getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@ -31,6 +30,8 @@ public class DatabaseActivity extends Activity {
// 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;

2
app/src/main/java/info/nerull7/mysqlbrowser/DatabaseFragment.java
View file

@ -28,7 +28,7 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic
return rootView;
}
private void setupListViewDatabase(){
private void setupListViewDatabase(){ // TODO: Handle no databases available problem
listAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1, Static.databaseConnector.getDatabases());
databasesListView.setAdapter(listAdapter);
databasesListView.setOnItemClickListener(this);

7
app/src/main/java/info/nerull7/mysqlbrowser/DatabaseItem.java
View file

@ -1,7 +0,0 @@
package info.nerull7.mysqlbrowser;
/**
* Created by nerull7 on 07.07.14.
*/
public class DatabaseItem {
}

5
app/src/main/java/info/nerull7/mysqlbrowser/EntriesActivity.java
View file

@ -26,8 +26,7 @@ public class EntriesActivity extends Activity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.entries, menu);
getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@ -36,6 +35,8 @@ public class EntriesActivity extends Activity {
// 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;

2
app/src/main/java/info/nerull7/mysqlbrowser/EntriesFragment.java
View file

@ -38,7 +38,7 @@ public class EntriesFragment extends Fragment {
return rootView;
}
private void setupTable(){
private void setupTable(){ // TODO Empty table handling
List<String> fieldList = Static.databaseConnector.getFields(tableName);
TableRow.LayoutParams layoutParams = new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT);

2
app/src/main/java/info/nerull7/mysqlbrowser/MainActivity.java
View file

@ -31,6 +31,8 @@ public class MainActivity extends Activity {
// 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;

5
app/src/main/java/info/nerull7/mysqlbrowser/TableActivity.java
View file

@ -25,8 +25,7 @@ public class TableActivity extends Activity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.table, menu);
getMenuInflater().inflate(R.menu.main, menu);
return true;
}
@ -35,6 +34,8 @@ public class TableActivity extends Activity {
// 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;

1
app/src/main/java/info/nerull7/mysqlbrowser/TableFragment.java
View file

@ -31,6 +31,7 @@ public class TableFragment extends Fragment implements AdapterView.OnItemClickLi
private void setupList(){
listAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1, Static.databaseConnector.getTables());
// TODO No tables handling
tablesList.setAdapter(listAdapter);
tablesList.setOnItemClickListener(this);
}

4
app/src/main/java/info/nerull7/mysqlbrowser/db/DatabaseConnector.java
View file

@ -8,15 +8,11 @@ import java.util.List;
public interface DatabaseConnector {
void setDatabaseInUse(String database);
// TODO Real connection
List<String> getDatabases();
// TODO Real getTables
List<String> getTables();
// TODO Real getFields
List<String> getFields(String table);
// TODO Real getRows
List<List<String>> getRows(String table, int count);
}

11
app/src/main/java/info/nerull7/mysqlbrowser/db/FakeDatabaseConnector.java
View file

@ -23,15 +23,8 @@ public class FakeDatabaseConnector implements DatabaseConnector {
this.url = url;
}
// TODO Real checking
public static boolean checkLogin(String login, String password, String url){
// if (login.compareTo("nerull7")==0)
return true;
// if(password.compareTo("")==0)
// errorMsg = "No Password";
// else
// errorMsg = "I don't know";
// return false;
}
@Override
@ -39,7 +32,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
this.database = database;
}
// TODO Real connection
@Override
public List<String> getDatabases(){
List<String> stringList = new ArrayList<String>();
@ -50,7 +42,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
return stringList;
}
// TODO Real getTables
@Override
public List<String> getTables(){
if(database==null) return null; // if database is not chosen return null
@ -62,7 +53,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
return stringList;
}
// TODO Real getFields
@Override
public List<String> getFields(String table){
if(database==null) return null; // if database is not chosen return null
@ -76,7 +66,6 @@ public class FakeDatabaseConnector implements DatabaseConnector {
return stringList;
}
// TODO Real getRows
@Override
public List<List<String>> getRows(String table, int count){
if(database==null) return null; // if database is not chosen return null

9
app/src/main/java/info/nerull7/mysqlbrowser/db/RealDatabaseConnector.java
View file

@ -45,7 +45,7 @@ public class RealDatabaseConnector implements DatabaseConnector {
private static String httpRequest(String urlRequest) throws IOException {
disableStrictMode(); // FIXME
URL url = new URL(urlRequest);
HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); // TODO Handling no connection
InputStream inputStream = null;
String response;
if(urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK) {
@ -58,13 +58,6 @@ public class RealDatabaseConnector implements DatabaseConnector {
return response;
}
else {
// try {
// inputStream = new BufferedInputStream(urlConnection.getErrorStream());
// errorMsg = readStream(inputStream);
// } finally {
// urlConnection.disconnect();
// }
// return null;
errorMsg = "ERROR: "+urlConnection.getResponseCode();
return null;
}

8
app/src/main/res/menu/database.xml
View file

@ -1,8 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context="info.nerull7.mysqlbrowser.DatabaseActivity" >
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>

8
app/src/main/res/menu/entries.xml
View file

@ -1,8 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context="info.nerull7.mysqlbrowser.EntriesActivity" >
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>

8
app/src/main/res/menu/login.xml
View file

@ -1,8 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".LoginActivity" >
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>

8
app/src/main/res/menu/table.xml
View file

@ -1,8 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:context="info.nerull7.mysqlbrowser.TableActivity" >
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
android:showAsAction="never" />
</menu>