Merge branch 'develop' into issue/4826-onboarding-cleanup

rokwire · Feb 28, 2025 · 071c51f · 071c51f
2 parents afd5eaa + afd128d
commit 071c51f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [6.1.X]
+<!-- The following updates persist in the 6.1 support branch. -->
+<!-- They should eihter appear in the next 6.1 support update, or in the upcoming 6.2 build. -->
+### Changed
+- Updated status text for no favorite locations [#4828](https://github.com/rokwire/illinois-app/issues/4828).
+### Fixed
+- Fixed storage update support in FlexUi, acknowledged for conversations visibility updates in Debug Home panel [#4830](https://github.com/rokwire/illinois-app/issues/4830).
+
 ## [6.2.0] - 2025-02-25
 ### Fixed
 - Make sure to dispose TapGestureRecognizer objects.

diff --git a/assets/strings.en.json b/assets/strings.en.json
@@ -3858,7 +3858,7 @@
     "widget.home.favorites.message.empty.news": "Tap the \u2606 on items in <a href='{{local_url}}'><b>Big 10 News</b></a> for quick access here.",
     "widget.home.favorites.message.empty.laundry": "Tap the \u2606 on items in <a href='{{local_url}}'><b>Laundry Locations</b></a> for quick access here.",
     "widget.home.favorites.message.empty.mtd_stops": "Tap the \u2606 on items in <a href='{{local_url}}'><b>Bus Stops</b></a> for quick access here.",
-    "widget.home.favorites.message.empty.locations": "Tap the \u2606 on items in <a href='{{local_url}}'><b>My Locations</b></a> for quick access here.",
+    "widget.home.favorites.message.empty.locations": "Tap the ☆ on locations on the <a href='{{local_url}}'><b>Map</b></a> for quick access here.",
     "widget.home.favorites.message.empty.campus_guide": "Tap the \u2606 on items in <a href='{{local_url}}'><b>Campus Guide</b></a> for quick access here.",
     "widget.home.favorites.message.empty.appointments": "Tap the \u2606 on items in <a href='{{local_url}}'><b>MyMcKinley Appointments</b></a> for quick access here.",
     "widget.home.favorites.message.empty.appointments.not_to_display": "There is nothing to display because you have chosen not to display any past or future appointments.",

diff --git a/assets/strings.es.json b/assets/strings.es.json
@@ -3856,7 +3856,7 @@
     "widget.home.favorites.message.empty.news": "Toca la \u2606 en los elementos de <a href='{{local_url}}'><b>10 grandes noticias</b></a> para acceder rápidamente aquí.",
     "widget.home.favorites.message.empty.laundry": "Toca la \u2606 en los elementos de <a href='{{local_url}}'><b>Lavanderías</b></a> para acceder rápidamente aquí.",
     "widget.home.favorites.message.empty.mtd_stops": "Toca la \u2606 en los elementos de <a href='{{local_url}}'><b>Paradas de Autobús</b></a> para acceder rápidamente aquí.",
-    "widget.home.favorites.message.empty.locations": "Tap the \u2606 on items in <a href='{{local_url}}'><b>My Locations</b></a> for quick access here.",
+    "widget.home.favorites.message.empty.locations": "Tap the \\u2606 on locations on the <a href='{{local_url}}'><b>Map</b></a> for quick access here.",
     "widget.home.favorites.message.empty.campus_guide": "Toca la \u2606 en los elementos de <a href='{{local_url}}'><b>Guía del Campus</b></a> para acceder rápidamente aquí.",
     "widget.home.favorites.message.empty.appointments": "Toca la \u2606 en los elementos de <a href='{{local_url}}'><b>Citas de MyMcKinley</b></a> para acceder rápidamente aquí.",
     "widget.home.favorites.message.empty.appointments.not_to_display": "No hay nada que mostrar, ya que has optado por no mostrar ninguna cita pasada o futura.",

diff --git a/assets/strings.zh.json b/assets/strings.zh.json
@@ -3833,7 +3833,7 @@
 	"widget.home.favorites.message.empty.news": "点击 <a href='{{local_url}}'><b>十大新聞</b></a> 中项目上的 \u2606，可以在这里快速找到它们。",
 	"widget.home.favorites.message.empty.laundry": "点击 <a href='{{local_url}}'><b>洗衣房</b></a> 中项目上的 \u2606，可以在这里快速找到它们。",
 	"widget.home.favorites.message.empty.mtd_stops": "点击 <a href='{{local_url}}'><b>公交车站</b></a> 中项目上的 \u2606，可以在这里快速找到它们。",
-	"widget.home.favorites.message.empty.locations": "Tap the \u2606 on items in <a href='{{local_url}}'><b>My Locations</b></a> for quick access here.",
+	"widget.home.favorites.message.empty.locations": "Tap the ☆ on locations on the <a href='{{local_url}}'><b>Map</b></a> for quick access here.",
 	"widget.home.favorites.message.empty.campus_guide": "点击 <a href='{{local_url}}'><b>校園指南/b></a> 中项目上的 \u2606，可以在这里快速找到它们。",
 	"widget.home.favorites.message.empty.appointments": "点击 <a href='{{local_url}}'><b>我的MyMckinley预约</b></a> 中项目上的 \u2606，可以在这里快速找到它们。",
 	"widget.home.favorites.message.empty.appointments.not_to_display": "因为您选择不显示任何过去或未来的预约，所以没有内容显示。",

diff --git a/lib/service/FlexUI.dart b/lib/service/FlexUI.dart
@@ -91,20 +91,20 @@ class FlexUI extends rokwire.FlexUI {
   // Local Build
 
   @override
-  bool localeIsEntryAvailable(String entry, { String? group, required Map<String, dynamic> rules }) {
+  bool localeIsEntryAvailable(String entry, { String? group, required Map<String, dynamic> rules, rokwire.FlexUiBuildContext? buildContext }) {
 
     String? pathEntry = (group != null) ? '$group.$entry' : null;
 
     Map<String, dynamic>? illiniCashRules = rules['illini_cash'];
     dynamic illiniCashRule = (illiniCashRules != null) ? (((pathEntry != null) ? illiniCashRules[pathEntry] : null) ?? illiniCashRules[entry])  : null;
-    if ((illiniCashRule != null) && !_localeEvalIlliniCashRule(illiniCashRule)) {
+    if ((illiniCashRule != null) && !_localeEvalIlliniCashRule(illiniCashRule, buildContext: buildContext)) {
       return false;
     }
 
-    return super.localeIsEntryAvailable(entry, group: group, rules: rules);
+    return super.localeIsEntryAvailable(entry, group: group, rules: rules, buildContext: buildContext);
   }
 
-  static bool _localeEvalIlliniCashRule(dynamic illiniCashRule) {
+  static bool _localeEvalIlliniCashRule(dynamic illiniCashRule, { rokwire.FlexUiBuildContext? buildContext }) {
     bool result = true;  // allow everything that is not defined or we do not understand
     if (illiniCashRule is Map) {
       illiniCashRule.forEach((dynamic key, dynamic value) {
@@ -120,8 +120,8 @@ class FlexUI extends rokwire.FlexUI {
   }
 
   @override
-  bool localeEvalAuthRule(dynamic authRule) {
-    bool result = super.localeEvalAuthRule(authRule);
+  bool localeEvalAuthRule(dynamic authRule, { rokwire.FlexUiBuildContext? buildContext }) {
+    bool result = super.localeEvalAuthRule(authRule, buildContext: buildContext);
     if (result && (authRule is Map)) {
       authRule.forEach((dynamic key, dynamic value) {
         if (key is String) {

diff --git a/lib/ui/debug/DebugHomePanel.dart b/lib/ui/debug/DebugHomePanel.dart
@@ -774,7 +774,6 @@ class _DebugHomePanelState extends State<DebugHomePanel> implements Notification
     setState(() {
       Storage().debugMessagesDisabled = (Storage().debugMessagesDisabled != true);
     });
-    FlexUI().update();
   }
 
   void _onUseDeviceLocalTimeZoneToggled() {

diff --git a/lib/ui/home/HomeFavoritesWidget.dart b/lib/ui/home/HomeFavoritesWidget.dart
@@ -88,7 +88,7 @@ class HomeFavoritesWidget extends StatefulWidget {
       case News.favoriteKeyName: message = Localization().getStringEx("widget.home.favorites.message.empty.news", "Tap the \u2606 on items in <a href='$localUrlMacro'><b>Big 10 News</b></a> for quick access here."); break;
       case LaundryRoom.favoriteKeyName: message = Localization().getStringEx("widget.home.favorites.message.empty.laundry", "Tap the \u2606 on items in <a href='$localUrlMacro'><b>Laundry Locations</b></a> for quick access here."); break;
       case MTDStop.favoriteKeyName: message = Localization().getStringEx("widget.home.favorites.message.empty.mtd_stops", "Tap the \u2606 on items in <a href='$localUrlMacro'><b>Bus Stops</b></a> for quick access here."); break;
-      case ExplorePOI.favoriteKeyName: message = Localization().getStringEx("widget.home.favorites.message.empty.locations", "Tap the \u2606 on items in <a href='$localUrlMacro'><b>My Locations</b></a> for quick access here."); break;
+      case ExplorePOI.favoriteKeyName: message = Localization().getStringEx("widget.home.favorites.message.empty.locations", "Tap the \u2606 on locations on the <a href='$localUrlMacro'><b>Map</b></a> for quick access here."); break;
       case GuideFavorite.favoriteKeyName: message = Localization().getStringEx("widget.home.favorites.message.empty.campus_guide", "Tap the \u2606 on items in <a href='$localUrlMacro'><b>Campus Guide</b></a> for quick access here."); break;
       case Appointment.favoriteKeyName:
         message = (Storage().appointmentsCanDisplay != true) ?

diff --git a/plugin b/plugin