Extract option picker dialog

lib/widget/album_viewer.dart

@@ -24,6 +24,7 @@ import 'package:nc_photos/use_case/resync_album.dart';
 import 'package:nc_photos/use_case/update_album.dart';
 import 'package:nc_photos/widget/album_viewer_mixin.dart';
 import 'package:nc_photos/widget/draggable_item_list_mixin.dart';
+import 'package:nc_photos/widget/fancy_option_picker.dart';
 import 'package:nc_photos/widget/photo_list_item.dart';
 import 'package:nc_photos/widget/selectable_item_stream_list_mixin.dart';
 import 'package:nc_photos/widget/simple_input_dialog.dart';
@@ -336,53 +337,28 @@ class _AlbumViewerState extends State<AlbumViewer>
 
   void _onEditAppBarSortPressed() {
     final sortProvider = _editAlbum.sortProvider;
-    final isOldest =
-        sortProvider is AlbumTimeSortProvider && sortProvider.isAscending;
-    final isNewest =
-        sortProvider is AlbumTimeSortProvider && !sortProvider.isAscending;
-    final activeTextStyle = TextStyle(
-      color: Theme.of(context).colorScheme.primary,
-    );
     showDialog(
       context: context,
-      builder: (context) => SimpleDialog(
+      builder: (context) => FancyOptionPicker(
-        title: Text(AppLocalizations.of(context).sortOptionDialogTitle),
+        title: AppLocalizations.of(context).sortOptionDialogTitle,
-        children: [
+        items: [
-          SimpleDialogOption(
+          FancyOptionPickerItem(
-            child: ListTile(
+            label: AppLocalizations.of(context).sortOptionTimeAscendingLabel,
-              leading: Icon(
+            isSelected: sortProvider is AlbumTimeSortProvider &&
-                isOldest ? Icons.check : null,
+                sortProvider.isAscending,
-                color: Theme.of(context).colorScheme.primary,
+            onSelect: () {
-              ),
+              _onSortOldestPressed();
-              title: Text(
+              Navigator.of(context).pop();
-                AppLocalizations.of(context).sortOptionTimeAscendingLabel,
+            },
-                style: isOldest ? activeTextStyle : null,
-              ),
-              onTap: isOldest
-                  ? null
-                  : () {
-                      _onSortOldestPressed();
-                      Navigator.of(context).pop();
-                    },
-            ),
           ),
-          SimpleDialogOption(
+          FancyOptionPickerItem(
-            child: ListTile(
+            label: AppLocalizations.of(context).sortOptionTimeDescendingLabel,
-              leading: Icon(
+            isSelected: sortProvider is AlbumTimeSortProvider &&
-                isNewest ? Icons.check : null,
+                !sortProvider.isAscending,
-                color: Theme.of(context).colorScheme.primary,
+            onSelect: () {
-              ),
+              _onSortNewestPressed();
-              title: Text(
+              Navigator.of(context).pop();
-                AppLocalizations.of(context).sortOptionTimeDescendingLabel,
+            },
-                style: isNewest ? activeTextStyle : null,
-              ),
-              onTap: isNewest
-                  ? null
-                  : () {
-                      _onSortNewestPressed();
-                      Navigator.of(context).pop();
-                    },
-            ),
           ),
         ],
       ),

lib/widget/fancy_option_picker.dart

@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+
+class FancyOptionPickerItem {
+  FancyOptionPickerItem({
+    @required this.label,
+    this.isSelected = false,
+    this.onSelect,
+  });
+
+  String label;
+  bool isSelected;
+  VoidCallback onSelect;
+}
+
+/// A fancy looking dialog to pick an option
+class FancyOptionPicker extends StatelessWidget {
+  FancyOptionPicker({
+    Key key,
+    this.title,
+    @required this.items,
+  }) : super(key: key);
+
+  @override
+  build(BuildContext context) {
+    return SimpleDialog(
+      title: title != null ? Text(title) : null,
+      children: items
+          .map((e) => SimpleDialogOption(
+                child: ListTile(
+                  leading: Icon(
+                    e.isSelected ? Icons.check : null,
+                    color: Theme.of(context).colorScheme.primary,
+                  ),
+                  title: Text(
+                    e.label,
+                    style: e.isSelected
+                        ? TextStyle(
+                            color: Theme.of(context).colorScheme.primary,
+                          )
+                        : null,
+                  ),
+                  onTap: e.isSelected ? null : e.onSelect,
+                ),
+              ))
+          .toList(),
+    );
+  }
+
+  final String title;
+  final List<FancyOptionPickerItem> items;
+}