Merge pull request #103 from tommyxchow/dev

Release v1.2.1

Author: tommyxchow

lib/screens/channel/chat/widgets/chat_message.dart

@@ -117,7 +117,18 @@ class ChatMessage extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Text(ircMessage.tags['system-msg']!),
+              if (ircMessage.tags.containsKey('system-msg')) Text(ircMessage.tags['system-msg']!),
+              if (ircMessage.tags.containsKey('msg-id') && ircMessage.tags['msg-id'] == 'announcement')
+                Row(
+                  children: const [
+                    Icon(Icons.announcement),
+                    SizedBox(width: 5.0),
+                    Text(
+                      'Announcement',
+                      style: TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                  ],
+                ),
               const SizedBox(height: 5.0),
               if (ircMessage.message != null)
                 Observer(

lib/screens/settings/sections/chat_settings.dart

@@ -57,7 +57,7 @@ class _ChatSettingsState extends State<ChatSettings> {
           SwitchListTile.adaptive(
             isThreeLine: true,
             title: const Text('Readable Name Colors'),
-            subtitle: const Text('Adjusts the lightness value of overly bright/dark names.'),
+            subtitle: const Text('Adjusts the lightness value of overly bright or dark names.'),
             value: settingsStore.useReadableColors,
             onChanged: (newValue) => settingsStore.useReadableColors = newValue,
           ),

lib/widgets/profile_picture.dart

@@ -23,7 +23,7 @@ class ProfilePicture extends StatelessWidget {
         return CircleAvatar(
           radius: radius,
           backgroundColor: Colors.transparent,
-          foregroundImage: snapshot.hasData && snapshot.data != null ? CachedNetworkImageProvider(snapshot.data!.profileImageUrl) : null,
+          foregroundImage: !snapshot.hasError && snapshot.hasData ? CachedNetworkImageProvider(snapshot.data!.profileImageUrl) : null,
         );
       },
     );

pubspec.lock

@@ -264,7 +264,7 @@ packages:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2+1"
+    version: "2.1.3+1"
   flutter_secure_storage:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.2.0+18
+version: 1.2.1+19
 
 environment:
   sdk: ">=2.15.0 <3.0.0"