Merge pull request #135 from rokwire/release/v1.2.0

Release/v1.2.0

Author: sandeep-ps

CHANGELOG.md

@@ -6,6 +6,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [1.2.0] - 2022-08-15
+### Fixed
+- Use simple getter for deep link redirect url [#2065](https://github.com/rokwire/illinois-app/issues/2065).
+- Properly convert colors that contain adjacent zeros [#122](https://github.com/rokwire/app-flutter-plugin/issues/122).
+### Changed
+- Allow referring string values from app config in FlexUI service [#118](https://github.com/rokwire/app-flutter-plugin/issues/118).
+- Added Auth2UserPres.setFavorite method; use Iterable inetead of List for muliple favorites paramter [#2065](https://github.com/rokwire/illinois-app/issues/2065).
+- FlexUI extended with content entry switch and multiple {content, rules} sets in single source  [#121](https://github.com/rokwire/app-flutter-plugin/issues/121).
+- Acknowledged new paramters of 'report/abuse' API of Groups BB [#2083](https://github.com/rokwire/illinois-app/issues/2083).
+- Refresh Auth2 account object instead of profile and prefs separately [#132](https://github.com/rokwire/app-flutter-plugin/issues/132).
+- Updated format of settings APIs in Auth2UserPrefs [#2194](https://github.com/rokwire/illinois-app/issues/2194).
+- Do not load all groups on portions (paging) [#125](https://github.com/rokwire/app-flutter-plugin/issues/125).
+### Added
+- Differ multi events and events that last more than one day [#126](https://github.com/rokwire/app-flutter-plugin/issues/126).
+- Added Config().appStoreId getter [#2162](https://github.com/rokwire/illinois-app/issues/2162).
+- Added MapUtils.get2 helper [#2169](https://github.com/rokwire/illinois-app/issues/2169).
+- Check if event ends in the same year as it starts [#128](https://github.com/rokwire/app-flutter-plugin/issues/128).
+- Load groups and members on portions (e.g. paging) [#125](https://github.com/rokwire/app-flutter-plugin/issues/125).
+- Added system configs in Auth2Account [#132](https://github.com/rokwire/app-flutter-plugin/issues/132).
+- Added int settings getter in Auth2UserPrefs [#2207](https://github.com/rokwire/illinois-app/issues/2207).
+- Added config settings refs support for FlexUI enabled rules [#2210](https://github.com/rokwire/illinois-app/issues/2210).
+
+
 ## [1.1.0] - 2022-07-19
 ### Changed
 - Added GeoFence location rules in FlexUI [#62](https://github.com/rokwire/app-flutter-plugin/issues/62).

SECURITY.md

@@ -6,6 +6,7 @@ Patches for [ **illinois-app** ] will only be applied to the following versions:
 
 | Version | Supported |
 | ------- | ------------------ |
+| 1.2.0 | :white_check_mark: |
 | 1.1.0 | :white_check_mark: |
 | 1.0.2 | :white_check_mark: |
 | 1.0.1 | :white_check_mark: |

example/pubspec.lock

@@ -638,7 +638,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.1.0"
+    version: "1.2.0"
   shared_preferences:
     dependency: transitive
     description:

ios/rokwire_plugin.podspec

@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'rokwire_plugin'
-  s.version          = '1.1.0'
+  s.version          = '1.2.0'
   s.summary          = 'Rokwire Flutter plugin'
   s.description      = <<-DESC
 Rokwire Flutter plugin

lib/model/auth2.dart

@@ -121,11 +121,11 @@ class Auth2Account {
   final List<Auth2StringEntry>? roles;
   final List<Auth2StringEntry>? groups;
   final List<Auth2Type>? authTypes;
+  final Map<String, dynamic>? systemConfigs;
 
-  
-  Auth2Account({this.id, this.profile, this.prefs, this.permissions, this.roles, this.groups, this.authTypes});
+  Auth2Account({this.id, this.profile, this.prefs, this.permissions, this.roles, this.groups, this.authTypes, this.systemConfigs});
 
-  factory Auth2Account.fromOther(Auth2Account? other, {String? id, Auth2UserProfile? profile, Auth2UserPrefs? prefs, List<Auth2StringEntry>? permissions, List<Auth2StringEntry>? roles, List<Auth2StringEntry>? groups, List<Auth2Type>? authTypes}) {
+  factory Auth2Account.fromOther(Auth2Account? other, {String? id, Auth2UserProfile? profile, Auth2UserPrefs? prefs, List<Auth2StringEntry>? permissions, List<Auth2StringEntry>? roles, List<Auth2StringEntry>? groups, List<Auth2Type>? authTypes, Map<String, dynamic>? systemConfigs}) {
     return Auth2Account(
       id: id ?? other?.id,
       profile: profile ?? other?.profile,
@@ -134,6 +134,7 @@ class Auth2Account {
       roles: roles ?? other?.roles,
       groups: groups ?? other?.groups,
       authTypes: authTypes ?? other?.authTypes,
+      systemConfigs: systemConfigs ?? other?.systemConfigs,
     );
   }
 
@@ -146,6 +147,7 @@ class Auth2Account {
       roles: Auth2StringEntry.listFromJson(JsonUtils.listValue(json['roles'])),
       groups: Auth2StringEntry.listFromJson(JsonUtils.listValue(json['groups'])),
       authTypes: Auth2Type.listFromJson(JsonUtils.listValue(json['auth_types'])),
+      systemConfigs: JsonUtils.mapValue(json['system_configs']),
     ) : null;
   }
 
@@ -158,6 +160,7 @@ class Auth2Account {
       'roles': roles,
       'groups': groups,
       'auth_types': authTypes,
+      'system_configs': systemConfigs,
     };
   }
 
@@ -169,7 +172,8 @@ class Auth2Account {
       const DeepCollectionEquality().equals(other.permissions, permissions) &&
       const DeepCollectionEquality().equals(other.roles, roles) &&
       const DeepCollectionEquality().equals(other.groups, groups) &&
-      const DeepCollectionEquality().equals(other.authTypes, authTypes);
+      const DeepCollectionEquality().equals(other.authTypes, authTypes) &&
+      const DeepCollectionEquality().equals(other.systemConfigs, systemConfigs);
 
   @override
   int get hashCode =>
@@ -178,7 +182,8 @@ class Auth2Account {
     (const DeepCollectionEquality().hash(permissions)) ^
     (const DeepCollectionEquality().hash(roles)) ^
     (const DeepCollectionEquality().hash(groups)) ^
-    (const DeepCollectionEquality().hash(authTypes));
+    (const DeepCollectionEquality().hash(authTypes)) ^
+    (const DeepCollectionEquality().hash(systemConfigs));
 
   bool get isValid {
     return (id != null) && id!.isNotEmpty /* && (profile != null) && profile.isValid*/;
@@ -214,6 +219,7 @@ class Auth2Account {
   bool hasRole(String role) => (Auth2StringEntry.findInList(roles, name: role) != null);
   bool hasPermission(String premission) => (Auth2StringEntry.findInList(permissions, name: premission) != null);
   bool bellongsToGroup(String group) => (Auth2StringEntry.findInList(groups, name: group) != null);
+  bool get isAnalyticsProcessed => (MapUtils.get(systemConfigs, 'analytics_processed_date') != null);
 }
 
 ////////////////////////////////
@@ -960,6 +966,8 @@ class Auth2UserPrefs {
 
   // Favorites
 
+  Iterable<String>? get favoritesKeys => _favorites?.keys;
+
   LinkedHashSet<String>? getFavorites(String favoriteKey) {
     return (_favorites != null) ? _favorites![favoriteKey] : null;
   }
@@ -1036,7 +1044,34 @@ class Auth2UserPrefs {
     }
   }
 
-  bool isListFavorite(List<Favorite>? favorites) {
+  void setFavorite(Favorite? favorite, bool value) {
+    if ((favorite != null) && (favorite.favoriteId != null)) {
+      LinkedHashSet<String>? favoriteIdsForKey = (_favorites != null) ? _favorites![favorite.favoriteKey] : null;
+      bool isFavorite = (favoriteIdsForKey != null) && favoriteIdsForKey.contains(favorite.favoriteId);
+      bool isModified = false;
+      if (value && !isFavorite) {
+        if (favoriteIdsForKey == null) {
+          _favorites ??= <String, LinkedHashSet<String>>{};
+            // ignore: prefer_collection_literals
+          _favorites![favorite.favoriteKey] = favoriteIdsForKey = LinkedHashSet<String>();
+        }
+        favoriteIdsForKey.add(favorite.favoriteId!);
+        isModified = true;
+      }
+      else if (!value && isFavorite) {
+        favoriteIdsForKey.remove(favorite.favoriteId);
+        isModified = true;
+      }
+
+      if (isModified) {
+        NotificationService().notify(notifyFavoriteChanged, favorite);
+        NotificationService().notify(notifyFavoritesChanged);
+        NotificationService().notify(notifyChanged, this);
+      }
+    }
+  }
+
+  bool isListFavorite(Iterable<Favorite>? favorites) {
     if ((favorites != null) && (_favorites != null)) {
       for (Favorite favorite in favorites) {
         if (!isFavorite(favorite)) {
@@ -1048,34 +1083,40 @@ class Auth2UserPrefs {
     return false;
   }
 
-  void setListFavorite(List<Favorite>? favorites, bool shouldFavorite, {Favorite? sourceFavorite}) {
+  void setListFavorite(Iterable<Favorite>? favorites, bool shouldFavorite, {Favorite? sourceFavorite}) {
     if (favorites != null) {
-      _favorites ??= <String, LinkedHashSet<String>>{};
 
+      bool isModified = false;
       for (Favorite favorite in favorites) {
-        LinkedHashSet<String>? favoriteIdsForKey = _favorites![favorite.favoriteKey];
-        bool isFavorite = (favoriteIdsForKey != null) && favoriteIdsForKey.contains(favorite.favoriteId);
-        if (isFavorite && !shouldFavorite) {
-          favoriteIdsForKey.remove(favorite.favoriteId);
-        }
-        else if (!isFavorite && shouldFavorite) {
-          if (favoriteIdsForKey == null) {
-            // ignore: prefer_collection_literals
-            _favorites![favorite.favoriteKey] = favoriteIdsForKey = LinkedHashSet<String>();
+        if (favorite.favoriteId != null) {
+          LinkedHashSet<String>? favoriteIdsForKey = (_favorites != null) ? _favorites![favorite.favoriteKey] : null;
+          bool isFavorite = (favoriteIdsForKey != null) && favoriteIdsForKey.contains(favorite.favoriteId);
+          if (shouldFavorite && !isFavorite) {
+            if (favoriteIdsForKey == null) {
+              _favorites ??= <String, LinkedHashSet<String>>{};
+              // ignore: prefer_collection_literals
+              _favorites![favorite.favoriteKey] = favoriteIdsForKey = LinkedHashSet<String>();
+            }
+            favoriteIdsForKey.add(favorite.favoriteId!);
+          }
+          else if (!shouldFavorite && isFavorite) {
+            favoriteIdsForKey.remove(favorite.favoriteId);
           }
-          SetUtils.add(favoriteIdsForKey, favorite.favoriteId);
+          NotificationService().notify(notifyFavoriteChanged, favorite);
+          isModified = true;
         }
-        NotificationService().notify(notifyFavoriteChanged, favorite);
       }
-      if (sourceFavorite != null) {
-        NotificationService().notify(notifyFavoriteChanged, sourceFavorite);
+      if (isModified) {
+        if (sourceFavorite != null) {
+          NotificationService().notify(notifyFavoriteChanged, sourceFavorite);
+        }
+        NotificationService().notify(notifyFavoritesChanged);
+        NotificationService().notify(notifyChanged, this);
       }
-      NotificationService().notify(notifyFavoritesChanged);
-      NotificationService().notify(notifyChanged, this);
     }
   }
 
-  void toggleListFavorite(List<Favorite>? favorites, {Favorite? sourceFavorite}) {
+  void toggleListFavorite(Iterable<Favorite>? favorites, {Favorite? sourceFavorite}) {
     setListFavorite(favorites, !isListFavorite(favorites), sourceFavorite: sourceFavorite);
   }
 
@@ -1384,22 +1425,23 @@ class Auth2UserPrefs {
   }
   // Settings
 
-  bool? getBoolSetting({String? settingName, bool? defaultValue}){
-    return JsonUtils.boolValue(getSetting(settingName: settingName)) ?? defaultValue;
-  }
+  bool? getBoolSetting(String? settingName, { bool? defaultValue }) =>
+    JsonUtils.boolValue(getSetting(settingName)) ?? defaultValue;
 
-  dynamic getSetting({String? settingName}){
-    if(_settings?.isNotEmpty ?? false){
-      return _settings![settingName];
-    }
+  int? getIntSetting(String? settingName, { int? defaultValue }) =>
+    JsonUtils.intValue(getSetting(settingName)) ?? defaultValue;
 
-    return null;//consider default TBD
-  }
-
-  void applySetting(String settingName, dynamic settingValue){
-    _settings ??= <String, dynamic>{};
-    _settings![settingName] = settingValue;
+  dynamic getSetting(String? settingName) =>
+    (_settings != null) ? _settings![settingName] : null;
 
+  void applySetting(String settingName, dynamic settingValue) {
+    if (settingValue != null) {
+      _settings ??= <String, dynamic>{};
+      _settings![settingName] = settingValue;
+    }
+    else if (_settings != null) {
+      _settings!.remove(settingName);
+    }
     NotificationService().notify(notifySettingsChanged);
     NotificationService().notify(notifyChanged, this);
   }

lib/model/event.dart

@@ -681,6 +681,21 @@ class Event with Explore, Favorite {
     return isRecurring || (isSuperEvent == true);
   }
 
+  bool get isMultiEvent {
+    return isComposite || isMoreThanOneDay;
+  }
+
+  bool get isMoreThanOneDay {
+    int eventDays = (endDateGmt?.difference(startDateGmt!).inDays ?? 0).abs();
+    return (eventDays >= 1);
+  }
+
+  bool get isNotTheSameYear {
+    int startYear = startDateGmt?.year ?? 0;
+    int endYear = endDateGmt?.year ?? 0;
+    return (startYear != endYear);
+  }
+
   static List<Map<String, dynamic>>? _constructSubEventsMap(List<dynamic>? subEventsJson) {
     if (subEventsJson == null || subEventsJson.isEmpty) {
       return null;