Skip to content

Commit b30b8db

Browse files
author
JumpMaster
committed
Moved setting strings to string.xml
1 parent 16d8dba commit b30b8db

10 files changed

Lines changed: 95 additions & 64 deletions

File tree

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.cooper.wheellog"
99
minSdkVersion 18
1010
targetSdkVersion 24
11-
versionCode 31
12-
versionName "1.6.0"
11+
versionCode 32
12+
versionName "1.7.0"
1313
}
1414
buildTypes {
1515
release {

‎app/src/main/java/com/cooper/wheellog/MainActivity.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -725,25 +725,25 @@ public void onPageSelected(int position) {
725725

726726
private void loadPreferences() {
727727
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
728-
use_mph = sharedPreferences.getBoolean("use_mph", false);
729-
int max_speed = sharedPreferences.getInt("max_speed", 30) * 10;
728+
use_mph = sharedPreferences.getBoolean(getString(R.string.use_mph), false);
729+
int max_speed = sharedPreferences.getInt(getString(R.string.max_speed), 30) * 10;
730730
wheelView.setMaxSpeed(max_speed);
731731
wheelView.setUseMPH(use_mph);
732732
wheelView.invalidate();
733733

734-
boolean alarms_enabled = sharedPreferences.getBoolean("alarms_enabled", false);
734+
boolean alarms_enabled = sharedPreferences.getBoolean(getString(R.string.alarms_enabled), false);
735735

736736
WheelData.getInstance().setAlarmsEnabled(alarms_enabled);
737737

738738
if (alarms_enabled) {
739-
int alarm1Speed = sharedPreferences.getInt("alarm_1_speed", 0);
740-
int alarm2Speed = sharedPreferences.getInt("alarm_2_speed", 0);
741-
int alarm3Speed = sharedPreferences.getInt("alarm_3_speed", 0);
742-
int alarm1Battery = sharedPreferences.getInt("alarm_1_battery", 0);
743-
int alarm2Battery = sharedPreferences.getInt("alarm_2_battery", 0);
744-
int alarm3Battery = sharedPreferences.getInt("alarm_3_battery", 0);
745-
int current_alarm = sharedPreferences.getInt("alarm_current", 0);
746-
boolean disablePhoneVibrate = sharedPreferences.getBoolean("disable_phone_vibrate", false);
739+
int alarm1Speed = sharedPreferences.getInt(getString(R.string.alarm_1_speed), 0);
740+
int alarm2Speed = sharedPreferences.getInt(getString(R.string.alarm_2_speed), 0);
741+
int alarm3Speed = sharedPreferences.getInt(getString(R.string.alarm_3_speed), 0);
742+
int alarm1Battery = sharedPreferences.getInt(getString(R.string.alarm_1_battery), 0);
743+
int alarm2Battery = sharedPreferences.getInt(getString(R.string.alarm_2_battery), 0);
744+
int alarm3Battery = sharedPreferences.getInt(getString(R.string.alarm_3_battery), 0);
745+
int current_alarm = sharedPreferences.getInt(getString(R.string.alarm_current), 0);
746+
boolean disablePhoneVibrate = sharedPreferences.getBoolean(getString(R.string.disable_phone_vibrate), false);
747747

748748
WheelData.getInstance().setPreferences(
749749
alarm1Speed, alarm1Battery,
@@ -754,9 +754,9 @@ private void loadPreferences() {
754754
} else
755755
wheelView.setWarningSpeed(0);
756756

757-
boolean auto_log = sharedPreferences.getBoolean("auto_log", false);
758-
boolean log_location = sharedPreferences.getBoolean("log_location_data", false);
759-
boolean auto_upload = sharedPreferences.getBoolean("auto_upload", false);
757+
boolean auto_log = sharedPreferences.getBoolean(getString(R.string.auto_log), false);
758+
boolean log_location = sharedPreferences.getBoolean(getString(R.string.log_location_data), false);
759+
boolean auto_upload = sharedPreferences.getBoolean(getString(R.string.auto_upload), false);
760760

761761
if (auto_log)
762762
MainActivityPermissionsDispatcher.acquireStoragePermissionWithCheck(this);

‎app/src/main/java/com/cooper/wheellog/PreferencesFragment.java‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void onClick(DialogInterface dialog, int which) {
8484
case "use_mph":
8585
getActivity().sendBroadcast(new Intent(Constants.ACTION_PEBBLE_AFFECTING_PREFERENCE_CHANGED));
8686
break;
87-
case "max_mph":
87+
case "max_speed":
8888
getActivity().sendBroadcast(new Intent(Constants.ACTION_PEBBLE_AFFECTING_PREFERENCE_CHANGED));
8989
break;
9090
}
@@ -108,10 +108,10 @@ public void onClick(View view) {
108108
switch (currentScreen) {
109109
case Main:
110110
tb.setTitle("Settings");
111-
Preference speed_button = findPreference("speed_preferences");
112-
Preference logs_button = findPreference("log_preferences");
113-
Preference alarm_button = findPreference("alarm_preferences");
114-
Preference watch_button = findPreference("watch_preferences");
111+
Preference speed_button = findPreference(getString(R.string.speed_preferences));
112+
Preference logs_button = findPreference(getString(R.string.log_preferences));
113+
Preference alarm_button = findPreference(getString(R.string.alarm_preferences));
114+
Preference watch_button = findPreference(getString(R.string.watch_preferences));
115115

116116
if (speed_button != null) {
117117
speed_button.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@@ -180,9 +180,9 @@ public boolean onPreferenceClick(Preference preference) {
180180

181181
public void refreshVolatileSettings() {
182182
if (currentScreen == SettingsScreen.Logs) {
183-
correctCheckState("auto_log");
184-
correctCheckState("log_location_data");
185-
correctCheckState("auto_upload");
183+
correctCheckState(getString(R.string.auto_log));
184+
correctCheckState(getString(R.string.log_location_data));
185+
correctCheckState(getString(R.string.auto_upload));
186186
}
187187
}
188188

@@ -199,15 +199,16 @@ private void correctCheckState(String preference) {
199199
}
200200

201201
private void hideShowSeekBars() {
202-
boolean alarms_enabled = getPreferenceManager().getSharedPreferences().getBoolean("alarms_enabled", false);
202+
boolean alarms_enabled = getPreferenceManager().getSharedPreferences()
203+
.getBoolean(getString(R.string.alarms_enabled), false);
203204
String[] seekbar_preferences = {
204-
"alarm_1_speed",
205-
"alarm_2_speed",
206-
"alarm_3_speed",
207-
"alarm_1_battery",
208-
"alarm_2_battery",
209-
"alarm_3_battery",
210-
"alarm_current"};
205+
getString(R.string.alarm_1_speed),
206+
getString(R.string.alarm_2_speed),
207+
getString(R.string.alarm_3_speed),
208+
getString(R.string.alarm_1_battery),
209+
getString(R.string.alarm_2_battery),
210+
getString(R.string.alarm_3_battery),
211+
getString(R.string.alarm_current)};
211212

212213
for (String preference : seekbar_preferences) {
213214
SeekBarPreference seekbar = (SeekBarPreference) findPreference(preference);

‎app/src/main/java/com/cooper/wheellog/utils/SettingsUtil.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.SharedPreferences;
55
import android.support.v7.preference.PreferenceManager;
66

7-
import timber.log.Timber;
7+
import com.cooper.wheellog.R;
88

99

1010
public class SettingsUtil {
@@ -41,46 +41,46 @@ public static boolean getBoolean(Context context, String preference) {
4141
}
4242

4343
public static boolean isAutoLogEnabled(Context context) {
44-
return getSharedPreferences(context).getBoolean("auto_log", false);
44+
return getSharedPreferences(context).getBoolean(context.getString(R.string.auto_log), false);
4545
}
4646

4747
public static void setAutoLog(Context context, boolean enabled) {
48-
getSharedPreferences(context).edit().putBoolean("auto_log", enabled).apply();
48+
getSharedPreferences(context).edit().putBoolean(context.getString(R.string.auto_log), enabled).apply();
4949
}
5050

5151
public static boolean isLogLocationEnabled(Context context) {
52-
return getSharedPreferences(context).getBoolean("log_location_data", false);
52+
return getSharedPreferences(context).getBoolean(context.getString(R.string.log_location_data), false);
5353
}
5454

5555
public static void setLogLocationEnabled(Context context, boolean enabled) {
56-
getSharedPreferences(context).edit().putBoolean("log_location_data", enabled).apply();
56+
getSharedPreferences(context).edit().putBoolean(context.getString(R.string.log_location_data), enabled).apply();
5757
}
5858

5959
public static boolean isUseGPSEnabled(Context context) {
60-
return getSharedPreferences(context).getBoolean("use_gps", false);
60+
return getSharedPreferences(context).getBoolean(context.getString(R.string.use_gps), false);
6161
}
6262

6363
public static boolean isAutoUploadEnabled(Context context) {
64-
return getSharedPreferences(context).getBoolean("auto_upload", false);
64+
return getSharedPreferences(context).getBoolean(context.getString(R.string.auto_upload), false);
6565
}
6666

6767
public static void setAutoUploadEnabled(Context context, boolean enabled) {
68-
getSharedPreferences(context).edit().putBoolean("auto_upload", enabled).apply();
68+
getSharedPreferences(context).edit().putBoolean(context.getString(R.string.auto_upload), enabled).apply();
6969
}
7070

7171
private static SharedPreferences getSharedPreferences(Context context) {
7272
return PreferenceManager.getDefaultSharedPreferences(context);
7373
}
7474

7575
public static boolean isUseMPH(Context context) {
76-
return getSharedPreferences(context).getBoolean("use_mph", false);
76+
return getSharedPreferences(context).getBoolean(context.getString(R.string.use_mph), false);
7777
}
7878

7979
public static int getMaxSpeed(Context context) {
80-
return getSharedPreferences(context).getInt("max_speed", 30);
80+
return getSharedPreferences(context).getInt(context.getString(R.string.max_speed), 30);
8181
}
8282

8383
public static int getHornMode(Context context) {
84-
return Integer.parseInt(getSharedPreferences(context).getString("horn_mode", "0"));
84+
return Integer.parseInt(getSharedPreferences(context).getString(context.getString(R.string.horn_mode), "0"));
8585
}
8686
}

‎app/src/main/res/values/strings.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,35 @@
6666
<string name="logging_error_network_disabled">Location logging using GSM Network was requested but this location provider is disabled. No location data will be logged.</string>
6767
<string name="logging_error_all_location_providers_disabled">Location has been disabled within Android. No location data will be logged.</string>
6868
<string name="raw_distance">Raw Distance</string>
69+
70+
// PREFERENCES
71+
<string name="speed_preferences" translatable="false">speed_preferences</string>
72+
<string name="log_preferences" translatable="false">log_preferences</string>
73+
<string name="alarm_preferences" translatable="false">alarm_preferences</string>
74+
<string name="watch_preferences" translatable="false">watch_preferences</string>
75+
76+
// ALARM PREFERENCES
77+
<string name="alarms_enabled" translatable="false">alarms_enabled</string>
78+
<string name="disable_phone_vibrate" translatable="false">disable_phone_vibrate</string>
79+
<string name="alarm_1_speed" translatable="false">alarm_1_speed</string>
80+
<string name="alarm_1_battery" translatable="false">alarm_1_battery</string>
81+
<string name="alarm_2_speed" translatable="false">alarm_2_speed</string>
82+
<string name="alarm_2_battery" translatable="false">alarm_2_battery</string>
83+
<string name="alarm_3_speed" translatable="false">alarm_3_speed</string>
84+
<string name="alarm_3_battery" translatable="false">alarm_3_battery</string>
85+
<string name="alarm_current" translatable="false">alarm_current</string>
86+
87+
// LOG PREFERENCES
88+
<string name="auto_log" translatable="false">auto_log</string>
89+
<string name="auto_upload" translatable="false">auto_upload</string>
90+
<string name="log_location_data" translatable="false">log_location_data</string>
91+
<string name="use_gps" translatable="false">use_gps</string>
92+
93+
// SPEED PREFERENCES
94+
<string name="use_mph" translatable="false">use_mph</string>
95+
<string name="max_speed" translatable="false">max_speed</string>
96+
97+
// WATCH PREFERENCES
98+
<string name="horn_mode" translatable="false">horn_mode</string>
99+
69100
</resources>

‎app/src/main/res/xml/preferences.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
xmlns:android="http://schemas.android.com/apk/res/android">
44

55
<Preference
6-
android:key="speed_preferences"
6+
android:key="@string/speed_preferences"
77
android:title="Speed Settings"
88
android:icon="@drawable/ic_speedometer_white_24dp"/>
99

1010
<Preference
11-
android:key="log_preferences"
11+
android:key="@string/log_preferences"
1212
android:title="Log Settings"
1313
android:icon="@drawable/ic_show_chart_white_24dp"/>
1414

1515
<Preference
16-
android:key="alarm_preferences"
16+
android:key="@string/alarm_preferences"
1717
android:title="Alarm Settings"
1818
android:icon="@drawable/ic_vibration_white_24dp"/>
1919

2020
<Preference
21-
android:key="watch_preferences"
21+
android:key="@string/watch_preferences"
2222
android:title="Watch Preferences"
2323
android:icon="@drawable/ic_watch_white_24dp" />
2424

‎app/src/main/res/xml/preferences_alarms.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
xmlns:sample="http://schemas.android.com/apk/res-auto">
55

66
<CheckBoxPreference
7-
android:key="alarms_enabled"
7+
android:key="@string/alarms_enabled"
88
android:title="Enable Alarms"
99
android:summary="Allow the phone to vibrate as a warning" />
1010

1111
<CheckBoxPreference
12-
android:key="disable_phone_vibrate"
12+
android:key="@string/disable_phone_vibrate"
1313
android:dependency="alarms_enabled"
1414
android:title="Disable Phone Vibration"
1515
android:summary="Phone will not vibrate but the alarm will be passed to a connected Pebble Watch" />
@@ -18,7 +18,7 @@
1818
android:title="Speed Alarm 1">
1919

2020
<com.pavelsikun.seekbarpreference.SeekBarPreference
21-
android:key="alarm_1_speed"
21+
android:key="@string/alarm_1_speed"
2222
android:title="Speed"
2323
android:summary="Speed that triggers the alarm"
2424
android:defaultValue="29"
@@ -30,7 +30,7 @@
3030
sample:msbp_dialogEnabled="true"/>
3131

3232
<com.pavelsikun.seekbarpreference.SeekBarPreference
33-
android:key="alarm_1_battery"
33+
android:key="@string/alarm_1_battery"
3434
android:title="Battery Percent"
3535
android:summary="Battery percent that activates the alarm"
3636
android:defaultValue="100"
@@ -47,7 +47,7 @@
4747
android:title="Speed Alarm 2">
4848

4949
<com.pavelsikun.seekbarpreference.SeekBarPreference
50-
android:key="alarm_2_speed"
50+
android:key="@string/alarm_2_speed"
5151
android:title="Speed"
5252
android:summary="Speed that triggers the alarm"
5353
android:defaultValue="0"
@@ -59,7 +59,7 @@
5959
sample:msbp_dialogEnabled="true"/>
6060

6161
<com.pavelsikun.seekbarpreference.SeekBarPreference
62-
android:key="alarm_2_battery"
62+
android:key="@string/alarm_2_battery"
6363
android:title="Battery Percent"
6464
android:summary="Battery percent that activates the alarm"
6565
android:defaultValue="0"
@@ -76,7 +76,7 @@
7676
android:title="Speed Alarm 3">
7777

7878
<com.pavelsikun.seekbarpreference.SeekBarPreference
79-
android:key="alarm_3_speed"
79+
android:key="@string/alarm_3_speed"
8080
android:title="Speed"
8181
android:summary="Speed that triggers the alarm"
8282
android:defaultValue="0"
@@ -88,7 +88,7 @@
8888
sample:msbp_dialogEnabled="true"/>
8989

9090
<com.pavelsikun.seekbarpreference.SeekBarPreference
91-
android:key="alarm_3_battery"
91+
android:key="@string/alarm_3_battery"
9292
android:title="Battery Percent"
9393
android:summary="Battery percent that activates the alarm"
9494
android:defaultValue="0"
@@ -105,7 +105,7 @@
105105
android:title="Current Alarm">
106106

107107
<com.pavelsikun.seekbarpreference.SeekBarPreference
108-
android:key="alarm_current"
108+
android:key="@string/alarm_current"
109109
android:title="Current"
110110
android:summary="Current that triggers the alarm"
111111
android:defaultValue="35"

‎app/src/main/res/xml/preferences_logs.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
<PreferenceScreen
33
xmlns:android="http://schemas.android.com/apk/res/android">
44
<CheckBoxPreference
5-
android:key="auto_log"
5+
android:key="@string/auto_log"
66
android:title="Auto Log"
77
android:summary="Start logging automatically when a wheel is connected" />
88

99
<CheckBoxPreference
10-
android:key="auto_upload"
10+
android:key="@string/auto_upload"
1111
android:title="Auto Upload Logs"
1212
android:summary="Automatically upload log files to Google Drive" />
1313

1414
<CheckBoxPreference
15-
android:key="log_location_data"
15+
android:key="@string/log_location_data"
1616
android:title="Log location"
1717
android:summary="Include location data within the logs" />
1818

1919
<CheckBoxPreference
20-
android:key="use_gps"
20+
android:key="@string/use_gps"
2121
android:dependency="log_location_data"
2222
android:title="Use GPS for location"
2323
android:summary="Use GPS for location rather than network provider. GPS is more accurate but may consume more battery power" />

‎app/src/main/res/xml/preferences_speed.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
xmlns:sample="http://schemas.android.com/apk/res-auto">
55

66
<CheckBoxPreference
7-
android:key="use_mph"
7+
android:key="@string/use_mph"
88
android:title="Use MPH"
99
android:summary="Show speed in miles rather than kilometers" />
1010

1111
<com.pavelsikun.seekbarpreference.SeekBarPreference
12-
android:key="max_speed"
12+
android:key="@string/max_speed"
1313
android:title="Max Speed"
1414
android:summary="The maximum speed shown on the outer dial"
1515
android:enabled="true"
1616
android:defaultValue="30"
17-
1817
sample:msbp_minValue="10"
1918
sample:msbp_maxValue="50"
2019
sample:msbp_interval="1"

‎app/src/main/res/xml/preferences_watch.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:android="http://schemas.android.com/apk/res/android">
44

55
<ListPreference
6-
android:key="horn_mode"
6+
android:key="@string/horn_mode"
77
android:title="Horn Mode"
88
android:defaultValue="0"
99
android:entries="@array/horn_modes"

0 commit comments

Comments
 (0)