Clean up, fixes

6 files changed, 2 insertions, 19 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 931cc4a..073654a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,18 +20,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
-    packagingOptions {
-        // pickFirst "META-INF/DEPENDENCIES"
-        exclude "META-INF/DEPENDENCIES"
-    }
 }
 
 dependencies {
-
-    implementation 'com.google.android.gms:play-services-wearable:17.1.0'
-    implementation 'androidx.percentlayout:percentlayout:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.google.android.support:wearable:2.8.1'
     implementation 'com.google.android.gms:play-services-base:17.6.0'
@@ -40,9 +31,5 @@ dependencies {
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.wear:wear:1.2.0'
-    implementation 'com.google.firebase:firebase-crashlytics-buildtools:2.7.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.google.android.gms:play-services-location:19.0.1'
-    implementation 'com.google.guava:guava:27.0.1-android'
     compileOnly 'com.google.android.wearable:wearable:2.8.1'
 }
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
index d538c4e..76ba98a 100644
--- a/app/src/main/res/drawable-nodpi/preview_round.png
+++ b/app/src/main/res/drawable-nodpi/preview_round.png