GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/pinned-events-high' into 'main' 

fix: Hide pinned events if event is not accessable or loading

See merge request famedly/fluffychat!800
This commit is contained in:
Krille Fear 2022-04-03 06:35:49 +00:00
parent 2f1dc8dc15 d1117e152e
commit fd248aad53
1 changed files with 58 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/pages/chat/pinned_events.dart
View File

@ -60,9 +60,11 @@ class PinnedEvents extends StatelessWidget {
? snapshot.data?.last ? snapshot.data?.last
: null; : null;
if (event != null && pinnedEvents != null) { if (event == null || pinnedEvents == null) {
final fontSize = return Container();
AppConfig.messageFontSize * AppConfig.fontSizeFactor; }
final fontSize = AppConfig.messageFontSize * AppConfig.fontSizeFactor;
return Material( return Material(
color: Theme.of(context).appBarTheme.backgroundColor, color: Theme.of(context).appBarTheme.backgroundColor,
elevation: Theme.of(context).appBarTheme.elevation ?? 10, elevation: Theme.of(context).appBarTheme.elevation ?? 10,
@ -120,22 +122,6 @@ class PinnedEvents extends StatelessWidget {
), ),
), ),
); );
} else if (snapshot.hasError) {
Logs().e('Error loading pinned events.', snapshot.error);
return ListTile(
tileColor: Theme.of(context).secondaryHeaderColor,
title: Text(L10n.of(context)!.pinnedEventsError));
} else {
return ListTile(
tileColor: Theme.of(context).secondaryHeaderColor,
title: const Center(
child: SizedBox.square(
dimension: 24,
child: CircularProgressIndicator(),
),
),
);
}
}); });
} }
} }