From 83b3b6b4c556e47e0a05f953eb05e3d3ff8a5345 Mon Sep 17 00:00:00 2001 From: Name Date: Sat, 28 Oct 2017 20:13:16 +0300 Subject: [PATCH] refactored day hour offset to new day offset --- .../isoron/uhabits/activities/settings/SettingsActivity.java | 2 +- uhabits-android/src/main/res/values/strings.xml | 2 +- uhabits-android/src/main/res/xml/preferences.xml | 4 ++-- .../java/org/isoron/uhabits/core/preferences/Preferences.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java index 3f5eb501c..bb3b2e18a 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsActivity.java @@ -60,7 +60,7 @@ public class SettingsActivity extends BaseActivity implements SharedPreferences. @Override public void onSharedPreferenceChanged(SharedPreferences sharedPref, String key) { SharedPreferences.Editor editor = sharedPref.edit(); - if (key.equalsIgnoreCase("pref_day_hour_offset")) { + if (key.equalsIgnoreCase("pref_new_day_offset")) { int dayHourOffset = 0; try { diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml index a4c51b3ec..31729a8e8 100644 --- a/uhabits-android/src/main/res/values/strings.xml +++ b/uhabits-android/src/main/res/values/strings.xml @@ -221,5 +221,5 @@ Target 15 Day starting hour - Day starting hour + Day starting hour \ No newline at end of file diff --git a/uhabits-android/src/main/res/xml/preferences.xml b/uhabits-android/src/main/res/xml/preferences.xml index 4c3edccf6..22e23fc15 100644 --- a/uhabits-android/src/main/res/xml/preferences.xml +++ b/uhabits-android/src/main/res/xml/preferences.xml @@ -112,9 +112,9 @@ android:dialogTitle="@string/day_hour_offset" android:entries="@array/hours_names" android:entryValues="@array/hours_values" - android:key="pref_day_hour_offset" + android:key="pref_new_day_offset" android:summary="%s" - android:title="@string/pref_day_hour_offset_title" /> + android:title="@string/pref_new_day_offset_title" /> diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java index 65f32ae95..14bfebb2f 100644 --- a/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java +++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java @@ -129,7 +129,7 @@ public class Preferences { return Integer.parseInt(storage.getString("pref_first_week_day", String.valueOf(calendar.getFirstDayOfWeek()))); } public int getDayHourOffset() { - return Integer.parseInt(storage.getString("pref_day_hour_offset", "-15")); + return Integer.parseInt(storage.getString("pref_new_day_offset", "-15")); } public String getSyncAddress() {