Variables renaming

2 files changed, 15 insertions, 15 deletions

diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
index acbe7cf..98789ca 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/HexWatchFace.java
@@ -284,7 +284,7 @@ public class HexWatchFace extends CanvasWatchFaceService {
                 drawNumber(canvas, mCalendar.get(Calendar.SECOND), timeEndianness, 1,HexNumbers.COLORS_CYAN, 2, 0);
 
                 int dateSystem = prefs.getInt(getString(R.string.pref_date), SettingsActivity.PREF_DEFAULT_DATE);
-                if (dateSystem != SettingsActivity.PREF_VALUE_NOT_SHOW) {
+                if (dateSystem != SettingsActivity.PREF_VALUE_HIDE) {
                     int dateEndianness;
                     if (dateSystem  == SettingsActivity.PREF_VALUE_COMMON_DEC_ON_TAP)
                         dateSystem = tapped
@@ -305,14 +305,14 @@ public class HexWatchFace extends CanvasWatchFaceService {
                 }
 
                 int dayOfTheWeekMode = prefs.getInt(getString(R.string.pref_day_week), SettingsActivity.PREF_DEFAULT_DAY_OF_THE_WEEK);
-                if (dayOfTheWeekMode != SettingsActivity.PREF_VALUE_NOT_SHOW) {
+                if (dayOfTheWeekMode != SettingsActivity.PREF_VALUE_HIDE) {
                     int dayOfTheWeek = mCalendar.get(Calendar.DAY_OF_WEEK) - 1;
                             if ((dayOfTheWeek == 0) && (dayOfTheWeekMode == SettingsActivity.PREF_VALUE_DAY_SUNDAY_7)) dayOfTheWeek = 7;
                     drawNumber(canvas, dayOfTheWeek, ENDIANNESS_FAKE_HEX, 1, HexNumbers.COLORS_CYAN, 1, 1);
                 }
 
                 int heartRateSystem = prefs.getInt(getString(R.string.pref_heart_rate), SettingsActivity.PREF_DEFAULT_HEART_RATE);
-                if (heartRateSystem != SettingsActivity.PREF_VALUE_NOT_SHOW) {
+                if (heartRateSystem != SettingsActivity.PREF_VALUE_HIDE) {
                     if (heartRateSystem == SettingsActivity.PREF_VALUE_COMMON_DEC_ON_TAP)
                         heartRateSystem = tapped
                                 ? SettingsActivity.PREF_VALUE_COMMON_DEC
@@ -329,7 +329,7 @@ public class HexWatchFace extends CanvasWatchFaceService {
                 }
 
                 int batterySystem = prefs.getInt(getString(R.string.pref_battery), SettingsActivity.PREF_DEFAULT_BATTERY);
-                if (batterySystem != SettingsActivity.PREF_VALUE_NOT_SHOW) {
+                if (batterySystem != SettingsActivity.PREF_VALUE_HIDE) {
                     switch(batterySystem) {
                         case SettingsActivity.PREF_VALUE_BATTERY_HEX_0_FF_TAP:
                             batterySystem = tapped
@@ -357,7 +357,7 @@ public class HexWatchFace extends CanvasWatchFaceService {
                 }
 
                 int stepsSystem = prefs.getInt(getString(R.string.pref_steps), SettingsActivity.PREF_DEFAULT_STEPS);
-                if (stepsSystem != SettingsActivity.PREF_VALUE_NOT_SHOW) {
+                if (stepsSystem != SettingsActivity.PREF_VALUE_HIDE) {
                     if (stepsSystem == SettingsActivity.PREF_VALUE_COMMON_DEC_ON_TAP)
                         stepsSystem = tapped
                                 ? SettingsActivity.PREF_VALUE_COMMON_DEC
diff --git a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java
index dee6b26..cb0f3da 100644
--- a/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java
+++ b/app/src/main/java/com/clusterrr/hexeditorwatchface/SettingsActivity.java
@@ -31,7 +31,7 @@ public class SettingsActivity extends AppCompatActivity {
     public static final int PREF_KEY_BARS = 9;
     public static final int PREF_KEY_VIGNETTING = 10;
 
-    public static final int PREF_VALUE_NOT_SHOW = 0;
+    public static final int PREF_VALUE_HIDE = 0;
 
     public static final int PREF_TIME_FORMAT_12 = 0;
     public static final int PREF_TIME_FORMAT_24 = 1;
@@ -66,11 +66,11 @@ public class SettingsActivity extends AppCompatActivity {
 
     public static final int PREF_DEFAULT_TIME_FORMAT = PREF_TIME_FORMAT_24;
     public static final int PREF_DEFAULT_TIME_SYSTEM = PREF_VALUE_TIME_DEC;
-    public static final int PREF_DEFAULT_DATE = PREF_VALUE_NOT_SHOW;
-    public static final int PREF_DEFAULT_DAY_OF_THE_WEEK = PREF_VALUE_NOT_SHOW;
-    public static final int PREF_DEFAULT_HEART_RATE = PREF_VALUE_NOT_SHOW;
-    public static final int PREF_DEFAULT_STEPS = PREF_VALUE_NOT_SHOW;
-    public static final int PREF_DEFAULT_BATTERY = PREF_VALUE_NOT_SHOW;
+    public static final int PREF_DEFAULT_DATE = PREF_VALUE_HIDE;
+    public static final int PREF_DEFAULT_DAY_OF_THE_WEEK = PREF_VALUE_HIDE;
+    public static final int PREF_DEFAULT_HEART_RATE = PREF_VALUE_HIDE;
+    public static final int PREF_DEFAULT_STEPS = PREF_VALUE_HIDE;
+    public static final int PREF_DEFAULT_BATTERY = PREF_VALUE_HIDE;
     public static final int PREF_DEFAULT_ENDIANNESS = PREF_VALUE_ENDIANNESS_LITTLE_ENDIAN;
     public static final int PREF_DEFAULT_BACKGROUND = PREF_VALUE_BACKGROUND_ZEROS;
     public static final int PREF_DEFAULT_BARS = PREF_VALUE_BARS_SHOW;
@@ -86,7 +86,7 @@ public class SettingsActivity extends AppCompatActivity {
         } else {
             // Rollback
             Log.i(TAG, "BODY_SENSORS not granted");
-            mSettings[PREF_KEY_HEART_RATE].setValue(PREF_VALUE_NOT_SHOW);
+            mSettings[PREF_KEY_HEART_RATE].setValue(PREF_VALUE_HIDE);
             mSettingsMenuAdapter.updateHolder(PREF_KEY_HEART_RATE);
         }
     });
@@ -96,7 +96,7 @@ public class SettingsActivity extends AppCompatActivity {
             Log.d(TAG, "ACTIVITY_RECOGNITION granted");
         } else {
             Log.d(TAG, "ACTIVITY_RECOGNITION not granted");
-            mSettings[PREF_KEY_STEPS].setValue(PREF_VALUE_NOT_SHOW);
+            mSettings[PREF_KEY_STEPS].setValue(PREF_VALUE_HIDE);
             mSettingsMenuAdapter.updateHolder(PREF_KEY_STEPS);
         }
     });
@@ -150,7 +150,7 @@ public class SettingsActivity extends AppCompatActivity {
 
         switch (setting) {
             case PREF_KEY_HEART_RATE:
-                if (selected != PREF_VALUE_NOT_SHOW) {
+                if (selected != PREF_VALUE_HIDE) {
                     if (ContextCompat.checkSelfPermission(this, Manifest.permission.BODY_SENSORS)
                             != PackageManager.PERMISSION_GRANTED) {
                         Log.d(TAG, "BODY_SENSORS request required");
@@ -159,7 +159,7 @@ public class SettingsActivity extends AppCompatActivity {
                 }
                 break;
             case PREF_KEY_STEPS:
-                if (selected != PREF_VALUE_NOT_SHOW) {
+                if (selected != PREF_VALUE_HIDE) {
                     if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACTIVITY_RECOGNITION)
                             != PackageManager.PERMISSION_GRANTED) {
                         Log.d(TAG, "ACTIVITY_RECOGNITION request required");