Skip to content

Commit cdb73b3

Browse files
mihail-varbanovmihail-varbanov
authored
Merge pull request #3994 from rokwire/release/v5.1.32+1932
Release/v5.1.32+1932
2 parents 78185e6 + 8194f52 commit cdb73b3

21 files changed

+206
-80
lines changed

‎CHANGELOG.md‎

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

77
## Unreleased
88

9+
## [5.1.32] - 2024-02-19
10+
### Removed
11+
- Android: background location permission [#3989](https://github.com/rokwire/illinois-app/issues/3989).
12+
### Fixed
13+
- Fixed the panels loaded on "View All" from "My Bus Stops" and "My Destination" favorite widgets [#3987](https://github.com/rokwire/illinois-app/issues/3987).
14+
- Loading today games in "It's Game Day" widget [#3988](https://github.com/rokwire/illinois-app/issues/3988).
15+
- Images for completed To-Do items [#3984](https://github.com/rokwire/illinois-app/issues/3984).
16+
17+
## [5.1.31] - 2024-02-16
18+
### Changed
19+
- Added ability close login widget in home panel [#3834](https://github.com/rokwire/illinois-app/issues/3834).
20+
### Added
21+
- Handled group stats update notifications [#3829](https://github.com/rokwire/illinois-app/issues/3829).
22+
- Added additional group analytics attributes [#3829](https://github.com/rokwire/illinois-app/issues/3829).
23+
24+
## [5.1.30] - 2024-02-15
25+
### Changed
26+
- Use display duration from app config for in-app notification toasts [#2774](https://github.com/rokwire/illinois-app/issues/2774).
27+
### Fixed
28+
- Fixed tappable area of SliverToutHeaderBar back button [#3827](https://github.com/rokwire/illinois-app/issues/3827).
29+
930
## [5.1.29] - 2024-02-14
1031
### Fixed
1132
- Essential Skills Coach fixes and improvements [#3971](https://github.com/rokwire/illinois-app/issues/3971)

‎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.29 | :white_check_mark: |
10-
| < 5.1.29 | :x: |
9+
| 5.1.32 | :white_check_mark: |
10+
| < 5.1.32 | :x: |
1111
| 5.0.78 | :white_check_mark: |
1212
| < 5.0.78 | :x: |
1313
| 4.3.61 | :white_check_mark: |

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
<uses-permission android:name="android.permission.INTERNET"/>
2727
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" tools:remove="android:maxSdkVersion"/>
2828
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:remove="android:maxSdkVersion"/>
29-
<!-- Android 10 (API level 29) or higher -->
30-
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
3129
<!-- For using location derived from bluetooth beacons -->
3230
<uses-permission android:name="android.permission.BLUETOOTH"/>
3331
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>

‎assets/styles.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@
811811

812812
"circle-outline": {"src": "images/oval-orange.png", "type": "flutter.asset", "color": "fillColorSecondary", "size": 24},
813813
"check-circle-outline": {"src": "0xf111", "type": "fa.icon", "weight": "thin", "color": "fillColorSecondary", "size": 20},
814-
"check-circle-outline-2": {"src": "images/deselected.png", "type": "flutter.asset", "color": "fillColorSecondary", "size": 24},
814+
"check-circle-outline-2": {"src": "images/deselected.png", "type": "flutter.asset", "color": "surface", "size": 24},
815815
"location-outline": {"src": "images/icon-map-view.png", "type": "flutter.asset", "color": "fillColorSecondary", "size": 18, "todo": "size issue"},
816816
"list-outline": {"src": "images/icon-list-view.png", "type": "flutter.asset", "color": "fillColorSecondary", "size": 16, "todo": "size issue"},
817817

@@ -849,6 +849,7 @@
849849
"more-white": {"src": "images/groups-more-inactive.png", "type": "flutter.asset", "color": "surface", "size": 24},
850850
"circle-outline-white": {"src": "images/oval-orange.png", "type": "flutter.asset", "color": "surface", "size": 24},
851851
"check-circle-outline-gray-white": {"src": "0xf111", "type": "fa.icon", "weight": "thin", "color": "surface", "size": 20, "todo": "remove if not needed"},
852+
"check-circle-outline-gray-white-2": {"src": "images/deselected.png", "type": "flutter.asset", "weight": "thin", "color": "surface", "size": 24, "todo": "remove if not needed"},
852853
"settings-white": {"src": "images/settings-white.png", "type": "flutter.asset", "color": "surface", "size": 16, "todo": "wrong size"},
853854
"chevron-left-white": {"src": "images/chevron-left-white.png", "type": "flutter.asset", "color": "surface", "size": 14, "todo": "size issue?"},
854855
"chevron-right-white": {"src": "images/chevron-right-white.png", "type": "flutter.asset", "color": "surface", "size": 14, "todo": "size issue?"},

‎ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ PODS:
159159
- ReachabilitySwift (5.0.0)
160160
- record (0.0.1):
161161
- Flutter
162-
- rokwire_plugin (1.6.0):
162+
- rokwire_plugin (1.6.3):
163163
- Flutter
164164
- SeosMobileKeysSDK-Debug (7.7.5):
165165
- BerTlv
@@ -400,7 +400,7 @@ SPEC CHECKSUMS:
400400
PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
401401
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
402402
record: cae05d8dd3cdb1dea3511b20e5a5811a1ae00d0d
403-
rokwire_plugin: 0553b4722ec910e78cf60a01da3129d887635b48
403+
rokwire_plugin: 3899716314e6a0c76d0148be0190e8fdc4944499
404404
SeosMobileKeysSDK-Debug: 41dc15710ad56f340a9ef3e82d987623c289d9ce
405405
SeosMobileKeysSDK-Release: add079b6221cd9d42b4c088407b2f8f365c0cd53
406406
share: 0b2c3e82132f5888bccca3351c504d0003b3b410

‎lib/ext/Group.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import 'dart:ui';
1818

1919
import 'package:illinois/service/Analytics.dart';
2020
import 'package:rokwire_plugin/service/app_datetime.dart';
21+
import 'package:rokwire_plugin/service/groups.dart';
2122
import 'package:rokwire_plugin/service/localization.dart';
2223
import 'package:rokwire_plugin/service/styles.dart';
2324
import 'package:rokwire_plugin/model/group.dart';
@@ -28,7 +29,9 @@ extension GroupExt on Group {
2829
Map<String, dynamic> get analyticsAttributes {
2930
return {
3031
Analytics.LogAttributeGroupId : id,
31-
Analytics.LogAttributeGroupName : title
32+
Analytics.LogAttributeGroupName : title,
33+
Analytics.LogAttributeGroupHiddenForSearch: hiddenForSearch,
34+
Analytics.LogAttributeGroupStats: Groups().cachedGroupStats(id)?.toJson(),
3235
};
3336
}
3437

‎lib/service/Analytics.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ class Analytics extends rokwire.Analytics implements NotificationsListener {
302302
static const String LogAttributeLaundryName = "laundry_name";
303303
static const String LogAttributeGroupId = "group_id";
304304
static const String LogAttributeGroupName = "group_name";
305+
static const String LogAttributeGroupHiddenForSearch = "group_hidden_for_search";
306+
static const String LogAttributeGroupStats = "group_stats";
305307
static const String LogAttributeGuide = "guide";
306308
static const String LogAttributeGuideId = "guide_id";
307309
static const String LogAttributeGuideTitle = "guide_title";

‎lib/service/Config.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ class Config extends rokwire.Config {
219219

220220
int get mobileAccessDeleteTimeoutMins => JsonUtils.intValue(settings['mobileAccessDeleteTimeout']) ?? 10;
221221

222+
int get inAppNotificationToastTimeout => JsonUtils.intValue(settings['inAppNotificationToastTimeout']) ?? 6;
223+
222224
@override
223225
int get refreshTimeout=> kReleaseMode ? super.refreshTimeout : 0;
224226

‎lib/service/Storage.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,15 @@ class Storage extends rokwire.Storage {
334334
int? get homeToutImageTime => getIntWithName(homeToutImageTimeKey);
335335
set homeToutImageTime(int? value) => setIntWithName(homeToutImageTimeKey, value);
336336

337-
// Home Welcome
338-
String get homeWelcomeVisibleKey => 'edu.illinois.rokwire.home.welcome.image.time';
337+
// Home
338+
String get homeWelcomeVisibleKey => 'edu.illinois.rokwire.home.welcome.visible';
339339
bool? get homeWelcomeVisible => getBoolWithName(homeWelcomeVisibleKey);
340340
set homeWelcomeVisible(bool? value) => setBoolWithName(homeWelcomeVisibleKey, value);
341341

342+
String get homeLoginVisibleKey => 'edu.illinois.rokwire.home.login.visible';
343+
bool? get homeLoginVisible => getBoolWithName(homeLoginVisibleKey);
344+
set homeLoginVisible(bool? value) => setBoolWithName(homeLoginVisibleKey, value);
345+
342346
// Browse Tout
343347
String get browseToutImageUrlKey => 'edu.illinois.rokwire.browse.tout.image.url';
344348
String? get browseToutImageUrl => getStringWithName(browseToutImageUrlKey);

‎lib/ui/RootPanel.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import 'package:flutter/material.dart';
2323
import 'package:fluttertoast/fluttertoast.dart';
2424
import 'package:illinois/service/Appointments.dart';
2525
import 'package:illinois/service/Canvas.dart';
26+
import 'package:illinois/service/Config.dart';
2627
import 'package:illinois/ui/AssistantPanel.dart';
2728
import 'package:illinois/ui/academics/AcademicsHomePanel.dart';
2829
import 'package:illinois/ui/athletics/AthleticsRosterListPanel.dart';
@@ -693,6 +694,7 @@ class _RootPanelState extends State<RootPanel> with TickerProviderStateMixin imp
693694
AppToast.show(context,
694695
toast: toast,
695696
gravity: ToastGravity.TOP,
697+
duration: Duration(seconds: Config().inAppNotificationToastTimeout),
696698
child: InAppNotificationToast.message(body,
697699
actionText: Localization().getStringEx('dialog.show.title', 'Show'),
698700
onAction: (completion != null) ? () => _onFirebaseForegroundMessageCompletition(toast, completion) : null,

0 commit comments

Comments
 (0)