diff options
author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-03-15 02:01:10 +0300 |
---|---|---|
committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-03-15 02:01:10 +0300 |
commit | 0dca222b183536e7f7a371526631028cbb028d83 (patch) | |
tree | b7e21e90dd3337f8d298f70d4baa7a4df5f07e91 /app/src/main | |
parent | af94d50a18cbb8744dd3c525328a7a7529308946 (diff) |
Clean up, fixes
Diffstat (limited to 'app/src/main')
5 files changed, 2 insertions, 6 deletions
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java index 1602cfa..3dd6ef7 100644 --- a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java +++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java @@ -211,7 +211,7 @@ public class HexWatchFace extends CanvasWatchFaceService { .apply(); todayStepStart = mStepCounter; } - todaySteps = mStepCounter - todayStepStart; + todaySteps = Math.max(mStepCounter - todayStepStart, 0); } IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED); diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java index 190df72..e0d5015 100644 --- a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java +++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java @@ -109,6 +109,7 @@ public class SettingsActivity extends AppCompatActivity { Resources res = getResources(); mSettings = new Setting[] { + // TODO: move strings to resources new Setting(prefs, "Time format", new String[] {"12 hours", "24 hours"}, getString(R.string.pref_time_format), PREF_DEFAULT_TIME_FORMAT), new Setting(prefs, "Time system", new String[] {"Dec", "Hex", "Hex, dec on tap"}, getString(R.string.pref_time_system), PREF_DEFAULT_TIME_SYSTEM), new Setting(prefs, "Date", new String[] {"Do not show", "Dec", "Hex", "Hex, dec on tap"}, getString(R.string.pref_date), PREF_DEFAULT_DATE), diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java index c113a54..979cc16 100644 --- a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java +++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsMenuAdapter.java @@ -27,14 +27,10 @@ public class SettingsMenuAdapter extends RecyclerView.Adapter<SettingsMenuAdapte this.mContext = context;
mSettings = settings;
this.mHolders = new SettingsMenuAdapter.RecyclerViewHolder[settings.length];
-
-// this.dataSource = dataArgs;
-// this.callback = callback;
}
public void updateHolder(int pos)
{
- SharedPreferences prefs = mContext.getSharedPreferences(mContext.getString(R.string.app_name), Context.MODE_PRIVATE);
Resources res = mContext.getResources();
SettingsMenuAdapter.RecyclerViewHolder holder = mHolders[pos];
holder.menuItemSettingKey.setText(mSettings[pos].getName());
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubMenuAdapter.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubMenuAdapter.java index fd134c2..203383c 100644 --- a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubMenuAdapter.java +++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsSubMenuAdapter.java @@ -63,7 +63,6 @@ public class SettingsSubMenuAdapter extends RecyclerView.Adapter<SettingsSubMenu 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);
diff --git a/app/src/main/res/drawable-nodpi/preview_round.png b/app/src/main/res/drawable-nodpi/preview_round.png Binary files differindex d538c4e..76ba98a 100644 --- a/app/src/main/res/drawable-nodpi/preview_round.png +++ b/app/src/main/res/drawable-nodpi/preview_round.png |