Merge branch 'master' of github.com:ClusterM/wear-os-hex-editor-watchface

3 files changed, 28 insertions, 14 deletions

diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
index 9194d86..71adaa6 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
@@ -65,13 +65,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();
         }
     }
 
@@ -183,7 +177,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(); }

+}

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index e44d3b7..0000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Mar 07 21:43:46 MSK 2022

-distributionBase=GRADLE_USER_HOME

-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

-distributionPath=wrapper/dists

-zipStorePath=wrapper/dists

-zipStoreBase=GRADLE_USER_HOME