feat: use settings as a dedicated page for mobile (#1057)

ubuntu-flutter-community · Nov 26, 2024 · a788794 · a788794
1 parent b4adf00
commit a788794
Show file tree

Hide file tree

Showing 13 changed files with 228 additions and 174 deletions.
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
@@ -161,7 +161,7 @@ class _MobileMusicPodAppState extends State<_MobileMusicPodApp> {
       navigatorKey: libraryModel.masterNavigatorKey,
       navigatorObservers: [libraryModel],
       initialRoute:
-          isMobile ? (libraryModel.selectedPageId ?? kSearchPageId) : null,
+          isMobile ? (libraryModel.selectedPageId ?? kLocalAudioPageId) : null,
       onGenerateRoute: (settings) {
         final page = (masterItems.firstWhereOrNull(
                   (e) => e.pageId == settings.name,

diff --git a/lib/app/view/master_items.dart b/lib/app/view/master_items.dart
@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:yaru/yaru.dart';
 
 import '../../common/data/audio_type.dart';
 import '../../common/view/icons.dart';
@@ -20,6 +21,7 @@ import '../../radio/view/radio_page.dart';
 import '../../radio/view/station_page.dart';
 import '../../radio/view/station_page_icon.dart';
 import '../../search/view/search_page.dart';
+import '../../settings/view/settings_page.dart';
 import 'main_page_icon.dart';
 
 class MasterItem {
@@ -73,6 +75,14 @@ List<MasterItem> createMasterItems({required LibraryModel libraryModel}) {
       ),
       pageId: kPodcastsPageId,
     ),
+    if (isMobile)
+      MasterItem(
+        titleBuilder: (context) => Text(context.l10n.settings),
+        iconBuilder: (selected) =>
+            Icon(selected ? Iconz.settingsFilled : Iconz.settings),
+        pageBuilder: (context) => const SettingsPage(),
+        pageId: kSettingsPageId,
+      ),
     MasterItem(
       iconBuilder: (selected) => Icon(Iconz.plus),
       titleBuilder: (context) => Text(context.l10n.add),

diff --git a/lib/app/view/mobile_navigation_bar.dart b/lib/app/view/mobile_navigation_bar.dart
@@ -50,11 +50,6 @@ class MobileNavigationBar extends StatelessWidget with WatchItMixin {
         watchPropertyValue((LibraryModel m) => m.selectedPageId);
 
     final destinations = <String, NavigationDestination>{
-      kSearchPageId: NavigationDestination(
-        selectedIcon: Icon(Iconz.search),
-        icon: Icon(Iconz.search),
-        label: l10n.search,
-      ),
       kLocalAudioPageId: NavigationDestination(
         selectedIcon:
             const MainPageIcon(selected: true, audioType: AudioType.local),
@@ -73,6 +68,11 @@ class MobileNavigationBar extends StatelessWidget with WatchItMixin {
         icon: const MainPageIcon(selected: false, audioType: AudioType.podcast),
         label: l10n.podcasts,
       ),
+      kSettingsPageId: NavigationDestination(
+        selectedIcon: Icon(Iconz.settingsFilled),
+        icon: Icon(Iconz.settings),
+        label: l10n.settings,
+      ),
     };
 
     return NavigationBar(

diff --git a/lib/common/view/icons.dart b/lib/common/view/icons.dart
@@ -186,7 +186,13 @@ class Iconz {
       ? YaruIcons.settings
       : appleStyled
           ? CupertinoIcons.settings
-          : Icons.settings_rounded;
+          : Icons.settings_outlined;
+
+  static IconData get settingsFilled => yaruStyled
+      ? YaruIcons.settings_filled
+      : appleStyled
+          ? CupertinoIcons.settings
+          : Icons.settings;
 
   static IconData get addToLibrary => yaruStyled
       ? YaruIcons.bell

diff --git a/lib/library/library_service.dart b/lib/library/library_service.dart
@@ -543,5 +543,6 @@ class LibraryService {
     kLocalAudioPageId,
     kPodcastsPageId,
     kRadioPageId,
+    kSettingsPageId,
   ];
 }
diff --git a/lib/local_audio/view/local_audio_page.dart b/lib/local_audio/view/local_audio_page.dart
@@ -1,7 +1,6 @@
 import 'package:animated_emoji/animated_emoji.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
 import '../../app/view/music_pod_scaffold.dart';
 import '../../common/data/audio_type.dart';
@@ -18,10 +17,10 @@ import '../../search/search_model.dart';
 import '../../search/search_type.dart';
 import '../../settings/view/settings_action.dart';
 import '../local_audio_model.dart';
+import '../local_audio_view.dart';
 import 'failed_imports_content.dart';
 import 'local_audio_body.dart';
 import 'local_audio_control_panel.dart';
-import '../local_audio_view.dart';
 
 class LocalAudioPage extends StatefulWidget with WatchItStatefulWidgetMixin {
   const LocalAudioPage({super.key});
@@ -64,7 +63,6 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
         adaptive: true,
         titleSpacing: 0,
         actions: [
-          if (isMobile) const SettingsButton.icon(),
           Padding(
             padding: appBarSingleActionSpacing,
             child: SearchButton(

diff --git a/lib/podcasts/view/podcasts_page.dart b/lib/podcasts/view/podcasts_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
 import '../../app/view/music_pod_scaffold.dart';
 import '../../common/data/audio_type.dart';
@@ -12,7 +11,6 @@ import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
-import '../../settings/view/settings_action.dart';
 import '../podcast_model.dart';
 import 'podcasts_collection_body.dart';
 
@@ -41,7 +39,6 @@ class _PodcastsPageState extends State<PodcastsPage> {
         titleSpacing: 0,
         adaptive: true,
         actions: [
-          if (isMobile) const SettingsButton.icon(),
           Padding(
             padding: appBarSingleActionSpacing,
             child: SearchButton(

diff --git a/lib/radio/view/radio_page.dart b/lib/radio/view/radio_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
-import 'package:yaru/yaru.dart';
 
 import '../../app/connectivity_model.dart';
 import '../../app/view/music_pod_scaffold.dart';
@@ -14,7 +13,6 @@ import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
-import '../../settings/view/settings_action.dart';
 import 'radio_lib_page.dart';
 
 class RadioPage extends StatelessWidget with WatchItMixin {
@@ -29,7 +27,6 @@ class RadioPage extends StatelessWidget with WatchItMixin {
       appBar: HeaderBar(
         adaptive: true,
         actions: [
-          if (isMobile) const SettingsButton.icon(),
           Flexible(
             child: Padding(
               padding: appBarSingleActionSpacing,