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

updates

This commit is contained in:
Dan Ballard 2021-12-10 14:35:21 -08:00
parent 53e79f5b9d
commit 089fee4c41
4 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/settings.dart
View File

@ -65,11 +65,6 @@ class Settings extends ChangeNotifier {
handleUpdate(dynamic settings) { handleUpdate(dynamic settings) {
// Set Theme and notify listeners // Set Theme and notify listeners
this.setTheme(settings["Theme"], settings["ThemeMode"] ?? mode_dark); this.setTheme(settings["Theme"], settings["ThemeMode"] ?? mode_dark);
/*if (settings["Theme"] == "light") {
this.setLight();
} else {
this.setDark();
}*/
// Set Locale and notify listeners // Set Locale and notify listeners
switchLocale(Locale(settings["Locale"])); switchLocale(Locale(settings["Locale"]));

4
lib/themes/cwtch.dart
View File

@ -56,7 +56,7 @@ class CwtchDark extends OpaqueThemeType {
get sendHintTextColor => mauvePurple; get sendHintTextColor => mauvePurple;
get hilightElementColor => purple; get hilightElementColor => purple;
get defaultButtonColor => accent; //hotPink; get defaultButtonColor => accent; //hotPink;
get defaultButtonActiveColor => pink; //get defaultButtonActiveColor => pink;
get defaultButtonTextColor => whiteishPurple; get defaultButtonTextColor => whiteishPurple;
get defaultButtonDisabledColor => lightGrey; get defaultButtonDisabledColor => lightGrey;
get defaultButtonDisabledTextColor => darkGreyPurple; get defaultButtonDisabledTextColor => darkGreyPurple;
@ -102,7 +102,7 @@ class CwtchLight extends OpaqueThemeType {
get sendHintTextColor => purple; get sendHintTextColor => purple;
get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable
get defaultButtonColor => accent; // hotPink; 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 defaultButtonTextColor => whitePurple; // ?
get defaultButtonDisabledColor => softGrey; get defaultButtonDisabledColor => softGrey;
get textfieldBackgroundColor => purple; get textfieldBackgroundColor => purple;

41
lib/themes/neon1.dart
View File

@ -1,6 +1,7 @@
import 'dart:ui'; import 'dart:ui';
import 'dart:core'; import 'dart:core';
import 'package:cwtch/themes/cwtch.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'opaque.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 background = Color(0xFF290826);
static final Color header = Color(0xFF290826); static final Color header = Color(0xFF290826);
static final Color userBubble = Color(0xFFD20070); static final Color userBubble = Color(0xFFD20070);
@ -49,19 +50,18 @@ class Neon1Dark extends OpaqueThemeType {
get backgroundMainColor => background; // darkGreyPurple; get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple; get backgroundPaneColor => header; //darkGreyPurple;
get backgroundHilightElementColor => deepPurple; //get backgroundHilightElementColor => deepPurple;
get mainTextColor => font; //whiteishPurple; get mainTextColor => font; //whiteishPurple;
get sendHintTextColor => mauvePurple; //get sendHintTextColor => mauvePurple;
get hilightElementColor => purple; //get hilightElementColor => purple;
get defaultButtonColor => accent; //hotPink; get defaultButtonColor => accent; //hotPink;
get defaultButtonActiveColor => pink; /*get defaultButtonTextColor => whiteishPurple;
get defaultButtonTextColor => whiteishPurple;
get defaultButtonDisabledColor => lightGrey; get defaultButtonDisabledColor => lightGrey;
get defaultButtonDisabledTextColor => darkGreyPurple; get defaultButtonDisabledTextColor => darkGreyPurple;
get textfieldBackgroundColor => deepPurple; get textfieldBackgroundColor => deepPurple;
get textfieldBorderColor => deepPurple; get textfieldBorderColor => deepPurple;*/
get textfieldHintColor => mainTextColor; //TODO pick get textfieldHintColor => mainTextColor; //TODO pick
get textfieldErrorColor => hotPink; /* get textfieldErrorColor => hotPink;
get scrollbarDefaultColor => purple; get scrollbarDefaultColor => purple;
get portraitBackgroundColor => deepPurple; get portraitBackgroundColor => deepPurple;
get portraitOnlineBorderColor => whiteishPurple; get portraitOnlineBorderColor => whiteishPurple;
@ -72,7 +72,7 @@ class Neon1Dark extends OpaqueThemeType {
get portraitContactBadgeTextColor => whiteishPurple; get portraitContactBadgeTextColor => whiteishPurple;
get portraitProfileBadgeColor => mauvePurple; get portraitProfileBadgeColor => mauvePurple;
get portraitProfileBadgeTextColor => darkGreyPurple; get portraitProfileBadgeTextColor => darkGreyPurple;
get dropShadowColor => mauvePurple; get dropShadowColor => mauvePurple;*/
get toolbarIconColor => settings; //whiteishPurple; get toolbarIconColor => settings; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple; get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple; get messageFromMeTextColor => font; //whiteishPurple;
@ -80,7 +80,7 @@ class Neon1Dark extends OpaqueThemeType {
get messageFromOtherTextColor => font; //whiteishPurple; get messageFromOtherTextColor => font; //whiteishPurple;
} }
class Neon1Light extends OpaqueThemeType { class Neon1Light extends CwtchLight {
static final Color background = Color(0xFFFFFDFF); static final Color background = Color(0xFFFFFDFF);
static final Color header = Color(0xFFFF94C2); static final Color header = Color(0xFFFF94C2);
static final Color userBubble = Color(0xFFFF94C2); static final Color userBubble = Color(0xFFFF94C2);
@ -95,29 +95,28 @@ class Neon1Light extends OpaqueThemeType {
get backgroundMainColor => background; //whitePurple; get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => header; //softPurple; get backgroundPaneColor => header; //softPurple;
get backgroundHilightElementColor => softPurple; //get backgroundHilightElementColor => softPurple;
get mainTextColor => settings; get mainTextColor => settings;
get sendHintTextColor => purple; //get sendHintTextColor => purple;
get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable //get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable
get defaultButtonColor => accent; // hotPink; get defaultButtonColor => accent; // hotPink;
get defaultButtonActiveColor => pink; // todo: lighten in light, darken in dark /*get defaultButtonTextColor => whitePurple; // ?
get defaultButtonTextColor => whitePurple; // ?
get defaultButtonDisabledColor => softGrey; get defaultButtonDisabledColor => softGrey;
get textfieldBackgroundColor => purple; get textfieldBackgroundColor => purple;
get textfieldBorderColor => purple; get textfieldBorderColor => purple; */
get textfieldHintColor => font; //TODO pick get textfieldHintColor => font; //TODO pick
get textfieldErrorColor => hotPink; //get textfieldErrorColor => hotPink;
get scrollbarDefaultColor => accent; get scrollbarDefaultColor => accent;
get portraitBackgroundColor => softPurple; /*get portraitBackgroundColor => softPurple;
get portraitOnlineBorderColor => greyPurple; get portraitOnlineBorderColor => greyPurple;
get portraitOfflineBorderColor => greyPurple; get portraitOfflineBorderColor => greyPurple;
get portraitBlockedBorderColor => softGrey; get portraitBlockedBorderColor => softGrey;
get portraitBlockedTextColor => softGrey; get portraitBlockedTextColor => softGrey;*/
get portraitContactBadgeColor => accent; get portraitContactBadgeColor => accent;
get portraitContactBadgeTextColor => whitePurple; /*get portraitContactBadgeTextColor => whitePurple;
get portraitProfileBadgeColor => brightPurple; get portraitProfileBadgeColor => brightPurple;
get portraitProfileBadgeTextColor => whitePurple; get portraitProfileBadgeTextColor => whitePurple;
get dropShadowColor => purple; get dropShadowColor => purple;*/
get toolbarIconColor => settings; //darkPurple; get toolbarIconColor => settings; //darkPurple;
get messageFromMeBackgroundColor => userBubble; //brightPurple; get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor; get messageFromMeTextColor => font; //mainTextColor;

2
lib/themes/opaque.dart
View File

@ -68,7 +68,7 @@ abstract class OpaqueThemeType {
get sendHintTextColor => red; get sendHintTextColor => red;
get defaultButtonColor => 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 defaultButtonTextColor => red;
get defaultButtonDisabledColor => red; get defaultButtonDisabledColor => red;
get textfieldBackgroundColor => red; get textfieldBackgroundColor => red;