From 2b47daab3c01869f5e31c3df38dfcb610ce16d9a Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 16:42:49 +0100 Subject: [PATCH 01/14] Unify Input. Input bordered rectangle with rounded corners. --- flutter/lib/common.dart | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart index 3e66e7883..c8cf4680a 100644 --- a/flutter/lib/common.dart +++ b/flutter/lib/common.dart @@ -206,10 +206,8 @@ class MyTheme { fillColor: grayBg, filled: true, isDense: true, - contentPadding: EdgeInsets.all(15), - border: UnderlineInputBorder( - borderRadius: BorderRadius.circular(18), - borderSide: BorderSide.none, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(8), ), ) : null, @@ -302,10 +300,8 @@ class MyTheme { fillColor: Color(0xFF24252B), filled: true, isDense: true, - contentPadding: EdgeInsets.all(15), - border: UnderlineInputBorder( - borderRadius: BorderRadius.circular(18), - borderSide: BorderSide.none, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(8), ), ) : null, From 7e13ff652497c0b48224ee71bd9bd11dd07af3a0 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 17:02:15 +0100 Subject: [PATCH 02/14] Unify Input. Remove hardcoded style (socket) --- flutter/lib/desktop/pages/desktop_setting_page.dart | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index 87b4a684c..ed1a16995 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -1862,7 +1862,6 @@ void changeSocks5Proxy() async { Expanded( child: TextField( decoration: InputDecoration( - border: const OutlineInputBorder(), errorText: proxyMsg.isNotEmpty ? proxyMsg : null), controller: proxyController, autofocus: true, @@ -1880,9 +1879,6 @@ void changeSocks5Proxy() async { ).marginOnly(right: 10)), Expanded( child: TextField( - decoration: const InputDecoration( - border: OutlineInputBorder(), - ), controller: userController, ), ), @@ -1900,7 +1896,6 @@ void changeSocks5Proxy() async { child: Obx(() => TextField( obscureText: obscure.value, decoration: InputDecoration( - border: const OutlineInputBorder(), suffixIcon: IconButton( onPressed: () => obscure.value = !obscure.value, icon: Icon(obscure.value From 55021fc5d9e25fe7759f58a1e077943fd276eac0 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 17:05:28 +0100 Subject: [PATCH 03/14] Unify Input. Remove hardcoded style (change id) --- flutter/lib/common/widgets/dialog.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/flutter/lib/common/widgets/dialog.dart b/flutter/lib/common/widgets/dialog.dart index 83be522fa..f30ada81e 100644 --- a/flutter/lib/common/widgets/dialog.dart +++ b/flutter/lib/common/widgets/dialog.dart @@ -106,7 +106,6 @@ void changeIdDialog() { TextField( decoration: InputDecoration( labelText: translate('Your new ID'), - border: isDesktop ? const OutlineInputBorder() : null, errorText: msg.isEmpty ? null : translate(msg), suffixText: '${rxId.value.length}/16', suffixStyle: const TextStyle(fontSize: 12, color: Colors.grey)), From 1faaca90ac6df2ada5f5b34d78abcbb13f0a736a Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 17:07:44 +0100 Subject: [PATCH 04/14] Unify Input. Remove hardcoded style (ip whitelist) --- flutter/lib/common/widgets/dialog.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/flutter/lib/common/widgets/dialog.dart b/flutter/lib/common/widgets/dialog.dart index f30ada81e..ff1a372d0 100644 --- a/flutter/lib/common/widgets/dialog.dart +++ b/flutter/lib/common/widgets/dialog.dart @@ -181,7 +181,6 @@ void changeWhiteList({Function()? callback}) async { child: TextField( maxLines: null, decoration: InputDecoration( - border: isDesktop ? const OutlineInputBorder() : null, errorText: msg.isEmpty ? null : translate(msg), ), controller: controller, From c28ac8a33912236e83098fa4cd7abee19f3e4d9c Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 17:28:25 +0100 Subject: [PATCH 05/14] Unify Input. Remove hardcoded style (password) --- flutter/lib/desktop/pages/desktop_home_page.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart index 541ec6aa8..e66e3f284 100644 --- a/flutter/lib/desktop/pages/desktop_home_page.dart +++ b/flutter/lib/desktop/pages/desktop_home_page.dart @@ -634,7 +634,6 @@ void setPasswordDialog() async { obscureText: true, decoration: InputDecoration( labelText: translate('Password'), - border: const OutlineInputBorder(), errorText: errMsg0.isNotEmpty ? errMsg0 : null), controller: p0, autofocus: true, @@ -662,7 +661,6 @@ void setPasswordDialog() async { child: TextField( obscureText: true, decoration: InputDecoration( - border: const OutlineInputBorder(), labelText: translate('Confirmation'), errorText: errMsg1.isNotEmpty ? errMsg1 : null), controller: p1, From 97bd83f18fef36c99ec4d19fed4394f13a32f5fd Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 17:32:34 +0100 Subject: [PATCH 06/14] Unify Input. Remove hardcoded style (rdp) --- flutter/lib/common/widgets/peer_card.dart | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart index 124057662..90946ca74 100644 --- a/flutter/lib/common/widgets/peer_card.dart +++ b/flutter/lib/common/widgets/peer_card.dart @@ -1157,7 +1157,6 @@ void _rdpDialog(String id) async { ], decoration: InputDecoration( labelText: isDesktop ? null : translate('Port'), - border: isDesktop ? const OutlineInputBorder() : null, hintText: '3389'), controller: portController, autofocus: true, @@ -1178,8 +1177,7 @@ void _rdpDialog(String id) async { Expanded( child: TextField( decoration: InputDecoration( - labelText: isDesktop ? null : translate('Username'), - border: isDesktop ? const OutlineInputBorder() : null), + labelText: isDesktop ? null : translate('Username')), controller: userController, ), ), @@ -1200,8 +1198,6 @@ void _rdpDialog(String id) async { obscureText: secure.value, decoration: InputDecoration( labelText: isDesktop ? null : translate('Password'), - border: - isDesktop ? const OutlineInputBorder() : null, suffixIcon: IconButton( onPressed: () => secure.value = !secure.value, icon: Icon(secure.value From 6e2c27cfb1ba618c29d3acdc79c71181f7463db0 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 17:40:48 +0100 Subject: [PATCH 07/14] Unify Input. Remove hardcoded style (settings port) --- flutter/lib/desktop/pages/desktop_setting_page.dart | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index ed1a16995..d54561f70 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -769,7 +769,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin { 'Port', Row(children: [ SizedBox( - width: 80, + width: 95, child: TextField( controller: controller, enabled: enabled && !locked, @@ -778,13 +778,10 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin { FilteringTextInputFormatter.allow(RegExp( r'^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$')), ], - textAlign: TextAlign.end, decoration: const InputDecoration( hintText: '21118', - border: OutlineInputBorder(), contentPadding: - EdgeInsets.only(bottom: 10, top: 10, right: 10), - isCollapsed: true, + EdgeInsets.symmetric(vertical: 12, horizontal: 12), ), ).marginOnly(right: 15), ), From 76252ec94c5d014aa3b1558996f6c265e00d82fc Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 17:50:54 +0100 Subject: [PATCH 08/14] Unify Input. Remove hardcoded style (new rdp) --- flutter/lib/desktop/pages/port_forward_page.dart | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flutter/lib/desktop/pages/port_forward_page.dart b/flutter/lib/desktop/pages/port_forward_page.dart index ae070b47b..99674db02 100644 --- a/flutter/lib/desktop/pages/port_forward_page.dart +++ b/flutter/lib/desktop/pages/port_forward_page.dart @@ -322,14 +322,9 @@ class _PortForwardPageState extends State child: SizedBox( width: 120, child: ElevatedButton( - style: ElevatedButton.styleFrom( - elevation: 0, - side: const BorderSide(color: MyTheme.border)), onPressed: () => bind.sessionNewRdp(id: widget.id), child: Text( translate('New RDP'), - style: const TextStyle( - fontWeight: FontWeight.w300, fontSize: 14), ), ).marginSymmetric(vertical: 10), ).marginOnly(left: 20), From de6b8547f2eeeb59fc50f19d5b870908982c77ea Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 18:10:26 +0100 Subject: [PATCH 09/14] Unify Input. Remove hardcoded style (_LabeledTextField) --- flutter/lib/desktop/pages/desktop_setting_page.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index d54561f70..1a62e7ca4 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -1701,9 +1701,6 @@ _LabeledTextField( enabled: enabled, obscureText: secure, decoration: InputDecoration( - isDense: true, - border: OutlineInputBorder(), - contentPadding: EdgeInsets.fromLTRB(14, 15, 14, 15), errorText: errorText.isNotEmpty ? errorText : null), style: TextStyle( color: _disabledTextColor(context, enabled), From f180c7d64527b8ef4b2e58384e272fefc0c46122 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 18:50:30 +0100 Subject: [PATCH 10/14] Unify Input. Remove hardcoded style (tcp tunnel) --- .../lib/desktop/pages/port_forward_page.dart | 33 ++++++------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/flutter/lib/desktop/pages/port_forward_page.dart b/flutter/lib/desktop/pages/port_forward_page.dart index 99674db02..06b2cf3a7 100644 --- a/flutter/lib/desktop/pages/port_forward_page.dart +++ b/flutter/lib/desktop/pages/port_forward_page.dart @@ -11,7 +11,7 @@ import 'package:wakelock/wakelock.dart'; const double _kColumn1Width = 30; const double _kColumn4Width = 100; -const double _kRowHeight = 50; +const double _kRowHeight = 60; const double _kTextLeftMargin = 20; class _PortForward { @@ -183,8 +183,6 @@ class _PortForwardPageState extends State controller: remotePortController, inputFormatters: portInputFormatter), ElevatedButton( - style: ElevatedButton.styleFrom( - elevation: 0, side: const BorderSide(color: MyTheme.border)), onPressed: () async { int? localPort = int.tryParse(localPortController.text); int? remotePort = int.tryParse(remotePortController.text); @@ -208,7 +206,7 @@ class _PortForwardPageState extends State child: Text( translate('Add'), ), - ).marginAll(10), + ).marginSymmetric(horizontal: 10), ]), ); } @@ -217,26 +215,15 @@ class _PortForwardPageState extends State {required TextEditingController controller, List? inputFormatters, String? hint}) { - final textColor = Theme.of(context).textTheme.titleLarge?.color; return Expanded( - child: TextField( - controller: controller, - inputFormatters: inputFormatters, - cursorColor: textColor, - cursorHeight: 20, - cursorWidth: 1, - decoration: InputDecoration( - border: OutlineInputBorder( - borderSide: BorderSide(color: MyTheme.color(context).border!)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: MyTheme.color(context).border!)), - fillColor: Theme.of(context).colorScheme.background, - contentPadding: const EdgeInsets.all(10), - hintText: hint, - hintStyle: - TextStyle(color: Theme.of(context).hintColor, fontSize: 16)), - style: TextStyle(color: textColor, fontSize: 16), - ).marginAll(10), + child: Padding( + padding: const EdgeInsets.all(10.0), + child: TextField( + controller: controller, + inputFormatters: inputFormatters, + decoration: InputDecoration( + hintText: hint, + ))), ); } From 011f41a0adbd6fb5f8672b2a024677224284f3f1 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 19:05:43 +0100 Subject: [PATCH 11/14] Unify Input. Remove hardcoded style (address book) --- flutter/lib/common/widgets/address_book.dart | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart index 88a5aaaa3..85c77d8ed 100644 --- a/flutter/lib/common/widgets/address_book.dart +++ b/flutter/lib/common/widgets/address_book.dart @@ -274,11 +274,7 @@ class _AddressBookState extends State { TextField( controller: idController, inputFormatters: [IDTextInputFormatter()], - decoration: InputDecoration( - isDense: true, - border: OutlineInputBorder(), - errorText: errorMsg), - style: style, + decoration: InputDecoration(errorText: errorMsg), ), Align( alignment: Alignment.centerLeft, @@ -289,11 +285,6 @@ class _AddressBookState extends State { ).marginOnly(top: 8, bottom: 2), TextField( controller: aliasController, - decoration: InputDecoration( - border: OutlineInputBorder(), - isDense: true, - ), - style: style, ), Align( alignment: Alignment.centerLeft, @@ -379,7 +370,6 @@ class _AddressBookState extends State { child: TextField( maxLines: null, decoration: InputDecoration( - border: const OutlineInputBorder(), errorText: msg.isEmpty ? null : translate(msg), ), controller: controller, From 6f88a7064972ca6116b6a19020a8a69ee5162357 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 19:19:52 +0100 Subject: [PATCH 12/14] Unify Input. Remove hardcoded style (remote id) --- flutter/lib/desktop/pages/connection_page.dart | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart index 30fe07b95..b6debbd8d 100644 --- a/flutter/lib/desktop/pages/connection_page.dart +++ b/flutter/lib/desktop/pages/connection_page.dart @@ -193,7 +193,7 @@ class _ConnectionPageState extends State style: const TextStyle( fontFamily: 'WorkSans', fontSize: 22, - height: 1.25, + height: 1.4, ), maxLines: 1, cursorColor: @@ -204,22 +204,8 @@ class _ConnectionPageState extends State hintText: _idInputFocused.value ? null : translate('Enter Remote ID'), - border: OutlineInputBorder( - borderRadius: BorderRadius.zero, - borderSide: BorderSide( - color: MyTheme.color(context).border!)), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.zero, - borderSide: BorderSide( - color: MyTheme.color(context).border!)), - focusedBorder: const OutlineInputBorder( - borderRadius: BorderRadius.zero, - borderSide: - BorderSide(color: MyTheme.button, width: 3), - ), - isDense: true, contentPadding: const EdgeInsets.symmetric( - horizontal: 10, vertical: 12)), + horizontal: 15, vertical: 13)), controller: _idController, inputFormatters: [IDTextInputFormatter()], onSubmitted: (s) { From f2ec6ff12a05a0ec036ac4a63687fcdc76fe3302 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Sat, 18 Mar 2023 03:45:56 +0100 Subject: [PATCH 13/14] Unify Input. Remove hardcoded style (login) --- flutter/lib/common/widgets/login.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flutter/lib/common/widgets/login.dart b/flutter/lib/common/widgets/login.dart index 43dc3a658..7b37c590d 100644 --- a/flutter/lib/common/widgets/login.dart +++ b/flutter/lib/common/widgets/login.dart @@ -405,7 +405,6 @@ class DialogTextField extends StatelessWidget { child: TextField( decoration: InputDecoration( labelText: title, - border: const OutlineInputBorder(), prefixIcon: prefixIcon, helperText: helperText, helperMaxLines: 8, @@ -635,9 +634,7 @@ Future verificationCodeDialog(UserPayload? user) async { offstage: user?.email == null, child: TextField( decoration: InputDecoration( - labelText: "Email", - prefixIcon: Icon(Icons.email), - border: InputBorder.none), + labelText: "Email", prefixIcon: Icon(Icons.email)), readOnly: true, controller: TextEditingController(text: user?.email), )), From 3b3556e6007946d4585ed5010542fa9277cca2f2 Mon Sep 17 00:00:00 2001 From: grummbeer Date: Fri, 17 Mar 2023 20:30:25 +0100 Subject: [PATCH 14/14] Unify Input. Add border radius to pulldown --- .../desktop/pages/desktop_setting_page.dart | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index 1a62e7ca4..66ef83d31 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -1738,19 +1738,20 @@ class _ComboBox extends StatelessWidget { current = keys[index]; return Container( decoration: BoxDecoration( - border: Border.all( - color: enabled - ? MyTheme.color(context).border2 ?? MyTheme.border - : MyTheme.border, - )), - height: 30, + border: Border.all( + color: enabled + ? MyTheme.color(context).border2 ?? MyTheme.border + : MyTheme.border, + ), + borderRadius: + BorderRadius.circular(8), //border raiuds of dropdown button + ), + height: 42, // should be the height of a TextField child: Obx(() => DropdownButton( isExpanded: true, value: ref.value, elevation: 16, - underline: Container( - height: 25, - ), + underline: Container(), style: TextStyle( color: enabled ? Theme.of(context).textTheme.titleMedium?.color @@ -1758,7 +1759,7 @@ class _ComboBox extends StatelessWidget { icon: const Icon( Icons.expand_more_sharp, size: 20, - ), + ).marginOnly(right: 15), onChanged: enabled ? (String? newValue) { if (newValue != null && newValue != ref.value) { @@ -1775,11 +1776,11 @@ class _ComboBox extends StatelessWidget { value, style: const TextStyle(fontSize: _kContentFontSize), overflow: TextOverflow.ellipsis, - ).marginOnly(left: 5), + ).marginOnly(left: 15), ); }).toList(), )), - ); + ).marginOnly(bottom: 5); } }