fluffychat merge
This commit is contained in:
commit
8aa5906d2c
2 changed files with 41 additions and 43 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -71,50 +71,48 @@ class Avatar extends StatelessWidget {
|
|||
borderRadius: borderRadius,
|
||||
side: border ?? BorderSide.none,
|
||||
),
|
||||
clipBehavior: Clip.hardEdge,
|
||||
child:
|
||||
// #Pangea
|
||||
(userId ?? presenceUserId) == BotName.byEnvironment
|
||||
? BotFace(
|
||||
width: size,
|
||||
expression: BotExpression.idle,
|
||||
useRive: useRive,
|
||||
)
|
||||
:
|
||||
clipBehavior: Clip.antiAlias,
|
||||
// #Pangea
|
||||
// child: noPic
|
||||
child: (userId ?? presenceUserId) == BotName.byEnvironment
|
||||
? BotFace(
|
||||
width: size,
|
||||
expression: BotExpression.idle,
|
||||
useRive: useRive,
|
||||
)
|
||||
: noPic
|
||||
// Pangea#
|
||||
|
||||
noPic
|
||||
? Container(
|
||||
decoration:
|
||||
BoxDecoration(color: name?.lightColorAvatar),
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
fallbackLetters,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'RobotoMono',
|
||||
color: Colors.white,
|
||||
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,
|
||||
),
|
||||
),
|
||||
? Container(
|
||||
decoration:
|
||||
BoxDecoration(color: name?.lightColorAvatar),
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
fallbackLetters,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'RobotoMono',
|
||||
color: Colors.white,
|
||||
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,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
// #Pangea
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue