Disconnected and Ephemeral Warnings
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Sarah Jamie Lewis 2021-06-04 13:17:40 -07:00
parent a41e6f12b0
commit dcefa30580
8 changed files with 32 additions and 15 deletions

View File

@ -17,6 +17,7 @@
"builddate": "Aufgebaut auf: %2",
"bulletinsBtn": "Meldungen",
"chatBtn": "Chat",
"chatHistoryDefault": "",
"contactAlreadyExists": "",
"conversationSettings": "",
"copiedClipboardNotification": "in die Zwischenablage kopiert",

View File

@ -17,6 +17,7 @@
"builddate": "Built on: %2",
"bulletinsBtn": "Bulletins",
"chatBtn": "Chat",
"chatHistoryDefault": "This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.",
"contactAlreadyExists": "Contact Already Exists",
"conversationSettings": "Conversation Settings",
"copiedClipboardNotification": "Copied to clipboard",

View File

@ -17,6 +17,7 @@
"builddate": "Basado en: %2",
"bulletinsBtn": "Boletines",
"chatBtn": "Chat",
"chatHistoryDefault": "",
"contactAlreadyExists": "",
"conversationSettings": "",
"copiedClipboardNotification": "Copiado al portapapeles",

View File

@ -17,6 +17,7 @@
"builddate": "",
"bulletinsBtn": "Bulletins",
"chatBtn": "Discuter",
"chatHistoryDefault": "",
"contactAlreadyExists": "",
"conversationSettings": "",
"copiedClipboardNotification": "Copié dans le presse-papier",

View File

@ -17,6 +17,7 @@
"builddate": "Costruito il: %2",
"bulletinsBtn": "Bollettini",
"chatBtn": "Chat",
"chatHistoryDefault": "",
"contactAlreadyExists": "",
"conversationSettings": "",
"copiedClipboardNotification": "Copiato negli Appunti",

View File

@ -17,6 +17,7 @@
"builddate": "",
"bulletinsBtn": "Boletins",
"chatBtn": "Chat",
"chatHistoryDefault": "",
"contactAlreadyExists": "",
"conversationSettings": "",
"copiedClipboardNotification": "Copiado",

View File

@ -1357,14 +1357,14 @@ ThemeData mkThemeData(Settings opaque) {
),
cardColor: opaque.current().backgroundMainColor(),
appBarTheme: AppBarTheme(
backgroundColor: opaque.current().backgroundPaneColor(),
titleTextStyle: TextStyle(
color: opaque.current().mainTextColor(),
),
actionsIconTheme: IconThemeData(
color: opaque.current().mainTextColor(),
),
),
backgroundColor: opaque.current().backgroundPaneColor(),
titleTextStyle: TextStyle(
color: opaque.current().mainTextColor(),
),
actionsIconTheme: IconThemeData(
color: opaque.current().mainTextColor(),
)),
bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor()),
textButtonTheme: TextButtonThemeData(
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor()),

View File

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import '../model.dart';
import '../settings.dart';
import 'messagerow.dart';
@ -17,10 +17,21 @@ class _MessageListState extends State<MessageList> {
Widget build(BuildContext outerContext) {
return RepaintBoundary(
child: Container(
child: Scrollbar(
isAlwaysShown: true,
controller: ctrlr1,
child: Container(
child: Column(children: [
Visibility(
visible: Provider.of<ContactInfoState>(context).isOnline() == false || Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory",
child: Container(
padding: EdgeInsets.all(5.0),
color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
child: Provider.of<ContactInfoState>(context).isOnline() == false
? Text(Provider.of<ContactInfoState>(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage)
: (Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory" ? Text(AppLocalizations.of(context)!.chatHistoryDefault) : Text("")),
)),
Expanded(
child: Scrollbar(
isAlwaysShown: true,
controller: ctrlr1,
child: Container(
// Only show broken heart is the contact is offline...
decoration: BoxDecoration(
image: Provider.of<ContactInfoState>(outerContext).isOnline()
@ -51,7 +62,7 @@ class _MessageListState extends State<MessageList> {
return RepaintBoundary(child: MessageRow(key: Provider.of<ContactInfoState>(bcontext).getMessageKey(idx)));
});
},
),
))));
))))
])));
}
}