From b29bb1e4dcd742c855941888bcae6200de05fe34 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 15 Dec 2021 15:28:49 -0500 Subject: [PATCH] clean up comments, delete old code, pr comments --- lib/themes/cwtch.dart | 4 ---- lib/themes/neon1.dart | 40 ------------------------------- lib/views/addeditservers.dart | 2 -- lib/views/globalsettingsview.dart | 1 - 4 files changed, 47 deletions(-) diff --git a/lib/themes/cwtch.dart b/lib/themes/cwtch.dart index 470ad617..d0f0b64c 100644 --- a/lib/themes/cwtch.dart +++ b/lib/themes/cwtch.dart @@ -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 hotPink = Color(0xFFD20070); // Color(0xFFD01972); 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) { if (mode == mode_dark) { @@ -54,7 +52,6 @@ class CwtchDark extends OpaqueThemeType { get sendHintTextColor => mauvePurple; get hilightElementColor => purple; get defaultButtonColor => accent; //hotPink; - //get defaultButtonActiveColor => pink; get defaultButtonTextColor => whiteishPurple; get defaultButtonDisabledColor => lightGrey; get defaultButtonDisabledTextColor => darkGreyPurple; @@ -99,7 +96,6 @@ 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 defaultButtonTextColor => whitePurple; // ? get defaultButtonDisabledColor => softGrey; get textfieldBackgroundColor => purple; diff --git a/lib/themes/neon1.dart b/lib/themes/neon1.dart index 196fcbf9..cc8e6adc 100644 --- a/lib/themes/neon1.dart +++ b/lib/themes/neon1.dart @@ -38,28 +38,6 @@ class Neon1Dark extends CwtchDark { get messageFromMeTextColor => font; //whiteishPurple; get messageFromOtherBackgroundColor => peerBubble; //deepPurple; 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 { @@ -86,22 +64,4 @@ class Neon1Light extends CwtchLight { get messageFromMeTextColor => font; //mainTextColor; get messageFromOtherBackgroundColor => peerBubble; //purple; 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;*/ } \ No newline at end of file diff --git a/lib/views/addeditservers.dart b/lib/views/addeditservers.dart index 1138dcdb..d2d0af22 100644 --- a/lib/views/addeditservers.dart +++ b/lib/views/addeditservers.dart @@ -34,8 +34,6 @@ class _AddEditServerViewState extends State { late bool usePassword; - //late bool deleted; - @override void initState() { super.initState(); diff --git a/lib/views/globalsettingsview.dart b/lib/views/globalsettingsview.dart index d11847f6..000ed444 100644 --- a/lib/views/globalsettingsview.dart +++ b/lib/views/globalsettingsview.dart @@ -92,7 +92,6 @@ class _GlobalSettingsViewState extends State { ), ListTile( title: Text(AppLocalizations.of(context)!.themeColorLabel), - //AppLocalizations.of(context)!.settingTheme)), trailing: DropdownButton( value: Provider.of(context).theme.theme, onChanged: (String? newValue) {