diff --git a/wear/src/main/java/info/nightscout/androidaps/watchfaces/RICTxWF01.java b/wear/src/main/java/info/nightscout/androidaps/watchfaces/RICTxWF01.java index 772af26400..3aa37ac629 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/RICTxWF01.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/RICTxWF01.java @@ -113,6 +113,7 @@ public class RICTxWF01 extends BaseWatchFace { String displayStyle=sharedPrefs.getString("rictxwf01_frameStyle", "full"); String displayFrameColor=sharedPrefs.getString("rictxwf01_frameColor", "red"); String displayFrameColorSaturation=sharedPrefs.getString("rictxwf01_frameColorSaturation", "500"); + String displayFrameColorOpacity=sharedPrefs.getString("rictxwf01_frameColorOpacity", "1"); // Load image with shapes String styleDrawableName = "rictxwf01_bg_" + displayStyle + "_" + displayFormatType; @@ -123,7 +124,7 @@ public class RICTxWF01 extends BaseWatchFace { } // set background-tint-color - if (displayStyle.equalsIgnoreCase("rainbow") || displayStyle.equalsIgnoreCase("none")) { + if (displayFrameColor.equalsIgnoreCase("multicolor") || displayStyle.equalsIgnoreCase("none")) { mShapesElements.setBackgroundTintList(null); } else { String strColorName =(( displayFrameColor.equals("white") || displayFrameColor.equals("black") )?displayFrameColor:displayFrameColor+"_"+displayFrameColorSaturation); @@ -137,10 +138,13 @@ public class RICTxWF01 extends BaseWatchFace { } } + // set opacity of shapes + mShapesElements.setAlpha(Float.parseFloat(displayFrameColorOpacity)); + } /* optimize font-size --> when date is off then increase font-size of time */ - Boolean isShowDate = sharedPrefs.getBoolean("show_date", true); + Boolean isShowDate = sharedPrefs.getBoolean("show_date", false); if (!isShowDate) { layoutView.findViewById(R.id.date_time).setVisibility(View.GONE); mHour.setTextSize(62); diff --git a/wear/src/main/res/drawable/rictxwf01_bg_full_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_full_rect.png index f6e4761210..e917a354b8 100644 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_full_rect.png and b/wear/src/main/res/drawable/rictxwf01_bg_full_rect.png differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_full_round.png b/wear/src/main/res/drawable/rictxwf01_bg_full_round.png index d1a03300e1..98fbbb1701 100644 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_full_round.png and b/wear/src/main/res/drawable/rictxwf01_bg_full_round.png differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_rainbow_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_rainbow_rect.png deleted file mode 100644 index e917a354b8..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_rainbow_rect.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_rainbow_round.png b/wear/src/main/res/drawable/rictxwf01_bg_rainbow_round.png deleted file mode 100644 index 98fbbb1701..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_rainbow_round.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_shape_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_shape_rect.png new file mode 100644 index 0000000000..63e0b09ff3 Binary files /dev/null and b/wear/src/main/res/drawable/rictxwf01_bg_shape_rect.png differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_shape_round.png b/wear/src/main/res/drawable/rictxwf01_bg_shape_round.png new file mode 100644 index 0000000000..8fd22ca027 Binary files /dev/null and b/wear/src/main/res/drawable/rictxwf01_bg_shape_round.png differ diff --git a/wear/src/main/res/values/rictxwf01_arrays.xml b/wear/src/main/res/values/rictxwf01_arrays.xml index 449f180621..09b10f258b 100644 --- a/wear/src/main/res/values/rictxwf01_arrays.xml +++ b/wear/src/main/res/values/rictxwf01_arrays.xml @@ -3,14 +3,14 @@ @string/style_none @string/style_minimal + @string/style_shape @string/style_full - @string/style_rainbow none minimal + shape full - rainbow @@ -34,6 +34,7 @@ @string/color_name_gray @string/color_name_bluegray @string/color_name_white + @string/color_name_multicolor red @@ -56,6 +57,7 @@ gray bluegray white + multicolor @@ -66,4 +68,31 @@ 900 + + + 10% + 20% + 30% + 40% + 50% + 60% + 70% + 80% + 90% + 100% + + + 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 0.6 + 0.7 + 0.8 + 0.9 + 1 + + + \ No newline at end of file diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml index ec76e27583..b3652447c0 100644 --- a/wear/src/main/res/values/strings.xml +++ b/wear/src/main/res/values/strings.xml @@ -140,18 +140,20 @@ blue gray white black - + multicolor Choose your style no style minimal style + shape style full style - rainbow style + Choose your color Choose your color saturation - vibrate hourly + Choose your color opacity + Vibrate hourly Show Week number diff --git a/wear/src/main/res/xml/rictxwf01configuration.xml b/wear/src/main/res/xml/rictxwf01configuration.xml index 7c84e1572a..cbe86ba872 100644 --- a/wear/src/main/res/xml/rictxwf01configuration.xml +++ b/wear/src/main/res/xml/rictxwf01configuration.xml @@ -23,6 +23,13 @@ android:entries="@array/rictxwf01_color_saturation" android:entryValues="@array/rictxwf01_color_saturation"/> + +