From fb6763fddfce329924ccb3678fbdf7875978a7ca Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 10 Sep 2018 16:15:01 +0200 Subject: wearable: add a dark theme with a runtime switch on the Settings page Change-Id: Iaa205c19aa413de7a5537f17f74d969547d5e558 Reviewed-by: Richard Moe Gustavsen --- .../wearable/qml/Alarms/AlarmsPage.qml | 4 +- .../wearable/qml/Fitness/FitnessPage.qml | 12 +-- .../qml/Fitness/images/man-running-dark.png | Bin 0 -> 1693 bytes .../qml/Fitness/images/man-running-dark@2x.png | Bin 0 -> 2694 bytes .../qml/Fitness/images/man-running-light.png | Bin 0 -> 16047 bytes .../qml/Fitness/images/man-running-light@2x.png | Bin 0 -> 2795 bytes .../wearable/qml/Fitness/images/man-running.png | Bin 16047 -> 0 bytes .../wearable/qml/Fitness/images/man-running@2x.png | Bin 2795 -> 0 bytes .../qml/Fitness/images/man-walking-dark.png | Bin 0 -> 1631 bytes .../qml/Fitness/images/man-walking-dark@2x.png | Bin 0 -> 2483 bytes .../qml/Fitness/images/man-walking-light.png | Bin 0 -> 16062 bytes .../qml/Fitness/images/man-walking-light@2x.png | Bin 0 -> 2668 bytes .../wearable/qml/Fitness/images/man-walking.png | Bin 16062 -> 0 bytes .../wearable/qml/Fitness/images/man-walking@2x.png | Bin 2668 -> 0 bytes .../quickcontrols2/wearable/qml/LauncherPage.qml | 4 +- .../wearable/qml/Navigation/NavigationPage.qml | 18 ++--- .../wearable/qml/Navigation/RouteElement.qml | 8 +- .../qml/Navigation/images/leftturn-dark.png | Bin 0 -> 1940 bytes .../qml/Navigation/images/leftturn-dark@2x.png | Bin 0 -> 1583 bytes .../qml/Navigation/images/leftturn-light.png | Bin 0 -> 16111 bytes .../qml/Navigation/images/leftturn-light@2x.png | Bin 0 -> 2148 bytes .../wearable/qml/Navigation/images/leftturn.png | Bin 16111 -> 0 bytes .../wearable/qml/Navigation/images/leftturn@2x.png | Bin 2148 -> 0 bytes .../qml/Navigation/images/navigation-dark.png | Bin 0 -> 704 bytes .../qml/Navigation/images/navigation-dark@2x.png | Bin 0 -> 1068 bytes .../qml/Navigation/images/navigation-light.png | Bin 0 -> 581 bytes .../qml/Navigation/images/navigation-light@2x.png | Bin 0 -> 1063 bytes .../wearable/qml/Navigation/images/navigation.png | Bin 581 -> 0 bytes .../qml/Navigation/images/navigation@2x.png | Bin 1063 -> 0 bytes .../qml/Navigation/images/rightturn-dark.png | Bin 0 -> 1947 bytes .../qml/Navigation/images/rightturn-dark@2x.png | Bin 0 -> 1532 bytes .../qml/Navigation/images/rightturn-light.png | Bin 0 -> 16077 bytes .../qml/Navigation/images/rightturn-light@2x.png | Bin 0 -> 1613 bytes .../wearable/qml/Navigation/images/rightturn.png | Bin 16077 -> 0 bytes .../qml/Navigation/images/rightturn@2x.png | Bin 1613 -> 0 bytes .../qml/Navigation/images/straight-dark.png | Bin 0 -> 1330 bytes .../qml/Navigation/images/straight-dark@2x.png | Bin 0 -> 911 bytes .../qml/Navigation/images/straight-light.png | Bin 0 -> 15727 bytes .../qml/Navigation/images/straight-light@2x.png | Bin 0 -> 790 bytes .../wearable/qml/Navigation/images/straight.png | Bin 15727 -> 0 bytes .../wearable/qml/Navigation/images/straight@2x.png | Bin 790 -> 0 bytes .../qml/Notifications/NotificationsPage.qml | 8 +- .../qml/Notifications/images/avatarf-dark.png | Bin 0 -> 2130 bytes .../qml/Notifications/images/avatarf-dark@2x.png | Bin 0 -> 1928 bytes .../qml/Notifications/images/avatarf-light.png | Bin 0 -> 16396 bytes .../qml/Notifications/images/avatarf-light@2x.png | Bin 0 -> 2183 bytes .../wearable/qml/Notifications/images/avatarf.png | Bin 16396 -> 0 bytes .../qml/Notifications/images/avatarf@2x.png | Bin 2183 -> 0 bytes .../qml/Notifications/images/avatarm-dark.png | Bin 0 -> 1909 bytes .../qml/Notifications/images/avatarm-dark@2x.png | Bin 0 -> 1739 bytes .../qml/Notifications/images/avatarm-light.png | Bin 0 -> 16198 bytes .../qml/Notifications/images/avatarm-light@2x.png | Bin 0 -> 2011 bytes .../wearable/qml/Notifications/images/avatarm.png | Bin 16198 -> 0 bytes .../qml/Notifications/images/avatarm@2x.png | Bin 2011 -> 0 bytes .../qml/Notifications/images/missedcall-dark.png | Bin 0 -> 2273 bytes .../Notifications/images/missedcall-dark@2x.png | Bin 0 -> 1727 bytes .../qml/Notifications/images/missedcall-light.png | Bin 0 -> 2833 bytes .../Notifications/images/missedcall-light@2x.png | Bin 0 -> 2685 bytes .../qml/Notifications/images/missedcall.png | Bin 2833 -> 0 bytes .../qml/Notifications/images/missedcall@2x.png | Bin 2685 -> 0 bytes .../wearable/qml/Settings/SettingsPage.qml | 44 +++++++---- .../qml/Settings/images/bluetooth-dark.png | Bin 0 -> 1033 bytes .../qml/Settings/images/bluetooth-dark@2x.png | Bin 0 -> 3001 bytes .../qml/Settings/images/bluetooth-light.png | Bin 0 -> 2770 bytes .../qml/Settings/images/bluetooth-light@2x.png | Bin 0 -> 4123 bytes .../wearable/qml/Settings/images/bluetooth.png | Bin 2770 -> 0 bytes .../wearable/qml/Settings/images/bluetooth@2x.png | Bin 4123 -> 0 bytes .../qml/Settings/images/brightness-dark.png | Bin 0 -> 1522 bytes .../qml/Settings/images/brightness-dark@2x.png | Bin 0 -> 1443 bytes .../qml/Settings/images/brightness-light.png | Bin 0 -> 2692 bytes .../qml/Settings/images/brightness-light@2x.png | Bin 0 -> 2320 bytes .../wearable/qml/Settings/images/brightness.png | Bin 2692 -> 0 bytes .../wearable/qml/Settings/images/brightness@2x.png | Bin 2320 -> 0 bytes .../wearable/qml/Settings/images/contrast-dark.png | Bin 0 -> 1386 bytes .../qml/Settings/images/contrast-dark@2x.png | Bin 0 -> 1395 bytes .../qml/Settings/images/contrast-light.png | Bin 0 -> 2347 bytes .../qml/Settings/images/contrast-light@2x.png | Bin 0 -> 1930 bytes .../wearable/qml/Settings/images/contrast.png | Bin 2347 -> 0 bytes .../wearable/qml/Settings/images/contrast@2x.png | Bin 1930 -> 0 bytes .../wearable/qml/Settings/images/theme-dark.png | Bin 0 -> 1433 bytes .../wearable/qml/Settings/images/theme-dark@2x.png | Bin 0 -> 2431 bytes .../wearable/qml/Settings/images/theme-light.png | Bin 0 -> 1628 bytes .../qml/Settings/images/theme-light@2x.png | Bin 0 -> 3340 bytes .../wearable/qml/Settings/images/theme.svg | 84 +++++++++++++++++++++ .../wearable/qml/Settings/images/wifi-dark.png | Bin 0 -> 1749 bytes .../wearable/qml/Settings/images/wifi-dark@2x.png | Bin 0 -> 1388 bytes .../wearable/qml/Settings/images/wifi-light.png | Bin 0 -> 16308 bytes .../wearable/qml/Settings/images/wifi-light@2x.png | Bin 0 -> 2151 bytes .../wearable/qml/Settings/images/wifi.png | Bin 16308 -> 0 bytes .../wearable/qml/Settings/images/wifi@2x.png | Bin 2151 -> 0 bytes .../wearable/qml/Style/PageIndicator.qml | 2 +- .../quickcontrols2/wearable/qml/Style/Slider.qml | 4 +- .../quickcontrols2/wearable/qml/Style/Switch.qml | 4 +- .../quickcontrols2/wearable/qml/Style/UIStyle.qml | 20 +++++ .../wearable/qml/Weather/WeatherPage.qml | 32 ++++---- .../wearable/qml/Weather/images/humidity-dark.png | Bin 0 -> 1907 bytes .../qml/Weather/images/humidity-dark@2x.png | Bin 0 -> 1749 bytes .../wearable/qml/Weather/images/humidity-light.png | Bin 0 -> 16450 bytes .../qml/Weather/images/humidity-light@2x.png | Bin 0 -> 3076 bytes .../wearable/qml/Weather/images/humidity.png | Bin 16450 -> 0 bytes .../wearable/qml/Weather/images/humidity@2x.png | Bin 3076 -> 0 bytes .../wearable/qml/Weather/images/pressure-dark.png | Bin 0 -> 1735 bytes .../qml/Weather/images/pressure-dark@2x.png | Bin 0 -> 1938 bytes .../wearable/qml/Weather/images/pressure-light.png | Bin 0 -> 16902 bytes .../qml/Weather/images/pressure-light@2x.png | Bin 0 -> 3256 bytes .../wearable/qml/Weather/images/pressure.png | Bin 16902 -> 0 bytes .../wearable/qml/Weather/images/pressure@2x.png | Bin 3256 -> 0 bytes .../wearable/qml/Weather/images/sunrise-dark.png | Bin 0 -> 2036 bytes .../qml/Weather/images/sunrise-dark@2x.png | Bin 0 -> 1575 bytes .../wearable/qml/Weather/images/sunrise-light.png | Bin 0 -> 16534 bytes .../qml/Weather/images/sunrise-light@2x.png | Bin 0 -> 2427 bytes .../wearable/qml/Weather/images/sunrise.png | Bin 16534 -> 0 bytes .../wearable/qml/Weather/images/sunrise@2x.png | Bin 2427 -> 0 bytes .../wearable/qml/Weather/images/sunset-dark.png | Bin 0 -> 2055 bytes .../wearable/qml/Weather/images/sunset-dark@2x.png | Bin 0 -> 1603 bytes .../wearable/qml/Weather/images/sunset-light.png | Bin 0 -> 16586 bytes .../qml/Weather/images/sunset-light@2x.png | Bin 0 -> 2489 bytes .../wearable/qml/Weather/images/sunset.png | Bin 16586 -> 0 bytes .../wearable/qml/Weather/images/sunset@2x.png | Bin 2489 -> 0 bytes .../qml/Weather/images/temperature-dark.png | Bin 0 -> 1471 bytes .../qml/Weather/images/temperature-dark@2x.png | Bin 0 -> 1255 bytes .../qml/Weather/images/temperature-light.png | Bin 0 -> 2004 bytes .../qml/Weather/images/temperature-light@2x.png | Bin 0 -> 1977 bytes .../wearable/qml/Weather/images/temperature.png | Bin 2004 -> 0 bytes .../wearable/qml/Weather/images/temperature@2x.png | Bin 1977 -> 0 bytes .../wearable/qml/Weather/images/wind-dark.png | Bin 0 -> 1993 bytes .../wearable/qml/Weather/images/wind-dark@2x.png | Bin 0 -> 1464 bytes .../wearable/qml/Weather/images/wind-light.png | Bin 0 -> 16440 bytes .../wearable/qml/Weather/images/wind-light@2x.png | Bin 0 -> 2309 bytes .../wearable/qml/Weather/images/wind.png | Bin 16440 -> 0 bytes .../wearable/qml/Weather/images/wind@2x.png | Bin 2309 -> 0 bytes .../wearable/qml/WorldClock/Clock.qml | 2 +- 132 files changed, 184 insertions(+), 62 deletions(-) create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png delete mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png delete mode 100644 examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/straight.png delete mode 100644 examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarf@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/avatarm@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png delete mode 100644 examples/quickcontrols2/wearable/qml/Notifications/images/missedcall@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/bluetooth@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/brightness.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/brightness@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/contrast-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/contrast-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/contrast.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/contrast@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/theme.svg create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/wifi.png delete mode 100644 examples/quickcontrols2/wearable/qml/Settings/images/wifi@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/humidity.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/humidity@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/pressure.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/pressure@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunrise@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunset.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/sunset@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/temperature.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/temperature@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png create mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/wind.png delete mode 100644 examples/quickcontrols2/wearable/qml/Weather/images/wind@2x.png (limited to 'examples/quickcontrols2/wearable/qml') diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml index d86e182e..dba8144a 100644 --- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml @@ -84,7 +84,7 @@ Item { font.bold: stateSwitch.checked font.pixelSize: stateSwitch.checked ? UIStyle.fontSizeXL : UIStyle.fontSizeL font.letterSpacing: 4 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -95,7 +95,7 @@ Item { font.italic: true font.bold: true font.letterSpacing: 1 - color: UIStyle.colorQtGray2 + color: UIStyle.themeColorQtGray2 } } } diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml index d4db0ca0..1f018e2e 100644 --- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml +++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml @@ -72,18 +72,18 @@ Item { text: qsTr("Steps: ") + FitnessData.getSteps() font.italic: true font.pixelSize: UIStyle.fontSizeM - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Image { anchors.horizontalCenter: parent.horizontalCenter - source: "images/man-walking.png" + source: UIStyle.themeImagePath("images/man-walking") } Text { anchors.horizontalCenter: parent.horizontalCenter text: qsTr("Calories: ") + FitnessData.getCalories() font.pixelSize: UIStyle.fontSizeS font.italic: true - color: UIStyle.colorQtGray3 + color: UIStyle.themeColorQtGray3 } } } @@ -102,11 +102,11 @@ Item { + qsTr(" miles") font.italic: true font.pixelSize: UIStyle.fontSizeM - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Image { anchors.horizontalCenter: parent.horizontalCenter - source: "images/man-running.png" + source: UIStyle.themeImagePath("images/man-running") } Text { anchors.horizontalCenter: parent.horizontalCenter @@ -115,7 +115,7 @@ Item { + qsTr(" mins") font.pixelSize: UIStyle.fontSizeS font.italic: true - color: UIStyle.colorQtGray3 + color: UIStyle.themeColorQtGray3 } } } diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png new file mode 100644 index 00000000..709c4b0f Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png new file mode 100644 index 00000000..1497ba4a Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png new file mode 100644 index 00000000..5efab6e2 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png new file mode 100644 index 00000000..2073d97f Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png deleted file mode 100644 index 5efab6e2..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png deleted file mode 100644 index 2073d97f..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png new file mode 100644 index 00000000..6de13144 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png new file mode 100644 index 00000000..e094e071 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png new file mode 100644 index 00000000..01add534 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png new file mode 100644 index 00000000..037a8f03 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png deleted file mode 100644 index 01add534..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png b/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png deleted file mode 100644 index 037a8f03..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/LauncherPage.qml b/examples/quickcontrols2/wearable/qml/LauncherPage.qml index 95312bfe..53c9e5a4 100644 --- a/examples/quickcontrols2/wearable/qml/LauncherPage.qml +++ b/examples/quickcontrols2/wearable/qml/LauncherPage.qml @@ -118,7 +118,7 @@ PathView { background: Rectangle { radius: width / 2 border.width: 3 - border.color: parent.PathView.isCurrentItem ? UIStyle.colorQtPrimGreen : UIStyle.colorQtGray4 + border.color: parent.PathView.isCurrentItem ? UIStyle.colorQtPrimGreen : UIStyle.themeColorQtGray4 } onClicked: { @@ -184,6 +184,6 @@ PathView { font.bold: true font.pixelSize: circularView.itemSize / 3 font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } } diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml index 26169c49..973ad528 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml @@ -63,7 +63,7 @@ Item { width: parent.width height: titleRow.height - color: UIStyle.colorQtGray9 + color: UIStyle.themeColorQtGray9 Row { id: titleRow @@ -72,7 +72,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: "images/navigation.png" + source: UIStyle.themeImagePath("images/navigation") fillMode: Image.PreserveAspectCrop } Text { @@ -80,7 +80,7 @@ Item { text: qsTr("Walking") font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 2 - color: UIStyle.colorQtGray2 + color: UIStyle.themeColorQtGray2 } } } @@ -94,12 +94,12 @@ Item { width: parent.width height: parent.height - titleRow.height - parent.spacing - property var imageList: ["straight.png", - "leftturn.png", - "rightturn.png", - "uturn.png", - "start.png", - "end.png"] + property var imageList: [UIStyle.themeImagePath("images/straight"), + UIStyle.themeImagePath("images/leftturn"), + UIStyle.themeImagePath("images/rightturn"), + "images/uturn.png", + "images/start.png", + "images/end.png"] clip: true focus: true diff --git a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml index bda5ea0f..937b84a8 100644 --- a/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml +++ b/examples/quickcontrols2/wearable/qml/Navigation/RouteElement.qml @@ -52,7 +52,7 @@ import QtQuick 2.10 import "../Style" Rectangle { - color: UIStyle.colorQtGray8 + color: UIStyle.themeColorQtGray8 Row { spacing: 5 @@ -62,7 +62,7 @@ Rectangle { Image { id: img anchors.verticalCenter: parent.verticalCenter - source: "images/" + navImage + source: navImage fillMode: Image.PreserveAspectFit } @@ -78,7 +78,7 @@ Rectangle { font.pixelSize: UIStyle.fontSizeS verticalAlignment: Text.AlignVCenter padding: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -88,7 +88,7 @@ Rectangle { font.pixelSize: UIStyle.fontSizeXS verticalAlignment: Text.AlignVCenter padding: 1 - color: UIStyle.colorQtGray2 + color: UIStyle.themeColorQtGray2 } } } diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png new file mode 100644 index 00000000..b318b954 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png new file mode 100644 index 00000000..ec782ebd Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png new file mode 100644 index 00000000..3c416304 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png new file mode 100644 index 00000000..39e9be84 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png deleted file mode 100644 index 3c416304..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png deleted file mode 100644 index 39e9be84..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png new file mode 100644 index 00000000..7dce6aa5 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png new file mode 100644 index 00000000..5061e52b Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png new file mode 100644 index 00000000..9b8cb8e6 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png new file mode 100644 index 00000000..8d133abc Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png deleted file mode 100644 index 9b8cb8e6..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png deleted file mode 100644 index 8d133abc..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png new file mode 100644 index 00000000..634ab593 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png new file mode 100644 index 00000000..9a388440 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png new file mode 100644 index 00000000..a29ec694 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png new file mode 100644 index 00000000..258c4144 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png deleted file mode 100644 index a29ec694..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png deleted file mode 100644 index 258c4144..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png new file mode 100644 index 00000000..014ed7c8 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png new file mode 100644 index 00000000..be51d2ac Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png new file mode 100644 index 00000000..e3c5bb5c Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png new file mode 100644 index 00000000..ef71ab1b Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Navigation/images/straight-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png deleted file mode 100644 index e3c5bb5c..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/straight.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png b/examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png deleted file mode 100644 index ef71ab1b..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml index dabbf735..eeddf6dc 100644 --- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml @@ -70,7 +70,7 @@ ListView { width: parent.width / 2 anchors.right: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter - source: "images/missedcall.png" + source: UIStyle.themeImagePath("images/missedcall") fillMode: Image.Pad } @@ -85,7 +85,7 @@ ListView { Image { anchors.horizontalCenter: parent.horizontalCenter - source: qsTr("images/avatar%1.png").arg(model.gender) + source: qsTr("images/avatar%1-%2.png").arg(model.gender).arg(UIStyle.darkTheme ? "dark" : "light") } Text { @@ -93,7 +93,7 @@ ListView { anchors.horizontalCenter: parent.horizontalCenter font.bold: true font.pixelSize: UIStyle.fontSizeS - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -101,7 +101,7 @@ ListView { text: date + " " + time font.pixelSize: UIStyle.fontSizeXS font.italic: true - color: UIStyle.colorQtGray2 + color: UIStyle.themeColorQtGray2 } } } diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png new file mode 100644 index 00000000..2a553aed Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png new file mode 100644 index 00000000..a91031f3 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png new file mode 100644 index 00000000..c88edc60 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png new file mode 100644 index 00000000..2c916b2c Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png deleted file mode 100644 index c88edc60..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf@2x.png deleted file mode 100644 index 2c916b2c..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarf@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png new file mode 100644 index 00000000..5810312c Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png new file mode 100644 index 00000000..64ddd8ea Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png new file mode 100644 index 00000000..f7abb4c9 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png new file mode 100644 index 00000000..d30eb2d2 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png deleted file mode 100644 index f7abb4c9..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm@2x.png deleted file mode 100644 index d30eb2d2..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/avatarm@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png new file mode 100644 index 00000000..4080e3e4 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png new file mode 100644 index 00000000..6002e456 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png new file mode 100644 index 00000000..d05f17b3 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png new file mode 100644 index 00000000..d28e62c5 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png deleted file mode 100644 index d05f17b3..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall@2x.png b/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall@2x.png deleted file mode 100644 index d28e62c5..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Notifications/images/missedcall@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml index 243020a7..af6561f3 100644 --- a/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml +++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsPage.qml @@ -50,20 +50,11 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 as QQC2 -import Qt.labs.settings 1.0 import ".." import "../Style" Item { - Settings { - id: settings - property alias wireless: wirelessSwitch.checked - property alias bluetooth: bluetoothSwitch.checked - property alias contrast: contrastSlider.value - property alias brightness: brightnessSlider.value - } - QQC2.SwipeView { id: svSettingsContainer @@ -80,24 +71,26 @@ Item { spacing: 50 Image { anchors.verticalCenter: parent.verticalCenter - source: "images/bluetooth.png" + source: UIStyle.themeImagePath("images/bluetooth") } QQC2.Switch { id: bluetoothSwitch anchors.verticalCenter: parent.verticalCenter checked: settings.bluetooth + onToggled: settings.bluetooth = checked } } Row { spacing: 50 Image { anchors.verticalCenter: parent.verticalCenter - source: "images/wifi.png" + source: UIStyle.themeImagePath("images/wifi") } QQC2.Switch { id: wirelessSwitch anchors.verticalCenter: parent.verticalCenter checked: settings.wireless + onToggled: settings.wireless = checked } } } @@ -113,7 +106,7 @@ Item { Column { Image { anchors.horizontalCenter: parent.horizontalCenter - source: "images/brightness.png" + source: UIStyle.themeImagePath("images/brightness") } QQC2.Slider { id: brightnessSlider @@ -122,13 +115,14 @@ Item { to: 5 stepSize: 1 value: settings.brightness + onMoved: settings.brightness = value } } Column { spacing: 2 Image { anchors.horizontalCenter: parent.horizontalCenter - source: "images/contrast.png" + source: UIStyle.themeImagePath("images/contrast") } QQC2.Slider { id: contrastSlider @@ -137,6 +131,30 @@ Item { to: 10 stepSize: 1 value: settings.contrast + onMoved: settings.contrast = value + } + } + } + } + + SwipeViewPage { + id: settingsPage3 + + Column { + anchors.centerIn: parent + spacing: 2 + + Row { + spacing: 50 + Image { + anchors.verticalCenter: parent.verticalCenter + source: UIStyle.themeImagePath("images/theme") + } + QQC2.Switch { + id: darkThemeSwitch + anchors.verticalCenter: parent.verticalCenter + checked: settings.darkTheme + onToggled: settings.darkTheme = checked } } } diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png new file mode 100644 index 00000000..32040b18 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png new file mode 100644 index 00000000..d29c6d3a Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png new file mode 100644 index 00000000..2b2d0e7e Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png new file mode 100644 index 00000000..276d7337 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png deleted file mode 100644 index 2b2d0e7e..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth@2x.png deleted file mode 100644 index 276d7337..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/bluetooth@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png new file mode 100644 index 00000000..1904a6a4 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png new file mode 100644 index 00000000..7cd287e9 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png new file mode 100644 index 00000000..846a896c Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png new file mode 100644 index 00000000..94753ea6 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/brightness-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness.png b/examples/quickcontrols2/wearable/qml/Settings/images/brightness.png deleted file mode 100644 index 846a896c..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/brightness.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/brightness@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/brightness@2x.png deleted file mode 100644 index 94753ea6..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/brightness@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark.png b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark.png new file mode 100644 index 00000000..92e17192 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark@2x.png new file mode 100644 index 00000000..d52633ab Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/contrast-light.png b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-light.png new file mode 100644 index 00000000..eb528eb8 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/contrast-light@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-light@2x.png new file mode 100644 index 00000000..92e112f9 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/contrast-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/contrast.png b/examples/quickcontrols2/wearable/qml/Settings/images/contrast.png deleted file mode 100644 index eb528eb8..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/contrast.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/contrast@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/contrast@2x.png deleted file mode 100644 index 92e112f9..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/contrast@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png b/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png new file mode 100644 index 00000000..346ffec3 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png new file mode 100644 index 00000000..4207d739 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/theme-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png b/examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png new file mode 100644 index 00000000..2f02744c Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/theme-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png new file mode 100644 index 00000000..07c4b774 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/theme-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg b/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg new file mode 100644 index 00000000..bf3f1e57 --- /dev/null +++ b/examples/quickcontrols2/wearable/qml/Settings/images/theme.svg @@ -0,0 +1,84 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png new file mode 100644 index 00000000..72b84245 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png new file mode 100644 index 00000000..bc49e4f4 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png new file mode 100644 index 00000000..42c92516 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png new file mode 100644 index 00000000..8aa4c9a8 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Settings/images/wifi-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi.png b/examples/quickcontrols2/wearable/qml/Settings/images/wifi.png deleted file mode 100644 index 42c92516..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/wifi.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Settings/images/wifi@2x.png b/examples/quickcontrols2/wearable/qml/Settings/images/wifi@2x.png deleted file mode 100644 index 8aa4c9a8..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Settings/images/wifi@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml index 34bd27fc..81d4c9ef 100644 --- a/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml +++ b/examples/quickcontrols2/wearable/qml/Style/PageIndicator.qml @@ -67,7 +67,7 @@ T.PageIndicator { implicitHeight: 8 radius: width / 2 - color: UIStyle.colorQtGray3 + color: UIStyle.themeColorQtGray3 opacity: index === control.currentIndex ? 1.0 : 0.35 diff --git a/examples/quickcontrols2/wearable/qml/Style/Slider.qml b/examples/quickcontrols2/wearable/qml/Style/Slider.qml index 0f19fbca..cdff4aec 100644 --- a/examples/quickcontrols2/wearable/qml/Style/Slider.qml +++ b/examples/quickcontrols2/wearable/qml/Style/Slider.qml @@ -66,14 +66,14 @@ T.Slider { radius: 5 color: control.pressed ? "#f0f0f0" : "#f6f6f6" - border.color: UIStyle.colorQtGray7 + border.color: UIStyle.themeColorQtGray7 } background: Rectangle { y: (control.height - height) / 2 height: 4 radius: 2 - color: UIStyle.colorQtGray3 + color: UIStyle.themeColorQtGray3 Rectangle { width: control.visualPosition * parent.width diff --git a/examples/quickcontrols2/wearable/qml/Style/Switch.qml b/examples/quickcontrols2/wearable/qml/Style/Switch.qml index 54295aff..6f663920 100644 --- a/examples/quickcontrols2/wearable/qml/Style/Switch.qml +++ b/examples/quickcontrols2/wearable/qml/Style/Switch.qml @@ -65,7 +65,7 @@ T.Switch { height: 26 radius: 13 - color: control.down ? UIStyle.colorQtGray6 : UIStyle.colorQtGray10 + color: control.down ? UIStyle.themeColorQtGray6 : UIStyle.themeColorQtGray10 border.color: !control.checked ? "#999999" : (control.down ? UIStyle.colorQtAuxGreen2 : UIStyle.colorQtAuxGreen1) @@ -80,7 +80,7 @@ T.Switch { radius: 13 color: control.checked ? UIStyle.colorQtAuxGreen2 : "#E6173D" border.color: control.checked ? UIStyle.colorQtAuxGreen2 - : UIStyle.colorQtGray6 + : UIStyle.themeColorQtGray6 } } diff --git a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml index 3b130497..98f2e5a2 100644 --- a/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml +++ b/examples/quickcontrols2/wearable/qml/Style/UIStyle.qml @@ -81,4 +81,24 @@ QtObject { readonly property color colorQtGray8: "#b5b7bf" readonly property color colorQtGray9: "#cecfd5" readonly property color colorQtGray10: "#f3f3f4" + + // Light/dark versions of the colors above. + // Some UI elements always use a specific color regardless of theme, + // which is why we have both sets: so that those elements don't need to hard-code the hex string. + readonly property color themeColorQtGray1: darkTheme ? colorQtGray10 : colorQtGray1 + readonly property color themeColorQtGray2: darkTheme ? colorQtGray9 : colorQtGray2 + readonly property color themeColorQtGray3: darkTheme ? colorQtGray8 : colorQtGray3 + readonly property color themeColorQtGray4: darkTheme ? colorQtGray7 : colorQtGray4 + readonly property color themeColorQtGray5: darkTheme ? colorQtGray6 : colorQtGray5 + readonly property color themeColorQtGray6: darkTheme ? colorQtGray5 : colorQtGray6 + readonly property color themeColorQtGray7: darkTheme ? colorQtGray4 : colorQtGray7 + readonly property color themeColorQtGray8: darkTheme ? colorQtGray3 : colorQtGray8 + readonly property color themeColorQtGray9: darkTheme ? colorQtGray2 : colorQtGray9 + readonly property color themeColorQtGray10: darkTheme ? colorQtGray1 : colorQtGray10 + + property bool darkTheme: false + + function themeImagePath(baseImagePath) { + return baseImagePath + (darkTheme ? "-dark" : "-light") + ".png" + } } diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml index 1405a8e7..256e60a4 100644 --- a/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml +++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherPage.qml @@ -69,7 +69,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: "images/temperature.png" + source: UIStyle.themeImagePath("images/temperature") } Column { @@ -85,7 +85,7 @@ Item { + " °F" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -97,7 +97,7 @@ Item { + " °F" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -109,7 +109,7 @@ Item { + " °F " : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } } } @@ -129,7 +129,7 @@ Item { Image { id: wImg anchors.verticalCenter: parent.verticalCenter - source: "images/wind.png" + source: UIStyle.themeImagePath("images/wind") } Text { @@ -141,7 +141,7 @@ Item { + " mph" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } } @@ -152,7 +152,7 @@ Item { Image { id: hImg anchors.verticalCenter: parent.verticalCenter - source: "images/humidity.png" + source: UIStyle.themeImagePath("images/humidity") } Text { @@ -164,7 +164,7 @@ Item { + " %" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } } } @@ -179,7 +179,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: "images/pressure.png" + source: UIStyle.themeImagePath("images/pressure") } Column { @@ -195,7 +195,7 @@ Item { + " hPa" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -207,7 +207,7 @@ Item { + " hPa" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } Text { @@ -219,7 +219,7 @@ Item { + " hPa" : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } } } @@ -238,7 +238,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: "images/sunrise.png" + source: UIStyle.themeImagePath("images/sunrise") } Text { @@ -250,7 +250,7 @@ Item { : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } } @@ -260,7 +260,7 @@ Item { Image { anchors.verticalCenter: parent.verticalCenter - source: "images/sunset.png" + source: UIStyle.themeImagePath("images/sunset") } Text { @@ -272,7 +272,7 @@ Item { : "N/A" font.pixelSize: UIStyle.fontSizeM font.letterSpacing: 1 - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 } } } diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png new file mode 100644 index 00000000..6baaefda Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png new file mode 100644 index 00000000..7060c48d Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png new file mode 100644 index 00000000..ef9ed9de Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png new file mode 100644 index 00000000..5c367a3e Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/humidity-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity.png deleted file mode 100644 index ef9ed9de..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/humidity.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/humidity@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/humidity@2x.png deleted file mode 100644 index 5c367a3e..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/humidity@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png new file mode 100644 index 00000000..2038c695 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png new file mode 100644 index 00000000..9b5a4abe Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png new file mode 100644 index 00000000..7850609e Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png new file mode 100644 index 00000000..14c1cab3 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/pressure-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure.png deleted file mode 100644 index 7850609e..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/pressure.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/pressure@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/pressure@2x.png deleted file mode 100644 index 14c1cab3..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/pressure@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png new file mode 100644 index 00000000..5a70f984 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png new file mode 100644 index 00000000..2baa7135 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png new file mode 100644 index 00000000..70a9a969 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png new file mode 100644 index 00000000..3a7892eb Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png deleted file mode 100644 index 70a9a969..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunrise@2x.png deleted file mode 100644 index 3a7892eb..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/sunrise@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png new file mode 100644 index 00000000..5dde7c0f Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png new file mode 100644 index 00000000..3892c2ea Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png new file mode 100644 index 00000000..01bb9ec8 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png new file mode 100644 index 00000000..39aeebe5 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/sunset-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset.png deleted file mode 100644 index 01bb9ec8..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/sunset.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/sunset@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/sunset@2x.png deleted file mode 100644 index 39aeebe5..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/sunset@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png new file mode 100644 index 00000000..1c86bae2 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png new file mode 100644 index 00000000..c1ac7d66 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png new file mode 100644 index 00000000..5d7faa99 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png new file mode 100644 index 00000000..0b4340ce Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/temperature-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature.png deleted file mode 100644 index 5d7faa99..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/temperature.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/temperature@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/temperature@2x.png deleted file mode 100644 index 0b4340ce..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/temperature@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png new file mode 100644 index 00000000..4e5264a3 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png new file mode 100644 index 00000000..0a893d50 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/wind-dark@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png new file mode 100644 index 00000000..c728fcc0 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png new file mode 100644 index 00000000..bab49c04 Binary files /dev/null and b/examples/quickcontrols2/wearable/qml/Weather/images/wind-light@2x.png differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind.png deleted file mode 100644 index c728fcc0..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/wind.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/Weather/images/wind@2x.png b/examples/quickcontrols2/wearable/qml/Weather/images/wind@2x.png deleted file mode 100644 index bab49c04..00000000 Binary files a/examples/quickcontrols2/wearable/qml/Weather/images/wind@2x.png and /dev/null differ diff --git a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml index 143c0343..158f3d70 100644 --- a/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml +++ b/examples/quickcontrols2/wearable/qml/WorldClock/Clock.qml @@ -180,7 +180,7 @@ SwipeViewPage { anchors.horizontalCenter: parent.horizontalCenter text: cityName - color: UIStyle.colorQtGray1 + color: UIStyle.themeColorQtGray1 font.pixelSize: UIStyle.fontSizeXS font.letterSpacing: 2 } -- cgit v1.2.3