Settings

10 files changed, 227 insertions, 58 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 24199ff..c37f3aa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,7 +65,11 @@
                 <category android:name="android.intent.category.DEFAULT" />

             </intent-filter>

         </activity>

-

+        <activity

+            android:name=".SettingsSubActivity"

+            android:label="Settings"

+            android:theme="@style/MyMaterialTheme">

+        </activity>

 

         <meta-data

             android:name="com.google.android.gms.version"

diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
index 71adaa6..21c5616 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
@@ -45,6 +45,9 @@ public class HexWatchFace extends CanvasWatchFaceService {
     private static final int ENDIANNESS_BIG_ENDIAN = 1;
     private static final int ENDIANNESS_FAKE_HEX = 2;
 
+    private static final int PREF_TIME_FORMAT_12 = 0;
+    private static final int PREF_TIME_FORMAT_24 = 1;
+
     /**
      * Handler message id for updating the time periodically in interactive mode.
      */
@@ -160,7 +163,8 @@ public class HexWatchFace extends CanvasWatchFaceService {
 
         @Override
         public void onDraw(Canvas canvas, Rect bounds) {
-            SharedPreferences preferences = getApplicationContext().getSharedPreferences(getString(R.string.app_name), MODE_PRIVATE);
+            SharedPreferences prefs = getApplicationContext().getSharedPreferences(getString(R.string.app_name), MODE_PRIVATE);
+            Resources res = getApplicationContext().getResources();
             long now = System.currentTimeMillis();
             mCalendar.setTimeInMillis(now);
             if ((mHeartRateTS + MAX_HEART_RATE_AGE < now) && (mHeartRate != 0)) {
@@ -171,10 +175,10 @@ public class HexWatchFace extends CanvasWatchFaceService {
             Intent batteryIntent = getApplicationContext().registerReceiver(null, filter);
             int battery = batteryIntent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
 
-            int todayStepStart = preferences.getInt(getString(R.string.pref_today_step_start), 0);
-            if (mCalendar.get(Calendar.DAY_OF_MONTH) != preferences.getInt(getString(R.string.pref_steps_day), 0)
+            int todayStepStart = prefs.getInt(getString(R.string.pref_today_step_start), 0);
+            if (mCalendar.get(Calendar.DAY_OF_MONTH) != prefs.getInt(getString(R.string.pref_steps_day), 0)
                 || mStepCounter < todayStepStart) {
-                    preferences.edit()
+                    prefs.edit()
                         .putInt(getString(R.string.pref_steps_day), mCalendar.get(Calendar.DAY_OF_MONTH))
                         .putInt(getString(R.string.pref_today_step_start), mStepCounter)
                         .apply();
@@ -206,7 +210,11 @@ public class HexWatchFace extends CanvasWatchFaceService {
                 drawNumber(canvas, battery, ENDIANNESS_FAKE_HEX, 2, HexNumbers.COLORS_CYAN, -2, 0);
                 drawNumber(canvas, todaySteps, ENDIANNESS_FAKE_HEX, 3, HexNumbers.COLORS_CYAN, -2, 1);
 
-                drawNumber(canvas, mCalendar.get(Calendar.HOUR_OF_DAY), ENDIANNESS_FAKE_HEX, 1, HexNumbers.COLORS_WHITE, 0, 0);
+                drawNumber(canvas, mCalendar.get(
+                        prefs.getInt(res.getString(R.string.pref_time_format),PREF_TIME_FORMAT_24) == PREF_TIME_FORMAT_12
+                        ? Calendar.HOUR
+                        : Calendar.HOUR_OF_DAY
+                ), ENDIANNESS_FAKE_HEX, 1, HexNumbers.COLORS_WHITE, 0, 0);
 //                drawNumber(canvas, 0x1E, ENDIANNESS_LITTLE_ENDIAN, 1, HexNumbers.COLORS_WHITE, 0, 0);
                 drawNumber(canvas, mCalendar.get(Calendar.MINUTE), ENDIANNESS_FAKE_HEX, 1,HexNumbers.COLORS_WHITE, 1, 0);
 //                drawNumber(canvas, 0xE7, ENDIANNESS_LITTLE_ENDIAN, 1,HexNumbers.COLORS_WHITE, 1, 0);
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java
index cc386bb..fb3f88c 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/Setting.java
@@ -21,7 +21,15 @@ public class Setting {
     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(); }

+    public String getValueName() {

+        try{

+            return mValueNames[mPrefs.getInt(mKey, mDefaultValue)];

+        }

+        catch (Exception ex) {

+            setValue(mDefaultValue);

+            return mValueNames[mDefaultValue];

+        }

+    }

+    public int getValue() { return mPrefs.getInt(mKey, mDefaultValue); }

+    public void setValue(int value) { mPrefs.edit().putInt(mKey, value).apply(); }

 }

diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java
index 4d1facd..f5682e2 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java
@@ -1,7 +1,10 @@
 package com.clusterrr.hexeditorwatchface;
 
 import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
@@ -19,19 +22,49 @@ import androidx.wear.widget.WearableLinearLayoutManager;
 import androidx.wear.widget.WearableRecyclerView;
 
 public class SettingsActivity extends AppCompatActivity {
+    private Setting[] mSettings;
+    SettingsMenuAdapter settingsMenuAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.settings_activity);
+        SharedPreferences prefs = getSharedPreferences(getString(R.string.app_name), MODE_PRIVATE);
+
+        mSettings = new Setting[] {
+                new Setting(prefs, "Time format", new String[] {"12 hours", "24 hours"}, getString(R.string.pref_time_format), 1),
+                new Setting(prefs, "Time system", new String[] {"Dec", "Hex", "Hex, dec on tap"}, getString(R.string.pref_time_system), 2),
+                new Setting(prefs, "Date", new String[] {"Do not show", "Dec", "Hex, dec on tap"}, getString(R.string.pref_date), 0),
+                new Setting(prefs, "Day of the week", new String[] {"Do not show", "Sunday=0", "Sunday=7"}, getString(R.string.pref_day_week), 0),
+                new Setting(prefs, "Heart rate", new String[] {"Do not show", "Dec", "Hex, dec on tap"}, getString(R.string.pref_heart_rate), 0),
+                new Setting(prefs, "Steps", new String[] {"Do not show", "Dec", "Hex, dec on tap"}, getString(R.string.pref_steps), 0),
+                new Setting(prefs, "Battery", new String[] {"Do not show", "Dec (0-100)",
+                        "Hex (0x00-0xFF)", "Hex (0-100)", "Hex (0x00-0xFF), dec on tap", "Hex (0-100), dec on tap"},
+                        getString(R.string.pref_battery), 0),
+                new Setting(prefs, "Endianness", new String[] {"Little endian", "Big endian"}, getString(R.string.pref_endianness), 0),
+                new Setting(prefs, "Round vignetting", new String[] {"Disabled", "Enabled"}, getString(R.string.pref_vignetting), 0),
+        };
+
         WearableRecyclerView recyclerView = findViewById(R.id.settings_menu_view);
-        //recyclerView.setHasFixedSize(true);
         recyclerView.setEdgeItemsCenteringEnabled(true);
         CustomScrollingLayoutCallback customScrollingLayoutCallback =
                 new CustomScrollingLayoutCallback();
         recyclerView.setLayoutManager(
                 new WearableLinearLayoutManager(this, customScrollingLayoutCallback));
-        recyclerView.setAdapter(new SettingsMenuAdapter(this));
+        settingsMenuAdapter = new SettingsMenuAdapter(this, mSettings);
+        recyclerView.setAdapter(settingsMenuAdapter);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Log.d(HexWatchFace.TAG, "Result code: " + resultCode);
+        if (resultCode != Activity.RESULT_OK) return;
+        int setting = data.getIntExtra("setting", -1);
+        int selected = data.getIntExtra("selected", -1);
+        Log.d(HexWatchFace.TAG, "Setting " + setting + " set to " + selected);
+        mSettings[setting].setValue(selected);
+        settingsMenuAdapter.updateHolder(setting);
     }
 }
 
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java
index dccaf57..9fbedfc 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java
@@ -2,56 +2,37 @@ package com.clusterrr.hexeditorwatchface;
 

 import static com.clusterrr.hexeditorwatchface.HexWatchFace.TAG;

 

-import android.Manifest;

 import android.content.Context;

+import android.content.Intent;

 import android.content.SharedPreferences;

-import android.content.pm.PackageManager;

 import android.util.Log;

 import android.view.LayoutInflater;

 import android.view.View;

 import android.view.ViewGroup;

 import android.widget.LinearLayout;

+import android.widget.RadioButton;

 import android.widget.TextView;

 

 import androidx.activity.result.ActivityResultLauncher;

 import androidx.activity.result.contract.ActivityResultContracts;

 import androidx.annotation.NonNull;

 import androidx.appcompat.app.AppCompatActivity;

-import androidx.core.content.ContextCompat;

 import androidx.recyclerview.widget.RecyclerView;

 

 public class SettingsMenuAdapter extends RecyclerView.Adapter<SettingsMenuAdapter.RecyclerViewHolder> {

-    //private ArrayList<MenuItem> dataSource = new ArrayList<MenuItem>();

-

     private Setting[] mSettings;

-

-    public interface AdapterCallback {

-        void onItemClicked(Integer menuPosition);

-    }

-

-    private AdapterCallback callback;

-    private String drawableIcon;

-    private AppCompatActivity context;

+    private AppCompatActivity mContext;

     private ActivityResultLauncher<String> requestPermissionLauncherLocation;

     private ActivityResultLauncher<String> requestPermissionLauncherBody;

     private ActivityResultLauncher<String> requestPermissionLauncherSteps;

+    private View.OnClickListener onClickListener;

+    private SettingsMenuAdapter.RecyclerViewHolder[] mHolders;

+

+    public SettingsMenuAdapter(AppCompatActivity context, Setting[] settings) {

+        this.mContext = context;

+        mSettings = settings;

+        this.mHolders = new SettingsMenuAdapter.RecyclerViewHolder[settings.length];

 

-    public SettingsMenuAdapter(AppCompatActivity context /*, ArrayList<MenuItem> dataArgs, AdapterCallback callback*/) {

-        this.context = context;

-        SharedPreferences prefs = context.getPreferences(Context.MODE_PRIVATE);

-        mSettings = new Setting[] {

-                new Setting(prefs, "Time format", new String[] {"12 hours", "24 hours"}, context.getString(R.string.pref_time_format), 1),

-                new Setting(prefs, "Time system", new String[] {"Dec", "Hex", "Hex, dec on tap"}, context.getString(R.string.pref_time_system), 2),

-                new Setting(prefs, "Date", new String[] {"Do not show", "Dec", "Hex, dec on tap"}, context.getString(R.string.pref_date), 0),

-                new Setting(prefs, "Day of the week", new String[] {"Do not show", "Sunday = 0", "Sunday = 7"}, context.getString(R.string.pref_day_week), 0),

-                new Setting(prefs, "Heart rate", new String[] {"Do not show", "Dec", "Hex, dec on tap"}, context.getString(R.string.pref_heart_rate), 0),

-                new Setting(prefs, "Steps", new String[] {"Do not show", "Dec", "Hex, dec on tap"}, context.getString(R.string.pref_steps), 0),

-                new Setting(prefs, "Battery", new String[] {"Do not show", "Dec (0-100)", 

-                        "Hex (0x00-0xFF)", "Hex (0-100)", "Hex (0x00-0xFF), dec on tap", "Hex (0-100), dec on tap"},

-                        context.getString(R.string.pref_battery), 0),

-                new Setting(prefs, "Endianness", new String[] {"Little endian", "Big endian"}, context.getString(R.string.pref_endianness), 0),

-                new Setting(prefs, "Round vignetting", new String[] {"Disabled", "Enabled>"}, context.getString(R.string.pref_vignetting), 0),

-        };

 //        this.dataSource = dataArgs;

 //        this.callback = callback;

         requestPermissionLauncherLocation = context.registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {

@@ -98,35 +79,52 @@ public class SettingsMenuAdapter extends RecyclerView.Adapter<SettingsMenuAdapte
         });

     }

 

+    public void updateHolder(int pos)

+    {

+        SettingsMenuAdapter.RecyclerViewHolder holder = mHolders[pos];

+        holder.menuItemSettingKey.setText(mSettings[pos].getName());

+        holder.menuItemSettingValue.setText(mSettings[pos].getValueName());

+        holder.menuContainer.setOnClickListener(v -> {

+            Intent intent = new Intent(mContext, SettingsSubActivity.class);

+            intent.putExtra("setting", pos);

+            intent.putExtra("values", mSettings[pos].getValueNames());

+            intent.putExtra("selected", mSettings[pos].getValue());

+            mContext.startActivityForResult(intent, 0);

+        });

+    }

+

     @NonNull

     @Override

     public RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.menu_item, parent, false);

-        return new RecyclerViewHolder(context, view);

+        return new RecyclerViewHolder(mContext, view);

     }

 

     public static class RecyclerViewHolder extends RecyclerView.ViewHolder {

-        private Context context;

+        private Context mContext;

         LinearLayout menuContainer;

         TextView menuItemSettingKey;

         TextView menuItemSettingValue;

+        RadioButton menuItemSettingRadio;

 

-        public RecyclerViewHolder(Context context, View view) {

+        public RecyclerViewHolder(AppCompatActivity context, View view) {

             super(view);

-            this.context = context;

+            this.mContext = context;

             menuContainer = view.findViewById(R.id.settingsContainer);

             menuItemSettingKey = view.findViewById(R.id.textViewSettingKey);

             menuItemSettingValue = view.findViewById(R.id.textViewSettingValue);

+            menuItemSettingRadio = view.findViewById(R.id.radioButtonSettingValue);

+            menuItemSettingValue.setVisibility(View.VISIBLE);

+            menuItemSettingRadio.setVisibility(View.GONE);

+            Log.i(TAG, "RecyclerViewHolder created");

         }

     }

 

     @Override

     public void onBindViewHolder(@NonNull SettingsMenuAdapter.RecyclerViewHolder holder, int position) {

-        holder.menuItemSettingKey.setText(mSettings[position].getName());

-        holder.menuItemSettingValue.setText(mSettings[position].getValueName());

-        holder.menuContainer.setOnClickListener(v -> {

-

-        });

+        final int pos = position;

+        mHolders[pos] = holder;

+        updateHolder(pos);

     }

 

     @Override

diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubActivity.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubActivity.java
new file mode 100644
index 0000000..ff76297
--- /dev/null
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubActivity.java
@@ -0,0 +1,32 @@
+package com.clusterrr.hexeditorwatchface;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.wear.widget.WearableLinearLayoutManager;
+import androidx.wear.widget.WearableRecyclerView;
+
+public class SettingsSubActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        int setting = intent.getIntExtra("setting", 0);
+        String[] values = intent.getStringArrayExtra("values");
+        int selected = intent.getIntExtra("selected", 0);
+        setContentView(R.layout.settings_activity);
+        WearableRecyclerView recyclerView = findViewById(R.id.settings_menu_view);
+        recyclerView.setEdgeItemsCenteringEnabled(true);
+        CustomScrollingLayoutCallback customScrollingLayoutCallback =
+                new CustomScrollingLayoutCallback();
+        recyclerView.setLayoutManager(
+                new WearableLinearLayoutManager(this, customScrollingLayoutCallback));
+        recyclerView.setAdapter(new SettingsSubMenuAdapter(this, setting, values, selected));
+        //Intent resultIntent = new Intent();
+        //resultIntent.putExtra("selected", 0);
+        //setResult(Activity.RESULT_OK, 0);
+    }
+}
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubMenuAdapter.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubMenuAdapter.java
new file mode 100644
index 0000000..fd134c2
--- /dev/null
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubMenuAdapter.java
@@ -0,0 +1,86 @@
+package com.clusterrr.hexeditorwatchface;

+

+import android.app.Activity;

+import android.content.Context;

+import android.content.Intent;

+import android.util.Log;

+import android.view.LayoutInflater;

+import android.view.View;

+import android.view.ViewGroup;

+import android.widget.LinearLayout;

+import android.widget.RadioButton;

+import android.widget.TextView;

+

+import androidx.annotation.NonNull;

+import androidx.appcompat.app.AppCompatActivity;

+import androidx.recyclerview.widget.RecyclerView;

+

+public class SettingsSubMenuAdapter extends RecyclerView.Adapter<SettingsSubMenuAdapter.RecyclerViewHolder> {

+    private AppCompatActivity mContext;

+    int mSetting;

+    private String[] mValues;

+    private int mSelected;

+    private RecyclerViewHolder[] mHolders;

+

+    public SettingsSubMenuAdapter(AppCompatActivity context, int setting, String[] values, int selected) {

+        this.mContext = context;

+        this.mSetting = setting;

+        this.mValues = values;

+        this.mSelected = selected;

+        this.mHolders = new RecyclerViewHolder[values.length];

+    }

+

+    @NonNull

+    @Override

+    public RecyclerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.menu_item, parent, false);

+        return new RecyclerViewHolder(mContext, view);

+    }

+

+    public static class RecyclerViewHolder extends RecyclerView.ViewHolder {

+        private Context mContext;

+        LinearLayout menuContainer;

+        TextView menuItemSettingKey;

+        TextView menuItemSettingValue;

+        RadioButton menuItemSettingRadio;

+

+        public RecyclerViewHolder(Context context, View view) {

+            super(view);

+            this.mContext = context;

+            menuContainer = view.findViewById(R.id.settingsContainer);

+            menuItemSettingKey = view.findViewById(R.id.textViewSettingKey);

+            menuItemSettingValue = view.findViewById(R.id.textViewSettingValue);

+            menuItemSettingRadio = view.findViewById(R.id.radioButtonSettingValue);

+            menuItemSettingValue.setVisibility(View.GONE);

+            menuItemSettingRadio.setVisibility(View.VISIBLE);

+        }

+    }

+

+    @Override

+    public void onBindViewHolder(@NonNull SettingsSubMenuAdapter.RecyclerViewHolder holder, int position) {

+        final int pos = position;

+        this.mHolders[pos] = holder;

+        holder.menuItemSettingKey.setText(mValues[pos]);

+        holder.menuItemSettingRadio.setChecked(pos == mSelected);

+        holder.menuItemSettingRadio.setOnCheckedChangeListener((v, b) -> {

+            //this.mHolders[pos].menuItemSettingRadio.setChecked(true);

+            if (b) {

+                Intent result = new Intent();

+                result.putExtra("setting", mSetting);

+                result.putExtra("selected", pos);

+                Log.d(HexWatchFace.TAG, "Return: " + mSetting + "=" + pos);

+                mContext.setResult(Activity.RESULT_OK, result);

+                mContext.finish();

+            }

+        });

+        holder.menuContainer.setOnClickListener((v) -> {

+            holder.menuItemSettingRadio.setChecked(false);

+            holder.menuItemSettingRadio.setChecked(true);

+        });

+    }

+

+    @Override

+    public int getItemCount() {

+        return mValues.length;

+    }

+}

diff --git a/app/src/main/res/layout/menu_item.xml b/app/src/main/res/layout/menu_item.xml
index 084e8b9..4f8b3c4 100644
--- a/app/src/main/res/layout/menu_item.xml
+++ b/app/src/main/res/layout/menu_item.xml
@@ -29,25 +29,25 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="key"
-                    android:textSize="18sp"/>
+                    android:textSize="15dp"/>
 
                 <TextView
                     android:id="@+id/textViewSettingValue"
-                    android:layout_width="70dp"
+                    android:layout_width="60dp"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="8dp"
                     android:text="value"
-                    android:textSize="12sp"
-                    android:visibility="visible" />
+                    android:textSize="12sp"/>
 
-                <Switch
-                    android:id="@+id/switchSettingValue"
+                <RadioButton
+                    android:id="@+id/radioButtonSettingValue"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"
                     android:enabled="true"
-                    android:checked="true"/>
+                    android:checked="false"
+                    android:layout_marginLeft="10dp"
+                    android:visibility="gone"/>
         </LinearLayout>
 
         <ImageView
diff --git a/app/src/main/res/values/values-notround.xml b/app/src/main/res/values-notround/values-notround.xml
index 414e281..414e281 100644
--- a/app/src/main/res/values/values-notround.xml
+++ b/app/src/main/res/values-notround/values-notround.xml
diff --git a/app/src/main/res/values/values-round.xml b/app/src/main/res/values-round/values-round.xml
index 4162b1d..4162b1d 100644
--- a/app/src/main/res/values/values-round.xml
+++ b/app/src/main/res/values-round/values-round.xml