From 0c8edf06e46dfe2866d9d7b388c1f8e3cae79b60 Mon Sep 17 00:00:00 2001
From: Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com>
Date: Mon, 14 Mar 2022 13:48:51 +0300
Subject: Setting class

---
 app/src/main/AndroidManifest.xml                   |  1 -
 .../clusterrr/hexeditorwatchface/HexWatchFace.java | 10 ++-------
 .../com/clusterrr/hexeditorwatchface/Setting.java  | 26 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java

(limited to 'app/src/main')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c1f3026..bb14e15 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,7 +48,6 @@
 
             <intent-filter>
                 <action android:name="android.service.wallpaper.WallpaperService" />
-
                 <category android:name="com.google.android.wearable.watchface.category.WATCH_FACE" />
             </intent-filter>
         </service>
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
index 6e077a6..c7ce6a4 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
@@ -72,13 +72,7 @@ public class HexWatchFace extends CanvasWatchFaceService {
         @Override
         public void handleMessage(Message msg) {
             HexWatchFace.Engine engine = mWeakReference.get();
-            if (engine != null) {
-                switch (msg.what) {
-                    case MSG_UPDATE_TIME:
-                        engine.handleUpdateTimeMessage();
-                        break;
-                }
-            }
+            if (engine != null) engine.handleUpdateTimeMessage();
         }
     }
 
@@ -196,7 +190,7 @@ public class HexWatchFace extends CanvasWatchFaceService {
                     preferences.edit()
                         .putInt(getString(R.string.pref_steps_day), mCalendar.get(Calendar.DAY_OF_MONTH))
                         .putInt(getString(R.string.pref_today_step_start), mStepCounter)
-                        .commit();
+                        .apply();
                     todayStepStart = mStepCounter;
             }
             int todaySteps = mStepCounter - todayStepStart;
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java
new file mode 100644
index 0000000..7fc117c
--- /dev/null
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java
@@ -0,0 +1,26 @@
+package com.clusterrr.hexeditorwatchface;
+
+import android.content.SharedPreferences;
+
+public class Setting {
+    private SharedPreferences mPrefs;
+    private String mName;
+    private String[] mValueNames;
+    private String mKey;
+    private int mDefaultValue;
+
+    public Setting(SharedPreferences prefs, String name, String[] valueNames, String key, int defaultValue) {
+        mPrefs = prefs;
+        mName = name;
+        mValueNames = valueNames.clone();
+        mKey = key;
+        mDefaultValue = defaultValue;
+    }
+
+    public String[] getValueNames() { return mValueNames.clone(); }
+    public String getValueName(int i) { return mValueNames[i]; }
+    public int getValueCount() { return mValueNames.length; }
+    public String getValueName() { return mValueNames[mPrefs.getInt(mKey, mDefaultValue)]; }
+    public int getValue(int i) { return mPrefs.getInt(mKey, mDefaultValue); }
+    public void setValue(int i, int value) { mPrefs.edit().putInt(mKey, value).apply(); }
+}
-- 
cgit v1.2.3