From 089fee4c41dbbf30602126bb68a3a57f29d0b34f Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 10 Dec 2021 14:35:21 -0800 Subject: [PATCH] updates --- lib/settings.dart | 5 ----- lib/themes/cwtch.dart | 4 ++-- lib/themes/neon1.dart | 41 ++++++++++++++++++++--------------------- lib/themes/opaque.dart | 2 +- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/lib/settings.dart b/lib/settings.dart index 30c6a59d..c0863991 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -65,11 +65,6 @@ class Settings extends ChangeNotifier { handleUpdate(dynamic settings) { // Set Theme and notify listeners this.setTheme(settings["Theme"], settings["ThemeMode"] ?? mode_dark); - /*if (settings["Theme"] == "light") { - this.setLight(); - } else { - this.setDark(); - }*/ // Set Locale and notify listeners switchLocale(Locale(settings["Locale"])); diff --git a/lib/themes/cwtch.dart b/lib/themes/cwtch.dart index 8d904c36..7b272962 100644 --- a/lib/themes/cwtch.dart +++ b/lib/themes/cwtch.dart @@ -56,7 +56,7 @@ class CwtchDark extends OpaqueThemeType { get sendHintTextColor => mauvePurple; get hilightElementColor => purple; get defaultButtonColor => accent; //hotPink; - get defaultButtonActiveColor => pink; + //get defaultButtonActiveColor => pink; get defaultButtonTextColor => whiteishPurple; get defaultButtonDisabledColor => lightGrey; get defaultButtonDisabledTextColor => darkGreyPurple; @@ -102,7 +102,7 @@ class CwtchLight extends OpaqueThemeType { get sendHintTextColor => purple; get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable get defaultButtonColor => accent; // hotPink; - get defaultButtonActiveColor => pink; // todo: lighten in light, darken in dark + //get defaultButtonActiveColor => pink; // todo: lighten in light, darken in dark get defaultButtonTextColor => whitePurple; // ? get defaultButtonDisabledColor => softGrey; get textfieldBackgroundColor => purple; diff --git a/lib/themes/neon1.dart b/lib/themes/neon1.dart index f3b2a505..58e85443 100644 --- a/lib/themes/neon1.dart +++ b/lib/themes/neon1.dart @@ -1,6 +1,7 @@ import 'dart:ui'; import 'dart:core'; +import 'package:cwtch/themes/cwtch.dart'; import 'package:flutter/material.dart'; import 'opaque.dart'; @@ -34,7 +35,7 @@ OpaqueThemeType GetNeon1Theme(String mode) { } } -class Neon1Dark extends OpaqueThemeType { +class Neon1Dark extends CwtchDark { static final Color background = Color(0xFF290826); static final Color header = Color(0xFF290826); static final Color userBubble = Color(0xFFD20070); @@ -49,19 +50,18 @@ class Neon1Dark extends OpaqueThemeType { get backgroundMainColor => background; // darkGreyPurple; get backgroundPaneColor => header; //darkGreyPurple; - get backgroundHilightElementColor => deepPurple; + //get backgroundHilightElementColor => deepPurple; get mainTextColor => font; //whiteishPurple; - get sendHintTextColor => mauvePurple; - get hilightElementColor => purple; + //get sendHintTextColor => mauvePurple; + //get hilightElementColor => purple; get defaultButtonColor => accent; //hotPink; - get defaultButtonActiveColor => pink; - get defaultButtonTextColor => whiteishPurple; + /*get defaultButtonTextColor => whiteishPurple; get defaultButtonDisabledColor => lightGrey; get defaultButtonDisabledTextColor => darkGreyPurple; get textfieldBackgroundColor => deepPurple; - get textfieldBorderColor => deepPurple; + get textfieldBorderColor => deepPurple;*/ get textfieldHintColor => mainTextColor; //TODO pick - get textfieldErrorColor => hotPink; + /* get textfieldErrorColor => hotPink; get scrollbarDefaultColor => purple; get portraitBackgroundColor => deepPurple; get portraitOnlineBorderColor => whiteishPurple; @@ -72,7 +72,7 @@ class Neon1Dark extends OpaqueThemeType { get portraitContactBadgeTextColor => whiteishPurple; get portraitProfileBadgeColor => mauvePurple; get portraitProfileBadgeTextColor => darkGreyPurple; - get dropShadowColor => mauvePurple; + get dropShadowColor => mauvePurple;*/ get toolbarIconColor => settings; //whiteishPurple; get messageFromMeBackgroundColor => userBubble; // mauvePurple; get messageFromMeTextColor => font; //whiteishPurple; @@ -80,7 +80,7 @@ class Neon1Dark extends OpaqueThemeType { get messageFromOtherTextColor => font; //whiteishPurple; } -class Neon1Light extends OpaqueThemeType { +class Neon1Light extends CwtchLight { static final Color background = Color(0xFFFFFDFF); static final Color header = Color(0xFFFF94C2); static final Color userBubble = Color(0xFFFF94C2); @@ -95,29 +95,28 @@ class Neon1Light extends OpaqueThemeType { get backgroundMainColor => background; //whitePurple; get backgroundPaneColor => header; //softPurple; - get backgroundHilightElementColor => softPurple; + //get backgroundHilightElementColor => softPurple; get mainTextColor => settings; - get sendHintTextColor => purple; - get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable + //get sendHintTextColor => purple; + //get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable get defaultButtonColor => accent; // hotPink; - get defaultButtonActiveColor => pink; // todo: lighten in light, darken in dark - get defaultButtonTextColor => whitePurple; // ? + /*get defaultButtonTextColor => whitePurple; // ? get defaultButtonDisabledColor => softGrey; get textfieldBackgroundColor => purple; - get textfieldBorderColor => purple; + get textfieldBorderColor => purple; */ get textfieldHintColor => font; //TODO pick - get textfieldErrorColor => hotPink; + //get textfieldErrorColor => hotPink; get scrollbarDefaultColor => accent; - get portraitBackgroundColor => softPurple; + /*get portraitBackgroundColor => softPurple; get portraitOnlineBorderColor => greyPurple; get portraitOfflineBorderColor => greyPurple; get portraitBlockedBorderColor => softGrey; - get portraitBlockedTextColor => softGrey; + get portraitBlockedTextColor => softGrey;*/ get portraitContactBadgeColor => accent; - get portraitContactBadgeTextColor => whitePurple; + /*get portraitContactBadgeTextColor => whitePurple; get portraitProfileBadgeColor => brightPurple; get portraitProfileBadgeTextColor => whitePurple; - get dropShadowColor => purple; + get dropShadowColor => purple;*/ get toolbarIconColor => settings; //darkPurple; get messageFromMeBackgroundColor => userBubble; //brightPurple; get messageFromMeTextColor => font; //mainTextColor; diff --git a/lib/themes/opaque.dart b/lib/themes/opaque.dart index bd037c08..f75a6ba4 100644 --- a/lib/themes/opaque.dart +++ b/lib/themes/opaque.dart @@ -68,7 +68,7 @@ abstract class OpaqueThemeType { get sendHintTextColor => red; get defaultButtonColor => red; - get defaultButtonActiveColor => mode == mode_light ? lighten(defaultButtonColor) : darken(defaultButtonColor); + get defaultButtonActiveColor => mode == mode_light ? darken(defaultButtonColor) : lighten(defaultButtonColor); get defaultButtonTextColor => red; get defaultButtonDisabledColor => red; get textfieldBackgroundColor => red;