2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up dark mode

Browse source
This commit is contained in:
Christian Pauly 2020-02-16 20:11:39 +01:00
commit ea71a97e45
8 changed files with 65 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/views/chat_details.dart
View file

@ -202,7 +202,12 @@ class _ChatDetailsState extends State<ChatDetails> {
ChatSettingsPopupMenu(widget.room, false)
],
title: Text(widget.room.getLocalizedDisplayname(context),
style: TextStyle(color: Colors.black)),
style: TextStyle(
color: Theme.of(context)
.appBarTheme
.textTheme
.headline6
.color)),
backgroundColor: Theme.of(context).appBarTheme.color,
flexibleSpace: FlexibleSpaceBar(
background: ContentBanner(widget.room.avatar,
@ -221,7 +226,8 @@ class _ChatDetailsState extends State<ChatDetails> {
ListTile(
leading: widget.room.canSendEvent("m.room.topic")
? CircleAvatar(
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey,
child: Icon(Icons.edit),
)
@ -257,7 +263,8 @@ class _ChatDetailsState extends State<ChatDetails> {
if (widget.room.canSendEvent("m.room.name"))
ListTile(
leading: CircleAvatar(
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey,
child: Icon(Icons.people),
),
@ -270,7 +277,8 @@ class _ChatDetailsState extends State<ChatDetails> {
widget.room.joinRules == JoinRules.public)
ListTile(
leading: CircleAvatar(
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey,
child: Icon(Icons.link),
),
@ -284,7 +292,8 @@ class _ChatDetailsState extends State<ChatDetails> {
PopupMenuButton(
child: ListTile(
leading: CircleAvatar(
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey,
child: Icon(Icons.public)),
title: Text(
@ -316,7 +325,8 @@ class _ChatDetailsState extends State<ChatDetails> {
PopupMenuButton(
child: ListTile(
leading: CircleAvatar(
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey,
child: Icon(Icons.visibility),
),
@ -363,7 +373,8 @@ class _ChatDetailsState extends State<ChatDetails> {
PopupMenuButton(
child: ListTile(
leading: CircleAvatar(
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey,
child: Icon(Icons.info_outline),
),
@ -436,7 +447,8 @@ class _ChatDetailsState extends State<ChatDetails> {
title: Text(I18n.of(context).loadCountMoreParticipants(
(actualMembersCount - members.length).toString())),
leading: CircleAvatar(
backgroundColor: Colors.white,
backgroundColor:
Theme.of(context).scaffoldBackgroundColor,
child: Icon(
Icons.refresh,
color: Colors.grey,

2
lib/views/chat_list.dart
View file

@ -8,7 +8,7 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
import 'package:toast/toast.dart';
import 'package:uni_links/uni_links.dart';
import '../components/ThemeSwitcher.dart';
import '../components/theme_switcher.dart';
import '../components/adaptive_page_layout.dart';
import '../components/list_items/chat_list_item.dart';
import '../components/matrix.dart';

11
lib/views/settings.dart
View file

@ -114,8 +114,15 @@ class _SettingsState extends State<Settings> {
pinned: true,
backgroundColor: Theme.of(context).appBarTheme.color,
flexibleSpace: FlexibleSpaceBar(
title: Text(I18n.of(context).settings,
style: TextStyle(color: Colors.black)),
title: Text(
I18n.of(context).settings,
style: TextStyle(
color: Theme.of(context)
.appBarTheme
.textTheme
.headline6
.color),
),
background: ContentBanner(
profile?.avatarUrl ?? MxContent(""),
height: 300,

4
lib/views/settings_themes.dart
View file

@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import '../components/ThemeSwitcher.dart';
import '../components/theme_switcher.dart';
import '../components/adaptive_page_layout.dart';
import '../components/matrix.dart';
import '../i18n/i18n.dart';
@ -82,7 +82,7 @@ class ThemesSettingsState extends State<ThemesSettings> {
});
},
),
Divider(thickness: 8),
Divider(thickness: 1),
ListTile(
title: Text(
I18n.of(context).useAmoledTheme,