changed dialog style

This commit is contained in:
Thibault Deckers 2020-08-02 15:57:18 +09:00
parent 5b338ba025
commit 93ebd25f70
6 changed files with 25 additions and 4 deletions

View file

@ -22,6 +22,14 @@ class Constants {
static const svgBackground = Colors.white; static const svgBackground = Colors.white;
static const svgColorFilter = ColorFilter.mode(svgBackground, BlendMode.dstOver); static const svgColorFilter = ColorFilter.mode(svgBackground, BlendMode.dstOver);
static const dialogContentHorizontalPadding = EdgeInsets.symmetric(horizontal: 24);
static const dialogActionsPadding = EdgeInsets.symmetric(horizontal: 8);
static const dialogShape = RoundedRectangleBorder(
borderRadius: BorderRadius.all(
Radius.circular(24),
),
);
static const List<Dependency> androidDependencies = [ static const List<Dependency> androidDependencies = [
Dependency( Dependency(
name: 'CWAC-Document', name: 'CWAC-Document',

View file

@ -1,6 +1,7 @@
import 'dart:io'; import 'dart:io';
import 'package:aves/utils/android_file_utils.dart'; import 'package:aves/utils/android_file_utils.dart';
import 'package:aves/utils/constants.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:path/path.dart'; import 'package:path/path.dart';
@ -16,8 +17,6 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
Set<StorageVolume> _allVolumes; Set<StorageVolume> _allVolumes;
StorageVolume _primaryVolume, _selectedVolume; StorageVolume _primaryVolume, _selectedVolume;
static const EdgeInsets hPadding = EdgeInsets.symmetric(horizontal: 24);
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -42,7 +41,7 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
children: [ children: [
if (_allVolumes.length > 1) ...[ if (_allVolumes.length > 1) ...[
Padding( Padding(
padding: hPadding, padding: Constants.dialogContentHorizontalPadding,
child: Text('Storage:'), child: Text('Storage:'),
), ),
..._allVolumes.map((volume) => RadioListTile<StorageVolume>( ..._allVolumes.map((volume) => RadioListTile<StorageVolume>(
@ -69,7 +68,7 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
SizedBox(height: 8), SizedBox(height: 8),
], ],
Padding( Padding(
padding: hPadding, padding: Constants.dialogContentHorizontalPadding,
child: ValueListenableBuilder<bool>( child: ValueListenableBuilder<bool>(
valueListenable: _existsNotifier, valueListenable: _existsNotifier,
builder: (context, exists, child) { builder: (context, exists, child) {
@ -96,6 +95,8 @@ class _CreateAlbumDialogState extends State<CreateAlbumDialog> {
child: Text('Create'.toUpperCase()), child: Text('Create'.toUpperCase()),
), ),
], ],
actionsPadding: Constants.dialogActionsPadding,
shape: Constants.dialogShape,
); );
} }

View file

@ -4,6 +4,7 @@ import 'package:aves/model/image_entry.dart';
import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_lens.dart';
import 'package:aves/services/android_app_service.dart'; import 'package:aves/services/android_app_service.dart';
import 'package:aves/services/image_file_service.dart'; import 'package:aves/services/image_file_service.dart';
import 'package:aves/utils/constants.dart';
import 'package:aves/widgets/common/action_delegates/feedback.dart'; import 'package:aves/widgets/common/action_delegates/feedback.dart';
import 'package:aves/widgets/common/action_delegates/permission_aware.dart'; import 'package:aves/widgets/common/action_delegates/permission_aware.dart';
import 'package:aves/widgets/common/action_delegates/rename_entry_dialog.dart'; import 'package:aves/widgets/common/action_delegates/rename_entry_dialog.dart';
@ -131,6 +132,8 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin {
child: Text('Delete'.toUpperCase()), child: Text('Delete'.toUpperCase()),
), ),
], ],
actionsPadding: Constants.dialogActionsPadding,
shape: Constants.dialogShape,
); );
}, },
); );

View file

@ -1,5 +1,6 @@
import 'package:aves/model/image_entry.dart'; import 'package:aves/model/image_entry.dart';
import 'package:aves/services/android_file_service.dart'; import 'package:aves/services/android_file_service.dart';
import 'package:aves/utils/constants.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
mixin PermissionAwareMixin { mixin PermissionAwareMixin {
@ -35,6 +36,8 @@ mixin PermissionAwareMixin {
child: Text('OK'.toUpperCase()), child: Text('OK'.toUpperCase()),
), ),
], ],
actionsPadding: Constants.dialogActionsPadding,
shape: Constants.dialogShape,
); );
}, },
); );

View file

@ -1,4 +1,5 @@
import 'package:aves/model/image_entry.dart'; import 'package:aves/model/image_entry.dart';
import 'package:aves/utils/constants.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class RenameEntryDialog extends StatefulWidget { class RenameEntryDialog extends StatefulWidget {
@ -43,6 +44,8 @@ class _RenameEntryDialogState extends State<RenameEntryDialog> {
child: Text('Apply'.toUpperCase()), child: Text('Apply'.toUpperCase()),
), ),
], ],
actionsPadding: Constants.dialogActionsPadding,
shape: Constants.dialogShape,
); );
} }
} }

View file

@ -8,6 +8,7 @@ import 'package:aves/model/source/collection_lens.dart';
import 'package:aves/model/source/collection_source.dart'; import 'package:aves/model/source/collection_source.dart';
import 'package:aves/services/android_app_service.dart'; import 'package:aves/services/android_app_service.dart';
import 'package:aves/services/image_file_service.dart'; import 'package:aves/services/image_file_service.dart';
import 'package:aves/utils/constants.dart';
import 'package:aves/utils/durations.dart'; import 'package:aves/utils/durations.dart';
import 'package:aves/widgets/album/app_bar.dart'; import 'package:aves/widgets/album/app_bar.dart';
import 'package:aves/widgets/album/empty.dart'; import 'package:aves/widgets/album/empty.dart';
@ -200,6 +201,8 @@ class SelectionActionDelegate with FeedbackMixin, PermissionAwareMixin {
child: Text('Delete'.toUpperCase()), child: Text('Delete'.toUpperCase()),
), ),
], ],
actionsPadding: Constants.dialogActionsPadding,
shape: Constants.dialogShape,
); );
}, },
); );