fluffychat merge

CHANGELOG.md

@@ -30,7 +30,7 @@
 - chore: Use Cupertino Activity Indicator in ChatEventList (krille-chan)
 - chore: Use other join endpoint for room upgrades (Krille)
 - fix(macos): update dependencies to make the build work (Rafał Hirsch)
-- fix: Add missing <s> html tag to render (Krille)
+- fix: Add missing \<s> html tag to render (Krille)
 - fix: Consistent element padding between server picker and login view (xegim)
 - fix: Index of numbered lists are off (Krille)
 - fix: never use a transition on the shell route (Rafał Hirsch)

lib/widgets/avatar.dart

@@ -71,50 +71,48 @@ class Avatar extends StatelessWidget {
               borderRadius: borderRadius,
               side: border ?? BorderSide.none,
             ),
-            clipBehavior: Clip.hardEdge,
+            clipBehavior: Clip.antiAlias,
-            child:
+            // #Pangea
-                // #Pangea
+            // child: noPic
-                (userId ?? presenceUserId) == BotName.byEnvironment
+            child: (userId ?? presenceUserId) == BotName.byEnvironment
-                    ? BotFace(
+                ? BotFace(
-                        width: size,
+                    width: size,
-                        expression: BotExpression.idle,
+                    expression: BotExpression.idle,
-                        useRive: useRive,
+                    useRive: useRive,
-                      )
+                  )
-                    :
+                : noPic
                     // Pangea#
-
+                    ? Container(
-                    noPic
+                        decoration:
-                        ? Container(
+                            BoxDecoration(color: name?.lightColorAvatar),
-                            decoration:
+                        alignment: Alignment.center,
-                                BoxDecoration(color: name?.lightColorAvatar),
+                        child: Text(
-                            alignment: Alignment.center,
+                          fallbackLetters,
-                            child: Text(
+                          textAlign: TextAlign.center,
-                              fallbackLetters,
+                          style: TextStyle(
-                              textAlign: TextAlign.center,
+                            fontFamily: 'RobotoMono',
-                              style: TextStyle(
+                            color: Colors.white,
-                                fontFamily: 'RobotoMono',
+                            fontWeight: FontWeight.bold,
-                                color: Colors.white,
+                            fontSize: (size / 2.5).roundToDouble(),
-                                fontWeight: FontWeight.bold,
-                                fontSize: (size / 2.5).roundToDouble(),
-                              ),
-                            ),
-                          )
-                        : MxcImage(
-                            client: client,
-                            key: ValueKey(mxContent.toString()),
-                            cacheKey: '${mxContent}_$size',
-                            uri: mxContent,
-                            fit: BoxFit.cover,
-                            width: size,
-                            height: size,
-                            placeholder: (_) => Center(
-                              child: Icon(
-                                Icons.person_2,
-                                color: theme.colorScheme.tertiary,
-                                size: size / 1.5,
-                              ),
-                            ),
                           ),
+                        ),
+                      )
+                    : MxcImage(
+                        client: client,
+                        key: ValueKey(mxContent.toString()),
+                        cacheKey: '${mxContent}_$size',
+                        uri: mxContent,
+                        fit: BoxFit.cover,
+                        width: size,
+                        height: size,
+                        placeholder: (_) => Center(
+                          child: Icon(
+                            Icons.person_2,
+                            color: theme.colorScheme.tertiary,
+                            size: size / 1.5,
+                          ),
+                        ),
+                      ),
           ),
         ),
         // #Pangea