Skip to content

Commit

Permalink
Merge remote-tracking branch 'hcj_squawker/smallUIFixes' into ca/smal…
Browse files Browse the repository at this point in the history
…lUIFixes
  • Loading branch information
j-fbriere committed May 7, 2024
2 parents 8473d60 + c3283f2 commit eaf465e
Show file tree
Hide file tree
Showing 5 changed files with 204 additions and 198 deletions.
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/46.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/default.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Fix the feature #129 Let tweet cards be True Dark as well (thanks @TheHJC).
3 changes: 2 additions & 1 deletion lib/home/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,15 @@ class ScaffoldWithBottomNavigationState extends State<ScaffoldWithBottomNavigati
),
bottomNavigationBar: NavigationBar(
selectedIndex: _selectedIndex,
surfaceTintColor: Theme.of(context).brightness == Brightness.dark && themeTrueBlack ? Colors.black : null,
backgroundColor: Theme.of(context).brightness == Brightness.dark && themeTrueBlack ? Colors.black : null,
indicatorColor: Theme.of(context).brightness == Brightness.dark && themeTrueBlack ? Colors.black : null,
labelBehavior: showTabLabels
? NavigationDestinationLabelBehavior.alwaysShow
: NavigationDestinationLabelBehavior.alwaysHide,
height: PrefService.of(context).get(optionHomeShowTabLabels) ? 70 : 40,
destinations: [
..._pages.map((e) => NavigationDestination(icon: Icon(e.icon, size: 22), label: e.titleBuilder(context)))
..._pages.map((e) => 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) {
Expand Down
Loading

0 comments on commit eaf465e

Please sign in to comment.