Skip to content

Commit

Permalink
use CustomDialog to add constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
sun-jiao committed Feb 26, 2024
1 parent 3e55d90 commit 540d421
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 11 deletions.
3 changes: 2 additions & 1 deletion lib/dialogs/increment_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import '../entity/constants.dart';
import '../l10n/l10n.dart';
import '../rules/rule.dart';
import '../widget/checkbox_tile.dart';
import '../widget/custom_dialog.dart';

void showIncrementDialog(BuildContext context, Function(Rule) onSave) => showDialog(
context: context,
Expand Down Expand Up @@ -35,7 +36,7 @@ class _IncrementDialogState extends State<IncrementDialog> {

@override
Widget build(BuildContext context) {
return AlertDialog(
return CustomDialog(
title: Text('${L10n.current.addRule}: ${L10n.current.increment}'),
content: SingleChildScrollView(
child: Column(
Expand Down
3 changes: 2 additions & 1 deletion lib/dialogs/insert_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import '../l10n/l10n.dart';
import '../tools/ex_text_editing_controller.dart';
import '../rules/rule.dart';
import '../widget/checkbox_tile.dart';
import '../widget/custom_dialog.dart';

void showInsertDialog(BuildContext context, Function(Rule) onSave) => showDialog(
context: context,
Expand Down Expand Up @@ -36,7 +37,7 @@ class _InsertDialogState extends State<InsertDialog> {

@override
Widget build(BuildContext context) {
return AlertDialog(
return CustomDialog(
title: Text('${L10n.current.addRule}: ${L10n.current.insert}'),
content: SingleChildScrollView(
child: Column(
Expand Down
4 changes: 3 additions & 1 deletion lib/dialogs/metadata_dialog.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:renamer/l10n/l10n.dart';

import '../widget/custom_dialog.dart';

void showMetadataDialog(BuildContext context, Function(String tag) onInsert) => showDialog(
context: context,
builder: (context) => MetadataDialog(
Expand Down Expand Up @@ -38,7 +40,7 @@ class MetadataDialog extends StatelessWidget {

@override
Widget build(BuildContext context) {
return AlertDialog(
return CustomDialog(
title: Text(L10n.current.metadataTags),
content: SingleChildScrollView(
child: Column(
Expand Down
3 changes: 2 additions & 1 deletion lib/dialogs/rearrange_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import '../entity/constants.dart';
import '../l10n/l10n.dart';
import '../rules/rule.dart';
import '../widget/checkbox_tile.dart';
import '../widget/custom_dialog.dart';

void showRearrangeDialog(BuildContext context, Function(Rule) onSave) => showDialog(
context: context,
Expand All @@ -29,7 +30,7 @@ class _RearrangeDialogState extends State<RearrangeDialog> {

@override
Widget build(BuildContext context) {
return AlertDialog(
return CustomDialog(
title: Text('${L10n.current.addRule}: ${L10n.current.rearrange}'),
content: SingleChildScrollView(
child: Column(
Expand Down
3 changes: 2 additions & 1 deletion lib/dialogs/replace_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import '../l10n/l10n.dart';
import '../tools/ex_text_editing_controller.dart';
import '../rules/rule.dart';
import '../widget/checkbox_tile.dart';
import '../widget/custom_dialog.dart';
import 'metadata_dialog.dart';

void showReplaceDialog(BuildContext context, Function(Rule) onSave) => showDialog(
Expand Down Expand Up @@ -49,7 +50,7 @@ class _ReplaceDialogState extends State<ReplaceDialog> {

@override
Widget build(BuildContext context) {
return AlertDialog(
return CustomDialog(
title: Text('${L10n.current.addRule}: $ruleName'),
content: SingleChildScrollView(
child: Column(
Expand Down
3 changes: 2 additions & 1 deletion lib/dialogs/transliterate_dialog.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import '../entity/transliterate.dart';
import '../l10n/l10n.dart';
import '../widget/custom_dialog.dart';
import '../widget/custom_drop.dart';
import 'package:cyrtranslit/cyrtranslit.dart' as cyrtranslit;

Expand Down Expand Up @@ -28,7 +29,7 @@ class _TransliterateDialogState extends State<TransliterateDialog> {

@override
Widget build(BuildContext context) {
return AlertDialog(
return CustomDialog(
title: Text('${L10n.current.addRule}: ${L10n.current.transliterate}'),
content: SingleChildScrollView(
child: Column(
Expand Down
3 changes: 2 additions & 1 deletion lib/dialogs/truncate_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import '../entity/constants.dart';
import '../l10n/l10n.dart';
import '../rules/rule.dart';
import '../widget/checkbox_tile.dart';
import '../widget/custom_dialog.dart';

void showTruncateDialog(BuildContext context, Function(Rule) onSave) => showDialog(
context: context,
Expand Down Expand Up @@ -55,7 +56,7 @@ class _TruncateDialogState extends State<TruncateDialog> {

@override
Widget build(BuildContext context) {
return AlertDialog(
return CustomDialog(
title: Text('${L10n.current.addRule}: ${L10n.current.truncate}'),
content: SingleChildScrollView(
child: Column(
Expand Down
5 changes: 3 additions & 2 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'entity/sharedpref.dart';
import 'entity/theme_extension.dart';
import 'l10n/l10n.dart';
import 'pages/home_page.dart';
import 'widget/custom_dialog.dart';

late Locale _appLocale;

Expand Down Expand Up @@ -106,7 +107,7 @@ class AppPage extends StatelessWidget {

void _permissionRequest(BuildContext context) => showDialog(
context: context,
builder: (contextD) => AlertDialog(
builder: (contextD) => CustomDialog(
title: Text(L10n.current.permissionTitle),
content: Text(L10n.current.permissionContent),
actions: [
Expand All @@ -129,7 +130,7 @@ class AppPage extends StatelessWidget {
void _cannotRun(BuildContext context) {
showDialog(
context: context,
builder: (context) => AlertDialog(
builder: (context) => CustomDialog(
title: Text(L10n.current.exitTitle),
content: Text(L10n.current.exitContent),
actions: [
Expand Down
3 changes: 2 additions & 1 deletion lib/pages/home_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import '../l10n/l10n.dart';
import '../rules/rule.dart';
import '../tools/file_metadata.dart';
import '../tools/responsive.dart';
import '../widget/custom_dialog.dart';
import 'rules_page.dart';
import 'files_page.dart';

Expand Down Expand Up @@ -228,7 +229,7 @@ class _HomeToolBarState extends State<HomeToolBar> {

void ratingMyApp() => showDialog(
context: context,
builder: (context) => AlertDialog(
builder: (context) => CustomDialog(
title: Text(L10n.current.ratingTitle),
content: Text(L10n.current.ratingContent),
actions: [
Expand Down
3 changes: 2 additions & 1 deletion lib/tools/rename.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:flutter/services.dart';

import '../l10n/l10n.dart';
import '../tools/ex_file.dart';
import '../widget/custom_dialog.dart';

Future<FileSystemEntity?> rename(
FileSystemEntity file, {
Expand All @@ -28,7 +29,7 @@ Future<FileSystemEntity?> rename(
if (context != null && context.mounted) {
showDialog(
context: context,
builder: (dContext) => AlertDialog(
builder: (dContext) => CustomDialog(
title: Text(L10n.current.appError),
content: Column(
mainAxisSize: MainAxisSize.min,
Expand Down
20 changes: 20 additions & 0 deletions lib/widget/custom_dialog.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import 'package:flutter/material.dart';

class CustomDialog extends StatelessWidget {
const CustomDialog({super.key, this.title, this.content, this.actions});
final Widget? title;
final Widget? content;
final List<Widget>? actions;

@override
Widget build(BuildContext context) {
return AlertDialog(
title: title,
actions: actions,
content: Container(
constraints: const BoxConstraints(minWidth: 200, maxWidth: 400),
child: content,
),
);
}
}

0 comments on commit 540d421

Please sign in to comment.