From 8af4deaf95cbb2049f1128a37f200352e1de8c6a Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 15 Dec 2021 12:25:29 -0500 Subject: [PATCH] the rest of the themes --- lib/themes/ghost.dart | 70 ++++++++++++++++++++++++++++++++++++++++ lib/themes/mermaid.dart | 70 ++++++++++++++++++++++++++++++++++++++++ lib/themes/midnight.dart | 70 ++++++++++++++++++++++++++++++++++++++++ lib/themes/neon2.dart | 70 ++++++++++++++++++++++++++++++++++++++++ lib/themes/opaque.dart | 11 +++++++ lib/themes/pumpkin.dart | 70 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 361 insertions(+) create mode 100644 lib/themes/ghost.dart create mode 100644 lib/themes/mermaid.dart create mode 100644 lib/themes/midnight.dart create mode 100644 lib/themes/neon2.dart create mode 100644 lib/themes/pumpkin.dart diff --git a/lib/themes/ghost.dart b/lib/themes/ghost.dart new file mode 100644 index 00000000..6f870190 --- /dev/null +++ b/lib/themes/ghost.dart @@ -0,0 +1,70 @@ +import 'dart:ui'; +import 'dart:core'; + +import 'package:cwtch/themes/cwtch.dart'; +import 'package:flutter/material.dart'; + +import 'opaque.dart'; + +final ghost_theme = "ghost"; +final ghost_name = "Ghost"; //Todo translate + +OpaqueThemeType GetGhostTheme(String mode) { + if (mode == mode_dark) { + return GhostDark(); + } else { + return GhostLight(); + } +} + +class GhostDark extends CwtchDark { + 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 settings = Color(0xFFFDFFFD); + static final Color accent = Color(0xFFD20070); + + get name => ghost_name; + get theme => ghost_theme; + get mode => mode_dark; + + get backgroundMainColor => background; // darkGreyPurple; + get backgroundPaneColor => 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; +} + +class GhostLight extends CwtchLight { + 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 font = Color(0xFF0D0D1F); + static final Color settings = Color(0xFF0D0D1F); + static final Color accent = Color(0xFFD20070); + + get name => ghost_name; + get theme => ghost_theme; + get mode => mode_light; + + get backgroundMainColor => background; //whitePurple; + get backgroundPaneColor => 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 messageFromMeBackgroundColor => userBubble; //brightPurple; + get messageFromMeTextColor => font; //mainTextColor; + get messageFromOtherBackgroundColor => peerBubble; //purple; + get messageFromOtherTextColor => font; //darkPurple; +} \ No newline at end of file diff --git a/lib/themes/mermaid.dart b/lib/themes/mermaid.dart new file mode 100644 index 00000000..a8cde812 --- /dev/null +++ b/lib/themes/mermaid.dart @@ -0,0 +1,70 @@ +import 'dart:ui'; +import 'dart:core'; + +import 'package:cwtch/themes/cwtch.dart'; +import 'package:flutter/material.dart'; + +import 'opaque.dart'; + +final mermaid_theme = "mermaid"; +final mermaid_name = "Mermaid"; //Todo translate + +OpaqueThemeType GetMermaidTheme(String mode) { + if (mode == mode_dark) { + return MermaidDark(); + } else { + return MermaidLight(); + } +} + +class MermaidDark extends CwtchDark { + 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 settings = Color(0xFFF7FCFD); + static final Color accent = Color(0xFF8E64A5); + + get name => mermaid_name; + get theme => mermaid_theme; + get mode => mode_dark; + + get backgroundMainColor => background; // darkGreyPurple; + get backgroundPaneColor => 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; +} + +class MermaidLight extends CwtchLight { + static final Color background = Color(0xFFF7FCFD); + static final Color header = Color(0xFF56C8D8); + static final Color userBubble = Color(0xFF56C8D8); + static final Color peerBubble = Color(0xFFB2EBF2); + static final Color font = Color(0xFF102426); + static final Color settings = Color(0xFF102426); + static final Color accent = Color(0xFF8E64A5); + + get name => mermaid_name; + get theme => mermaid_theme; + get mode => mode_light; + + get backgroundMainColor => background; //whitePurple; + get backgroundPaneColor => 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 messageFromMeBackgroundColor => userBubble; //brightPurple; + get messageFromMeTextColor => font; //mainTextColor; + get messageFromOtherBackgroundColor => peerBubble; //purple; + get messageFromOtherTextColor => font; //darkPurple; +} \ No newline at end of file diff --git a/lib/themes/midnight.dart b/lib/themes/midnight.dart new file mode 100644 index 00000000..e6c4507f --- /dev/null +++ b/lib/themes/midnight.dart @@ -0,0 +1,70 @@ +import 'dart:ui'; +import 'dart:core'; + +import 'package:cwtch/themes/cwtch.dart'; +import 'package:flutter/material.dart'; + +import 'opaque.dart'; + +final midnight_theme = "midnight"; +final midnight_name = "Midnight"; //Todo translate + +OpaqueThemeType GetMidnightTheme(String mode) { + if (mode == mode_dark) { + return MidnightDark(); + } else { + return MidnightLight(); + } +} + +class MidnightDark extends CwtchDark { + static final Color background = Color(0xFF1B1B1B); + static final Color header = Color(0xFF1B1B1B); + static final Color userBubble = Color(0xFF373737); + static final Color peerBubble = Color(0xFF212121); + static final Color font = Color(0xFFFFFFFF); + static final Color settings = Color(0xFFFFFDFF); + static final Color accent = Color(0xFFD20070); + + get name => midnight_name; + get theme => midnight_theme; + get mode => mode_dark; + + get backgroundMainColor => background; // darkGreyPurple; + get backgroundPaneColor => 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; +} + +class MidnightLight extends CwtchLight { + static final Color background = Color(0xFFFFFDFF); + static final Color header = Color(0xFFE0E0E0); + static final Color userBubble = Color(0xFFE0E0E0); + static final Color peerBubble = Color(0xFFF3F3F3); + static final Color font = Color(0xFF1B1B1B); + static final Color settings = Color(0xFF1B1B1B); + static final Color accent = Color(0xFFD20070); + + get name => midnight_name; + get theme => midnight_theme; + get mode => mode_light; + + get backgroundMainColor => background; //whitePurple; + get backgroundPaneColor => 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 messageFromMeBackgroundColor => userBubble; //brightPurple; + get messageFromMeTextColor => font; //mainTextColor; + get messageFromOtherBackgroundColor => peerBubble; //purple; + get messageFromOtherTextColor => font; //darkPurple; +} \ No newline at end of file diff --git a/lib/themes/neon2.dart b/lib/themes/neon2.dart new file mode 100644 index 00000000..ee90520f --- /dev/null +++ b/lib/themes/neon2.dart @@ -0,0 +1,70 @@ +import 'dart:ui'; +import 'dart:core'; + +import 'package:cwtch/themes/cwtch.dart'; +import 'package:flutter/material.dart'; + +import 'opaque.dart'; + +final neon2_theme = "neon2"; +final neon2_name = "Neon2"; //Todo translate + +OpaqueThemeType GetNeon2Theme(String mode) { + if (mode == mode_dark) { + return Neon2Dark(); + } else { + return Neon2Light(); + } +} + +class Neon2Dark extends CwtchDark { + static final Color background = Color(0xFF290826); + static final Color header = Color(0xFF290826); + static final Color userBubble = Color(0xFFA604FE); + static final Color peerBubble = Color(0xFF03AD00); + static final Color font = Color(0xFFFFFFFF); + static final Color settings = Color(0xFFFFFDFF); + static final Color accent = Color(0xFFA604FE); + + get name => neon2_name; + get theme => neon2_theme; + get mode => mode_dark; + + get backgroundMainColor => background; // darkGreyPurple; + get backgroundPaneColor => 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; +} + +class Neon2Light extends CwtchLight { + static final Color background = Color(0xFFFFFDFF); + static final Color header = Color(0xFFD8C7E1); + static final Color userBubble = Color(0xFFD8C7E1); + static final Color peerBubble = Color(0xFF80E27E); + static final Color font = Color(0xFF290826); + static final Color settings = Color(0xFF290826); + static final Color accent = Color(0xFFA604FE); + + get name => neon2_name; + get theme => neon2_theme; + get mode => mode_light; + + get backgroundMainColor => background; //whitePurple; + get backgroundPaneColor => 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 messageFromMeBackgroundColor => userBubble; //brightPurple; + get messageFromMeTextColor => font; //mainTextColor; + get messageFromOtherBackgroundColor => peerBubble; //purple; + get messageFromOtherTextColor => font; //darkPurple; +} \ No newline at end of file diff --git a/lib/themes/opaque.dart b/lib/themes/opaque.dart index 8218934c..27eb5dec 100644 --- a/lib/themes/opaque.dart +++ b/lib/themes/opaque.dart @@ -2,17 +2,28 @@ import 'dart:ui'; import 'dart:core'; import 'package:cwtch/themes/cwtch.dart'; +import 'package:cwtch/themes/mermaid.dart'; import 'package:cwtch/themes/neon1.dart'; +import 'package:cwtch/themes/pumpkin.dart'; import 'package:cwtch/themes/vampire.dart'; import 'package:cwtch/themes/witch.dart'; import 'package:flutter/material.dart'; import 'package:cwtch/settings.dart'; +import 'ghost.dart'; +import 'midnight.dart'; +import 'neon2.dart'; + const mode_light = "light"; const mode_dark = "dark"; final themes = { cwtch_theme: {mode_light: CwtchLight(), mode_dark: CwtchDark()}, + ghost_theme: {mode_light: GhostLight(), mode_dark: GhostDark()}, + mermaid_theme: {mode_light: MermaidLight(), mode_dark: MermaidDark()}, + midnight_theme: {mode_light: MidnightLight(), mode_dark: MidnightDark()}, 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()}, }; diff --git a/lib/themes/pumpkin.dart b/lib/themes/pumpkin.dart new file mode 100644 index 00000000..da779341 --- /dev/null +++ b/lib/themes/pumpkin.dart @@ -0,0 +1,70 @@ +import 'dart:ui'; +import 'dart:core'; + +import 'package:cwtch/themes/cwtch.dart'; +import 'package:flutter/material.dart'; + +import 'opaque.dart'; + +final pumpkin_theme = "pumpkin"; +final pumpkin_name = "Pumpkin"; //Todo translate + +OpaqueThemeType GetPumpkinTheme(String mode) { + if (mode == mode_dark) { + return PumpkinDark(); + } else { + return PumpkinLight(); + } +} + +class PumpkinDark extends CwtchDark { + static final Color background = Color(0xFF281831); + static final Color header = Color(0xFF281831); + static final Color userBubble = Color(0xFFB53D00); + static final Color peerBubble = Color(0xFF422850); + static final Color font = Color(0xFFFFFFFF); + static final Color settings = Color(0xFFFFFBF6); + static final Color accent = Color(0xFF8E64A5); + + get name => pumpkin_name; + get theme => pumpkin_theme; + get mode => mode_dark; + + get backgroundMainColor => background; // darkGreyPurple; + get backgroundPaneColor => 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; +} + +class PumpkinLight extends CwtchLight { + static final Color background = Color(0xFFFFFBF6); + static final Color header = Color(0xFFFF9800); + static final Color userBubble = Color(0xFFFF9800); + static final Color peerBubble = Color(0xFFD8C7E1); + static final Color font = Color(0xFF281831); + static final Color settings = Color(0xFF281831); + static final Color accent = Color(0xFF8E64A5); + + get name => pumpkin_name; + get theme => pumpkin_theme; + get mode => mode_light; + + get backgroundMainColor => background; //whitePurple; + get backgroundPaneColor => 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 messageFromMeBackgroundColor => userBubble; //brightPurple; + get messageFromMeTextColor => font; //mainTextColor; + get messageFromOtherBackgroundColor => peerBubble; //purple; + get messageFromOtherTextColor => font; //darkPurple; +} \ No newline at end of file