diff --git a/app/build.gradle b/app/build.gradle index c71f0b7..cda1f4b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ defaultConfig { applicationId "de.apps4ics.mountainnavigation" - minSdkVersion 11 + minSdkVersion 21 targetSdkVersion 22 versionCode 1 versionName "1.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a445a8b..f0ae23e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,7 +29,14 @@ - + + diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java index 560aed1..a0a7427 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.res.Resources; import android.location.Criteria; import android.location.Location; @@ -10,6 +11,7 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.wifi.WifiManager; +import android.preference.PreferenceManager; import android.provider.Settings; import android.support.design.widget.FloatingActionButton; import android.support.v4.view.GravityCompat; @@ -76,6 +78,8 @@ private static NetworkInfo activeNetwork; private static int networkStrength; + private static SharedPreferences sharedPrefs; + public static SimpleDateFormat df_hm; public static SimpleDateFormat df_full; @@ -124,6 +128,8 @@ tm.listen(new MyPhoneStateListener(), PhoneStateListener.LISTEN_SIGNAL_STRENGTHS); wm = (WifiManager) getSystemService(WIFI_SERVICE); + sharedPrefs = PreferenceManager.getDefaultSharedPreferences(MainActivity.this); + df_hm = new SimpleDateFormat(res.getString(R.string.date_format_hm)); df_full = new SimpleDateFormat(res.getString(R.string.date_format_full)); @@ -196,7 +202,8 @@ Intent about = new Intent(MainActivity.this, AboutActivity.class); startActivity(about); } else if(key.equals(getString(R.string.menu_title_settings_key))) { - Toaster("Open settings!", false); + Intent settings = new Intent(MainActivity.this, SettingsActivity.class); + startActivity(settings); } } }); @@ -254,6 +261,8 @@ } } + public static SharedPreferences getSharedPrefs() { return sharedPrefs; } + public static Resources getRes() { return res; } diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java new file mode 100644 index 0000000..4ac94de --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java @@ -0,0 +1,33 @@ +package de.apps4ics.mountainnavigation; + +import android.app.Activity; +import android.app.FragmentManager; +import android.app.FragmentTransaction; +import android.os.Bundle; +import android.preference.PreferenceFragment; + +/** + * Created by Vinz on 17.03.2016. + */ +public class SettingsActivity extends Activity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + FragmentManager mFragmentManager = getFragmentManager(); + FragmentTransaction mFragmentTransaction = mFragmentManager + .beginTransaction(); + PrefsFragment mPrefsFragment = new PrefsFragment(); + mFragmentTransaction.replace(android.R.id.content, mPrefsFragment); + mFragmentTransaction.commit(); + + } + public static class PrefsFragment extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Load the preferences from an XML resource + addPreferencesFromResource(R.xml.preferences); + } + } +} diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index f6f4294..a09eb6e 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -53,6 +53,7 @@ Example action Einstellungen + Über © OpenStreetMap-Mitwirkende diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a3785f9..36b7d2e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -54,6 +54,7 @@ Example action Settings + About © OpenStreetMap contributors diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml new file mode 100644 index 0000000..cc2e1df --- /dev/null +++ b/app/src/main/res/xml/preferences.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file