Skip to content

Commit

Permalink
Merge pull request #75 from mono0926/73-support-dragging-text-input-d…
Browse files Browse the repository at this point in the history 
…ialog-for-macos

73 support dragging text input dialog for macos
  • Loading branch information
@mono0926
mono0926 authored Apr 28, 2022
2 parents 8cc17c0 + 7c3c93a commit dfc27e9
Show file tree
Hide file tree
Showing 2 changed files with 198 additions and 168 deletions.
87 changes: 87 additions & 0 deletions lib/src/helper/macos_draggable_dialog.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:macos_ui/macos_ui.dart';

class MacosDraggableDialog extends StatefulWidget {
const MacosDraggableDialog({
Key? key,
required this.child,
}) : super(key: key);

final Widget child;

@override
State<MacosDraggableDialog> createState() => _MacosDraggableDialogState();
}

class _MacosDraggableDialogState extends State<MacosDraggableDialog> {
var _offset = Offset.zero;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
final borderRadius = BorderRadius.circular(12);
final brightness = theme.brightness;
final color = brightness.resolve(
CupertinoColors.extraLightBackgroundGray,
CupertinoColors.darkBackgroundGray,
);
final innerBorderColor = brightness.resolve(
Colors.white.withOpacity(0.45),
Colors.white.withOpacity(0.15),
);
return Transform.translate(
offset: _offset,
child: Dialog(
clipBehavior: Clip.antiAlias,
shape: RoundedRectangleBorder(
borderRadius: borderRadius,
),
backgroundColor: color,
child: Container(
decoration: BoxDecoration(
border: Border.all(
width: 2,
color: innerBorderColor,
),
borderRadius: borderRadius,
),
foregroundDecoration: BoxDecoration(
border: Border.all(
color: brightness.resolve(
Colors.black.withOpacity(0.23),
Colors.black.withOpacity(0.76),
),
),
borderRadius: borderRadius,
),
child: SizedBox(
width: 500,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
GestureDetector(
onPanUpdate: (details) => setState(() {
_offset += details.delta;
}),
child: Container(
height: 28,
decoration: BoxDecoration(
color: Color.lerp(color, Colors.white, 0.12),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.2),
blurRadius: 1,
),
],
),
),
),
widget.child,
],
),
),
),
),
);
}
}
279 changes: 111 additions & 168 deletions lib/src/text_input_dialog/macos_text_input_dialog.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:adaptive_dialog/src/extensions/extensions.dart';
import 'package:adaptive_dialog/src/helper/macos_draggable_dialog.dart';
import 'package:collection/collection.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -83,182 +84,124 @@ class _MacOSTextInputDialogState extends State<MacOSTextInputDialog> {
final title = widget.title;
final message = widget.message;
void cancel() => navigator.pop();
final brightness = theme.brightness;

final color = brightness.resolve(
CupertinoColors.extraLightBackgroundGray,
CupertinoColors.darkBackgroundGray,
);
final innerBorderColor = brightness.resolve(
Colors.white.withOpacity(0.45),
Colors.white.withOpacity(0.15),
);
final borderRadius = BorderRadius.circular(12);
final icon = AdaptiveDialog.instance.macOS.applicationIcon;
return Dialog(
clipBehavior: Clip.antiAlias,
shape: RoundedRectangleBorder(
borderRadius: borderRadius,
),
backgroundColor: color,
child: Container(
decoration: BoxDecoration(
border: Border.all(
width: 2,
color: innerBorderColor,
),
borderRadius: borderRadius,
),
foregroundDecoration: BoxDecoration(
border: Border.all(
color: brightness.resolve(
Colors.black.withOpacity(0.23),
Colors.black.withOpacity(0.76),
),
),
borderRadius: borderRadius,
),
child: SizedBox(
width: 500,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Container(
height: 28,
decoration: BoxDecoration(
color: Color.lerp(color, Colors.white, 0.12),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.2),
blurRadius: 1,
),
],
return MacosDraggableDialog(
child: Padding(
padding: const EdgeInsets.all(20),
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (icon != null)
Padding(
padding: const EdgeInsets.only(
top: 8,
right: 20,
),
child: SizedBox(
width: 52,
height: 52,
child: icon,
),
),
Padding(
padding: const EdgeInsets.all(20),
child: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (icon != null)
Padding(
padding: const EdgeInsets.only(
top: 8,
right: 20,
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (title != null)
Padding(
padding: const EdgeInsets.only(bottom: 8),
child: Text(
title,
style: theme.textTheme.titleMedium!.copyWith(
fontWeight: FontWeight.bold,
),
child: SizedBox(
width: 52,
height: 52,
child: icon,
),
),
if (message != null)
Padding(
padding: const EdgeInsets.only(bottom: 8),
child: Text(message),
),
const SizedBox(height: 8),
..._textControllers.mapIndexed<Widget>(
(i, c) {
final isLast = widget.textFields.length == i + 1;
final field = widget.textFields[i];
final prefixText = field.prefixText;
final suffixText = field.suffixText;
return Center(
child: FractionallySizedBox(
widthFactor: 0.7,
child: MacosTextField(
controller: c,
autofocus: i == 0,
placeholder: field.hintText,
obscureText: field.obscureText,
keyboardType: field.keyboardType,
minLines: field.minLines,
maxLines: field.maxLines,
autocorrect: field.autocorrect,
prefix:
prefixText == null ? null : Text(prefixText),
suffix:
suffixText == null ? null : Text(suffixText),
textInputAction:
isLast ? null : TextInputAction.next,
onSubmitted: isLast && widget.autoSubmit
? (_) => submitIfValid()
: null,
),
),
);
},
).intersperse(const SizedBox(height: 4)),
if (validationMessage != null)
Padding(
padding: const EdgeInsets.only(top: 18),
child: Text(
validationMessage,
style: const TextStyle(
color: CupertinoColors.destructiveRed,
),
),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (title != null)
Padding(
padding: const EdgeInsets.only(bottom: 8),
child: Text(
title,
style: theme.textTheme.titleMedium!.copyWith(
fontWeight: FontWeight.bold,
),
),
),
if (message != null)
Padding(
padding: const EdgeInsets.only(bottom: 8),
child: Text(message),
),
const SizedBox(height: 8),
..._textControllers.mapIndexed<Widget>(
(i, c) {
final isLast = widget.textFields.length == i + 1;
final field = widget.textFields[i];
final prefixText = field.prefixText;
final suffixText = field.suffixText;
return Center(
child: FractionallySizedBox(
widthFactor: 0.7,
child: MacosTextField(
controller: c,
autofocus: i == 0,
placeholder: field.hintText,
obscureText: field.obscureText,
keyboardType: field.keyboardType,
minLines: field.minLines,
maxLines: field.maxLines,
autocorrect: field.autocorrect,
prefix: prefixText == null
? null
: Text(prefixText),
suffix: suffixText == null
? null
: Text(suffixText),
textInputAction:
isLast ? null : TextInputAction.next,
onSubmitted: isLast && widget.autoSubmit
? (_) => submitIfValid()
: null,
),
),
);
},
).intersperse(const SizedBox(height: 4)),
if (validationMessage != null)
Padding(
padding: const EdgeInsets.only(top: 18),
child: Text(
validationMessage,
style: const TextStyle(
color: CupertinoColors.destructiveRed,
),
),
),
const SizedBox(height: 12),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
PushButton(
buttonSize: ButtonSize.large,
isSecondary: true,
onPressed: cancel,
child: Text(
widget.cancelLabel ??
MaterialLocalizations.of(context)
.cancelButtonLabel
.capitalizedForce,
),
),
const SizedBox(width: 14),
PushButton(
buttonSize: ButtonSize.large,
onPressed: submitIfValid,
isSecondary: widget.isDestructiveAction,
child: Text(
widget.okLabel ??
MaterialLocalizations.of(context)
.okButtonLabel,
style: TextStyle(
color: widget.isDestructiveAction
? CupertinoColors.systemRed
.resolveFrom(context)
: null,
),
),
),
],
)
],
),
const SizedBox(height: 12),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
PushButton(
buttonSize: ButtonSize.large,
isSecondary: true,
onPressed: cancel,
child: Text(
widget.cancelLabel ??
MaterialLocalizations.of(context)
.cancelButtonLabel
.capitalizedForce,
),
),
)
],
),
const SizedBox(width: 14),
PushButton(
buttonSize: ButtonSize.large,
onPressed: submitIfValid,
isSecondary: widget.isDestructiveAction,
child: Text(
widget.okLabel ??
MaterialLocalizations.of(context).okButtonLabel,
style: TextStyle(
color: widget.isDestructiveAction
? CupertinoColors.systemRed.resolveFrom(context)
: null,
),
),
),
],
)
],
),
],
),
)
],
),
),
);
Expand Down

0 comments on commit dfc27e9

Please sign in to comment.