clean up comments, delete old code, pr comments
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This commit is contained in:
parent
124694447b
commit
b29bb1e4dc
|
@ -24,8 +24,6 @@ final Color greyPurple = Color(0xFF775F84); // not in new: portrait borders
|
||||||
final Color pink = Color(0xFFE85DA1); // not in new: active button color
|
final Color pink = Color(0xFFE85DA1); // not in new: active button color
|
||||||
final Color hotPink = Color(0xFFD20070); // Color(0xFFD01972);
|
final Color hotPink = Color(0xFFD20070); // Color(0xFFD01972);
|
||||||
final Color softGrey = Color(0xFFB3B6B3); // not in new theme: blocked
|
final Color softGrey = Color(0xFFB3B6B3); // not in new theme: blocked
|
||||||
//static final Color softGreen = Color(0xFFA0FFB0);
|
|
||||||
//static final Color softRed = Color(0xFFFFA0B0);
|
|
||||||
|
|
||||||
OpaqueThemeType GetCwtchTheme(String mode) {
|
OpaqueThemeType GetCwtchTheme(String mode) {
|
||||||
if (mode == mode_dark) {
|
if (mode == mode_dark) {
|
||||||
|
@ -54,7 +52,6 @@ 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 defaultButtonTextColor => whiteishPurple;
|
get defaultButtonTextColor => whiteishPurple;
|
||||||
get defaultButtonDisabledColor => lightGrey;
|
get defaultButtonDisabledColor => lightGrey;
|
||||||
get defaultButtonDisabledTextColor => darkGreyPurple;
|
get defaultButtonDisabledTextColor => darkGreyPurple;
|
||||||
|
@ -99,7 +96,6 @@ 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 defaultButtonTextColor => whitePurple; // ?
|
get defaultButtonTextColor => whitePurple; // ?
|
||||||
get defaultButtonDisabledColor => softGrey;
|
get defaultButtonDisabledColor => softGrey;
|
||||||
get textfieldBackgroundColor => purple;
|
get textfieldBackgroundColor => purple;
|
||||||
|
|
|
@ -38,28 +38,6 @@ class Neon1Dark extends CwtchDark {
|
||||||
get messageFromMeTextColor => font; //whiteishPurple;
|
get messageFromMeTextColor => font; //whiteishPurple;
|
||||||
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
|
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
|
||||||
get messageFromOtherTextColor => font; //whiteishPurple;
|
get messageFromOtherTextColor => font; //whiteishPurple;
|
||||||
|
|
||||||
/*get backgroundHilightElementColor => deepPurple;
|
|
||||||
get sendHintTextColor => mauvePurple;
|
|
||||||
get hilightElementColor => purple;
|
|
||||||
get defaultButtonTextColor => whiteishPurple;
|
|
||||||
get defaultButtonDisabledColor => lightGrey;
|
|
||||||
get defaultButtonDisabledTextColor => darkGreyPurple;
|
|
||||||
get textfieldBackgroundColor => deepPurple;
|
|
||||||
get textfieldBorderColor => deepPurple;
|
|
||||||
get textfieldErrorColor => hotPink;
|
|
||||||
get scrollbarDefaultColor => purple;
|
|
||||||
get portraitBackgroundColor => deepPurple;
|
|
||||||
get portraitOnlineBorderColor => whiteishPurple;
|
|
||||||
get portraitOfflineBorderColor => purple;
|
|
||||||
get portraitBlockedBorderColor => lightGrey;
|
|
||||||
get portraitBlockedTextColor => lightGrey;
|
|
||||||
get portraitContactBadgeColor => hotPink;
|
|
||||||
get portraitContactBadgeTextColor => whiteishPurple;
|
|
||||||
get portraitProfileBadgeColor => mauvePurple;
|
|
||||||
get portraitProfileBadgeTextColor => darkGreyPurple;
|
|
||||||
get dropShadowColor => mauvePurple;*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Neon1Light extends CwtchLight {
|
class Neon1Light extends CwtchLight {
|
||||||
|
@ -86,22 +64,4 @@ class Neon1Light extends CwtchLight {
|
||||||
get messageFromMeTextColor => font; //mainTextColor;
|
get messageFromMeTextColor => font; //mainTextColor;
|
||||||
get messageFromOtherBackgroundColor => peerBubble; //purple;
|
get messageFromOtherBackgroundColor => peerBubble; //purple;
|
||||||
get messageFromOtherTextColor => font; //darkPurple;
|
get messageFromOtherTextColor => font; //darkPurple;
|
||||||
|
|
||||||
/*get backgroundHilightElementColor => softPurple;
|
|
||||||
get sendHintTextColor => purple;
|
|
||||||
get hilightElementColor => purple; //darkPurple; // todo shouldn't be this, too dark, makes font unreadable
|
|
||||||
get defaultButtonTextColor => whitePurple; // ?
|
|
||||||
get defaultButtonDisabledColor => softGrey;
|
|
||||||
get textfieldBackgroundColor => purple;
|
|
||||||
get textfieldBorderColor => purple;
|
|
||||||
get textfieldErrorColor => hotPink;
|
|
||||||
get portraitBackgroundColor => softPurple;
|
|
||||||
get portraitOnlineBorderColor => greyPurple;
|
|
||||||
get portraitOfflineBorderColor => greyPurple;
|
|
||||||
get portraitBlockedBorderColor => softGrey;
|
|
||||||
get portraitBlockedTextColor => softGrey;
|
|
||||||
get portraitContactBadgeTextColor => whitePurple;
|
|
||||||
get portraitProfileBadgeColor => brightPurple;
|
|
||||||
get portraitProfileBadgeTextColor => whitePurple;
|
|
||||||
get dropShadowColor => purple;*/
|
|
||||||
}
|
}
|
|
@ -34,8 +34,6 @@ class _AddEditServerViewState extends State<AddEditServerView> {
|
||||||
|
|
||||||
late bool usePassword;
|
late bool usePassword;
|
||||||
|
|
||||||
//late bool deleted;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
|
@ -92,7 +92,6 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
),
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
title: Text(AppLocalizations.of(context)!.themeColorLabel),
|
title: Text(AppLocalizations.of(context)!.themeColorLabel),
|
||||||
//AppLocalizations.of(context)!.settingTheme)),
|
|
||||||
trailing: DropdownButton<String>(
|
trailing: DropdownButton<String>(
|
||||||
value: Provider.of<Settings>(context).theme.theme,
|
value: Provider.of<Settings>(context).theme.theme,
|
||||||
onChanged: (String? newValue) {
|
onChanged: (String? newValue) {
|
||||||
|
|
Loading…
Reference in New Issue