eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-07 21:01:03 +00:00
Code Activity

rename preferences to include unit [ms] and fix int/string resource bug

Browse Source
This commit is contained in:
Fredrik Teschke committed 2014-10-21 09:22:00 +02:00
1 parent 40aace7f3f
commit 44533435af
4 files changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
+2 -2
View File
@@ -6,8 +6,8 @@
<!-- override default values of android.shared -->
<string name="app_folder">tracking</string>
<string name="preference_gps_fix_interval_key">gpsFixInterval</string>
<string name="preference_gps_fix_interval_ms_key">gpsFixInterval</string>
<string name="preference_gps_fix_interval_ms_default">500</string>
<string name="preference_gps_fix_fastest_interval_key">gpsFixFastestInterval</string>
<string name="preference_gps_fix_fastest_interval_ms_key">gpsFixFastestInterval</string>
<string name="preference_gps_fastest_fix_interval_ms_default">100</string>
</resources>
mobile/com.sap.sailing.android.tracking.app/res/xml/preference_general.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<EditTextPreference
android:defaultValue="@string/preference_gps_fix_interval_ms_default"
android:key="@string/preference_gps_fix_interval_key"
android:key="@string/preference_gps_fix_interval_ms_key"
android:summary="@string/empty"
android:title="@string/gps_fix_interval"
android:inputType="number"
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
+1 -3
View File
@@ -2,7 +2,6 @@ package com.sap.sailing.android.tracking.app.ui.fragments.preference;
import android.os.Bundle;
import android.preference.Preference;
import com.sap.sailing.android.shared.ui.fragments.preference.BasePreferenceFragment;
import com.sap.sailing.android.tracking.app.R;
@@ -15,7 +14,6 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
addPreferencesFromResource(R.xml.preference_general);
bindPreferenceSummaryToValue(findPreference(R.string.preference_device_identifier_key));
bindPreferenceSummaryToValue(findPreference(R.string.preference_server_url_key));
Preference findPreference = findPreference(R.string.preference_gps_fix_interval_key);
bindPreferenceSummaryToValue(findPreference);
bindPreferenceSummaryToValue(findPreference(R.string.preference_gps_fix_interval_ms_key));
}
}
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
+6 -2
View File
@@ -29,11 +29,15 @@ public class AppPreferences {
}
public int getGPSFixInterval() {
return PrefUtils.getInt(context, R.string.preference_gps_fix_interval_key, R.string.preference_gps_fix_interval_ms_default);
//EditTextPreference saves value as string, even if android:inputType="number" is set
String value = PrefUtils.getString(context, R.string.preference_gps_fix_interval_ms_key, R.string.preference_gps_fix_interval_ms_default);
return value == null ? -1 : Integer.valueOf(value);
}
public int getGPSFixFastestInterval() {
return PrefUtils.getInt(context, R.string.preference_gps_fix_fastest_interval_key, R.string.preference_gps_fastest_fix_interval_ms_default);
//EditTextPreference saves value as string, even if android:inputType="number" is set
String value = PrefUtils.getString(context, R.string.preference_gps_fix_fastest_interval_ms_key, R.string.preference_gps_fastest_fix_interval_ms_default);
return value == null ? -1 : Integer.valueOf(value);
}
public void setServerURL(String serverUrl) {