diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6cd6f91..b623d6c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,6 +26,8 @@ dependencies { implementation 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.android.support:preference-v7:27.1.1' + implementation 'com.android.support:preference-v14:27.1.1' implementation 'com.google.android.gms:play-services-vision:15.0.2' @@ -35,6 +37,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.5' implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:support-v4:27.1.1' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3280d17..e03baac 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,16 +28,17 @@ android:screenOrientation="portrait" android:theme="@style/AppTheme.Fullscreen"> - - - + + \ No newline at end of file diff --git a/app/src/main/java/de/overview/wg/its/mispbump/MainActivity.java b/app/src/main/java/de/overview/wg/its/mispbump/MainActivity.java index 7bd1a2a..3388319 100644 --- a/app/src/main/java/de/overview/wg/its/mispbump/MainActivity.java +++ b/app/src/main/java/de/overview/wg/its/mispbump/MainActivity.java @@ -23,6 +23,8 @@ import android.widget.TextView; import de.overview.wg.its.mispbump.adapter.SyncedPartnerAdapter; import de.overview.wg.its.mispbump.auxiliary.PreferenceManager; import de.overview.wg.its.mispbump.model.SyncedPartner; +import de.overview.wg.its.mispbump.preferences.AppPreferenceActivity; +import de.overview.wg.its.mispbump.preferences.AppPreferenceFragment; import java.util.ArrayList; import java.util.List; @@ -68,6 +70,10 @@ public class MainActivity extends AppCompatActivity { case R.id.menu_item_delete_local_data: createSelectDeleteDialog(); return true; + + case R.id.main_menu_settings: + startActivity(new Intent(this, AppPreferenceActivity.class)); + return true; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/de/overview/wg/its/mispbump/preferences/AppPreferenceActivity.java b/app/src/main/java/de/overview/wg/its/mispbump/preferences/AppPreferenceActivity.java new file mode 100644 index 0000000..9c98c1e --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispbump/preferences/AppPreferenceActivity.java @@ -0,0 +1,34 @@ +package de.overview.wg.its.mispbump.preferences; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.support.v7.preference.PreferenceManager; +import android.support.v7.widget.Toolbar; +import de.overview.wg.its.mispbump.R; + +public class AppPreferenceActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_app_preference); + + getSupportFragmentManager().beginTransaction() + .replace(R.id.settings_content, new AppPreferenceFragment()) + .commit(); + + initializeContent(); + } + + private void initializeContent() { + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + //noinspection ConstantConditions + getSupportActionBar().setDisplayShowTitleEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayShowHomeEnabled(true); + } + +} diff --git a/app/src/main/java/de/overview/wg/its/mispbump/preferences/AppPreferenceFragment.java b/app/src/main/java/de/overview/wg/its/mispbump/preferences/AppPreferenceFragment.java new file mode 100644 index 0000000..69cffb9 --- /dev/null +++ b/app/src/main/java/de/overview/wg/its/mispbump/preferences/AppPreferenceFragment.java @@ -0,0 +1,14 @@ +package de.overview.wg.its.mispbump.preferences; + +import android.os.Bundle; +import android.support.v7.preference.PreferenceFragmentCompat; +import de.overview.wg.its.mispbump.R; + +public class AppPreferenceFragment extends PreferenceFragmentCompat { + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + addPreferencesFromResource(R.xml.app_preferences); + } + +} diff --git a/app/src/main/res/layout/activity_app_preference.xml b/app/src/main/res/layout/activity_app_preference.xml new file mode 100644 index 0000000..9a0aa75 --- /dev/null +++ b/app/src/main/res/layout/activity_app_preference.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_generate_keys.xml b/app/src/main/res/layout/fragment_generate_keys.xml deleted file mode 100644 index 7fd8ee3..0000000 --- a/app/src/main/res/layout/fragment_generate_keys.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml new file mode 100644 index 0000000..2dbf9a0 --- /dev/null +++ b/app/src/main/res/values/array.xml @@ -0,0 +1,7 @@ + + + + English + German + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2bc0a5c..741b754 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,5 +49,8 @@ No Proceed + + Hello blank fragment + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8034862..15ac006 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -4,6 +4,9 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + + @style/PreferenceThemeOverlay.v14.Material +