Added option to show navigation labels

QuackerApp · Mar 26, 2024 · c3fa4ee · c3fa4ee
1 parent 3327fbb
commit c3fa4ee
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git a/lib/constants.dart b/lib/constants.dart
@@ -31,8 +31,7 @@ const optionSubscriptionOrderByField = 'subscription.order_by.field';
 
 const optionThemeMode = 'theme.mode';
 const optionThemeTrueBlack = 'theme.true_black';
-const optionThemeMaterial3 = 'theme.material3';
-const optionThemeColorScheme = 'theme.color_scheme';
+const optionShowNavigationLabels = 'theme.show_navigation_labels';
 
 const optionTweetsHideSensitive = 'tweets.hide_sensitive';
 

diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -338,6 +338,8 @@ class MessageLookup extends MessageLookupByLibrary {
                 "Check for updates when Quacker starts"),
         "should_check_for_updates_label":
             MessageLookupByLibrary.simpleMessage("Check for updates"),
+        "show_navigation_labels":
+            MessageLookupByLibrary.simpleMessage(" Show navigation labels"),
         "small": MessageLookupByLibrary.simpleMessage("Small"),
         "something_broke_in_fritter":
             MessageLookupByLibrary.simpleMessage("Something broke in Quacker."),

diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart
@@ -212,6 +212,7 @@ class _ScaffoldWithBottomNavigationState extends State<ScaffoldWithBottomNavigat
 
   @override
   Widget build(BuildContext context) {
+    final showNavigationLabels = PrefService.of(context).get(optionShowNavigationLabels);
     return Scaffold(
       body: PageView(
         controller: _pageController,
@@ -225,9 +226,9 @@ class _ScaffoldWithBottomNavigationState extends State<ScaffoldWithBottomNavigat
       ),
       bottomNavigationBar: NavigationBar(
         selectedIndex: currentPage,
-        height: 50,
-        labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
-        indicatorShape: CircleBorder(),
+        labelBehavior: showNavigationLabels
+            ? NavigationDestinationLabelBehavior.alwaysShow
+            : NavigationDestinationLabelBehavior.alwaysHide,
         destinations: [
           ..._pages.map((e) => NavigationDestination(icon: Icon(e.icon, size: 22), label: e.titleBuilder(context)))
         ],

diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -424,5 +424,6 @@
   "regex": "Regex filters",
   "regexSubtitle": "Filter exclude posts containing an expression. Each filter is separated by a pipe(|): \"+\"ExampleFilter1|ExampleFilter[2-3] \n If you want to show tweets containing just your expression\"+\", use this one :^((?!expression).)*\\$",
   "foryou": "For You",
-  "clickToShowMore": " \nClick to show more.."
+  "clickToShowMore": " \nClick to show more..",
+  "show_navigation_labels": " Show navigation labels"
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -162,6 +162,7 @@ Future<void> main() async {
     optionSubscriptionOrderByField: 'name',
     optionThemeMode: 'system',
     optionThemeTrueBlack: false,
+    optionShowNavigationLabels: true,
     optionTweetsHideSensitive: true,
     optionUserTrendsLocations: jsonEncode({
       'active': {'name': 'Worldwide', 'woeid': 1},

diff --git a/lib/settings/_theme.dart b/lib/settings/_theme.dart
@@ -35,6 +35,10 @@ class SettingsThemeFragment extends StatelessWidget {
               L10n.of(context).use_true_black_for_the_dark_mode_theme,
             ),
           ),
+          PrefSwitch(
+            title: Text(L10n.of(context).show_navigation_labels),
+            pref: optionShowNavigationLabels,
+          ),
         ]),
       ),
     );