Fix ugly time picker preference

ZeusWPI · Oct 26, 2023 · 16e185b · 16e185b
1 parent f2b6e9d
commit 16e185b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/app/src/main/java/be/ugent/zeus/hydra/common/ui/widgets/TimePreference.java b/app/src/main/java/be/ugent/zeus/hydra/common/ui/widgets/TimePreference.java
@@ -33,9 +33,6 @@
 
 import java.time.LocalTime;
 
-import be.ugent.zeus.hydra.R;
-import be.ugent.zeus.hydra.common.utils.ViewUtils;
-
 /**
  * Custom dialog to select a time in the preferences.
  * <p>
@@ -48,36 +45,28 @@
  * @author Niko Strijbol
  * @see <a href="https://github.com/Gericop/Android-Support-Preference-V7-Fix">Based on this library</a>
  * @see LocalTime#toString() The exact documentation on how the value is saved.
+ * @noinspection unused
  */
-@SuppressWarnings({"WeakerAccess"})
 public class TimePreference extends DialogPreference {
 
     public TimePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.TimePreference, defStyleAttr, defStyleRes);
-
-        if (ViewUtils.getBoolean(a, R.styleable.TimePreference_useDefaultSummary,
-                R.styleable.TimePreference_useDefaultSummary, false)) {
-            setSummaryProvider(new TimeSummaryProvider());
-        }
-
-        a.recycle();
+        setSummaryProvider(new TimeSummaryProvider());
     }
 
     public TimePreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
+        super(context, attrs, defStyleAttr);
+        setSummaryProvider(new TimeSummaryProvider());
     }
 
     public TimePreference(Context context, AttributeSet attrs) {
-        this(context, attrs, ViewUtils.getAttr(context,
-                androidx.preference.R.attr.dialogPreferenceStyle,
-                android.R.attr.dialogPreferenceStyle));
+        super(context, attrs);
+        setSummaryProvider(new TimeSummaryProvider());
     }
 
-    @SuppressWarnings({"unused", "RedundantSuppression"})
     public TimePreference(Context context) {
-        this(context, null);
+        super(context);
+        setSummaryProvider(new TimeSummaryProvider());
     }
 
     @Nullable

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -43,10 +43,6 @@
         <attr name="messagePaddingTop" format="boolean" />
     </declare-styleable>
 
-    <declare-styleable name="TimePreference">
-        <attr name="useDefaultSummary" format="boolean" />
-    </declare-styleable>
-
     <!--
     An attribute that is the primary colour in the light theme,
     but the secondary colour in the dark theme.

diff --git a/app/src/main/res/xml/pref_resto.xml b/app/src/main/res/xml/pref_resto.xml
@@ -35,9 +35,7 @@
         app:allowDividerBelow="true"
         app:defaultValue="21:00"
         app:key="pref_resto_closing_hour"
-        app:summary="@string/resto_pref_closing_description"
-        app:title="@string/resto_pref_closing_title"
-        app:useDefaultSummary="true" />
+        app:title="@string/resto_pref_closing_title" />
 
     <ListPreference
         app:allowDividerAbove="true"