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

69 nice theme fixes #590

Merged
sarah merged 4 commits from 69nicefixes into trunk 2022-12-06 00:33:23 +00:00
Conversation 1 Commits 4 Files Changed 13 +216 -151
13 changed files with 216 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
lib/themes/cwtch.dart
View File

@ -45,37 +45,37 @@ class CwtchDark extends OpaqueThemeType {
get theme => cwtch_theme;
get mode => mode_dark;
get backgroundHilightElementColor => deepPurple;
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get backgroundHilightElementColor => deepPurple;
get mainTextColor => font; //whiteishPurple;
get sendHintTextColor => mauvePurple;
get hilightElementColor => purple;
get defaultButtonColor => accent; //hotPink;
get defaultButtonTextColor => whiteishPurple;
get defaultButtonDisabledColor => lightGrey;
get defaultButtonDisabledTextColor => darkGreyPurple;
get textfieldBackgroundColor => deepPurple;
get textfieldBorderColor => deepPurple;
get textfieldHintColor => mainTextColor; //TODO pick
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 => hotPink;
get portraitProfileBadgeTextColor => whiteishPurple;
get defaultButtonTextColor => whiteishPurple;
get dropShadowColor => mauvePurple;
get toolbarIconColor => settings; //whiteishPurple;
get hilightElementColor => purple;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get portraitBackgroundColor => deepPurple;
get portraitBlockedBorderColor => lightGrey;
get portraitBlockedTextColor => lightGrey;
get portraitContactBadgeColor => hotPink;
get portraitContactBadgeTextColor => whiteishPurple;
get portraitOfflineBorderColor => purple;
get portraitOnlineBorderColor => whiteishPurple;
get portraitProfileBadgeColor => hotPink;
get portraitProfileBadgeTextColor => whiteishPurple;
get scrollbarDefaultColor => purple;
get sendHintTextColor => mauvePurple;
get textfieldBackgroundColor => deepPurple;
get textfieldBorderColor => deepPurple;
get textfieldErrorColor => hotPink;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class CwtchLight extends OpaqueThemeType {
@ -90,34 +90,34 @@ class CwtchLight extends OpaqueThemeType {
get theme => cwtch_theme;
get mode => mode_light;
get backgroundHilightElementColor => softPurple;
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //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 defaultButtonColor => accent; // hotPink;
get defaultButtonTextColor => whitePurple; // ?
get defaultButtonDisabledColor => softGrey;
get textfieldBackgroundColor => purple;
get textfieldBorderColor => purple;
get textfieldHintColor => font; //TODO pick
get textfieldErrorColor => hotPink;
get scrollbarDefaultColor => accent;
get portraitBackgroundColor => softPurple;
get portraitOnlineBorderColor => greyPurple;
get portraitOfflineBorderColor => greyPurple;
get portraitBlockedBorderColor => softGrey;
get portraitBlockedTextColor => softGrey;
get portraitContactBadgeColor => accent;
get portraitContactBadgeTextColor => whitePurple;
get portraitProfileBadgeColor => accent;
get portraitProfileBadgeTextColor => whitePurple;
get defaultButtonTextColor => whitePurple; // ?
get dropShadowColor => purple;
get toolbarIconColor => settings; //darkPurple;
get hilightElementColor => purple;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitBackgroundColor => softPurple;
get portraitBlockedBorderColor => softGrey;
get portraitBlockedTextColor => softGrey;
get portraitContactBadgeColor => accent;
get portraitContactBadgeTextColor => whitePurple;
get portraitOfflineBorderColor => greyPurple;
get portraitOnlineBorderColor => greyPurple;
get portraitProfileBadgeColor => accent;
get portraitProfileBadgeTextColor => whitePurple;
get scrollbarDefaultColor => accent;
get sendHintTextColor => purple;
get textfieldBackgroundColor => purple;
get textfieldBorderColor => purple;
get textfieldErrorColor => hotPink;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple;
}

80
lib/themes/ghost.dart
View File

@ -17,53 +17,73 @@ OpaqueThemeType GetGhostTheme(String mode) {
}
class GhostDark extends CwtchDark {
static final Color darkBlue = Color(0xFF000051);
static final Color lightBlue = Color(0xFF1A237E);
static final Color background = Color(0xFF0D0D1F);
static final Color header = Color(0xFF0D0D1F);
static final Color userBubble = Color(0xFF1A237E);
static final Color peerBubble = Color(0xFF000051);
static final Color font = Color(0xFFFFFFFF);
static final Color userBubble = lightBlue;
static final Color peerBubble = darkBlue;
static final Color font = Colors.white;
static final Color settings = Color(0xFFFDFFFD);
static final Color accent = Color(0xFFD20070);
static final Color accent = lightBlue;//Color(0xFFD20070);
get theme => ghost_theme;
get mode => mode_dark;
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get backgroundHilightElementColor => darkBlue;
get backgroundMainColor => background;
get backgroundPaneColor => header;
get defaultButtonColor => accent;
get dropShadowColor => GhostLight.darkBlue;
get mainTextColor => font;
get messageFromMeBackgroundColor => userBubble;
get messageFromMeTextColor => font;
get messageFromOtherBackgroundColor => peerBubble;
get messageFromOtherTextColor => font;
get scrollbarDefaultColor => lightBlue;
get sendHintTextColor => GhostLight.darkBlue;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings;
get topbarColor => header;
}
class GhostLight extends CwtchLight {
static final Color darkBlue = Color(0xFFAAB6FE);
static final Color lighterDarkBlue = Color(0xFFc3ccfe);
static final Color lightBlue = Color(0xFFE8EAF6);
static final Color background = Color(0xFFFDFDFF);
static final Color header = Color(0xFFAAB6FE);
static final Color userBubble = Color(0xFFAAB6FE);
static final Color peerBubble = Color(0xFFE8EAF6);
static final Color header = darkBlue;
static final Color userBubble = darkBlue;
static final Color peerBubble = lightBlue;
static final Color font = Color(0xFF0D0D1F);
static final Color settings = Color(0xFF0D0D1F);
static final Color accent = Color(0xFFD20070);
static final Color accent = darkBlue;
get theme => ghost_theme;
get mode => mode_light;
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple;
get backgroundHilightElementColor => peerBubble;
get backgroundMainColor => background;
get backgroundPaneColor => background;
get defaultButtonColor => accent;
get defaultButtonActiveColor => lighterDarkBlue;
get defaultButtonDisabledColor => peerBubble;
get dropShadowColor => darkBlue;
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get messageFromMeBackgroundColor => userBubble;
get messageFromMeTextColor => font;
get messageFromOtherBackgroundColor => peerBubble;
get messageFromOtherTextColor => font;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get scrollbarDefaultColor => accent;
get sendHintTextColor => lightBlue;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => font;
get toolbarIconColor => settings;
get topbarColor => header;
}

32
lib/themes/mermaid.dart
View File

@ -17,28 +17,34 @@ OpaqueThemeType GetMermaidTheme(String mode) {
}
class MermaidDark extends CwtchDark {
static final Color lavender = Color(0xFFB194C1);
static final Color background = Color(0xFF102426);
static final Color header = Color(0xFF102426);
static final Color userBubble = Color(0xFF00838F);
static final Color peerBubble = Color(0xFF00363A);
static final Color font = Color(0xFFFFFFFF);
static final Color font = Colors.white;
static final Color settings = Color(0xFFF7FCFD);
static final Color accent = Color(0xFF8E64A5);
get theme => mermaid_theme;
get mode => mode_dark;
get backgroundHilightElementColor => peerBubble;
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get dropShadowColor => lavender;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class MermaidLight extends CwtchLight {
@ -53,17 +59,21 @@ class MermaidLight extends CwtchLight {
get theme => mermaid_theme;
get mode => mode_light;
get backgroundHilightElementColor => peerBubble;
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple;
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get dropShadowColor => peerBubble;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitContactBadgeColor => accent;
get scrollbarDefaultColor => accent;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple;
}

30
lib/themes/midnight.dart
View File

@ -17,6 +17,7 @@ OpaqueThemeType GetMidnightTheme(String mode) {
}
class MidnightDark extends CwtchDark {
static final Color accentGray = Color(0xFFE0E0E0);
static final Color background = Color(0xFF1B1B1B);
static final Color backgroundAlt = Color(0xFF494949);
static final Color header = Color(0xFF1B1B1B);
@ -29,24 +30,26 @@ class MidnightDark extends CwtchDark {
get theme => midnight_theme;
get mode => mode_dark;
get backgroundHilightElementColor => backgroundAlt;
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get dropShadowColor => accentGray;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get scrollbarDefaultColor => accentGray;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get backgroundHilightElementColor => backgroundAlt;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class MidnightLight extends CwtchLight {
static final Color background = Color(0xFFFFFDFF);
static final Color background = Color(0xFFFBFBFB);//Color(0xFFFFFDFF);
static final Color header = Color(0xFFE0E0E0);
static final Color userBubble = Color(0xFFE0E0E0);
static final Color peerBubble = Color(0xFFBABDBE);
@ -57,18 +60,21 @@ class MidnightLight extends CwtchLight {
get theme => midnight_theme;
get mode => mode_light;
get backgroundHilightElementColor => peerBubble;
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple;
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitContactBadgeColor => accent;
get portraitOfflineBorderColor => peerBubble;
get portraitOnlineBorderColor => font;
get scrollbarDefaultColor => accent;
get textfieldBackgroundColor => userBubble;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple;
}

26
lib/themes/neon1.dart
View File

@ -30,15 +30,16 @@ class Neon1Dark extends CwtchDark {
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get scrollbarDefaultColor => accent;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class Neon1Light extends CwtchLight {
@ -55,15 +56,20 @@ class Neon1Light extends CwtchLight {
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get dropShadowColor => userBubble;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitContactBadgeColor => accent;
get portraitOfflineBorderColor => peerBubble;
get portraitOnlineBorderColor => font;
get scrollbarDefaultColor => accent;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple
}

28
lib/themes/neon2.dart
View File

@ -30,18 +30,21 @@ class Neon2Dark extends CwtchDark {
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get scrollbarDefaultColor => accent;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class Neon2Light extends CwtchLight {
static final Color paleGreen = Color(0xFFE7F6F6);
static final Color background = Color(0xFFFFFDFF);
static final Color header = Color(0xFFD8C7E1);
static final Color userBubble = Color(0xFFD8C7E1);
@ -55,15 +58,20 @@ class Neon2Light extends CwtchLight {
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple;
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get dropShadowColor => userBubble;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitContactBadgeColor => accent;
get portraitOfflineBorderColor => peerBubble;
get portraitOnlineBorderColor => font;
get scrollbarDefaultColor => accent;
get textfieldBackgroundColor => paleGreen;
get textfieldBorderColor => peerBubble;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple;
}

3
lib/themes/opaque.dart
View File

@ -28,8 +28,8 @@ final themes = {
neon1_theme: {mode_light: Neon1Light(), mode_dark: Neon1Dark()},
neon2_theme: {mode_light: Neon2Light(), mode_dark: Neon2Dark()},
pumpkin_theme: {mode_light: PumpkinLight(), mode_dark: PumpkinDark()},
witch_theme: {mode_light: WitchLight(), mode_dark: WitchDark()},
vampire_theme: {mode_light: VampireLight(), mode_dark: VampireDark()},
witch_theme: {mode_light: WitchLight(), mode_dark: WitchDark()},
};
OpaqueThemeType getTheme(String themeId, String mode) {
@ -125,6 +125,7 @@ abstract class OpaqueThemeType {
ThemeData mkThemeData(Settings opaque) {
return ThemeData(
hoverColor: opaque.current().backgroundHilightElementColor.withOpacity(0.5),
visualDensity: VisualDensity.adaptivePlatformDensity,
primarySwatch: Colors.red,
primaryIconTheme: IconThemeData(

21
lib/themes/pumpkin.dart
View File

@ -30,15 +30,15 @@ class PumpkinDark extends CwtchDark {
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class PumpkinLight extends CwtchLight {
@ -55,15 +55,16 @@ class PumpkinLight extends CwtchLight {
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple;
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get dropShadowColor => peerBubble;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitContactBadgeColor => accent;
get scrollbarDefaultColor => accent;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple;
}

24
lib/themes/vampire.dart
View File

@ -30,15 +30,16 @@ class VampireDark extends CwtchDark {
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get scrollbarDefaultColor => accent;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class VampireLight extends CwtchLight {
@ -55,15 +56,18 @@ class VampireLight extends CwtchLight {
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple;
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get dropShadowColor => userBubble;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitContactBadgeColor => accent;
get scrollbarDefaultColor => accent;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple;
}

27
lib/themes/witch.dart
View File

@ -28,17 +28,21 @@ class WitchDark extends CwtchDark {
get theme => witch_theme;
get mode => mode_dark;
get backgroundHilightElementColor => peerBubble;
get backgroundMainColor => background; // darkGreyPurple;
get backgroundPaneColor => header; //darkGreyPurple;
get topbarColor => header; //darkGreyPurple;
get mainTextColor => font; //whiteishPurple;
get defaultButtonColor => accent; //hotPink;
get textfieldHintColor => mainTextColor; //TODO pick
get toolbarIconColor => settings; //whiteishPurple;
get mainTextColor => font; //whiteishPurple;
get messageFromMeBackgroundColor => userBubble; // mauvePurple;
get messageFromMeTextColor => font; //whiteishPurple;
get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
get messageFromOtherTextColor => font; //whiteishPurple;
get scrollbarDefaultColor => accent;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => mainTextColor;
get toolbarIconColor => settings; //whiteishPurple;
get topbarColor => header; //darkGreyPurple;
}
class WitchLight extends CwtchLight {
@ -53,17 +57,20 @@ class WitchLight extends CwtchLight {
get theme => witch_theme;
get mode => mode_light;
get backgroundHilightElementColor => peerBubble;
get backgroundMainColor => background; //whitePurple;
get backgroundPaneColor => background; //whitePurple;
get topbarColor => header; //softPurple;
get mainTextColor => settings;
get defaultButtonColor => accent; // hotPink;
get textfieldHintColor => font; //TODO pick
get scrollbarDefaultColor => accent;
get portraitContactBadgeColor => accent;
get toolbarIconColor => settings; //darkPurple;
get mainTextColor => settings;
get messageFromMeBackgroundColor => userBubble; //brightPurple;
get messageFromMeTextColor => font; //mainTextColor;
get messageFromOtherBackgroundColor => peerBubble; //purple;
get messageFromOtherTextColor => font; //darkPurple;
get portraitContactBadgeColor => accent;
get scrollbarDefaultColor => accent;
get textfieldBackgroundColor => peerBubble;
get textfieldBorderColor => userBubble;
get textfieldHintColor => font;
get toolbarIconColor => settings; //darkPurple;
get topbarColor => header; //softPurple;
}

9
lib/views/contactsview.dart
View File

@ -85,6 +85,7 @@ void _pushMessageView(BuildContext context, int handle) {
class _ContactsViewState extends State<ContactsView> {
late TextEditingController ctrlrFilter;
bool showSearchBar = false;
final scaffoldKey = GlobalKey<ScaffoldMessengerState>();
@override
void initState() {
@ -94,7 +95,7 @@ class _ContactsViewState extends State<ContactsView> {
@override
Widget build(BuildContext context) {
return Scaffold(
return ScaffoldMessenger(key: scaffoldKey, child: Scaffold(
endDrawerEnableOpenDragGesture: false,
drawerEnableOpenDragGesture: false,
appBar: AppBar(
@ -157,7 +158,7 @@ class _ContactsViewState extends State<ContactsView> {
color: Provider.of<Settings>(context).theme.defaultButtonTextColor,
),
),
body: showSearchBar || Provider.of<ContactListState>(context).isFiltered ? _buildFilterable() : _buildContactList());
body: showSearchBar || Provider.of<ContactListState>(context).isFiltered ? _buildFilterable() : _buildContactList()));
}
List<Widget> getActions(context) {
@ -177,7 +178,7 @@ class _ContactsViewState extends State<ContactsView> {
{
Clipboard.setData(new ClipboardData(text: Provider.of<ProfileInfoState>(context, listen: false).onion));
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.copiedToClipboardNotification));
ScaffoldMessenger.of(context).showSnackBar(snackBar);
scaffoldKey.currentState?.showSnackBar(snackBar);
}
break;
case ShareMenu.qrcode:
@ -206,7 +207,7 @@ class _ContactsViewState extends State<ContactsView> {
onPressed: () {
Clipboard.setData(new ClipboardData(text: Provider.of<ProfileInfoState>(context, listen: false).onion));
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.copiedToClipboardNotification));
ScaffoldMessenger.of(context).showSnackBar(snackBar);
scaffoldKey.currentState?.showSnackBar(snackBar);
}));
}

1
lib/views/filesharingview.dart
View File

@ -46,6 +46,7 @@ class _FileSharingViewState extends State<FileSharingView> {
itemScrollController: ItemScrollController(),
itemCount: sharedFiles.length,
shrinkWrap: true,
reverse: true,
physics: BouncingScrollPhysics(),
semanticChildCount: sharedFiles.length,
itemBuilder: (context, index) {

2
lib/widgets/messagelist.dart
View File

@ -78,7 +78,7 @@ class _MessageListState extends State<MessageList> {
fit: BoxFit.scaleDown,
alignment: Alignment.center,
image: AssetImage("assets/core/negative_heart_512px.png"),
colorFilter: ColorFilter.mode(Provider.of<Settings>(context).theme.hilightElementColor, BlendMode.srcIn))),
colorFilter: ColorFilter.mode(Provider.of<Settings>(context).theme.hilightElementColor.withOpacity(0.15), BlendMode.srcIn))),
// Don't load messages for syncing server...
child: loadMessages
? ScrollablePositionedList.builder(