Merge pull request #3705 from grummbeer/unify-dialogs-step-1-reset

Unify dialogs. Reset input style to underlined for mobile, reset buttons to right aligned
This commit is contained in:
RustDesk 2023-03-18 11:37:44 +08:00 committed by GitHub
commit 15e5400857
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -201,16 +201,18 @@ class MyTheme {
), ),
), ),
), ),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: isDesktop
fillColor: grayBg, ? InputDecorationTheme(
filled: true, fillColor: grayBg,
isDense: true, filled: true,
contentPadding: EdgeInsets.all(15), isDense: true,
border: UnderlineInputBorder( contentPadding: EdgeInsets.all(15),
borderRadius: BorderRadius.circular(18), border: UnderlineInputBorder(
borderSide: BorderSide.none, borderRadius: BorderRadius.circular(18),
), borderSide: BorderSide.none,
), ),
)
: null,
textTheme: const TextTheme( textTheme: const TextTheme(
titleLarge: TextStyle(fontSize: 19, color: Colors.black87), titleLarge: TextStyle(fontSize: 19, color: Colors.black87),
titleSmall: TextStyle(fontSize: 14, color: Colors.black87), titleSmall: TextStyle(fontSize: 14, color: Colors.black87),
@ -295,16 +297,18 @@ class MyTheme {
), ),
), ),
), ),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: isDesktop
fillColor: Color(0xFF24252B), ? InputDecorationTheme(
filled: true, fillColor: Color(0xFF24252B),
isDense: true, filled: true,
contentPadding: EdgeInsets.all(15), isDense: true,
border: UnderlineInputBorder( contentPadding: EdgeInsets.all(15),
borderRadius: BorderRadius.circular(18), border: UnderlineInputBorder(
borderSide: BorderSide.none, borderRadius: BorderRadius.circular(18),
), borderSide: BorderSide.none,
), ),
)
: null,
textTheme: const TextTheme( textTheme: const TextTheme(
titleLarge: TextStyle(fontSize: 19), titleLarge: TextStyle(fontSize: 19),
titleSmall: TextStyle(fontSize: 14), titleSmall: TextStyle(fontSize: 14),
@ -839,7 +843,6 @@ class CustomAlertDialog extends StatelessWidget {
), ),
actions: actions, actions: actions,
actionsPadding: EdgeInsets.fromLTRB(padding, 0, padding, padding), actionsPadding: EdgeInsets.fromLTRB(padding, 0, padding, padding),
actionsAlignment: MainAxisAlignment.center,
), ),
); );
} }