diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index c438a3c7b..ceff7480e 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -174,6 +174,27 @@ class MyTheme {
brightness: Brightness.light,
hoverColor: Color.fromARGB(255, 224, 224, 224),
scaffoldBackgroundColor: Color(0xFFFFFFFF),
+ dialogBackgroundColor: Color(0xFFFFFFFF),
+ dialogTheme: DialogTheme(
+ elevation: 15,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(18.0),
+ side: BorderSide(
+ width: 1,
+ color: Color(0xFFEEEEEE),
+ ),
+ ),
+ ),
+ inputDecorationTheme: InputDecorationTheme(
+ fillColor: Color(0xFFEEEEEE),
+ filled: true,
+ isDense: true,
+ contentPadding: EdgeInsets.all(15),
+ border: UnderlineInputBorder(
+ borderRadius: BorderRadius.circular(18),
+ borderSide: BorderSide.none,
+ ),
+ ),
textTheme: const TextTheme(
titleLarge: TextStyle(fontSize: 19, color: Colors.black87),
titleSmall: TextStyle(fontSize: 14, color: Colors.black87),
@@ -192,9 +213,48 @@ class MyTheme {
splashFactory: isDesktop ? NoSplash.splashFactory : null,
textButtonTheme: isDesktop
? TextButtonThemeData(
- style: ButtonStyle(splashFactory: NoSplash.splashFactory),
+ style: TextButton.styleFrom(
+ splashFactory: NoSplash.splashFactory,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(18.0),
+ ),
+ ),
)
: null,
+ elevatedButtonTheme: ElevatedButtonThemeData(
+ style: ElevatedButton.styleFrom(
+ backgroundColor: MyTheme.accent,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ ),
+ ),
+ outlinedButtonTheme: OutlinedButtonThemeData(
+ style: OutlinedButton.styleFrom(
+ backgroundColor: Color(
+ 0xFFEEEEEE,
+ ),
+ foregroundColor: Colors.black87,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ ),
+ ),
+ checkboxTheme: const CheckboxThemeData(
+ splashRadius: 0,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.all(
+ Radius.circular(5),
+ ),
+ ),
+ ),
+ listTileTheme: ListTileThemeData(
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.all(
+ Radius.circular(5),
+ ),
+ ),
+ ),
colorScheme: ColorScheme.fromSwatch(
primarySwatch: Colors.blue,
).copyWith(
@@ -211,6 +271,27 @@ class MyTheme {
brightness: Brightness.dark,
hoverColor: Color.fromARGB(255, 45, 46, 53),
scaffoldBackgroundColor: Color(0xFF18191E),
+ dialogBackgroundColor: Color(0xFF18191E),
+ dialogTheme: DialogTheme(
+ elevation: 15,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(18.0),
+ side: BorderSide(
+ width: 1,
+ color: Color(0xFF24252B),
+ ),
+ ),
+ ),
+ inputDecorationTheme: InputDecorationTheme(
+ fillColor: Color(0xFF24252B),
+ filled: true,
+ isDense: true,
+ contentPadding: EdgeInsets.all(15),
+ border: UnderlineInputBorder(
+ borderRadius: BorderRadius.circular(18),
+ borderSide: BorderSide.none,
+ ),
+ ),
textTheme: const TextTheme(
titleLarge: TextStyle(fontSize: 19),
titleSmall: TextStyle(fontSize: 14),
@@ -229,27 +310,55 @@ class MyTheme {
splashColor: Colors.transparent,
highlightColor: Colors.transparent,
splashFactory: isDesktop ? NoSplash.splashFactory : null,
- outlinedButtonTheme: OutlinedButtonThemeData(
- style: OutlinedButton.styleFrom(
- side: BorderSide(color: Colors.white38),
- disabledForegroundColor: Colors.white70,
- ),
- ),
textButtonTheme: isDesktop
? TextButtonThemeData(
style: TextButton.styleFrom(
- splashFactory: NoSplash.splashFactory,
- disabledForegroundColor: Colors.white70,
- ))
+ splashFactory: NoSplash.splashFactory,
+ disabledForegroundColor: Colors.white70,
+ foregroundColor: Colors.white70,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(18.0),
+ ),
+ ),
+ )
: null,
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
+ backgroundColor: MyTheme.accent,
disabledForegroundColor: Colors.white70,
disabledBackgroundColor: Colors.white10,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ ),
+ ),
+ outlinedButtonTheme: OutlinedButtonThemeData(
+ style: OutlinedButton.styleFrom(
+ backgroundColor: Color(0xFF24252B),
+ side: BorderSide(color: Colors.white12, width: 0.5),
+ disabledForegroundColor: Colors.white70,
+ foregroundColor: Colors.white70,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(8.0),
+ ),
+ ),
+ ),
+ checkboxTheme: const CheckboxThemeData(
+ checkColor: MaterialStatePropertyAll(dark),
+ splashRadius: 0,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.all(
+ Radius.circular(5),
+ ),
+ ),
+ ),
+ listTileTheme: ListTileThemeData(
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.all(
+ Radius.circular(5),
+ ),
),
),
- checkboxTheme:
- const CheckboxThemeData(checkColor: MaterialStatePropertyAll(dark)),
colorScheme: ColorScheme.fromSwatch(
primarySwatch: Colors.blue,
).copyWith(
@@ -480,7 +589,7 @@ class OverlayDialogManager {
BackButtonInterceptor.removeByName(dialogTag);
}
- dialog.entry = OverlayEntry(builder: (_) {
+ dialog.entry = OverlayEntry(builder: (context) {
bool innerClicked = false;
return Listener(
onPointerUp: (_) {
@@ -490,7 +599,9 @@ class OverlayDialogManager {
innerClicked = false;
},
child: Container(
- color: Colors.black12,
+ color: Theme.of(context).brightness == Brightness.light
+ ? Colors.black12
+ : Colors.black45,
child: StatefulBuilder(builder: (context, setState) {
return Listener(
onPointerUp: (_) => innerClicked = true,
@@ -672,7 +783,7 @@ class CustomAlertDialog extends StatelessWidget {
Future.delayed(Duration.zero, () {
if (!scopeNode.hasFocus) scopeNode.requestFocus();
});
- const double padding = 16;
+ const double padding = 30;
bool tabTapped = false;
return FocusScope(
node: scopeNode,
@@ -701,18 +812,19 @@ class CustomAlertDialog extends StatelessWidget {
scrollable: true,
title: title,
titlePadding: EdgeInsets.fromLTRB(padding, 24, padding, 0),
- contentPadding: EdgeInsets.fromLTRB(contentPadding ?? padding, 25,
- contentPadding ?? padding, actions is List ? 10 : padding),
+ contentPadding: EdgeInsets.fromLTRB(
+ contentPadding ?? padding,
+ 25,
+ contentPadding ?? padding,
+ actions is List ? 10 : padding,
+ ),
content: ConstrainedBox(
constraints: contentBoxConstraints,
- child: Theme(
- data: Theme.of(context).copyWith(
- inputDecorationTheme: InputDecorationTheme(
- isDense: true, contentPadding: EdgeInsets.all(15))),
- child: content),
+ child: content,
),
actions: actions,
actionsPadding: EdgeInsets.fromLTRB(padding, 0, padding, padding),
+ actionsAlignment: MainAxisAlignment.center,
),
);
}
@@ -1727,28 +1839,43 @@ class ServerConfig {
Widget dialogButton(String text,
{required VoidCallback? onPressed,
bool isOutline = false,
+ Widget? icon,
TextStyle? style,
ButtonStyle? buttonStyle}) {
if (isDesktop) {
if (isOutline) {
- return OutlinedButton(
- onPressed: onPressed,
- child: Text(translate(text), style: style),
- );
+ return icon == null
+ ? OutlinedButton(
+ onPressed: onPressed,
+ child: Text(translate(text), style: style),
+ )
+ : OutlinedButton.icon(
+ icon: icon,
+ onPressed: onPressed,
+ label: Text(translate(text), style: style),
+ );
} else {
- return ElevatedButton(
- style: ElevatedButton.styleFrom(elevation: 0).merge(buttonStyle),
- onPressed: onPressed,
- child: Text(translate(text), style: style),
- );
+ return icon == null
+ ? ElevatedButton(
+ style: ElevatedButton.styleFrom(elevation: 0).merge(buttonStyle),
+ onPressed: onPressed,
+ child: Text(translate(text), style: style),
+ )
+ : ElevatedButton.icon(
+ icon: icon,
+ style: ElevatedButton.styleFrom(elevation: 0).merge(buttonStyle),
+ onPressed: onPressed,
+ label: Text(translate(text), style: style),
+ );
}
} else {
return TextButton(
- onPressed: onPressed,
- child: Text(
- translate(text),
- style: style,
- ));
+ onPressed: onPressed,
+ child: Text(
+ translate(text),
+ style: style,
+ ),
+ );
}
}
diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
index a69fc3bbe..5a7f2bfa7 100644
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -532,19 +532,7 @@ abstract class BasePeerCard extends StatelessWidget {
],
),
proc: () {
- () async {
- if (isLan) {
- bind.mainRemoveDiscovered(id: id);
- } else {
- final favs = (await bind.mainGetFav()).toList();
- if (favs.remove(id)) {
- await bind.mainStoreFav(favs: favs);
- }
- await bind.mainRemovePeer(id: id);
- }
- removePreference(id);
- await reloadFunc();
- }();
+ _delete(id, isLan, reloadFunc);
},
padding: menuPadding,
dismissOnClicked: true,
@@ -673,7 +661,13 @@ abstract class BasePeerCard extends StatelessWidget {
}
return CustomAlertDialog(
- title: Text(translate('Rename')),
+ title: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(Icons.edit_rounded, color: MyTheme.accent),
+ Text(translate('Rename')).paddingOnly(left: 10),
+ ],
+ ),
content: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -682,9 +676,7 @@ abstract class BasePeerCard extends StatelessWidget {
child: TextFormField(
controller: controller,
autofocus: true,
- decoration: InputDecoration(
- border: OutlineInputBorder(),
- labelText: translate('Name')),
+ decoration: InputDecoration(labelText: translate('Name')),
),
),
),
@@ -694,8 +686,17 @@ abstract class BasePeerCard extends StatelessWidget {
],
),
actions: [
- dialogButton("Cancel", onPressed: close, isOutline: true),
- dialogButton("OK", onPressed: submit),
+ dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: close,
+ isOutline: true,
+ ),
+ dialogButton(
+ "OK",
+ icon: Icon(Icons.done_rounded),
+ onPressed: submit,
+ ),
],
onSubmit: submit,
onCancel: close,
@@ -705,6 +706,58 @@ abstract class BasePeerCard extends StatelessWidget {
@protected
void _update();
+
+ void _delete(String id, bool isLan, Function reloadFunc) async {
+ gFFI.dialogManager.show(
+ (setState, close) {
+ submit() async {
+ if (isLan) {
+ bind.mainRemoveDiscovered(id: id);
+ } else {
+ final favs = (await bind.mainGetFav()).toList();
+ if (favs.remove(id)) {
+ await bind.mainStoreFav(favs: favs);
+ }
+ await bind.mainRemovePeer(id: id);
+ }
+ removePreference(id);
+ await reloadFunc();
+ close();
+ }
+
+ return CustomAlertDialog(
+ title: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(
+ Icons.delete_rounded,
+ color: Colors.red,
+ ),
+ Text(translate('Delete')).paddingOnly(
+ left: 10,
+ ),
+ ],
+ ),
+ content: SizedBox.shrink(),
+ actions: [
+ dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: close,
+ isOutline: true,
+ ),
+ dialogButton(
+ "OK",
+ icon: Icon(Icons.done_rounded),
+ onPressed: submit,
+ ),
+ ],
+ onSubmit: submit,
+ onCancel: close,
+ );
+ },
+ );
+ }
}
class RecentPeerCard extends BasePeerCard {
diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart
index badb68a84..9c72caa5f 100644
--- a/flutter/lib/desktop/pages/file_manager_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_page.dart
@@ -300,14 +300,13 @@ class _FileManagerPageState extends State<FileManagerPage>
}
skipCount = index + 1;
}
- var searchResult = entries
- .skip(skipCount)
- .where((element) => element.name.toLowerCase().startsWith(buffer));
+ var searchResult = entries.skip(skipCount).where(
+ (element) => element.name.toLowerCase().startsWith(buffer));
if (searchResult.isEmpty) {
// cannot find next, lets restart search from head
debugPrint("restart search from head");
- searchResult =
- entries.where((element) => element.name.toLowerCase().startsWith(buffer));
+ searchResult = entries.where(
+ (element) => element.name.toLowerCase().startsWith(buffer));
}
if (searchResult.isEmpty) {
setState(() {
@@ -321,8 +320,8 @@ class _FileManagerPageState extends State<FileManagerPage>
onSearch: (buffer) {
debugPrint("searching for $buffer");
final selectedEntries = getSelectedItems(isLocal);
- final searchResult =
- entries.where((element) => element.name.toLowerCase().startsWith(buffer));
+ final searchResult = entries.where(
+ (element) => element.name.toLowerCase().startsWith(buffer));
selectedEntries.clear();
if (searchResult.isEmpty) {
setState(() {
@@ -504,8 +503,7 @@ class _FileManagerPageState extends State<FileManagerPage>
debugPrint("entry is not valid: ${entry.path}");
}
final selectedEntries = getSelectedItems(isLocal);
- final searchResult =
- entries.where((element) => element == entry);
+ final searchResult = entries.where((element) => element == entry);
selectedEntries.clear();
if (searchResult.isEmpty) {
return;
@@ -976,14 +974,26 @@ class _FileManagerPageState extends State<FileManagerPage>
cancel() => close(false);
return CustomAlertDialog(
- title: Text(translate("Create Folder")),
+ title: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ SvgPicture.asset("assets/folder_new.svg",
+ color: MyTheme.accent),
+ Text(
+ translate("Create Folder"),
+ ).paddingOnly(
+ left: 10,
+ ),
+ ],
+ ),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextFormField(
decoration: InputDecoration(
labelText: translate(
- "Please enter the folder name"),
+ "Please enter the folder name",
+ ),
),
controller: name,
autofocus: true,
@@ -991,9 +1001,17 @@ class _FileManagerPageState extends State<FileManagerPage>
],
),
actions: [
- dialogButton("Cancel",
- onPressed: cancel, isOutline: true),
- dialogButton("OK", onPressed: submit)
+ dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: cancel,
+ isOutline: true,
+ ),
+ dialogButton(
+ "Ok",
+ icon: Icon(Icons.done_rounded),
+ onPressed: submit,
+ ),
],
onSubmit: submit,
onCancel: cancel,
@@ -1036,11 +1054,6 @@ class _FileManagerPageState extends State<FileManagerPage>
? MyTheme.accent80
: MyTheme.accent,
),
- shape: MaterialStateProperty.all<RoundedRectangleBorder>(
- RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(18.0),
- ),
- ),
),
onPressed: validItems(selectedItems)
? () {
@@ -1430,14 +1443,14 @@ class _FileManagerPageState extends State<FileManagerPage>
).marginSymmetric(horizontal: 4),
),
Flexible(
- flex: 1,
- child: ascending.value != null
- ? Icon(
- ascending.value!
- ? Icons.keyboard_arrow_up_rounded
- : Icons.keyboard_arrow_down_rounded,
- )
- : const Offstage())
+ flex: 1,
+ child: ascending.value != null
+ ? Icon(
+ ascending.value!
+ ? Icons.keyboard_arrow_up_rounded
+ : Icons.keyboard_arrow_down_rounded,
+ )
+ : const Offstage())
],
),
),
@@ -1467,10 +1480,8 @@ class _FileManagerPageState extends State<FileManagerPage>
axis: Axis.vertical,
onPointerMove: (dx) {
nameColWidth.value += dx;
- nameColWidth.value = min(
- kDesktopFileTransferMaximumWidth,
- max(kDesktopFileTransferMinimumWidth,
- nameColWidth.value));
+ nameColWidth.value = min(kDesktopFileTransferMaximumWidth,
+ max(kDesktopFileTransferMinimumWidth, nameColWidth.value));
},
padding: padding,
),
diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart
index 47d58ce5e..081cd1649 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_menubar.dart
@@ -411,17 +411,18 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
borderRadius: BorderRadius.all(Radius.circular(10)),
),
child: SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- child: Theme(
- data: themeData(),
- child: MenuBar(
- children: [
- SizedBox(width: _MenubarTheme.buttonHMargin),
- ...menubarItems,
- SizedBox(width: _MenubarTheme.buttonHMargin)
- ],
- ),
- )),
+ scrollDirection: Axis.horizontal,
+ child: Theme(
+ data: themeData(),
+ child: MenuBar(
+ children: [
+ SizedBox(width: _MenubarTheme.buttonHMargin),
+ ...menubarItems,
+ SizedBox(width: _MenubarTheme.buttonHMargin)
+ ],
+ ),
+ ),
+ ),
),
_buildDraggableShowHide(context),
],
@@ -431,10 +432,13 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
ThemeData themeData() {
return Theme.of(context).copyWith(
menuButtonTheme: MenuButtonThemeData(
- style: ButtonStyle(
- minimumSize: MaterialStatePropertyAll(Size(64, 36)),
- textStyle: MaterialStatePropertyAll(
- TextStyle(fontWeight: FontWeight.normal)))),
+ style: ButtonStyle(
+ minimumSize: MaterialStatePropertyAll(Size(64, 36)),
+ textStyle: MaterialStatePropertyAll(
+ TextStyle(fontWeight: FontWeight.normal),
+ ),
+ ),
+ ),
dividerTheme: DividerThemeData(space: 4),
);
}
@@ -655,26 +659,44 @@ class _ControlMenu extends StatelessWidget {
}
return CustomAlertDialog(
- title: Text(translate('OS Password')),
- content: Column(mainAxisSize: MainAxisSize.min, children: [
- PasswordWidget(controller: controller),
- CheckboxListTile(
- contentPadding: const EdgeInsets.all(0),
- dense: true,
- controlAffinity: ListTileControlAffinity.leading,
- title: Text(
- translate('Auto Login'),
+ title: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(Icons.password_rounded, color: MyTheme.accent),
+ Text(translate('OS Password')).paddingOnly(left: 10),
+ ],
+ ),
+ content: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ PasswordWidget(controller: controller),
+ CheckboxListTile(
+ contentPadding: const EdgeInsets.all(0),
+ dense: true,
+ controlAffinity: ListTileControlAffinity.leading,
+ title: Text(
+ translate('Auto Login'),
+ ),
+ value: autoLogin,
+ onChanged: (v) {
+ if (v == null) return;
+ setState(() => autoLogin = v);
+ },
),
- value: autoLogin,
- onChanged: (v) {
- if (v == null) return;
- setState(() => autoLogin = v);
- },
- ),
- ]),
+ ],
+ ),
actions: [
- dialogButton('Cancel', onPressed: close, isOutline: true),
- dialogButton('OK', onPressed: submit),
+ dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: close,
+ isOutline: true,
+ ),
+ dialogButton(
+ "OK",
+ icon: Icon(Icons.done_rounded),
+ onPressed: submit,
+ ),
],
onSubmit: submit,
onCancel: close,
diff --git a/flutter/lib/mobile/pages/server_page.dart b/flutter/lib/mobile/pages/server_page.dart
index bab2911f1..218559a6e 100644
--- a/flutter/lib/mobile/pages/server_page.dart
+++ b/flutter/lib/mobile/pages/server_page.dart
@@ -429,7 +429,7 @@ class ConnectionManager extends StatelessWidget {
? ElevatedButton.icon(
style: ButtonStyle(
backgroundColor:
- MaterialStateProperty.all(Colors.red)),
+ MaterialStatePropertyAll(Colors.red)),
icon: const Icon(Icons.close),
onPressed: () {
bind.cmCloseConnection(connId: client.id);
diff --git a/flutter/lib/mobile/widgets/dialog.dart b/flutter/lib/mobile/widgets/dialog.dart
index 931999382..3832ca7b1 100644
--- a/flutter/lib/mobile/widgets/dialog.dart
+++ b/flutter/lib/mobile/widgets/dialog.dart
@@ -25,19 +25,26 @@ void showRestartRemoteDevice(
final res =
await dialogManager.show<bool>((setState, close) => CustomAlertDialog(
title: Row(children: [
- Icon(Icons.warning_amber_sharp,
- color: Colors.redAccent, size: 28),
- SizedBox(width: 10),
- Text(translate("Restart Remote Device")),
+ Icon(Icons.warning_rounded, color: Colors.redAccent, size: 28),
+ Text(translate("Restart Remote Device")).paddingOnly(left: 10),
]),
content: Text(
"${translate('Are you sure you want to restart')} \n${pi.username}@${pi.hostname}($id) ?"),
+ actions: [
+ dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: close,
+ isOutline: true,
+ ),
+ dialogButton(
+ "OK",
+ icon: Icon(Icons.done_rounded),
+ onPressed: () => close(true),
+ ),
+ ],
onCancel: close,
onSubmit: () => close(true),
- actions: [
- dialogButton("Cancel", onPressed: close, isOutline: true),
- dialogButton("OK", onPressed: () => close(true)),
- ],
));
if (res == true) bind.sessionRestartRemoteDevice(id: id);
}
@@ -62,7 +69,13 @@ void setPermanentPasswordDialog(OverlayDialogManager dialogManager) async {
}
return CustomAlertDialog(
- title: Text(translate('Set your own password')),
+ title: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(Icons.password_rounded, color: MyTheme.accent),
+ Text(translate('Set your own password')).paddingOnly(left: 10),
+ ],
+ ),
content: Form(
autovalidateMode: AutovalidateMode.onUserInteraction,
child: Column(mainAxisSize: MainAxisSize.min, children: [
@@ -112,11 +125,13 @@ void setPermanentPasswordDialog(OverlayDialogManager dialogManager) async {
actions: [
dialogButton(
'Cancel',
+ icon: Icon(Icons.close_rounded),
onPressed: close,
isOutline: true,
),
dialogButton(
'OK',
+ icon: Icon(Icons.done_rounded),
onPressed: (validateLength && validateSame) ? submit : null,
),
],
@@ -178,7 +193,13 @@ void enterPasswordDialog(String id, OverlayDialogManager dialogManager) async {
}
return CustomAlertDialog(
- title: Text(translate('Password Required')),
+ title: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(Icons.password_rounded, color: MyTheme.accent),
+ Text(translate('Password Required')).paddingOnly(left: 10),
+ ],
+ ),
content: Column(mainAxisSize: MainAxisSize.min, children: [
PasswordWidget(controller: controller),
CheckboxListTile(
@@ -197,8 +218,17 @@ void enterPasswordDialog(String id, OverlayDialogManager dialogManager) async {
),
]),
actions: [
- dialogButton('Cancel', onPressed: cancel, isOutline: true),
- dialogButton('OK', onPressed: submit),
+ dialogButton(
+ 'Cancel',
+ icon: Icon(Icons.close_rounded),
+ onPressed: cancel,
+ isOutline: true,
+ ),
+ dialogButton(
+ 'OK',
+ icon: Icon(Icons.done_rounded),
+ onPressed: submit,
+ ),
],
onSubmit: submit,
onCancel: cancel,
diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart
index 5817e54fe..56c9339f3 100644
--- a/flutter/lib/models/file_model.dart
+++ b/flutter/lib/models/file_model.dart
@@ -593,9 +593,12 @@ class FileModel extends ChangeNotifier {
? "${translate("Are you sure you want to delete the file of this directory?")}\n"
: "";
final count = entries.length > 1 ? "${i + 1}/${entries.length}" : "";
- content = "$dirShow$count \n${entries[i].path}";
- final confirm =
- await showRemoveDialog(title, content, item.isDirectory);
+ content = "$dirShow\n\n${entries[i].path}".trim();
+ final confirm = await showRemoveDialog(
+ count.isEmpty ? title : "$title ($count)",
+ content,
+ item.isDirectory,
+ );
try {
if (confirm == true) {
sendRemoveFile(entries[i].path, i, items.isLocal!);
@@ -636,41 +639,56 @@ class FileModel extends ChangeNotifier {
submit() => close(true);
return CustomAlertDialog(
title: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
children: [
- const Icon(Icons.warning, color: Colors.red),
- const SizedBox(width: 20),
- Text(title)
+ const Icon(Icons.warning_rounded, color: Colors.red),
+ Text(title).paddingOnly(
+ left: 10,
+ ),
],
),
contentBoxConstraints:
BoxConstraints(minHeight: 100, minWidth: 400, maxWidth: 400),
content: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.min,
- children: [
- Text(content),
- const SizedBox(height: 5),
- Text(translate("This is irreversible!"),
- style: const TextStyle(fontWeight: FontWeight.bold)),
- showCheckbox
- ? CheckboxListTile(
- contentPadding: const EdgeInsets.all(0),
- dense: true,
- controlAffinity: ListTileControlAffinity.leading,
- title: Text(
- translate("Do this for all conflicts"),
- ),
- value: removeCheckboxRemember,
- onChanged: (v) {
- if (v == null) return;
- setState(() => removeCheckboxRemember = v);
- },
- )
- : const SizedBox.shrink()
- ]),
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(content),
+ Text(
+ translate("This is irreversible!"),
+ style: const TextStyle(
+ fontWeight: FontWeight.bold,
+ color: Colors.red,
+ ),
+ ).paddingOnly(top: 20),
+ showCheckbox
+ ? CheckboxListTile(
+ contentPadding: const EdgeInsets.all(0),
+ dense: true,
+ controlAffinity: ListTileControlAffinity.leading,
+ title: Text(
+ translate("Do this for all conflicts"),
+ ),
+ value: removeCheckboxRemember,
+ onChanged: (v) {
+ if (v == null) return;
+ setState(() => removeCheckboxRemember = v);
+ },
+ )
+ : const SizedBox.shrink()
+ ],
+ ),
actions: [
- dialogButton("Cancel", onPressed: cancel, isOutline: true),
- dialogButton("OK", onPressed: submit),
+ dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: cancel,
+ isOutline: true,
+ ),
+ dialogButton(
+ "OK",
+ icon: Icon(Icons.done_rounded),
+ onPressed: submit,
+ ),
],
onSubmit: submit,
onCancel: cancel,
@@ -690,9 +708,10 @@ class FileModel extends ChangeNotifier {
return CustomAlertDialog(
title: Row(
children: [
- const Icon(Icons.warning, color: Colors.red),
- const SizedBox(width: 20),
- Text(title)
+ const Icon(Icons.warning_rounded, color: Colors.red),
+ Text(title).paddingOnly(
+ left: 10,
+ ),
],
),
contentBoxConstraints:
@@ -722,9 +741,23 @@ class FileModel extends ChangeNotifier {
: const SizedBox.shrink()
]),
actions: [
- dialogButton("Cancel", onPressed: cancel, isOutline: true),
- dialogButton("Skip", onPressed: () => close(null), isOutline: true),
- dialogButton("OK", onPressed: submit),
+ dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: cancel,
+ isOutline: true,
+ ),
+ dialogButton(
+ "Skip",
+ icon: Icon(Icons.navigate_next_rounded),
+ onPressed: () => close(null),
+ isOutline: true,
+ ),
+ dialogButton(
+ "OK",
+ icon: Icon(Icons.done_rounded),
+ onPressed: submit,
+ ),
],
onSubmit: submit,
onCancel: cancel,