From 7dc25b92c7651e5ae0a621efaf6425c4cea9c077 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Wed, 7 Feb 2024 08:16:33 -0800
Subject: [PATCH] theme fixes and new fields: messageSelectionColor,
 portraitOnlineAwayColor, portraitOnlineBusyColor, textfieldSelectionColor,
 menuBackgroundColor

---
 assets/themes/cwtch/theme.yml    |  12 +++++
 lib/themes/cwtch.dart            |  12 +++++
 lib/themes/opaque.dart           |  30 ++++++++++-
 lib/themes/yamltheme.dart        |   7 ++-
 lib/views/messageview.dart       |   4 +-
 lib/widgets/buttontextfield.dart |  81 ++++++++++++++++--------------
 lib/widgets/messagebubble.dart   |  22 ++++++--
 lib/widgets/passwordfield.dart   |  83 +++++++++++++++++--------------
 lib/widgets/textfield.dart       |  73 +++++++++++++++------------
 test/textfield_basic.png         | Bin 5648 -> 5648 bytes
 test/textfield_form_42.png       | Bin 5595 -> 5595 bytes
 11 files changed, 206 insertions(+), 118 deletions(-)

diff --git a/assets/themes/cwtch/theme.yml b/assets/themes/cwtch/theme.yml
index d1c4f48d..423129e2 100644
--- a/assets/themes/cwtch/theme.yml
+++ b/assets/themes/cwtch/theme.yml
@@ -43,6 +43,7 @@ themes:
       messageFromMeTextColor: font  # whiteishPurple
       messageFromOtherBackgroundColor: peerBubble  # deepPurple
       messageFromOtherTextColor: font  # whiteishPurple
+      messageSelectionColor: accent
       portraitBackgroundColor: deepPurple
       portraitBlockedBorderColor: lightGrey
       portraitBlockedTextColor: lightGrey
@@ -50,6 +51,8 @@ themes:
       portraitContactBadgeTextColor: whiteishPurple
       portraitOfflineBorderColor: purple
       portraitOnlineBorderColor: whiteishPurple
+      portraitOnlineAwayColor: 0xFFFFF59D
+      portraitOnlineBusyColor: 0xFFEF9A9A
       portraitProfileBadgeColor: hotPink
       portraitProfileBadgeTextColor: whiteishPurple
       scrollbarDefaultColor: purple
@@ -59,8 +62,10 @@ themes:
       textfieldBorderColor: deepPurple
       textfieldErrorColor: hotPink
       textfieldHintColor: mainTextColor
+      textfieldSelectionColor: accent
       toolbarIconColor: settings  # whiteishPurple
       topbarColor: header  # darkGreyPurple
+      menuBackgroundColor: accent;
       snackbarBackgroundColor: accent
       snackbarTextColor: whiteishPurple
       chatImageColor: purple
@@ -87,6 +92,7 @@ themes:
       messageFromMeTextColor: font  # mainTextColor
       messageFromOtherBackgroundColor: peerBubble  # purple
       messageFromOtherTextColor: font  # darkPurple
+      messageSelectionColor: 0x80FF80
       portraitBackgroundColor: softPurple
       portraitBlockedBorderColor: softGrey
       portraitBlockedTextColor: softGrey
@@ -94,6 +100,8 @@ themes:
       portraitContactBadgeTextColor: whitePurple
       portraitOfflineBorderColor: greyPurple
       portraitOnlineBorderColor: greyPurple
+      portraitOnlineAwayColor: 0xFFFFF59D
+      portraitOnlineBusyColor: 0xFFEF9A9A
       portraitProfileBadgeColor: accent
       portraitProfileBadgeTextColor: whitePurple
       scrollbarDefaultColor: accent
@@ -103,6 +111,10 @@ themes:
       textfieldBorderColor: purple
       textfieldErrorColor: hotPink
       textfieldHintColor: font
+      textfieldSelectionColor: accent
       toolbarIconColor: settings  # darkPurple
       topbarColor: header  # softPurple
+      menuBackgroundColor: accent;
+      snackbarBackgroundColor: accent
+      snackbarTextColor: whitePurple
       chatImageColor: purple
diff --git a/lib/themes/cwtch.dart b/lib/themes/cwtch.dart
index e81d5509..ffdd8ba7 100644
--- a/lib/themes/cwtch.dart
+++ b/lib/themes/cwtch.dart
@@ -63,6 +63,7 @@ class CwtchDark extends OpaqueThemeType {
   get messageFromMeTextColor => font; //whiteishPurple;
   get messageFromOtherBackgroundColor => peerBubble; //deepPurple;
   get messageFromOtherTextColor => font; //whiteishPurple;
+  get messageSelectionColor => accent;
   get portraitBackgroundColor => deepPurple;
   get portraitBlockedBorderColor => lightGrey;
   get portraitBlockedTextColor => lightGrey;
@@ -70,6 +71,8 @@ class CwtchDark extends OpaqueThemeType {
   get portraitContactBadgeTextColor => whiteishPurple;
   get portraitOfflineBorderColor => purple;
   get portraitOnlineBorderColor => whiteishPurple;
+  get portraitOnlineAwayColor => Color(0xFFFFF59D);
+  get portraitOnlineBusyColor => Color(0xFFEF9A9A);
   get portraitProfileBadgeColor => hotPink;
   get portraitProfileBadgeTextColor => whiteishPurple;
   get scrollbarDefaultColor => purple;
@@ -79,8 +82,11 @@ class CwtchDark extends OpaqueThemeType {
   get textfieldBorderColor => deepPurple;
   get textfieldErrorColor => hotPink;
   get textfieldHintColor => mainTextColor;
+  get textfieldSelectionColor => accent;
   get toolbarIconColor => settings; //whiteishPurple;
   get topbarColor => header; //darkGreyPurple;
+  get menuBackgroundColor => accent;
+  get menuTextColor => darkGreyPurple;
   get snackbarBackgroundColor => accent;
   get snackbarTextColor => whitePurple;
   get chatImageColor => purple;
@@ -111,6 +117,7 @@ class CwtchLight extends OpaqueThemeType {
   get messageFromMeTextColor => font; //mainTextColor;
   get messageFromOtherBackgroundColor => peerBubble; //purple;
   get messageFromOtherTextColor => font; //darkPurple;
+  get messageSelectionColor => accent;
   get portraitBackgroundColor => softPurple;
   get portraitBlockedBorderColor => softGrey;
   get portraitBlockedTextColor => softGrey;
@@ -118,6 +125,8 @@ class CwtchLight extends OpaqueThemeType {
   get portraitContactBadgeTextColor => whitePurple;
   get portraitOfflineBorderColor => greyPurple;
   get portraitOnlineBorderColor => greyPurple;
+  get portraitOnlineAwayColor => Color(0xFFFFF59D);
+  get portraitOnlineBusyColor => Color(0xFFEF9A9A);
   get portraitProfileBadgeColor => accent;
   get portraitProfileBadgeTextColor => whitePurple;
   get scrollbarDefaultColor => accent;
@@ -127,8 +136,11 @@ class CwtchLight extends OpaqueThemeType {
   get textfieldBorderColor => purple;
   get textfieldErrorColor => hotPink;
   get textfieldHintColor => font;
+  get textfieldSelectionColor => accent;
   get toolbarIconColor => settings; //darkPurple;
   get topbarColor => header; //softPurple;
+  get menuBackgroundColor => accent;
+  get menuTextColor => whitePurple;
   get snackbarBackgroundColor => accent;
   get snackbarTextColor => whitePurple;
   get chatImageColor => purple;
diff --git a/lib/themes/opaque.dart b/lib/themes/opaque.dart
index e1c5b514..bab22160 100644
--- a/lib/themes/opaque.dart
+++ b/lib/themes/opaque.dart
@@ -99,6 +99,7 @@ abstract class OpaqueThemeType {
   get textfieldBorderColor => red;
   get textfieldHintColor => red;
   get textfieldErrorColor => red;
+  get textfieldSelectionColor => red;
   get scrollbarDefaultColor => red;
   get portraitBackgroundColor => red;
   get portraitOnlineBorderColor => red;
@@ -123,6 +124,9 @@ abstract class OpaqueThemeType {
   get messageFromMeTextColor => red;
   get messageFromOtherBackgroundColor => red;
   get messageFromOtherTextColor => red;
+  get messageSelectionColor => red;
+
+  get menuBackgroundColor => red;
 
   get snackbarBackgroundColor => red;
   get snackbarTextColor => red;
@@ -142,11 +146,33 @@ abstract class OpaqueThemeType {
   }
 }
 
+// Borrowed from Stackoverflow
+MaterialColor getMaterialColor(Color color) {
+  final int red = color.red;
+  final int green = color.green;
+  final int blue = color.blue;
+
+  final Map<int, Color> shades = {
+    50: Color.fromRGBO(red, green, blue, .1),
+    100: Color.fromRGBO(red, green, blue, .2),
+    200: Color.fromRGBO(red, green, blue, .3),
+    300: Color.fromRGBO(red, green, blue, .4),
+    400: Color.fromRGBO(red, green, blue, .5),
+    500: Color.fromRGBO(red, green, blue, .6),
+    600: Color.fromRGBO(red, green, blue, .7),
+    700: Color.fromRGBO(red, green, blue, .8),
+    800: Color.fromRGBO(red, green, blue, .9),
+    900: Color.fromRGBO(red, green, blue, 1),
+  };
+
+  return MaterialColor(color.value, shades);
+}
+
 ThemeData mkThemeData(Settings opaque) {
   return ThemeData(
       hoverColor: opaque.current().backgroundHilightElementColor.withOpacity(0.5),
       visualDensity: VisualDensity.adaptivePlatformDensity,
-      primarySwatch: Colors.red,
+      primarySwatch: getMaterialColor(opaque.current().topbarColor),
       primaryIconTheme: IconThemeData(
         color: opaque.current().mainTextColor,
       ),
@@ -249,7 +275,7 @@ ThemeData mkThemeData(Settings opaque) {
           enableFeedback: true,
           splashColor: opaque.current().defaultButtonActiveColor),
       textSelectionTheme: TextSelectionThemeData(
-          cursorColor: opaque.current().defaultButtonActiveColor, selectionColor: opaque.current().defaultButtonActiveColor, selectionHandleColor: opaque.current().defaultButtonActiveColor),
+          cursorColor: opaque.current().textfieldSelectionColor, selectionColor: opaque.current().textfieldSelectionColor, selectionHandleColor: opaque.current().textfieldSelectionColor),
       popupMenuTheme: PopupMenuThemeData(
         color: opaque.current().backgroundPaneColor.withOpacity(0.9),
       ),
diff --git a/lib/themes/yamltheme.dart b/lib/themes/yamltheme.dart
index eb90c7a0..7e32b529 100644
--- a/lib/themes/yamltheme.dart
+++ b/lib/themes/yamltheme.dart
@@ -175,6 +175,7 @@ class YmlTheme extends OpaqueThemeType {
   get textfieldBorderColor => getColor("textfieldBorderColor") ?? fallbackTheme.textfieldBorderColor;
   get textfieldHintColor => getColor("textfieldHintColor") ?? fallbackTheme.textfieldHintColor;
   get textfieldErrorColor => getColor("textfieldErrorColor") ?? fallbackTheme.textfieldErrorColor;
+  get textfieldSelectionColor => getColor("textfieldSelectionColor") ?? fallbackTheme.textfieldSelectionColor;
   get scrollbarDefaultColor => getColor("scrollbarDefaultColor") ?? fallbackTheme.scrollbarDefaultColor;
   get portraitBackgroundColor => getColor("portraitBackgroundColor") ?? fallbackTheme.portraitBackgroundColor;
   get portraitOnlineBorderColor => getColor("portraitOnlineBorderColor") ?? fallbackTheme.portraitOnlineBorderColor;
@@ -185,8 +186,8 @@ class YmlTheme extends OpaqueThemeType {
   get portraitContactBadgeTextColor => getColor("portraitContactBadgeTextColor") ?? fallbackTheme.portraitContactBadgeTextColor;
   get portraitProfileBadgeColor => getColor("portraitProfileBadgeColor") ?? fallbackTheme.portraitProfileBadgeColor;
   get portraitProfileBadgeTextColor => getColor("portraitProfileBadgeTextColor") ?? fallbackTheme.portraitProfileBadgeTextColor;
-  get portraitOnlineAwayColor => Color(0xFFFFF59D) ?? fallbackTheme.portraitOnlineAwayColor;
-  get portraitOnlineBusyColor => Color(0xFFEF9A9A) ?? fallbackTheme.portraitOnlineBusyColor;
+  get portraitOnlineAwayColor => getColor("portraitOnlineAwayColor") ?? fallbackTheme.portraitOnlineAwayColor;
+  get portraitOnlineBusyColor => getColor("portraitOnlineBusyColor") ?? fallbackTheme.portraitOnlineBusyColor;
   get dropShadowColor => getColor("dropShadowColor") ?? fallbackTheme.dropShadowColor;
   get toolbarIconColor => getColor("toolbarIconColor") ?? fallbackTheme.toolbarIconColor;
   get chatReactionIconColor => getColor("chatReactionIconColor") ?? fallbackTheme.chatReactionIconColor;
@@ -194,6 +195,8 @@ class YmlTheme extends OpaqueThemeType {
   get messageFromMeTextColor => getColor("messageFromMeTextColor") ?? fallbackTheme.messageFromMeTextColor;
   get messageFromOtherBackgroundColor => getColor("messageFromOtherBackgroundColor") ?? fallbackTheme.messageFromOtherBackgroundColor;
   get messageFromOtherTextColor => getColor("messageFromOtherTextColor") ?? fallbackTheme.messageFromOtherTextColor;
+  get messageSelectionColor => getColor("messageSelectionColor") ?? fallbackTheme.messageSelectionColor;
+  get menuBackgroundColor => getColor("menuBackgroundColor") ?? fallbackTheme.menuBackgroundColor;
   get snackbarBackgroundColor => getColor("snackbarBackgroundColor") ?? fallbackTheme.snackbarBackgroundColor;
   get snackbarTextColor => getColor("snackbarTextColor") ?? fallbackTheme.snackbarTextColor;
 
diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart
index 0f5a18a7..5136ce8f 100644
--- a/lib/views/messageview.dart
+++ b/lib/views/messageview.dart
@@ -516,7 +516,9 @@ class _MessageViewState extends State<MessageView> {
       height: 164 + ((Provider.of<ContactInfoState>(context).messageDraft.messageText.split("\n").length - 1) * 16),
       child: Column(
         children: [
-          Row(mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.max, children: [preview]),
+          Container(
+              decoration: BoxDecoration(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor),
+              child: Row(mainAxisAlignment: MainAxisAlignment.start, mainAxisSize: MainAxisSize.max, children: [preview])),
           Container(
               decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor))),
               child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [wdgMessage])),
diff --git a/lib/widgets/buttontextfield.dart b/lib/widgets/buttontextfield.dart
index 0307b367..3d4c6afd 100644
--- a/lib/widgets/buttontextfield.dart
+++ b/lib/widgets/buttontextfield.dart
@@ -49,44 +49,51 @@ class _CwtchButtonTextFieldState extends State<CwtchButtonTextField> {
       return Container(
           clipBehavior: Clip.antiAlias,
           decoration: BoxDecoration(),
-          child: TextFormField(
-            key: widget.testKey,
-            controller: widget.controller,
-            readOnly: widget.readonly,
-            showCursor: !widget.readonly,
-            focusNode: _focusNode,
-            enableIMEPersonalizedLearning: false,
-            onChanged: widget.onChanged,
-            maxLines: 1,
-            style: widget.textStyle == null ? TextStyle(overflow: TextOverflow.clip) : widget.textStyle,
-            decoration: InputDecoration(
-                labelText: widget.labelText,
-                labelStyle: TextStyle(color: theme.current().mainTextColor, backgroundColor: theme.current().textfieldBackgroundColor),
-                suffixIcon: IconButton(
-                  onPressed: widget.onPressed,
-                  icon: widget.icon,
-                  splashRadius: Material.defaultSplashRadius / 2,
-                  padding: EdgeInsets.fromLTRB(0.0, 4.0, 2.0, 2.0),
-                  tooltip: widget.tooltip,
-                  enableFeedback: true,
-                  color: theme.current().mainTextColor,
-                  highlightColor: theme.current().defaultButtonColor,
-                  focusColor: theme.current().defaultButtonActiveColor,
-                  splashColor: theme.current().defaultButtonActiveColor,
+          // Horrifying Hack: Flutter doesn't give us direct control over system menus but instead picks BG color from TextButtonThemeData ¯\_(ツ)_/¯
+          child: Theme(
+              data: Theme.of(context).copyWith(
+                textButtonTheme: TextButtonThemeData(
+                  style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.menuBackgroundColor)),
                 ),
-                floatingLabelBehavior: FloatingLabelBehavior.never,
-                filled: true,
-                fillColor: theme.current().textfieldBackgroundColor,
-                focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
-                focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
-                errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
-                errorStyle: TextStyle(
-                  color: theme.current().textfieldErrorColor,
-                  fontWeight: FontWeight.bold,
-                ),
-                contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
-                enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0))),
-          ));
+              ),
+              child: TextFormField(
+                key: widget.testKey,
+                controller: widget.controller,
+                readOnly: widget.readonly,
+                showCursor: !widget.readonly,
+                focusNode: _focusNode,
+                enableIMEPersonalizedLearning: false,
+                onChanged: widget.onChanged,
+                maxLines: 1,
+                style: widget.textStyle == null ? TextStyle(overflow: TextOverflow.clip) : widget.textStyle,
+                decoration: InputDecoration(
+                    labelText: widget.labelText,
+                    labelStyle: TextStyle(color: theme.current().mainTextColor, backgroundColor: theme.current().textfieldBackgroundColor),
+                    suffixIcon: IconButton(
+                      onPressed: widget.onPressed,
+                      icon: widget.icon,
+                      splashRadius: Material.defaultSplashRadius / 2,
+                      padding: EdgeInsets.fromLTRB(0.0, 4.0, 2.0, 2.0),
+                      tooltip: widget.tooltip,
+                      enableFeedback: true,
+                      color: theme.current().mainTextColor,
+                      highlightColor: theme.current().defaultButtonColor,
+                      focusColor: theme.current().defaultButtonActiveColor,
+                      splashColor: theme.current().defaultButtonActiveColor,
+                    ),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
+                    filled: true,
+                    fillColor: theme.current().textfieldBackgroundColor,
+                    focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
+                    focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
+                    errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
+                    errorStyle: TextStyle(
+                      color: theme.current().textfieldErrorColor,
+                      fontWeight: FontWeight.bold,
+                    ),
+                    contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
+                    enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0))),
+              )));
     });
   }
 }
diff --git a/lib/widgets/messagebubble.dart b/lib/widgets/messagebubble.dart
index f956025f..5f36f6c6 100644
--- a/lib/widgets/messagebubble.dart
+++ b/lib/widgets/messagebubble.dart
@@ -71,11 +71,23 @@ class MessageBubbleState extends State<MessageBubble> {
                   ),
                   child: Padding(
                       padding: EdgeInsets.all(9.0),
-                      child: Column(
-                          crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
-                          mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
-                          mainAxisSize: MainAxisSize.min,
-                          children: fromMe ? [wdgMessage, wdgDecorations] : [wdgSender, wdgMessage, wdgDecorations])))));
+                      child: Theme(
+                          data: Theme.of(context).copyWith(
+                            textSelectionTheme: TextSelectionThemeData(
+                                cursorColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                                selectionColor: Provider.of<Settings>(context).theme.messageSelectionColor,
+                                selectionHandleColor: Provider.of<Settings>(context).theme.messageSelectionColor),
+
+                            // Horrifying Hack: Flutter doesn't give us direct control over system menus but instead picks BG color from TextButtonThemeData ¯\_(ツ)_/¯
+                            textButtonTheme: TextButtonThemeData(
+                              style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.menuBackgroundColor)),
+                            ),
+                          ),
+                          child: Column(
+                              crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+                              mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
+                              mainAxisSize: MainAxisSize.min,
+                              children: fromMe ? [wdgMessage, wdgDecorations] : [wdgSender, wdgMessage, wdgDecorations]))))));
     });
   }
 }
diff --git a/lib/widgets/passwordfield.dart b/lib/widgets/passwordfield.dart
index 83dd5d76..e22ca6fe 100644
--- a/lib/widgets/passwordfield.dart
+++ b/lib/widgets/passwordfield.dart
@@ -38,45 +38,52 @@ class _CwtchPasswordTextFieldState extends State<CwtchPasswordField> {
     }
 
     return Consumer<Settings>(builder: (context, theme, child) {
-      return TextFormField(
-        autofocus: widget.autofocus,
-        controller: widget.controller,
-        validator: widget.validator,
-        obscureText: obscureText,
-        obscuringCharacter: '*',
-        enableIMEPersonalizedLearning: false,
-        autofillHints: widget.autoFillHints,
-        autovalidateMode: AutovalidateMode.always,
-        onFieldSubmitted: widget.action,
-        enableSuggestions: false,
-        autocorrect: false,
-        decoration: InputDecoration(
-          suffixIcon: IconButton(
-            onPressed: () {
-              setState(() {
-                obscureText = !obscureText;
-              });
-            },
-            icon: Icon((obscureText ? CwtchIcons.eye_closed : CwtchIcons.eye_open), semanticLabel: label),
-            tooltip: label,
-            color: theme.current().mainTextColor,
-            highlightColor: theme.current().defaultButtonColor,
-            focusColor: theme.current().defaultButtonActiveColor,
-            splashColor: theme.current().defaultButtonActiveColor,
-            splashRadius: Material.defaultSplashRadius / 2,
+      // Horrifying Hack: Flutter doesn't give us direct control over system menus but instead picks BG color from TextButtonThemeData ¯\_(ツ)_/¯
+      return Theme(
+          data: Theme.of(context).copyWith(
+            textButtonTheme: TextButtonThemeData(
+              style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.menuBackgroundColor)),
+            ),
           ),
-          errorStyle: TextStyle(
-            color: theme.current().textfieldErrorColor,
-            fontWeight: FontWeight.bold,
-          ),
-          focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
-          focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
-          errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
-          filled: true,
-          fillColor: theme.current().textfieldBackgroundColor,
-          enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
-        ),
-      );
+          child: TextFormField(
+            autofocus: widget.autofocus,
+            controller: widget.controller,
+            validator: widget.validator,
+            obscureText: obscureText,
+            obscuringCharacter: '*',
+            enableIMEPersonalizedLearning: false,
+            autofillHints: widget.autoFillHints,
+            autovalidateMode: AutovalidateMode.always,
+            onFieldSubmitted: widget.action,
+            enableSuggestions: false,
+            autocorrect: false,
+            decoration: InputDecoration(
+              suffixIcon: IconButton(
+                onPressed: () {
+                  setState(() {
+                    obscureText = !obscureText;
+                  });
+                },
+                icon: Icon((obscureText ? CwtchIcons.eye_closed : CwtchIcons.eye_open), semanticLabel: label),
+                tooltip: label,
+                color: theme.current().mainTextColor,
+                highlightColor: theme.current().defaultButtonColor,
+                focusColor: theme.current().defaultButtonActiveColor,
+                splashColor: theme.current().defaultButtonActiveColor,
+                splashRadius: Material.defaultSplashRadius / 2,
+              ),
+              errorStyle: TextStyle(
+                color: theme.current().textfieldErrorColor,
+                fontWeight: FontWeight.bold,
+              ),
+              focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
+              focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
+              errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
+              filled: true,
+              fillColor: theme.current().textfieldBackgroundColor,
+              enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
+            ),
+          ));
     });
   }
 }
diff --git a/lib/widgets/textfield.dart b/lib/widgets/textfield.dart
index 95ec20c7..38e194f2 100644
--- a/lib/widgets/textfield.dart
+++ b/lib/widgets/textfield.dart
@@ -47,39 +47,46 @@ class _CwtchTextFieldState extends State<CwtchTextField> {
       return Container(
           clipBehavior: Clip.antiAlias,
           decoration: BoxDecoration(),
-          child: TextFormField(
-            key: widget.testKey,
-            controller: widget.controller,
-            validator: widget.validator,
-            onChanged: widget.onChanged,
-            autofocus: widget.autofocus,
-            autovalidateMode: AutovalidateMode.onUserInteraction,
-            textAlign: widget.number ? TextAlign.end : TextAlign.start,
-            keyboardType: widget.multiLine
-                ? TextInputType.multiline
-                : widget.number
-                    ? TextInputType.number
-                    : TextInputType.text,
-            inputFormatters: widget.number ? <TextInputFormatter>[FilteringTextInputFormatter.digitsOnly] : null,
-            maxLines: widget.multiLine ? null : 1,
-            scrollController: _scrollController,
-            enableIMEPersonalizedLearning: false,
-            focusNode: _focusNode,
-            style: Provider.of<Settings>(context).scaleFonts(defaultTextStyle).copyWith(overflow: TextOverflow.clip),
-            decoration: InputDecoration(
-                errorMaxLines: 2,
-                hintText: widget.hintText,
-                hintStyle: TextStyle(color: (theme.current().mainTextColor as Color).withOpacity(0.5)),
-                floatingLabelBehavior: FloatingLabelBehavior.never,
-                filled: true,
-                focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
-                focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
-                errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
-                errorStyle: TextStyle(color: theme.current().textfieldErrorColor, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),
-                fillColor: theme.current().textfieldBackgroundColor,
-                contentPadding: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 5.0),
-                enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0))),
-          ));
+          // Horrifying Hack: Flutter doesn't give us direct control over system menus but instead picks BG color from TextButtonThemeData ¯\_(ツ)_/¯
+          child: Theme(
+              data: Theme.of(context).copyWith(
+                textButtonTheme: TextButtonThemeData(
+                  style: ButtonStyle(backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.menuBackgroundColor)),
+                ),
+              ),
+              child: TextFormField(
+                key: widget.testKey,
+                controller: widget.controller,
+                validator: widget.validator,
+                onChanged: widget.onChanged,
+                autofocus: widget.autofocus,
+                autovalidateMode: AutovalidateMode.onUserInteraction,
+                textAlign: widget.number ? TextAlign.end : TextAlign.start,
+                keyboardType: widget.multiLine
+                    ? TextInputType.multiline
+                    : widget.number
+                        ? TextInputType.number
+                        : TextInputType.text,
+                inputFormatters: widget.number ? <TextInputFormatter>[FilteringTextInputFormatter.digitsOnly] : null,
+                maxLines: widget.multiLine ? null : 1,
+                scrollController: _scrollController,
+                enableIMEPersonalizedLearning: false,
+                focusNode: _focusNode,
+                style: Provider.of<Settings>(context).scaleFonts(defaultTextStyle).copyWith(overflow: TextOverflow.clip),
+                decoration: InputDecoration(
+                    errorMaxLines: 2,
+                    hintText: widget.hintText,
+                    hintStyle: TextStyle(color: (theme.current().mainTextColor as Color).withOpacity(0.5)),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
+                    filled: true,
+                    focusedBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0)),
+                    focusedErrorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
+                    errorBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldErrorColor, width: 1.0)),
+                    errorStyle: TextStyle(color: theme.current().textfieldErrorColor, fontWeight: FontWeight.bold, overflow: TextOverflow.visible),
+                    fillColor: theme.current().textfieldBackgroundColor,
+                    contentPadding: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 5.0),
+                    enabledBorder: OutlineInputBorder(borderRadius: BorderRadius.circular(6.0), borderSide: BorderSide(color: theme.current().textfieldBorderColor, width: 1.0))),
+              )));
     });
   }
 }
diff --git a/test/textfield_basic.png b/test/textfield_basic.png
index b26e46c58e9bc6dc04d9a9ddd00a246083bfdaf8..311e38d041fe9a67011422c400b2d8f91cc81b22 100644
GIT binary patch
literal 5648
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
Z;ZJ#O-TN%lEgUjJT}GP}8{hoT{{SJfX>0%h

literal 5648
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

diff --git a/test/textfield_form_42.png b/test/textfield_form_42.png
index cd8bc5aa85f15a47f7b2a049f2f824379b1a1823..3682c4dc7f5613cbb7003a040b37cd36537e9def 100644
GIT binary patch
literal 5595
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
Nk<6?KC8nqU=ie5|I}ZQ=

literal 5595
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
I#5w-{U#sg!&j0`b