Fix debug theme bug + message timestamps.
continuous-integration/drone/pr Build is failing
Details
continuous-integration/drone/pr Build is failing
Details
This commit is contained in:
parent
3aadd1f413
commit
c32164b61b
|
@ -1357,7 +1357,6 @@ ThemeData mkThemeData(Settings opaque) {
|
|||
),
|
||||
cardColor: opaque.current().backgroundMainColor(),
|
||||
appBarTheme: AppBarTheme(
|
||||
color: opaque.current().mainTextColor(),
|
||||
backgroundColor: opaque.current().backgroundPaneColor(),
|
||||
titleTextStyle: TextStyle(
|
||||
color: opaque.current().mainTextColor(),
|
||||
|
|
|
@ -22,17 +22,14 @@ class MessageBubbleState extends State<MessageBubble> {
|
|||
|
||||
if (Provider.of<MessageState>(context).timestamp != null) {
|
||||
// user-configurable timestamps prolly ideal? #todo
|
||||
prettyDate = DateFormat.yMd().add_jm().format(Provider.of<MessageState>(context).timestamp);
|
||||
DateTime messageDate = Provider.of<MessageState>(context).timestamp;
|
||||
prettyDate = DateFormat.yMd().add_jm().format(messageDate.toLocal());
|
||||
}
|
||||
|
||||
var senderDisplayStr = "";
|
||||
if (Provider.of<MessageState>(context).senderOnion != null) {
|
||||
var contact = Provider.of<ProfileInfoState>(context).contactList.getContact(Provider.of<MessageState>(context).senderOnion);
|
||||
if (contact == null) {
|
||||
senderDisplayStr = Provider.of<MessageState>(context).senderOnion;
|
||||
} else {
|
||||
senderDisplayStr = contact.nickname;
|
||||
}
|
||||
senderDisplayStr = contact.nickname;
|
||||
}
|
||||
var wdgSender = SelectableText(senderDisplayStr,
|
||||
style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()));
|
||||
|
|
Loading…
Reference in New Issue