Skip to content

Commit 2d42a8e

Browse files
mihail-varbanovdobromirdobrevTodorBachvarov
authored
Release/v5.1.34+1934 (#4016)
* Filter sport events with the correct sport names [#3986] * Make the event2 favorite [#3986] * Update CHANGELOG.md [#3986] * Accessibility improvements * Accessibility improvements * Acknowledged "Assistant Managed" group for enabling Assistant UI [#4002]. * Trim URL links before launching them, report URL parse failure when confirming URLs [#4001]. * Created HomeEmptyContentWidget displayed when there is no favorites content [#3999]. * version: 5.1.33+1933 * version: 5.1.33+1933 * Add event image description when creating / modifying event [#4010] * Update CHANGELOG.md [#4010] * Use registration label for event if available [#4012] * Update CHANGELOG.md [#4012] * Fix deep link key for notifyProfileLoginNotification to profile.login * version: 5.1.34+1934 --------- Co-authored-by: Dobromir Dobrev <dobromir.i.dobrev@gmail.com> Co-authored-by: Todor Bachvarov <tobachvarov@gmail.com>
1 parent b7735a9 commit 2d42a8e

29 files changed

+251
-102
lines changed

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9+
## [5.1.34] - 2024-03-15
10+
### Added
11+
- Event cover image description [#4010](https://github.com/rokwire/illinois-app/issues/4010).
12+
### Fixed
13+
- Show event registration label if available [#4012](https://github.com/rokwire/illinois-app/issues/4012).
14+
- Fix Settings and Profile deep links [#4014](https://github.com/rokwire/illinois-app/issues/4014).
15+
16+
## [5.1.33] - 2024-03-14
17+
### Added
18+
- Created HomeEmptyContentWidget displayed when there is no favorites content [#3999](https://github.com/rokwire/illinois-app/issues/3999).
19+
### Changed
20+
- Acknowledged "Assistant Managed" group for enabling Assistant UI [#4002](https://github.com/rokwire/illinois-app/issues/4002).
21+
### Fixed
22+
- Correct filtering of sport events [#3986](https://github.com/rokwire/illinois-app/issues/3986).
23+
- Trim URL links before launching them, report URL parse failure when confirming URLs [#4001](https://github.com/rokwire/illinois-app/issues/4001).
24+
925
## [5.1.32] - 2024-02-19
1026
### Removed
1127
- Android: background location permission [#3989](https://github.com/rokwire/illinois-app/issues/3989).

SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Patches for [ **illinois-app** ] will only be applied to the following versions:
66

77
| Version | Supported |
88
|----------| ------------------ |
9-
| 5.1.32 | :white_check_mark: |
10-
| < 5.1.32 | :x: |
9+
| 5.1.34 | :white_check_mark: |
10+
| < 5.1.34 | :x: |
1111
| 5.0.78 | :white_check_mark: |
1212
| < 5.0.78 | :x: |
1313
| 4.3.61 | :white_check_mark: |

assets/flexUI.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"canvas_courses" : ["${config.settings.groups.canvas}"],
121121
"medicine_courses" : ["${config.settings.groups.canvas}"],
122122
"mtd_bus_pass" : ["${config.settings.groups.mtd_bus_pass}"],
123-
"assistant" : ["${config.settings.groups.assistant}"],
123+
"assistant" : ["${config.settings.groups.assistant}", "OR", "${config.settings.groups.assistant_managed}"],
124124
"essential_skills_coach" : ["${config.settings.groups.essential_skills_coach}"]
125125
},
126126
"locations": {

assets/strings.en.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136

137137
"panel.home.header.title": "Favorites",
138138
"panel.home.header.editing.title": "Customize",
139+
"panel.home.connect.not_logged_in.title": "Connect to Illinois",
139140
"panel.home.connect.not_logged_in.netid.description.part_1": "Are you a ",
140141
"panel.home.connect.not_logged_in.netid.description.part_2": "university student",
141142
"panel.home.connect.not_logged_in.netid.description.part_3": " or ",
@@ -1213,6 +1214,7 @@
12131214

12141215
"panel.event2.create.header.title": "Create an Event",
12151216
"panel.event2.update.header.title": "Update Event",
1217+
"panel.event2.create.section.image.description": "The event image displays a 16:9 or 1000px x 615px jpg, png, or gif (not animated). Larger images are automatically positioned within the frame and can be tapped to view in their entirety within the Illinois app.",
12161218
"panel.event2.create.section.title.title": "EVENT TITLE",
12171219
"panel.event2.create.section.title.field.title": "TITLE FIELD",
12181220
"panel.event2.create.section.description.title": "EVENT DESCRIPTION",
@@ -3530,6 +3532,8 @@
35303532
"widget.home.welcome.text.title": "Welcome to {{app_title}} {{app_version}}",
35313533
"widget.home.welcome.button.close.label": "Close",
35323534

3535+
"widget.home.empty.content.text": "Tap the \u2606s under <a href='{{browse_local_url}}'>Browse</a> to add shortcuts to Favorites. Note that some features require specific <a href='{{privacy_settings_local_url}}'>privacy settings</a> and <a href='{{sign_in_local_url}}'>signing in</a> with your NetID, phone number, or email address.",
3536+
35333537
"widget.home.athletics_news.text.title": "Big 10 News",
35343538
"widget.home.athletics_news.text.empty.description": "Big 10 News is not available right now.",
35353539
"widget.home.athletics_news.text.offline": "Big 10 News is not available while offline.",

assets/strings.es.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136

137137
"panel.home.header.title": "Favoritas",
138138
"panel.home.header.editing.title": "Personalizar",
139+
"panel.home.connect.not_logged_in.title": "Connect to Illinois",
139140
"panel.home.connect.not_logged_in.netid.description.part_1": "¿Eres un/a ",
140141
"panel.home.connect.not_logged_in.netid.description.part_2": "estudiante universitario/a",
141142
"panel.home.connect.not_logged_in.netid.description.part_3": " o ",
@@ -1212,6 +1213,7 @@
12121213

12131214
"panel.event2.create.header.title": "Crear un Evento",
12141215
"panel.event2.update.header.title": "Actualizar un Evento",
1216+
"panel.event2.create.section.image.description": "La imagen del evento muestra un formato jpg, png o gif de 16:9 o 1000 px x 615 px (no animado). Las imágenes más grandes se colocan automáticamente dentro del marco y se pueden tocar para verlas en su totalidad dentro de la aplicación de Illinois.",
12151217
"panel.event2.create.section.title.title": "TÍTULO DEL EVENTO",
12161218
"panel.event2.create.section.title.field.title": "TITLE FIELD",
12171219
"panel.event2.create.section.description.title": "DESCRIPCIÓN DEL EVENTO",
@@ -3523,6 +3525,8 @@
35233525
"widget.home.welcome.text.title": "Bienvenido a {{app_title}} {{app_version}}",
35243526
"widget.home.welcome.button.close.label": "Cerrar",
35253527

3528+
"widget.home.empty.content.text": "Tap the \u2606s under <a href='$_browseLocalUrlMacro'>Browse</a> to add shortcuts to Favorites. Note that some features require specific <a href='$_privacySettingsLocalUrlMacro'>privacy settings</a> and <a href='$_signInLocalUrlMacro'>signing in</a> with your NetID, phone number, or email address.",
3529+
35263530
"widget.home.athletics_news.text.title": "10 grandes noticias",
35273531
"widget.home.athletics_news.text.empty.description": "Las 10 grandes noticias no están disponibles en este momento.",
35283532
"widget.home.athletics_news.text.offline": "Big 10 News no está disponible sin conexión.",

assets/strings.zh.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136

137137
"panel.home.header.title": "收藏夾",
138138
"panel.home.header.editing.title": "定制",
139+
"panel.home.connect.not_logged_in.title": "Connect to Illinois",
139140
"panel.home.connect.not_logged_in.netid.description.part_1": "您是 ",
140141
"panel.home.connect.not_logged_in.netid.description.part_2": "學生",
141142
"panel.home.connect.not_logged_in.netid.description.part_3": "",
@@ -1212,6 +1213,7 @@
12121213

12131214
"panel.event2.create.header.title": "举办活动",
12141215
"panel.event2.update.header.title": "活动更新",
1216+
"panel.event2.create.section.image.description": "事件圖像顯示 16:9 或 1000px x 615px jpg、png 或 gif(非動畫)。 較大的圖像會自動定位在框架內,並且可以點擊以在伊利諾伊州應用程式中完整查看。",
12151217
"panel.event2.create.section.title.title": "活动名称",
12161218
"panel.event2.create.section.description.title": "活动细节",
12171219
"panel.event2.create.section.description.description": " (在此栏新增的超链接无法使用。请将网址输入至正确的字段,如在线活动的活动网址、活动网页链接、或是外部的活动注册链接。)",
@@ -3508,6 +3510,8 @@
35083510
"widget.home.welcome.text.title": "“歡迎來到{{app_title}} {{app_version}}",
35093511
"widget.home.welcome.button.close.label": "",
35103512

3513+
"widget.home.empty.content.text": "Tap the \u2606s under <a href='$_browseLocalUrlMacro'>Browse</a> to add shortcuts to Favorites. Note that some features require specific <a href='$_privacySettingsLocalUrlMacro'>privacy settings</a> and <a href='$_signInLocalUrlMacro'>signing in</a> with your NetID, phone number, or email address.",
3514+
35113515
"widget.home.athletics_news.text.title": "十大新聞",
35123516
"widget.home.athletics_news.text.empty.description": "目前無法查看十大新聞。",
35133517
"widget.home.athletics_news.text.offline": "離線時無法查看十大新聞。",

lib/ext/Favorite.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ extension FavoriteExt on Favorite {
192192
else if (this is Event2) {
193193
Event2 event2 = (this as Event2);
194194
if (event2.hasGame) {
195-
Navigator.push(context, CupertinoPageRoute(builder: (context) => AthleticsGameDetailPanel(game: event2.game)));
195+
Navigator.push(context, CupertinoPageRoute(builder: (context) => AthleticsGameDetailPanel(game: event2.game, event: event2)));
196196
} else {
197197
Navigator.push(context, CupertinoPageRoute(builder: (context) => Event2DetailPanel(event: event2)));
198198
}

lib/service/FirebaseMessaging.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,20 @@ class FirebaseMessaging extends rokwire.FirebaseMessaging implements Notificatio
9898
static const String notifyWellnessToDoItemNotification = "$notifyBase.wellness.to_do";
9999
static const String notifyProfileMyNotification = "$notifyBase.profile.my";
100100
static const String notifyProfileWhoAreYouNotification = "$notifyBase.profile.who_are_you";
101-
static const String notifyProfileLoginNotification = "$notifyBase.profile.privacy"; //TBD profile.login?
102-
static const String notifySettingsSectionsNotification = "$notifyBase.settings.sections"; //TBD deprecate. Use payloadTypeProfileLogin instead
101+
static const String notifyProfileLoginNotification = "$notifyBase.profile.login";
102+
static const String notifySettingsSectionsNotification = "$notifyBase.settings.sections"; //TBD deprecate and delete. Use profile.login instead
103103
static const String notifySettingsInterestsNotification = "$notifyBase.settings.interests";
104104
static const String notifySettingsFoodFiltersNotification = "$notifyBase.settings.food_filters";
105105
static const String notifySettingsSportsNotification = "$notifyBase.settings.sports";
106106
static const String notifySettingsFavoritesNotification = "$notifyBase.settings.favorites";
107107
static const String notifySettingsAssessmentsNotification = "$notifyBase.settings.assessments";
108108
static const String notifySettingsCalendarNotification = "$notifyBase.settings.calendar";
109109
static const String notifySettingsAppointmentsNotification = "$notifyBase.settings.appointments";
110-
static const String notifySettingsMapsNotification = "$notifyBase.settings.maps"; //TBD do we need this? Are we declaring these somewhere in the documentation?
111-
static const String notifySettingsContactsNotification = "$notifyBase.settings.contacts"; //TBD do we need this?
112-
static const String notifySettingsResearchNotification = "$notifyBase.settings.research"; //TBD do we need this?
113-
static const String notifySettingsPrivacyNotification = "$notifyBase.settings.privacy"; //TBD do we need this?
114-
static const String notifySettingsNotificationsNotification = "$notifyBase.settings.notifications"; //TBD do we need this?
110+
static const String notifySettingsMapsNotification = "$notifyBase.settings.maps";
111+
static const String notifySettingsContactsNotification = "$notifyBase.settings.contacts";
112+
static const String notifySettingsResearchNotification = "$notifyBase.settings.research";
113+
static const String notifySettingsPrivacyNotification = "$notifyBase.settings.privacy";
114+
static const String notifySettingsNotificationsNotification = "$notifyBase.settings.notifications";
115115
static const String notifyGuideArticleDetailNotification = "$notifyBase.guide.article.detail";
116116

117117
// Topic names

lib/ui/BrowsePanel.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ import 'package:rokwire_plugin/utils/utils.dart';
7575
import 'package:url_launcher/url_launcher.dart';
7676

7777
class BrowsePanel extends StatefulWidget {
78-
7978
static const String notifyRefresh = "edu.illinois.rokwire.browse.refresh";
79+
static const String notifySelect = "edu.illinois.rokwire.browse.select";
8080

8181
BrowsePanel();
8282

lib/ui/RootPanel.dart

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ class _RootPanelState extends State<RootPanel> with TickerProviderStateMixin imp
190190
Polls.notifyPresentResult,
191191
uiuc.TabBar.notifySelectionChanged,
192192
HomePanel.notifySelect,
193+
BrowsePanel.notifySelect,
193194
ExploreMapPanel.notifySelect,
194195
]);
195196

@@ -475,7 +476,10 @@ class _RootPanelState extends State<RootPanel> with TickerProviderStateMixin imp
475476
_onFirebaseGuideArticleNotification(param);
476477
}
477478
else if (name == HomePanel.notifySelect) {
478-
_onSelectHome();
479+
_onSelectTab(RootTab.Favorites);
480+
}
481+
else if (name == BrowsePanel.notifySelect) {
482+
_onSelectTab(RootTab.Browse);
479483
}
480484
else if (name == ExploreMapPanel.notifySelect) {
481485
_onSelectMaps(param);
@@ -493,11 +497,11 @@ class _RootPanelState extends State<RootPanel> with TickerProviderStateMixin imp
493497
}
494498
}
495499

496-
void _onSelectHome() {
497-
int? homeIndex = _getIndexByRootTab(RootTab.Favorites);
498-
if (mounted && (homeIndex != null)) {
500+
void _onSelectTab(RootTab tab) {
501+
int? tabIndex = _getIndexByRootTab(tab);
502+
if (mounted && (tabIndex != null)) {
499503
Navigator.of(context, rootNavigator: true).popUntil((route) => route.isFirst);
500-
_selectTab(homeIndex);
504+
_selectTab(tabIndex);
501505
}
502506
}
503507

0 commit comments

Comments
 (0)