From 238cddd7d31f34bdcd21250ab4214f304c64ed0e Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Tue, 9 Jan 2024 21:41:55 -0800 Subject: [PATCH] add themeImage setting and use --- lib/l10n/intl_cy.arb | 4 +++- lib/l10n/intl_da.arb | 4 +++- lib/l10n/intl_de.arb | 4 +++- lib/l10n/intl_el.arb | 4 +++- lib/l10n/intl_en.arb | 4 +++- lib/l10n/intl_es.arb | 4 +++- lib/l10n/intl_fr.arb | 4 +++- lib/l10n/intl_it.arb | 4 +++- lib/l10n/intl_ja.arb | 4 +++- lib/l10n/intl_ko.arb | 4 +++- lib/l10n/intl_lb.arb | 4 +++- lib/l10n/intl_nl.arb | 4 +++- lib/l10n/intl_no.arb | 4 +++- lib/l10n/intl_pl.arb | 4 +++- lib/l10n/intl_pt.arb | 4 +++- lib/l10n/intl_pt_BR.arb | 4 +++- lib/l10n/intl_ro.arb | 4 +++- lib/l10n/intl_ru.arb | 4 +++- lib/l10n/intl_sk.arb | 4 +++- lib/l10n/intl_sv.arb | 4 +++- lib/l10n/intl_sw.arb | 4 +++- lib/l10n/intl_tr.arb | 4 +++- lib/l10n/intl_uk.arb | 4 +++- lib/l10n/intl_uz.arb | 4 +++- lib/settings.dart | 9 +++++++++ lib/views/globalsettingsappearanceview.dart | 18 ++++++++++++++++++ lib/widgets/messagelist.dart | 4 ++-- 27 files changed, 101 insertions(+), 26 deletions(-) diff --git a/lib/l10n/intl_cy.arb b/lib/l10n/intl_cy.arb index 470e94dd..88c53a61 100644 --- a/lib/l10n/intl_cy.arb +++ b/lib/l10n/intl_cy.arb @@ -1,6 +1,8 @@ { "@@locale": "cy", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_da.arb b/lib/l10n/intl_da.arb index c2d80469..c3044569 100644 --- a/lib/l10n/intl_da.arb +++ b/lib/l10n/intl_da.arb @@ -1,6 +1,8 @@ { "@@locale": "da", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 74dd15a5..4a3e2653 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -1,6 +1,8 @@ { "@@locale": "de", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_el.arb b/lib/l10n/intl_el.arb index bee0cc15..d560a6ab 100644 --- a/lib/l10n/intl_el.arb +++ b/lib/l10n/intl_el.arb @@ -1,6 +1,8 @@ { "@@locale": "el", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 3e84688d..7078aaa9 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1,6 +1,8 @@ { "@@locale": "en", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb index 49bebdec..d1edeba7 100644 --- a/lib/l10n/intl_es.arb +++ b/lib/l10n/intl_es.arb @@ -1,6 +1,8 @@ { "@@locale": "es", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "deleteServerConfirmBtn": "¿Realmente desea borrar el servidor?", "defaultScalingText": "Factor de escala del texto", diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index a8f0fd56..2d46422b 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -1,6 +1,8 @@ { "@@locale": "fr", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb index 58dca9e2..a06e10b6 100644 --- a/lib/l10n/intl_it.arb +++ b/lib/l10n/intl_it.arb @@ -1,6 +1,8 @@ { "@@locale": "it", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_ja.arb b/lib/l10n/intl_ja.arb index 051ce110..bd16d297 100644 --- a/lib/l10n/intl_ja.arb +++ b/lib/l10n/intl_ja.arb @@ -1,6 +1,8 @@ { "@@locale": "ja", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_ko.arb b/lib/l10n/intl_ko.arb index cde50d87..9a0ea914 100644 --- a/lib/l10n/intl_ko.arb +++ b/lib/l10n/intl_ko.arb @@ -1,6 +1,8 @@ { "@@locale": "ko", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_lb.arb b/lib/l10n/intl_lb.arb index f75dc3a2..8082b4ab 100644 --- a/lib/l10n/intl_lb.arb +++ b/lib/l10n/intl_lb.arb @@ -1,6 +1,8 @@ { "@@locale": "lb", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_nl.arb b/lib/l10n/intl_nl.arb index 1e413a56..b586b844 100644 --- a/lib/l10n/intl_nl.arb +++ b/lib/l10n/intl_nl.arb @@ -1,6 +1,8 @@ { "@@locale": "nl", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_no.arb b/lib/l10n/intl_no.arb index 750dcdd9..e232357b 100644 --- a/lib/l10n/intl_no.arb +++ b/lib/l10n/intl_no.arb @@ -1,6 +1,8 @@ { "@@locale": "no", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb index d49c635d..73b3e44c 100644 --- a/lib/l10n/intl_pl.arb +++ b/lib/l10n/intl_pl.arb @@ -1,6 +1,8 @@ { "@@locale": "pl", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb index 175745cc..4d6a08c1 100644 --- a/lib/l10n/intl_pt.arb +++ b/lib/l10n/intl_pt.arb @@ -1,6 +1,8 @@ { "@@locale": "pt", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_pt_BR.arb b/lib/l10n/intl_pt_BR.arb index 4e5076aa..5636d69c 100644 --- a/lib/l10n/intl_pt_BR.arb +++ b/lib/l10n/intl_pt_BR.arb @@ -1,6 +1,8 @@ { "@@locale": "pt_BR", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_ro.arb b/lib/l10n/intl_ro.arb index dc0f2cc1..91c7220c 100644 --- a/lib/l10n/intl_ro.arb +++ b/lib/l10n/intl_ro.arb @@ -1,6 +1,8 @@ { "@@locale": "ro", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index 07bd15be..a0b09ca4 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -1,6 +1,8 @@ { "@@locale": "ru", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_sk.arb b/lib/l10n/intl_sk.arb index 68ab071c..1ae32d9a 100644 --- a/lib/l10n/intl_sk.arb +++ b/lib/l10n/intl_sk.arb @@ -1,6 +1,8 @@ { "@@locale": "sk", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_sv.arb b/lib/l10n/intl_sv.arb index 477b816c..93e4ed3c 100644 --- a/lib/l10n/intl_sv.arb +++ b/lib/l10n/intl_sv.arb @@ -1,6 +1,8 @@ { "@@locale": "sv", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_sw.arb b/lib/l10n/intl_sw.arb index 42d9139c..f2e32762 100644 --- a/lib/l10n/intl_sw.arb +++ b/lib/l10n/intl_sw.arb @@ -1,6 +1,8 @@ { "@@locale": "sw", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_tr.arb b/lib/l10n/intl_tr.arb index 036a75f6..9746347c 100644 --- a/lib/l10n/intl_tr.arb +++ b/lib/l10n/intl_tr.arb @@ -1,6 +1,8 @@ { "@@locale": "tr", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_uk.arb b/lib/l10n/intl_uk.arb index febc3dfe..b319ae15 100644 --- a/lib/l10n/intl_uk.arb +++ b/lib/l10n/intl_uk.arb @@ -1,6 +1,8 @@ { "@@locale": "uk", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/l10n/intl_uz.arb b/lib/l10n/intl_uz.arb index b9718afd..2e991141 100644 --- a/lib/l10n/intl_uz.arb +++ b/lib/l10n/intl_uz.arb @@ -1,6 +1,8 @@ { "@@locale": "uz", - "@@last_modified": "2024-01-04T10:56:20+01:00", + "@@last_modified": "2024-01-10T06:54:15+01:00", + "settingsThemeImagesDescription": "Enable display of images from themes", + "settingsThemeImages": "Theme Images", "settingsGroupAbout": "About", "localeUzbek": "Uzbek \/ Oʻzbekcha", "profileOfflineAtStart": "Appear Offline at Startup", diff --git a/lib/settings.dart b/lib/settings.dart index 98514826..ee75f6b5 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -43,6 +43,7 @@ class Settings extends ChangeNotifier { Locale locale; late PackageInfo packageInfo; OpaqueThemeType theme; + bool _themeImages = false; // explicitly set experiments to false until told otherwise... bool experimentsEnabled = false; @@ -92,6 +93,12 @@ class Settings extends ChangeNotifier { notifyListeners(); } + bool get themeImages => _themeImages; + set themeImages(bool newVal) { + _themeImages = newVal; + notifyListeners(); + } + /// Get access to the current theme. OpaqueThemeType current() { return theme; @@ -127,6 +134,7 @@ class Settings extends ChangeNotifier { handleUpdate(dynamic settings) { // Set Theme and notify listeners this.setTheme(settings["Theme"], settings["ThemeMode"] ?? mode_dark); + _themeImages = settings["ThemeImages"] ?? false; // Set Locale and notify listeners switchLocaleByCode(settings["Locale"]); @@ -469,6 +477,7 @@ class Settings extends ChangeNotifier { "Locale": this.locale.toString(), "Theme": theme.theme, "ThemeMode": theme.mode, + "ThemeImages": _themeImages, "PreviousPid": -1, "BlockUnknownConnections": blockUnknownConnections, "NotificationPolicy": _notificationPolicy.toString(), diff --git a/lib/views/globalsettingsappearanceview.dart b/lib/views/globalsettingsappearanceview.dart index 54882d74..8b985178 100644 --- a/lib/views/globalsettingsappearanceview.dart +++ b/lib/views/globalsettingsappearanceview.dart @@ -144,6 +144,24 @@ class _GlobalSettingsAppearanceViewState extends State { // Only show broken heart is the contact is offline... decoration: BoxDecoration( image: Provider.of(outerContext).isOnline() - ? (Provider.of(context).theme.chatImage != null) + ? (Provider.of(context).themeImages && Provider.of(context).theme.chatImage != null) ? DecorationImage( repeat: ImageRepeat.repeat, - image: Provider.of(context).theme.loadImage(Provider.of(context).theme.chatImage, context: context), + image: Provider.of(context, listen: false).theme.loadImage(Provider.of(context, listen: false).theme.chatImage, context: context), colorFilter: ColorFilter.mode(Provider.of(context).theme.hilightElementColor.withOpacity(0.15), BlendMode.srcIn)) : null : DecorationImage(