Extract sleep timer preferences into dedicated class

3 files changed, 48 insertions, 53 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
index 8a13a75d9..dd51aba4d 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
@@ -19,19 +19,14 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.preferences.SleepTimerPreferences;
 
 public abstract class SleepTimerDialog {
     
     private static final String TAG = SleepTimerDialog.class.getSimpleName();
 
-    private static final int DEFAULT_SPINNER_POSITION = 1;
 
     private Context context;
-    private String PREF_NAME = "SleepTimerDialog";
-    private String PREF_VALUE = "LastValue";
-    private String PREF_TIME_UNIT = "LastTimeUnit";
-    private String PREF_VIBRATE = "Vibrate";
-    private String PREF_SHAKE_TO_RESET = "ShakeToReset";
     private SharedPreferences prefs;
 
     private MaterialDialog dialog;
@@ -40,12 +35,10 @@ public abstract class SleepTimerDialog {
     private CheckBox cbShakeToReset;
     private CheckBox cbVibrate;
 
-
     private TimeUnit[] units = { TimeUnit.SECONDS, TimeUnit.MINUTES, TimeUnit.HOURS };
 
     public SleepTimerDialog(Context context) {
         this.context = context;
-        prefs = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
     }
 
     public MaterialDialog createNewDialog() {
@@ -75,8 +68,9 @@ public abstract class SleepTimerDialog {
         spTimeUnit = (Spinner) view.findViewById(R.id.spTimeUnit);
         cbShakeToReset = (CheckBox) view.findViewById(R.id.cbShakeToReset);
         cbVibrate = (CheckBox) view.findViewById(R.id.cbVibrate);
+        chAutoEnable = (CheckBox) view.findViewById(R.id.chAutoEnable);
 
-        etxtTime.setText(prefs.getString(PREF_VALUE, "15"));
+        etxtTime.setText(SleepTimerPreferences.lastTimerValue());
         etxtTime.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
@@ -104,11 +98,10 @@ public abstract class SleepTimerDialog {
                 android.R.layout.simple_spinner_item, spinnerContent);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spTimeUnit.setAdapter(spinnerAdapter);
-        int selection = prefs.getInt(PREF_TIME_UNIT, DEFAULT_SPINNER_POSITION);
-        spTimeUnit.setSelection(selection);
+        spTimeUnit.setSelection(SleepTimerPreferences.lastTimerTimeUnit());
 
-        cbShakeToReset.setChecked(prefs.getBoolean(PREF_SHAKE_TO_RESET, true));
-        cbVibrate.setChecked(prefs.getBoolean(PREF_VIBRATE, true));
+        cbShakeToReset.setChecked(SleepTimerPreferences.shakeToReset());
+        cbVibrate.setChecked(SleepTimerPreferences.vibrate());
 
         return dialog;
     }
@@ -132,12 +125,10 @@ public abstract class SleepTimerDialog {
     }
 
     private void savePreferences() {
-        prefs.edit()
-                .putString(PREF_VALUE, etxtTime.getText().toString())
-                .putInt(PREF_TIME_UNIT, spTimeUnit.getSelectedItemPosition())
-                .putBoolean(PREF_SHAKE_TO_RESET, cbShakeToReset.isChecked())
-                .putBoolean(PREF_VIBRATE, cbVibrate.isChecked())
-                .apply();
+        SleepTimerPreferences.setLastTimer(etxtTime.getText().toString(),
+                spTimeUnit.getSelectedItemPosition());
+        SleepTimerPreferences.setShakeToReset(cbShakeToReset.isChecked());
+        SleepTimerPreferences.setVibrate(cbVibrate.isChecked());
     }
 
 }
diff --git a/app/src/main/res/layout-v14/time_dialog.xml b/app/src/main/res/layout-v14/time_dialog.xml
index 06c2cce14..6a75d1f3f 100644
--- a/app/src/main/res/layout-v14/time_dialog.xml
+++ b/app/src/main/res/layout-v14/time_dialog.xml
@@ -33,26 +33,28 @@
     </LinearLayout>
 
     <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/timer_about_to_expire_label"
+            android:textSize="16sp" />
+
+        <CheckBox
+            android:id="@+id/cbShakeToReset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/shake_to_reset_label" />
+
+        <CheckBox
+            android:id="@+id/cbVibrate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textSize="16sp"
-                android:text="@string/timer_about_to_expire_label"/>
-
-            <CheckBox android:id="@+id/cbShakeToReset"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/shake_to_reset_label"/>
-
-            <CheckBox android:id="@+id/cbVibrate"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/timer_vibration_label"/>
+            android:text="@string/timer_vibration_label" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/time_dialog.xml b/app/src/main/res/layout/time_dialog.xml
index b270e82f7..c790802d6 100644
--- a/app/src/main/res/layout/time_dialog.xml
+++ b/app/src/main/res/layout/time_dialog.xml
@@ -36,22 +36,24 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textSize="16sp"
-                android:text="@string/timer_about_to_expire_label"/>
-
-            <CheckBox android:id="@+id/cbShakeToReset"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/shake_to_reset_label"/>
-
-            <CheckBox android:id="@+id/cbVibrate"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/timer_vibration_label"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/timer_about_to_expire_label"
+            android:textSize="16sp" />
+
+        <CheckBox
+            android:id="@+id/cbShakeToReset"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/shake_to_reset_label" />
+
+        <CheckBox
+            android:id="@+id/cbVibrate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/timer_vibration_label" />
 
     </LinearLayout>