Merge pull request #261 from rokwire/release/v1.3.2

Release/v1.3.2

Author: sandeep-ps

CHANGELOG.md

@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [1.3.2] - 2023-02-16
+### Changed
+- Delete poll notification is not a lifecycle notification any more [#2173](https://github.com/rokwire/illinois-app/issues/2173).
+### Fixed
+- Clear unread notifications count when logged out.
+- Formatting date times when using device local time zone [#240](https://github.com/rokwire/app-flutter-plugin/issues/240).
+### Added
+- Added hint in VerticalTitleValueSection [#2892](https://github.com/rokwire/illinois-app/issues/2892).
+- Load poll by id [#2645](https://github.com/rokwire/illinois-app/issues/2645).
+
+## [1.3.1] - 2023-01-03
+### Deleted
+- Removed category from inbox message model [#237](https://github.com/rokwire/app-flutter-plugin/issues/237).
+
 ## [1.3.0] - 2022-12-22
 ### Fixed
 - Fix launchUrlString LaunchMode [#167](https://github.com/rokwire/app-flutter-plugin/issues/167).

SECURITY.md

@@ -6,15 +6,12 @@ Patches for [ **illinois-app** ] will only be applied to the following versions:
 
 | Version | Supported |
 | ------- | ------------------ |
+| 1.3.2 | :white_check_mark: |
 | 1.3.0 | :white_check_mark: |
 | 1.2.4 | :white_check_mark: |
-| 1.2.3 | :white_check_mark: |
-| 1.2.2 | :white_check_mark: |
 | 1.2.0 | :white_check_mark: |
 | 1.1.0 | :white_check_mark: |
 | 1.0.2 | :white_check_mark: |
-| 1.0.1 | :white_check_mark: |
-| 1.0.0 | :white_check_mark: |
 | < 1.1.0 | :x: |
 
 ## Reporting a Bug or Vulnerability

example/pubspec.lock

@@ -687,7 +687,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.3.0"
+    version: "1.3.2"
   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.3.0'
+  s.version          = '1.3.2'
   s.summary          = 'Rokwire Flutter plugin'
   s.description      = <<-DESC
 Rokwire Flutter plugin

lib/model/inbox.dart

@@ -8,7 +8,6 @@ class InboxMessage {
   final String?   messageId;
   final int?      priority;
   final String?   topic;
-  final String?   category;
 
   final DateTime? dateCreatedUtc;
   final DateTime? dateUpdatedUtc;
@@ -24,7 +23,7 @@ class InboxMessage {
   final InboxSender?          sender;
   final List<InboxRecepient>? recepients;
 
-  InboxMessage({this.messageId, this.priority, this.topic, this.category,
+  InboxMessage({this.messageId, this.priority, this.topic,
     this.dateCreatedUtc, this.dateUpdatedUtc, this.dateSentUtc,
     this.subject, this.body, this.data,
     this.mute, this.read,
@@ -36,7 +35,6 @@ class InboxMessage {
       messageId: JsonUtils.stringValue(json['id']),
       priority: JsonUtils.intValue(json['priority']),
       topic: JsonUtils.stringValue(json['topic']),
-      category: JsonUtils.stringValue(json['category']),
 
       dateCreatedUtc: DateTimeUtils.dateTimeFromString(JsonUtils.stringValue(json['date_created'])),
       dateUpdatedUtc: DateTimeUtils.dateTimeFromString(JsonUtils.stringValue(json['date_updated'])),

lib/service/app_datetime.dart

@@ -125,8 +125,11 @@ class AppDateTime with Service {
         format = iso8601DateTimeFormat;
       }
       DateFormat dateFormat = DateFormat(format, locale);
-      if (ignoreTimeZone! || useDeviceLocalTimeZone) {
+      if (ignoreTimeZone!) {
           formattedDateTime = dateFormat.format(dateTime);
+      } else if (useDeviceLocalTimeZone) {
+        DateTime? dt = (dateTime.isUtc) ? getDeviceTimeFromUtcTime(dateTime) : dateTime;
+        formattedDateTime = (dt != null) ? dateFormat.format(dt) : null;
       } else {
           timezone.Location? uniLocation = universityLocation;
           timezone.TZDateTime? tzDateTime = (uniLocation != null) ? timezone.TZDateTime.from(dateTime, uniLocation) : null;

lib/service/inbox.dart

@@ -404,6 +404,9 @@ class Inbox with Service implements NotificationsListener {
         debugPrint('Failed to retrieve unread messages count. Reason: $responseCode, $responseBody');
       }
     }
+    else {
+      _applyUnreadMessagesCount(0);
+    }
   }
 
   void _applyUnreadMessagesCount(int? unreadMessagesCount){

lib/service/polls.dart

@@ -42,12 +42,12 @@ class Polls with Service implements NotificationsListener {
   static const String notifyResultsChanged   = "edu.illinois.rokwire.poll.resultschanged"; // poll updated
   static const String notifyVoteChanged      = "edu.illinois.rokwire.poll.votechanged"; // poll updated
   static const String notifyStatusChanged    = "edu.illinois.rokwire.poll.statuschnaged"; // poll closed, results could be presented
+  static const String notifyDeleted          = "edu.illinois.rokwire.poll.deleted";
 
   static const String notifyLifecycleCreate  = "edu.illinois.rokwire.poll.lifecycle.create";
   static const String notifyLifecycleOpen    = "edu.illinois.rokwire.poll.lifecycle.open";
   static const String notifyLifecycleClose   = "edu.illinois.rokwire.poll.lifecycle.close";
   static const String notifyLifecycleVote    = "edu.illinois.rokwire.poll.lifecycle.vote";
-  static const String notifyLifecycleDelete  = "edu.illinois.rokwire.poll.lifecycle.delete";
 
   final Map<String, PollChunk> _pollChunks = <String, PollChunk>{};
 
@@ -281,8 +281,8 @@ class Polls with Service implements NotificationsListener {
           PollChunk? pollChunk = _pollChunks[pollId];
           if (pollChunk != null) {
             removePollChunk(pollChunk);
-            NotificationService().notify(notifyLifecycleDelete, pollChunk.poll);
           }
+          NotificationService().notify(notifyDeleted, pollId);
         }
         else {
           throw PollsException(PollsError.serverResponse, '${response?.statusCode} ${response?.body}');
@@ -326,6 +326,24 @@ class Polls with Service implements NotificationsListener {
     return null;
   }
 
+  Future<Poll?> loadById(String pollId) async {
+    if (!enabled) {
+      debugPrint('Failed to load poll with id "$pollId". Missing polls url');
+      return null;
+    }
+    String url = '${Config().quickPollsUrl}/polls/$pollId';
+    Response? response = await Network().get(url, auth: Auth2());
+    int responseCode = response?.statusCode ?? -1;
+    String? responseBody = response?.body;
+    if (responseCode == 200) {
+      Poll? poll = Poll.fromJson(JsonUtils.decodeMap(responseBody));
+      return poll;
+    } else {
+      debugPrint('Failed to load poll with id "$pollId". Reason: $responseCode, $responseBody');
+      return null;
+    }
+  }
+
   bool presentPollId(String? pollId) {
     if (enabled && presentPoll == null) {
       PollChunk? pollChunk = _pollChunks[pollId];

lib/ui/widgets/section.dart

@@ -30,6 +30,12 @@ class VerticalTitleValueSection extends StatelessWidget {
   final Color? valueTextColor;
   final TextStyle? valueTextStyle;
 
+  final String? hint;
+  final String? hintFontFamily;
+  final double hintFontSize;
+  final Color? hintTextColor;
+  final TextStyle? hintTextStyle;
+
   final BoxBorder? border;
   final Color? borderColor;
   final double borderWidth;
@@ -50,6 +56,12 @@ class VerticalTitleValueSection extends StatelessWidget {
     this.valueTextColor,
     this.valueTextStyle,
 
+    this.hint,
+    this.hintFontFamily,
+    this.hintFontSize = 12,
+    this.hintTextColor,
+    this.hintTextStyle,
+
     this.border,
     this.borderColor,
     this.borderWidth = 3,
@@ -76,6 +88,15 @@ class VerticalTitleValueSection extends StatelessWidget {
   @protected TextStyle get defaultValueTextStyle => TextStyle(fontFamily: displayValueFontFamily, fontSize: valueFontSize, color: displayValueTextColor);
   @protected TextStyle get displayValueTextStyle => valueTextStyle ?? defaultValueTextStyle;
 
+  @protected Color? get defaultHintTextColor => Styles().colors?.textBackground;
+  @protected Color? get displayHintTextColor => hintTextColor ?? defaultHintTextColor;
+  
+  @protected String? get defaultHintFontFamily => Styles().fontFamilies?.regular;
+  @protected String? get displayHintFontFamily => hintFontFamily ?? defaultHintFontFamily;
+
+  @protected TextStyle get defaultHintTextStyle => TextStyle(fontFamily: displayHintFontFamily, fontSize: hintFontSize, color: displayHintTextColor);
+  @protected TextStyle get displayHintTextStyle => hintTextStyle ?? defaultHintTextStyle;
+
   @protected Color get defaultBorderColor => Styles().colors?.fillColorSecondary ?? Colors.transparent;
   @protected Color get displayBorderColor => borderColor ?? defaultBorderColor;
 
@@ -94,6 +115,7 @@ class VerticalTitleValueSection extends StatelessWidget {
             Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
               (title != null) ? Row(children: [Expanded(child: Text(title ?? '', style: displayTitleTextStyle,))]) : Container(),
               (value != null) ? Row(children: [Expanded(child: Text(value ?? '', style: displayValueTextStyle))]) : Container(),
+              (hint != null) ? Row(children: [Expanded(child: Text(hint ?? '', style: displayHintTextStyle))]) : Container(),
             ],),
           ),
         ),

pubspec.yaml

@@ -1,6 +1,6 @@
 name: rokwire_plugin
 description: Rokwire Flutter plugin
-version: 1.3.0
+version: 1.3.2
 homepage:
 
 environment: