Change: Setting activity to normal android prefereces

res/values-pl/strings.xml

@@ -73,4 +73,6 @@
     <string name="centerToLocationMap">Centruj do obecnej lokalizacji</string>
     <string name="addIgnorePointDesciption">Tutaj możesz dodać ignorowany punkt z mapy. Kliknij w
         jakiś punkt na mapie aby go oznaczyć</string>
+    <string name="otherSettingsLabel">Inne</string>
+    <string name="notificationsGroupLabel">Powiadomienia</string>
 </resources>

res/values/distanceSetting.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer-array name="distanceArray">
+    <string-array name="distanceArray">
         <item>10</item>
         <item>50</item>
         <item>100</item>
         <item>180</item>
-    </integer-array>
-</resources>
+    </string-array>
+    <string name="distanceArrayDefault">100</string>
+</resources>

res/values/strings.xml

@@ -74,4 +74,6 @@
     <string name="addIgnorePointDesciption">Here you can add ignored point from map. Click on any
         point on the map to mark</string>
     <string name="doneLabel">Done</string>
+    <string name="notificationsGroupLabel">Notifications</string>
+    <string name="otherSettingsLabel">Others</string>
 </resources>

res/values/timeSetting.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer-array name="timeArray">
+    <string-array name="timeArray">
         <item>500</item>
         <item>1000</item>
         <item>1500</item>
-    </integer-array>
-</resources>
+    </string-array>
+    <string name="timeArrayDefault">1000</string>
+</resources>

res/values/viewDistanceSetting.xml

@@ -6,4 +6,4 @@
         <item>Normal</item>
         <item>Far</item>
     </string-array>
-</resources>
+</resources>

res/values/viewTimeSetting.xml

@@ -5,4 +5,4 @@
         <item>Normal</item>
         <item>Slow</item>
     </string-array>
-</resources>
+</resources>

res/xml/activity_preferences.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+            android:title="@string/notificationsGroupLabel">
+        <CheckBoxPreference
+                android:title="@string/NotificationLabel"
+                android:defaultValue="true"
+                android:key="showNotificationWorkout"/>
+        <CheckBoxPreference
+                android:title="@string/vibraNotifylabel"
+                android:defaultValue="false"
+                android:key="vibrateNotification"/>
+    </PreferenceCategory>
+    <PreferenceCategory
+            android:title="@string/otherSettingsLabel">
+        <CheckBoxPreference
+                android:title="@string/settingShowWorkoutInfoLabel"
+                android:defaultValue="false"
+                android:key="showWorkoutInfo"/>
+        <CheckBoxPreference
+                android:title="@string/exitAlertLabel"
+                android:defaultValue="true"
+                android:key="exitAlert"/>
+        <ListPreference
+                android:key="distance"
+                android:title="@string/settingDistanceBetweenPointLabel"
+                android:entries="@array/viewDistanceSetting"
+                android:entryValues="@array/distanceArray"
+                android:defaultValue="@string/distanceArrayDefault"
+        />
+
+        <ListPreference
+                android:key="time"
+                android:title="@string/settingGPSSpeedScan"
+                android:entries="@array/viewTimeSetting"
+                android:entryValues="@array/timeArray"
+                android:defaultValue="@string/timeArrayDefault"
+        />
+
+    </PreferenceCategory>
+</PreferenceScreen>

src/com/sylwke3100/freetrackgps/AreaNotificationManager.java

@@ -29,7 +29,7 @@ public AreaNotificationManager(Context currentContext, int smallIcon, String tit
         PendingIntent pendingIntent =
             PendingIntent.getActivity(currentContext, 0, mainActivityIntent, 0);
         globalNotification.setContentIntent(pendingIntent);
-        pref = currentContext.getSharedPreferences("Pref", Activity.MODE_PRIVATE);
+        pref = currentContext.getSharedPreferences(DefaultValues.prefs, Activity.MODE_PRIVATE);
         this.context = currentContext;
     }
 

src/com/sylwke3100/freetrackgps/DatabaseNameFilter.java

@@ -10,7 +10,7 @@ public class DatabaseNameFilter implements DatabaseFilter {
 
     public DatabaseNameFilter(Context local) {
         name = new String();
-        prefs = local.getSharedPreferences("Pref", Activity.MODE_PRIVATE);
+        prefs = local.getSharedPreferences(DefaultValues.prefs, Activity.MODE_PRIVATE);
         name = prefs.getString("filterName", "");
     }
 

src/com/sylwke3100/freetrackgps/DatabaseTimeFilter.java

@@ -9,7 +9,7 @@ public class DatabaseTimeFilter implements DatabaseFilter {
     private SharedPreferences sharePrefs;
 
     public DatabaseTimeFilter(Context context) {
-        sharePrefs = context.getSharedPreferences("Pref", Activity.MODE_PRIVATE);
+        sharePrefs = context.getSharedPreferences(DefaultValues.prefs, Activity.MODE_PRIVATE);
         startTimeFilter = sharePrefs.getLong("filterOneTime", -1);
         endTimeFilter = 0;
     }

src/com/sylwke3100/freetrackgps/DateFilterActivity.java

@@ -19,7 +19,7 @@ public class DateFilterActivity extends Activity {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_date_filter);
-        sharePrefs = getSharedPreferences("Pref", Activity.MODE_PRIVATE);
+        sharePrefs = getSharedPreferences(DefaultValues.prefs, Activity.MODE_PRIVATE);
         okButton = (Button) findViewById(R.id.okButton);
         cancelButton = (Button) findViewById(R.id.cancelButton);
         localPickier = (DatePicker) findViewById(R.id.datePicker);

src/com/sylwke3100/freetrackgps/DefaultValues.java

@@ -1,8 +1,8 @@
 package com.sylwke3100.freetrackgps;
 
-public class DefaultValues {
-    public static int defaultMinSpeedIndex = 1;
-    public static int defaultMinDistanceIndex = 2;
+public final class DefaultValues {
+    public static String defaultMinSpeedIndex = "1";
+    public static String defaultMinDistanceIndex = "2";
     public static String defaultDatabaseName = "workout";
     public static String defaultFolderWithWorkout = "/workout/";
     public static String defaultFileFormat = "gpx";
@@ -17,4 +17,5 @@ public static enum areaStatus {
         ok,
         prohibited
     }
+    public static String prefs= "com.sylwke3100.freetrackgps_preferences";
 }

src/com/sylwke3100/freetrackgps/GPSRunnerService.java

@@ -21,12 +21,11 @@ public class GPSRunnerService extends Service {
     private LocationManager service;
 
     private void onCreateGPSConnection() {
-        int[] timeSettingArray = this.getResources().getIntArray(R.array.timeArray);
-        int[] distanceSettingArray = this.getResources().getIntArray(R.array.distanceArray);
         if (service != null) {
             service.requestLocationUpdates(LocationManager.GPS_PROVIDER,
-                timeSettingArray[(sharedPrefs.getInt("time", DefaultValues.defaultMinSpeedIndex))],
-                distanceSettingArray[(sharedPrefs.getInt("distance", 1))],
+                Integer.valueOf(sharedPrefs.getString("time", DefaultValues.defaultMinSpeedIndex)),
+                Integer.valueOf(
+                    sharedPrefs.getString("distance", DefaultValues.defaultMinDistanceIndex)),
                 new GPSListener(currentRoute, this));
             sendMessageToUi("gpsOn", new Intent());
             Location lastLocation =
@@ -43,16 +42,17 @@ private void onCreateGPSConnection() {
         } else {
             sendMessageToUi("gpsOff", new Intent());
             service.requestLocationUpdates(LocationManager.GPS_PROVIDER,
-                timeSettingArray[(sharedPrefs.getInt("time", DefaultValues.defaultMinSpeedIndex))],
-                distanceSettingArray[(sharedPrefs.getInt("distance", 1))],
+                Integer.valueOf(sharedPrefs.getString("time", DefaultValues.defaultMinSpeedIndex)),
+                Integer.valueOf(
+                    sharedPrefs.getString("distance", DefaultValues.defaultMinDistanceIndex)),
                 new GPSListener(currentRoute, this));
         }
     }
 
     public void onCreate() {
         currentRoute = new RouteManager(this);
         service = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
-        sharedPrefs = this.getSharedPreferences("Pref", Activity.MODE_PRIVATE);
+        sharedPrefs = this.getSharedPreferences(DefaultValues.prefs, Activity.MODE_PRIVATE);
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(ACTION);
         registerReceiver(new GPSRunnerServiceReceiver(currentRoute, this), intentFilter);

src/com/sylwke3100/freetrackgps/LocationSharing.java

@@ -10,7 +10,7 @@ public class LocationSharing {
 
 
     public LocationSharing(Context activityContext) {
-        sharedPrefs = activityContext.getSharedPreferences("Pref", Activity.MODE_PRIVATE);
+        sharedPrefs = activityContext.getSharedPreferences(DefaultValues.prefs, Activity.MODE_PRIVATE);
     }
 
     public void clearCurrentLocation() {

src/com/sylwke3100/freetrackgps/MainActivity.java

@@ -28,7 +28,7 @@ public class MainActivity extends Activity {
 
     protected void onCreate(Bundle savedInstanceState) {
         workoutStatus = new StatusWorkout();
-        sharedPrefs = getSharedPreferences("Pref", Activity.MODE_PRIVATE);
+        sharedPrefs = getSharedPreferences("com.sylwke3100.freetrackgps_preferences", Activity.MODE_PRIVATE);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         List<TextView> textViewElements = Arrays

src/com/sylwke3100/freetrackgps/PreferencesFragment.java

@@ -0,0 +1,14 @@
+package com.sylwke3100.freetrackgps;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+
+
+public class PreferencesFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.activity_preferences);
+        }
+
+}