From d2b6b0eb0882f45a1a1facfc3d9cd25a1b46bf6b Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Wed, 11 Mar 2020 13:19:50 +0100 Subject: [PATCH] Remove the Compact View I need to merge it into the StandardView. The more I think about it, the more this view doesn't make sense. Specially since I need to add the same extra configuration options in both views. --- lib/folder_views/common.dart | 8 --- lib/folder_views/compact_view.dart | 80 ------------------------------ lib/screens/folder_view.dart | 12 ----- lib/settings.dart | 2 - 4 files changed, 102 deletions(-) delete mode 100644 lib/folder_views/compact_view.dart diff --git a/lib/folder_views/common.dart b/lib/folder_views/common.dart index a59acb18..26ca1abe 100644 --- a/lib/folder_views/common.dart +++ b/lib/folder_views/common.dart @@ -2,7 +2,6 @@ import 'package:fimber/fimber.dart'; import 'package:flutter/material.dart'; import 'package:gitjournal/core/note.dart'; import 'package:gitjournal/core/notes_folder.dart'; -import 'package:gitjournal/folder_views/compact_view.dart'; import 'package:gitjournal/folder_views/journal_view.dart'; import 'package:gitjournal/screens/note_editor.dart'; import 'package:gitjournal/utils.dart'; @@ -12,7 +11,6 @@ import 'standard_view.dart'; enum FolderViewType { Standard, Journal, - Compact, } Widget buildFolderView( @@ -47,12 +45,6 @@ Widget buildFolderView( noteSelectedFunction: noteSelectionFn, emptyText: emptyText, ); - case FolderViewType.Compact: - return CompactView( - folder: folder, - noteSelectedFunction: noteSelectionFn, - emptyText: emptyText, - ); } assert(false, "Code path should never be executed"); diff --git a/lib/folder_views/compact_view.dart b/lib/folder_views/compact_view.dart deleted file mode 100644 index 32e9a03f..00000000 --- a/lib/folder_views/compact_view.dart +++ /dev/null @@ -1,80 +0,0 @@ -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:gitjournal/folder_views/list_view.dart'; - -import 'package:intl/intl.dart'; - -import 'package:gitjournal/core/note.dart'; -import 'package:gitjournal/core/notes_folder.dart'; - -class CompactView extends StatelessWidget { - final NoteSelectedFunction noteSelectedFunction; - final NotesFolderReadOnly folder; - final String emptyText; - - CompactView({ - @required this.folder, - @required this.noteSelectedFunction, - @required this.emptyText, - }); - - @override - @override - Widget build(BuildContext context) { - return FolderListView( - folder: folder, - noteSelectedFunction: noteSelectedFunction, - emptyText: emptyText, - noteTileBuilder: _buildRow, - ); - } - - Widget _buildRow(BuildContext context, Note note) { - var textTheme = Theme.of(context).textTheme; - - var title = note.title; - if (title == null || title.isEmpty) { - title = note.summary; - } - var titleTheme = textTheme.title; - Widget titleWidget = Text( - title, - style: titleTheme, - overflow: TextOverflow.ellipsis, - ); - Widget trailing = Container(); - - var date = note.modified ?? note.created; - if (date != null) { - var formatter = DateFormat('dd MMM, yyyy'); - var dateStr = formatter.format(date); - trailing = Text(dateStr, style: textTheme.caption); - } - - var titleRow = Row( - children: [Expanded(child: titleWidget), trailing], - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.baseline, - textBaseline: TextBaseline.alphabetic, - ); - - var tile = ListTile( - title: titleRow, - onTap: () => noteSelectedFunction(note), - ); - - var dc = Theme.of(context).dividerColor; - var divider = Container( - height: 1.0, - child: Divider(color: dc.withOpacity(dc.opacity / 3)), - ); - - return Column( - children: [ - divider, - tile, - divider, - ], - ); - } -} diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart index f65ee6e9..89545ee5 100644 --- a/lib/screens/folder_view.dart +++ b/lib/screens/folder_view.dart @@ -40,9 +40,6 @@ class _FolderViewState extends State { case SettingsFolderViewType.Standard: _viewType = FolderViewType.Standard; break; - case SettingsFolderViewType.Compact: - _viewType = FolderViewType.Compact; - break; case SettingsFolderViewType.Journal: _viewType = FolderViewType.Journal; break; @@ -189,12 +186,6 @@ class _FolderViewState extends State { groupValue: _viewType, onChanged: onViewChange, ), - RadioListTile( - title: const Text("Compact View"), - value: FolderViewType.Compact, - groupValue: _viewType, - onChanged: onViewChange, - ), ]; return AlertDialog( @@ -218,9 +209,6 @@ class _FolderViewState extends State { case FolderViewType.Journal: Settings.instance.defaultView = SettingsFolderViewType.Journal; break; - case FolderViewType.Compact: - Settings.instance.defaultView = SettingsFolderViewType.Compact; - break; } Settings.instance.save(); }); diff --git a/lib/settings.dart b/lib/settings.dart index f60b02e8..fc59347f 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -261,7 +261,6 @@ class SettingsEditorType { class SettingsFolderViewType { static const Standard = SettingsFolderViewType("Standard", "Standard"); static const Journal = SettingsFolderViewType("Journal", "Journal"); - static const Compact = SettingsFolderViewType("Compact", "Compact"); static const Default = Standard; final String _str; @@ -279,7 +278,6 @@ class SettingsFolderViewType { static const options = [ Standard, Journal, - Compact, ]; static SettingsFolderViewType fromInternalString(String str) {