diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5829f73..ba08ea4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,11 @@ <activity android:name=".SettingsActivity" android:label="@string/title_activity_setting" - android:theme="@style/SettingsTheme"> + android:theme="@style/SettingsTheme" > + </activity> + <activity + android:name=".ElementActivity" + android:label="@string/title_activity_element" > </activity> </application> diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/ElementActivity.java b/app/src/main/java/info/nerull7/mysqlbrowser/ElementActivity.java new file mode 100644 index 0000000..38680c8 --- /dev/null +++ b/app/src/main/java/info/nerull7/mysqlbrowser/ElementActivity.java @@ -0,0 +1,21 @@ +package info.nerull7.mysqlbrowser; + +import android.app.Activity; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; +import info.nerull7.mysqlbrowser.R; + +public class ElementActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_database); + if (savedInstanceState == null) { + getFragmentManager().beginTransaction() + .add(R.id.container, new ElementFragment()) + .commit(); + } + } +} diff --git a/app/src/main/java/info/nerull7/mysqlbrowser/ElementFragment.java b/app/src/main/java/info/nerull7/mysqlbrowser/ElementFragment.java new file mode 100644 index 0000000..c69d447 --- /dev/null +++ b/app/src/main/java/info/nerull7/mysqlbrowser/ElementFragment.java @@ -0,0 +1,9 @@ +package info.nerull7.mysqlbrowser; + +import android.app.Fragment; + +/** + * Created by nerull7 on 2014-08-06. + */ +public class ElementFragment extends Fragment { +} diff --git a/app/src/main/res/layout/activity_element.xml b/app/src/main/res/layout/activity_element.xml new file mode 100644 index 0000000..12fee7b --- /dev/null +++ b/app/src/main/res/layout/activity_element.xml @@ -0,0 +1,7 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="info.nerull7.mysqlbrowser.ElementActivity" + tools:ignore="MergeRootFrame" /> diff --git a/app/src/main/res/layout/fragment_element.xml b/app/src/main/res/layout/fragment_element.xml new file mode 100644 index 0000000..987aad8 --- /dev/null +++ b/app/src/main/res/layout/fragment_element.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="match_parent"> + +</RelativeLayout> \ No newline at end of file diff --git a/app/src/main/res/menu/element.xml b/app/src/main/res/menu/element.xml new file mode 100644 index 0000000..7109817 --- /dev/null +++ b/app/src/main/res/menu/element.xml @@ -0,0 +1,8 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + tools:context="info.nerull7.mysqlbrowser.ElementActivity" > + <item android:id="@+id/action_settings" + android:title="@string/action_settings" + android:orderInCategory="100" + android:showAsAction="never" /> +</menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f8d2e52..3e85dfd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,7 +17,7 @@ <string name="title_activity_entries">EntriesActivity</string> <string name="general_category">General</string> <string name="entries_limit">Entries per page limit</string> - <string name="entries_summary">%s entries per page</string><!--<xliff:g id="count"></xliff:g>--> + <string name="entries_summary">%s entries per page</string> <!-- <xliff:g id="count"></xliff:g> --> <string name="title_activity_setting">Settings</string> <string name="cancel">Cancel</string> <string name="set">Set</string> @@ -32,5 +32,6 @@ <string name="connector_url">Connector URL</string> <string name="no_connection">No Internet Connection</string> <string name="action_add">Add new</string> + <string name="title_activity_element">ElementActivity</string> </resources>