Fix issue #309 Toolbar icons are not aligned.

j-fbriere · May 13, 2024 · f83961b · f83961b
1 parent 6f85aa9
commit f83961b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/fastlane/metadata/android/en-US/changelogs/46.txt b/fastlane/metadata/android/en-US/changelogs/46.txt
@@ -1 +1,3 @@
 * Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
+* The released apk files also include apk files built for older Android KitKat (version 4.4.x).
+* Fix issue #309 Toolbar icons are not aligned.
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1 +1,3 @@
 * Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
+* The released apk files also include apk files built for older Android KitKat (version 4.4.x).
+* Fix issue #309 Toolbar icons are not aligned.
diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart
@@ -376,7 +376,12 @@ class ScaffoldWithBottomNavigationState extends State<ScaffoldWithBottomNavigati
           : NavigationDestinationLabelBehavior.alwaysHide,
         height: PrefService.of(context).get(optionHomeShowTabLabels) ? 70 : 40,
         destinations: [
-          ..._pages.map((e) => NavigationDestination(selectedIcon: Icon(e.icon, size: 22, fill: 1), icon: Icon(e.icon, size: 22), label: e.titleBuilder(context)))
+          ..._pages.map((e) => DefaultTextStyle.merge(
+            style: NavigationBarTheme.of(context).labelTextStyle?.resolve(e.id == _pages[_selectedIndex].id ? <MaterialState>{MaterialState.selected} : <MaterialState>{}),
+            overflow: TextOverflow.clip,
+            maxLines: 1,
+            child: NavigationDestination(selectedIcon: Icon(e.icon, size: 22, fill: 1), icon: Icon(e.icon, size: 22), label: e.titleBuilder(context))
+          ))
         ],
         onDestinationSelected: (int value) async {
           if (_children[value] is FeedScreen && widget.feedKey != null && widget.feedKey!.currentState != null) {