cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

Light Theme Fixes #162
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Sarah Jamie Lewis 2021-09-21 13:31:11 -07:00
parent c1aee0d128
commit 539b93836a
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cwtch/cwtchNotifier.dart
View File

@ -307,6 +307,8 @@ class CwtchNotifier {
if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]) != null) { if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]) != null) {
profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.isArchived = data["Data"] == "true"; profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.isArchived = data["Data"] == "true";
} }
} else if (data["Key"] == "LastKnowSignature") {
// group syncing information that isn't relevant to the UI...
} else { } else {
EnvironmentConfig.debugLog("unhandled set peer attribute event: ${data['Key']}"); EnvironmentConfig.debugLog("unhandled set peer attribute event: ${data['Key']}");
} }

11
lib/opaque.dart
View File

@ -630,7 +630,7 @@ class OpaqueLight extends OpaqueThemeType {
static final Color whitePurple = Color(0xFFFFFDFF); static final Color whitePurple = Color(0xFFFFFDFF);
static final Color softPurple = Color(0xFFFDF3FC); static final Color softPurple = Color(0xFFFDF3FC);
static final Color purple = Color(0xFFDFB9DE); static final Color purple = Color(0xFFDFB9DE);
static final Color brightPurple = Color(0xFF760388); static final Color brightPurple = Color(0xFFD1B0E0);
static final Color darkPurple = Color(0xFF350052); static final Color darkPurple = Color(0xFF350052);
static final Color greyPurple = Color(0xFF775F84); static final Color greyPurple = Color(0xFF775F84);
static final Color pink = Color(0xFFE85DA1); static final Color pink = Color(0xFFE85DA1);
@ -900,11 +900,11 @@ class OpaqueLight extends OpaqueThemeType {
} }
Color messageFromMeBackgroundColor() { Color messageFromMeBackgroundColor() {
return darkPurple; return brightPurple;
} }
Color messageFromMeTextColor() { Color messageFromMeTextColor() {
return whitePurple; return mainTextColor();
} }
Color messageFromOtherBackgroundColor() { Color messageFromOtherBackgroundColor() {
@ -948,11 +948,14 @@ ThemeData mkThemeData(Settings opaque) {
backgroundColor: opaque.current().backgroundMainColor(), backgroundColor: opaque.current().backgroundMainColor(),
highlightColor: opaque.current().hilightElementTextColor(), highlightColor: opaque.current().hilightElementTextColor(),
iconTheme: IconThemeData( iconTheme: IconThemeData(
color: opaque.current().mainTextColor(), color: opaque.current().toolbarIconColor(),
), ),
cardColor: opaque.current().backgroundMainColor(), cardColor: opaque.current().backgroundMainColor(),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
backgroundColor: opaque.current().backgroundPaneColor(), backgroundColor: opaque.current().backgroundPaneColor(),
iconTheme: IconThemeData(
color: opaque.current().mainTextColor(),
),
titleTextStyle: TextStyle( titleTextStyle: TextStyle(
color: opaque.current().mainTextColor(), color: opaque.current().mainTextColor(),
), ),

2
lib/views/messageview.dart
View File

@ -236,7 +236,7 @@ class _MessageViewState extends State<MessageView> {
focusedBorder: InputBorder.none, focusedBorder: InputBorder.none,
enabled: true, enabled: true,
suffixIcon: ElevatedButton( suffixIcon: ElevatedButton(
child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()), child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.defaultButtonTextColor()),
onPressed: isOffline ? null : _sendMessage, onPressed: isOffline ? null : _sendMessage,
))), ))),
)))), )))),

1
lib/views/profilemgrview.dart
View File

@ -51,6 +51,7 @@ class _ProfileMgrViewState extends State<ProfileMgrView> {
Icon( Icon(
CwtchIcons.cwtch_knott, CwtchIcons.cwtch_knott,
size: 36, size: 36,
color: settings.theme.mainTextColor(),
), ),
SizedBox( SizedBox(
width: 10, width: 10,