diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/configurationActivities/RICTxWF01ConfigurationActivity.java b/wear/src/main/java/info/nightscout/androidaps/interaction/configurationActivities/RICTxWF01ConfigurationActivity.java index d3def6dab0..7b03ece00e 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/configurationActivities/RICTxWF01ConfigurationActivity.java +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/configurationActivities/RICTxWF01ConfigurationActivity.java @@ -16,6 +16,7 @@ public class RICTxWF01ConfigurationActivity extends WearPreferenceActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTitle("watchface"); addPreferencesFromResource(R.xml.rictxwf01configuration); ViewGroup view = (ViewGroup) getWindow().getDecorView(); removeBackgroundRecursively(view); 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 8f3d7911b0..517cc4996c 100644 --- a/wear/src/main/java/info/nightscout/androidaps/watchfaces/RICTxWF01.java +++ b/wear/src/main/java/info/nightscout/androidaps/watchfaces/RICTxWF01.java @@ -1,12 +1,14 @@ package info.nightscout.androidaps.watchfaces; import android.content.Intent; +import android.content.res.ColorStateList; import android.os.Vibrator; import android.support.wearable.watchface.WatchFaceStyle; import android.util.Log; import android.view.LayoutInflater; import android.widget.LinearLayout; import androidx.core.content.ContextCompat; + import com.ustwo.clockwise.common.WatchFaceTime; import com.ustwo.clockwise.common.WatchMode; import info.nightscout.androidaps.R; @@ -101,19 +103,34 @@ public class RICTxWF01 extends BaseWatchFace { LinearLayout mShapesElements = layoutView.findViewById(R.id.shapes_elements); if (mShapesElements != null) { String displayFormatType = (mShapesElements.getContentDescription().toString().startsWith("round") ? "round" : "rect"); - String styleDrawableName = "rictxwf01_bg_" + sharedPrefs.getString("rictxwf01_frameStyle", "red") + "_" + displayFormatType; - Log.d("rictxwf01_frameStyle", styleDrawableName); + String displayStyle=sharedPrefs.getString("rictxwf01_frameStyle", "full"); + String displayFrameColor=sharedPrefs.getString("rictxwf01_frameColor", "red"); + String displayFrameColorSaturation=sharedPrefs.getString("rictxwf01_frameColorSaturation", "500"); + + // Load image with shapes + String styleDrawableName = "rictxwf01_bg_" + displayStyle + "_" + displayFormatType; try { mShapesElements.setBackground(getResources().getDrawable(getResources().getIdentifier(styleDrawableName, "drawable", getApplicationContext().getPackageName()))); } catch (Exception e) { Log.e("rictxwf01_frameStyle", "RESOURCE NOT FOUND >> " + styleDrawableName); } + + // set background-tint-color + if (displayStyle.equalsIgnoreCase("rainbow") || displayStyle.equalsIgnoreCase("none")) { + mShapesElements.setBackgroundTintList(null); + } else { + String strColorName =(( displayFrameColor.equals("white") || displayFrameColor.equals("black") )?displayFrameColor:displayFrameColor+"_"+displayFrameColorSaturation); + Log.v("rictxwf01_strColorName",strColorName); + try { + ColorStateList colorStateList = ContextCompat.getColorStateList(getApplicationContext(), getResources().getIdentifier(strColorName, "color", getApplicationContext().getPackageName())); + mShapesElements.setBackgroundTintList(colorStateList); + } catch (Exception e) { + mShapesElements.setBackgroundTintList(null); + Log.e("rictxwf01_ColorName", "COLOR NOT FOUND >> " + strColorName); + } + } + } - - - /* ToDo Implement a configurable background image - * layoutView.setBackground(); - */ } protected void setColorLowRes() { diff --git a/wear/src/main/res/drawable/rictxwf01_bg_bluegray_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_bluegray_rect.png deleted file mode 100644 index af7d41a13d..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_bluegray_rect.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_bluegray_round.png b/wear/src/main/res/drawable/rictxwf01_bg_bluegray_round.png deleted file mode 100644 index cc3c966874..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_bluegray_round.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_deeppurple_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_deeppurple_rect.png deleted file mode 100644 index f4d14196b1..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_deeppurple_rect.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_deeppurple_round.png b/wear/src/main/res/drawable/rictxwf01_bg_deeppurple_round.png deleted file mode 100644 index 637029b708..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_deeppurple_round.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_red_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_full_rect.png similarity index 100% rename from wear/src/main/res/drawable/rictxwf01_bg_red_rect.png rename to wear/src/main/res/drawable/rictxwf01_bg_full_rect.png diff --git a/wear/src/main/res/drawable/rictxwf01_bg_red_round.png b/wear/src/main/res/drawable/rictxwf01_bg_full_round.png similarity index 100% rename from wear/src/main/res/drawable/rictxwf01_bg_red_round.png rename to wear/src/main/res/drawable/rictxwf01_bg_full_round.png diff --git a/wear/src/main/res/drawable/rictxwf01_bg_indigo_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_indigo_rect.png deleted file mode 100644 index fe0629e2cd..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_indigo_rect.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_indigo_round.png b/wear/src/main/res/drawable/rictxwf01_bg_indigo_round.png deleted file mode 100644 index d0ee9496ba..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_indigo_round.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_lightblue_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_lightblue_rect.png deleted file mode 100644 index 997af6abc4..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_lightblue_rect.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_lightblue_round.png b/wear/src/main/res/drawable/rictxwf01_bg_lightblue_round.png deleted file mode 100644 index 3e9ef5eb15..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_lightblue_round.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_lime_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_lime_rect.png deleted file mode 100644 index 6066ac3a0a..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_lime_rect.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_lime_round.png b/wear/src/main/res/drawable/rictxwf01_bg_lime_round.png deleted file mode 100644 index b38e666084..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_lime_round.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_simplestyle_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_minimal_rect.png similarity index 100% rename from wear/src/main/res/drawable/rictxwf01_bg_simplestyle_rect.png rename to wear/src/main/res/drawable/rictxwf01_bg_minimal_rect.png diff --git a/wear/src/main/res/drawable/rictxwf01_bg_simplestyle_round.png b/wear/src/main/res/drawable/rictxwf01_bg_minimal_round.png similarity index 100% rename from wear/src/main/res/drawable/rictxwf01_bg_simplestyle_round.png rename to wear/src/main/res/drawable/rictxwf01_bg_minimal_round.png diff --git a/wear/src/main/res/drawable/rictxwf01_bg_nostyle_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_none_rect.png similarity index 100% rename from wear/src/main/res/drawable/rictxwf01_bg_nostyle_rect.png rename to wear/src/main/res/drawable/rictxwf01_bg_none_rect.png diff --git a/wear/src/main/res/drawable/rictxwf01_bg_nostyle_round.png b/wear/src/main/res/drawable/rictxwf01_bg_none_round.png similarity index 100% rename from wear/src/main/res/drawable/rictxwf01_bg_nostyle_round.png rename to wear/src/main/res/drawable/rictxwf01_bg_none_round.png diff --git a/wear/src/main/res/drawable/rictxwf01_bg_orange_rect.png b/wear/src/main/res/drawable/rictxwf01_bg_orange_rect.png deleted file mode 100644 index 1e55275f79..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_orange_rect.png and /dev/null differ diff --git a/wear/src/main/res/drawable/rictxwf01_bg_orange_round.png b/wear/src/main/res/drawable/rictxwf01_bg_orange_round.png deleted file mode 100644 index 6b6f0446b9..0000000000 Binary files a/wear/src/main/res/drawable/rictxwf01_bg_orange_round.png and /dev/null differ diff --git a/wear/src/main/res/layout/rect_activity_rictxwf01.xml b/wear/src/main/res/layout/rect_activity_rictxwf01.xml index a55214dc2c..3e56dff497 100644 --- a/wear/src/main/res/layout/rect_activity_rictxwf01.xml +++ b/wear/src/main/res/layout/rect_activity_rictxwf01.xml @@ -2,12 +2,12 @@ + tools:context=".watchfaces.RICTxWF01" + tools:deviceIds="wear_square"> @@ -15,7 +15,7 @@ android:id="@+id/shapes_elements" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rictxwf01_bg_red_rect" + android:background="@drawable/rictxwf01_bg_full_rect" android:contentDescription="rect-shape-elements" android:orientation="horizontal" /> diff --git a/wear/src/main/res/layout/round_activity_rictxwf01.xml b/wear/src/main/res/layout/round_activity_rictxwf01.xml index 83f522ca3e..95b7d89c1d 100644 --- a/wear/src/main/res/layout/round_activity_rictxwf01.xml +++ b/wear/src/main/res/layout/round_activity_rictxwf01.xml @@ -15,7 +15,7 @@ android:id="@+id/shapes_elements" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/rictxwf01_bg_red_round" + android:background="@drawable/rictxwf01_bg_full_round" android:contentDescription="round-shape-elements" android:orientation="horizontal" /> diff --git a/wear/src/main/res/values/colors.xml b/wear/src/main/res/values/colors.xml index 2280e772d3..defa7ea339 100644 --- a/wear/src/main/res/values/colors.xml +++ b/wear/src/main/res/values/colors.xml @@ -42,37 +42,138 @@ @color/grey_500 + + + + + + + #FFCDD2 + #F44336 #E53935 + #D32F2F + #B71C1C #FF0000 - + + + #F8BBD0 + #E91E63 + #C2185B + #880E4F + + + #E1BEE7 + #9C27B0 + #7B1FA2 + #4A148C + + + #D1C4E9 + #673AB7 + #512DA8 + #311B92 + + + #C5CAE9 + #3F51B5 + #303F9F + #1A237E + #BBDEFB #64B5F6 - + #2196F3 + #1976D2 + #0D47A1 + #0000FF + + + #B3E5FC + #03A9F4 + #0288D1 + #01579B + + + #B2EBF2 + #00BCD4 + #0097A7 + #006064 + + + #B2DFDB + #009688 + #00796B + #004D40 + + + #C8E6C9 + #4CAF50 + #388E3C + #1B5E20 + + + #DCEDC8 + #8BC34A + #689F38 + #33691E + + + #F0F4C3 + #CDDC39 + #AFB42B + #827717 + #FFF9C4 + #FFEB3B #FBC02D + #F57F17 #FFFF00 - - + + #FFECB3 + #FFC107 + #FFA000 + #FF6F00 + + + #FFE0B2 + #FF9800 + #F57C00 + #E65100 + + + #FFCCBC + #FF5722 + #E64A19 + #BF360C + + + #D7CCC8 + #795548 + #5D4037 + #3E2723 + + + #FAFAFA + #F5F5F5 #E0E0E0 #9E9E9E + #9E9E9E + #616161 + #212121 #333333 - - - #0000FF - + + #CFD8DC + #607D8B + #455A64 + #263238 - + #000000 - - - #FFFFFF - \ No newline at end of file diff --git a/wear/src/main/res/values/rictxwf01_arrays.xml b/wear/src/main/res/values/rictxwf01_arrays.xml index 0ab4513611..449f180621 100644 --- a/wear/src/main/res/values/rictxwf01_arrays.xml +++ b/wear/src/main/res/values/rictxwf01_arrays.xml @@ -1,27 +1,69 @@ - @string/color_name_red - @string/color_name_deeppurple - @string/color_name_indigo - @string/color_name_lightblue - @string/color_name_lime - @string/color_name_orange - @string/color_name_bluegray - @string/style_rainbowstyle - @string/style_simplestyle - @string/style_nostyle + @string/style_none + @string/style_minimal + @string/style_full + @string/style_rainbow + none + minimal + full + rainbow + + + + @string/color_name_red + @string/color_name_pink + @string/color_name_purple + @string/color_name_deeppurple + @string/color_name_indigo + @string/color_name_blue + @string/color_name_lightblue + @string/color_name_cyan + @string/color_name_teal + @string/color_name_green + @string/color_name_lightgreen + @string/color_name_lime + @string/color_name_yellow + @string/color_name_amber + @string/color_name_orange + @string/color_name_deeporange + @string/color_name_brown + @string/color_name_gray + @string/color_name_bluegray + @string/color_name_white + + red + pink + purple deeppurple indigo + blue lightblue + cyan + teal + green + lightgreen lime + yellow + amber orange + deeporange + brown + gray bluegray - rainbow - simplestyle - nostyle + white + + + + 100 + 500 + 700 + 900 + + \ 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 389d527cb8..dbff78b9d0 100644 --- a/wear/src/main/res/values/strings.xml +++ b/wear/src/main/res/values/strings.xml @@ -117,18 +117,40 @@ h d w - Choose your style - vibrate hourly - deep purple - red - orange - lime - indigo - no style - simple style - blue gray - light blue - rainbow style + red + pink + purple + deep purple + indigo + blue + light blue + cyan + teal + green + light green + lime + yellow + amber + orange + deep orange + brown + gray + blue gray + white + black + + + + Choose your style + no style + minimal style + full style + rainbow style + + Choose your color + Choose your color saturation + vibrate hourly + diff --git a/wear/src/main/res/xml/rictxwf01configuration.xml b/wear/src/main/res/xml/rictxwf01configuration.xml index f9edf6b7f0..99a685fa80 100644 --- a/wear/src/main/res/xml/rictxwf01configuration.xml +++ b/wear/src/main/res/xml/rictxwf01configuration.xml @@ -6,10 +6,23 @@ + + + - -