Merge pull request #718 from micahmo/feature/sort-type-icon-revival

Show sort icon in header/settings
thunder-app · Sep 11, 2023 · c08110a · c08110a
2 parents faee905 + 1f121b4
commit c08110a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Added setting to import and export settings
 - Added liveness and latency indicators for instances in profile switcher - contribution from @micahmo
 - Add option to disabling graying out read posts - contribution from @micahmo
+- Show sort type icon - contribution from @micahmo
 - Downvote actions will be disabled when instances have downvotes disabled
 - Automatically save drafts for posts and comments - contribution from @micahmo
 

diff --git a/lib/community/pages/community_page.dart b/lib/community/pages/community_page.dart
@@ -172,7 +172,13 @@ class _CommunityPageState extends State<CommunityPage> with AutomaticKeepAliveCl
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
                         ),
-                        subtitle: Text(getSortName(state)),
+                        subtitle: Row(
+                          children: [
+                            Icon(getSortIcon(state), size: 13),
+                            const SizedBox(width: 4),
+                            Text(getSortName(state)),
+                          ],
+                        ),
                         contentPadding: const EdgeInsets.symmetric(horizontal: 0),
                       ),
                       centerTitle: false,
@@ -494,6 +500,14 @@ class _CommunityPageState extends State<CommunityPage> with AutomaticKeepAliveCl
     return sortTypeLabel ?? '';
   }
 
+  IconData? getSortIcon(CommunityState state) {
+    if (state.status == CommunityStatus.initial || state.status == CommunityStatus.loading) {
+      return null;
+    }
+
+    return sortTypeIcon;
+  }
+
   FutureOr<bool> _handleBack(bool stopDefaultButtonEvent, RouteInfo info) async {
     if (context.read<ThunderBloc>().state.isFabOpen) {
       context.read<ThunderBloc>().add(const OnFabToggle(false));

diff --git a/lib/post/pages/post_page.dart b/lib/post/pages/post_page.dart
@@ -140,7 +140,13 @@ class _PostPageState extends State<PostPage> {
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,
                 ),
-                subtitle: Text(sortTypeLabel ?? ''),
+                subtitle: Row(
+                  children: [
+                    Icon(sortTypeIcon, size: 13),
+                    const SizedBox(width: 4),
+                    Text(sortTypeLabel ?? ''),
+                  ],
+                ),
                 contentPadding: const EdgeInsets.symmetric(horizontal: 0),
               ),
               flexibleSpace: GestureDetector(
@@ -459,6 +465,7 @@ class _PostPageState extends State<PostPage> {
         onSelect: (selected) {
           setState(() {
             sortType = selected.payload;
+            sortTypeLabel = selected.label;
             sortTypeIcon = selected.icon;
           });
           context.read<PostBloc>().add(

diff --git a/lib/settings/pages/general_settings_page.dart b/lib/settings/pages/general_settings_page.dart
@@ -410,6 +410,16 @@ class _GeneralSettingsPageState extends State<GeneralSettingsPage> with SingleTi
                             },
                             previouslySelected: defaultSortType,
                           ),
+                          valueDisplay: Row(
+                            children: [
+                              Icon(allSortTypeItems.firstWhere((sortTypeItem) => sortTypeItem.payload == defaultSortType).icon, size: 13),
+                              const SizedBox(width: 4),
+                              Text(
+                                allSortTypeItems.firstWhere((sortTypeItem) => sortTypeItem.payload == defaultSortType).label,
+                                style: theme.textTheme.titleSmall,
+                              ),
+                            ],
+                          ),
                         ),
                       ],
                     ),
@@ -603,6 +613,16 @@ class _GeneralSettingsPageState extends State<GeneralSettingsPage> with SingleTi
                             },
                             previouslySelected: defaultCommentSortType,
                           ),
+                          valueDisplay: Row(
+                            children: [
+                              Icon(commentSortTypeItems.firstWhere((sortTypeItem) => sortTypeItem.payload == defaultCommentSortType).icon, size: 13),
+                              const SizedBox(width: 4),
+                              Text(
+                                commentSortTypeItems.firstWhere((sortTypeItem) => sortTypeItem.payload == defaultCommentSortType).label,
+                                style: theme.textTheme.titleSmall,
+                              ),
+                            ],
+                          ),
                         ),
                         ListOption(
                           description: LocalSettings.nestedCommentIndicatorStyle.label,