Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Hide Feed tab in Local Gallery

ashil-pilot219db33e82a2
diff --git a/mobile/apps/photos/lib/events/tab_changed_event.dart b/mobile/apps/photos/lib/events/tab_changed_event.dart
index f58b7f6a80..4508c12785 100644
--- a/mobile/apps/photos/lib/events/tab_changed_event.dart
+++ b/mobile/apps/photos/lib/events/tab_changed_event.dart
@@ -7,7 +7,13 @@ class TabChangedEvent extends Event {
TabChangedEvent(this.selectedIndex, this.source);
}
-enum TabChangedEventSource { tabBar, pageView, collectionsPage, backButton }
+enum TabChangedEventSource {
+ tabBar,
+ pageView,
+ collectionsPage,
+ backButton,
+ appMode,
+}
class TabDoubleTapEvent extends Event {
final int selectedIndex;
diff --git a/mobile/apps/photos/lib/models/home_tab.dart b/mobile/apps/photos/lib/models/home_tab.dart
new file mode 100644
index 0000000000..ae5147b1b1
--- /dev/null
+++ b/mobile/apps/photos/lib/models/home_tab.dart
@@ -0,0 +1,7 @@
+// Tab events keep stable IDs: Search remains 3 when Feed is hidden.
+List<int> homeTabIndices({required bool showFeed}) => [
+ 0,
+ 1,
+ if (showFeed) 2,
+ 3,
+];
diff --git a/mobile/apps/photos/lib/ui/home/home_bottom_nav_bar.dart b/mobile/apps/photos/lib/ui/home/home_bottom_nav_bar.dart
index 3ef0ee2b98..89433cad77 100644
--- a/mobile/apps/photos/lib/ui/home/home_bottom_nav_bar.dart
+++ b/mobile/apps/photos/lib/ui/home/home_bottom_nav_bar.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/events/tab_changed_event.dart';
+import 'package:photos/models/home_tab.dart';
import "package:photos/models/selected_albums.dart";
import 'package:photos/models/selected_files.dart';
import 'package:photos/ui/tabs/nav_bar.dart';
@@ -21,12 +22,14 @@ class HomeBottomNavigationBar extends StatefulWidget {
this.selectedFiles,
this.selectedAlbums, {
required this.selectedTabIndex,
+ required this.showFeed,
super.key,
});
final SelectedFiles selectedFiles;
final SelectedAlbums selectedAlbums;
final int selectedTabIndex;
+ final bool showFeed;
@override
State<HomeBottomNavigationBar> createState() =>
@@ -134,6 +137,7 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
children: [
_HomeNavBar(
selectedIndex: currentTabIndex,
+ showFeed: widget.showFeed,
onTabChange: (index) {
_onTabChange(index, mode: "OnPressed");
},
@@ -150,7 +154,11 @@ class _HomeBottomNavigationBarState extends State<HomeBottomNavigationBar> {
}
class _HomeNavBar extends StatelessWidget {
- const _HomeNavBar({required this.selectedIndex, required this.onTabChange});
+ const _HomeNavBar({
+ required this.selectedIndex,
+ required this.showFeed,
+ required this.onTabChange,
+ });
static const _tabs = [
_HomeNavTab(
@@ -180,11 +188,13 @@ class _HomeNavBar extends StatelessWidget {
];
final int selectedIndex;
+ final bool showFeed;
final ValueChanged<int> onTabChange;
@override
Widget build(BuildContext context) {
final colors = context.componentColors;
+ final tabIndices = homeTabIndices(showFeed: showFeed);
return GNav(
curve: Curves.easeOutExpo,
backgroundColor: colors.fillLight,
@@ -203,24 +213,28 @@ class _HomeNavBar extends StatelessWidget {
tabBorderRadius: Radii.md,
tabBackgroundColor: colors.fillDark,
haptic: false,
- selectedIndex: selectedIndex,
- onTabChange: onTabChange,
- tabs: List.generate(_tabs.length, (index) {
+ selectedIndex: tabIndices.indexOf(selectedIndex),
+ onTabChange: (index) => onTabChange(tabIndices[index]),
+ tabs: List.generate(tabIndices.length, (index) {
+ final tabIndex = tabIndices[index];
+ final tab = _tabs[tabIndex];
return GButton(
margin: EdgeInsets.only(
left: index == 0 ? Spacing.lg : _homeNavItemSpacing,
- right: index == _tabs.length - 1 ? Spacing.lg : _homeNavItemSpacing,
+ right: index == tabIndices.length - 1
+ ? Spacing.lg
+ : _homeNavItemSpacing,
top: Spacing.md,
bottom: Spacing.md,
),
text: '',
- semanticLabel: _tabs[index].semanticLabel,
- semanticIdentifier: _tabs[index].semanticIdentifier,
+ semanticLabel: tab.semanticLabel,
+ semanticIdentifier: tab.semanticIdentifier,
leading: SizedBox.square(
dimension: IconSizes.small,
child: _HomeNavIcon(
- tab: _tabs[index],
- selected: selectedIndex == index,
+ tab: tab,
+ selected: selectedIndex == tabIndex,
color: colors.iconColor,
),
),
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index 4e377e2f5e..a3c551bffb 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -34,6 +34,7 @@ import "package:photos/models/collection/collection.dart";
import "package:photos/models/collection/collection_items.dart";
import "package:photos/models/file/file.dart";
import "package:photos/models/gallery_type.dart";
+import "package:photos/models/home_tab.dart";
import "package:photos/models/search/index_of_indexed_stack.dart";
import "package:photos/models/selected_albums.dart";
import "package:photos/models/selected_files.dart";
@@ -148,6 +149,8 @@ class _HomeWidgetState extends State<HomeWidget> {
final DiffFetcher _diffFetcher = DiffFetcher();
+ List<int> get _tabIndices => homeTabIndices(showFeed: !isLocalGalleryMode);
+
void _startWithoutAccountFlow() {
setState(() {
_startWithoutAccount = true;
@@ -189,6 +192,9 @@ class _HomeWidgetState extends State<HomeWidget> {
_tabChangedEventSubscription = Bus.instance.on<TabChangedEvent>().listen((
event,
) {
+ final tabIndices = _tabIndices;
+ final pageIndex = tabIndices.indexOf(event.selectedIndex);
+ if (pageIndex < 0) return;
final previousTabIndex = _selectedTabIndex;
_selectedTabIndex = event.selectedIndex;
_selectedTabIndexNotifier.value = event.selectedIndex;
@@ -204,15 +210,16 @@ class _HomeWidgetState extends State<HomeWidget> {
"TabChange going from $previousTabIndex to ${event.selectedIndex} source: ${event.source}",
);
if (_pageController.hasClients) {
- final pageDelta = (event.selectedIndex - previousTabIndex).abs();
- if (pageDelta <= 1) {
+ final pageDelta = (pageIndex - tabIndices.indexOf(previousTabIndex))
+ .abs();
+ if (pageDelta <= 1 && event.source != TabChangedEventSource.appMode) {
_pageController.animateToPage(
- event.selectedIndex,
+ pageIndex,
duration: const Duration(milliseconds: 200),
curve: Curves.easeInOut,
);
} else {
- _pageController.jumpToPage(event.selectedIndex);
+ _pageController.jumpToPage(pageIndex);
}
}
}
@@ -257,7 +264,19 @@ class _HomeWidgetState extends State<HomeWidget> {
.on<AppModeChangedEvent>()
.listen((event) async {
if (mounted) {
+ final selectedTabIndex = _tabIndices.contains(_selectedTabIndex)
+ ? _selectedTabIndex
+ : 0;
setState(() {});
+ SchedulerBinding.instance.addPostFrameCallback((_) {
+ if (!mounted) return;
+ Bus.instance.fire(
+ TabChangedEvent(
+ selectedTabIndex,
+ TabChangedEventSource.appMode,
+ ),
+ );
+ });
_scheduleChangeLogCheck(delay: const Duration(milliseconds: 250));
}
});
@@ -990,6 +1009,7 @@ class _HomeWidgetState extends State<HomeWidget> {
Widget _getBody(BuildContext context) {
final bool localGalleryMode = isLocalGalleryMode;
+ final tabIndices = _tabIndices;
if (!Configuration.instance.hasConfiguredAccount()) {
_closeDrawerIfOpen();
final shouldBootstrapLocalGalleryEntryFlow =
@@ -1057,8 +1077,12 @@ class _HomeWidgetState extends State<HomeWidget> {
builder: (context, selectedTabIndex, _) {
return ExtentsPageView(
onPageChanged: (page) {
+ if (page >= tabIndices.length) return;
Bus.instance.fire(
- TabChangedEvent(page, TabChangedEventSource.pageView),
+ TabChangedEvent(
+ tabIndices[page],
+ TabChangedEventSource.pageView,
+ ),
);
},
controller: _pageController,
@@ -1079,7 +1103,8 @@ class _HomeWidgetState extends State<HomeWidget> {
_shouldAlbumsSearchConsumeBackNotifier,
),
),
- _buildTabHeroMode(2, selectedTabIndex, _feedTab),
+ if (!localGalleryMode)
+ _buildTabHeroMode(2, selectedTabIndex, _feedTab),
_buildTabHeroMode(
3,
selectedTabIndex,
@@ -1151,6 +1176,7 @@ class _HomeWidgetState extends State<HomeWidget> {
_selectedFiles,
_selectedAlbums,
selectedTabIndex: _selectedTabIndex,
+ showFeed: !localGalleryMode,
),
],
);
diff --git a/mobile/apps/photos/test/ui/home/home_bottom_nav_bar_test.dart b/mobile/apps/photos/test/ui/home/home_bottom_nav_bar_test.dart
new file mode 100644
index 0000000000..9cbbdff920
--- /dev/null
+++ b/mobile/apps/photos/test/ui/home/home_bottom_nav_bar_test.dart
@@ -0,0 +1,81 @@
+import "package:ente_components/theme/theme.dart";
+import "package:flutter/material.dart";
+import "package:flutter_test/flutter_test.dart";
+import "package:photos/core/event_bus.dart";
+import "package:photos/events/tab_changed_event.dart";
+import "package:photos/models/selected_albums.dart";
+import "package:photos/models/selected_files.dart";
+import "package:photos/ui/home/home_bottom_nav_bar.dart";
+import "package:photos/ui/tabs/nav_bar.dart";
+
+void main() {
+ for (final showFeed in [false, true]) {
+ testWidgets(
+ "${showFeed ? 'Ente' : 'Local'} Gallery tabs preserve Search navigation",
+ (tester) async {
+ final selectedFiles = SelectedFiles();
+ final selectedAlbums = SelectedAlbums();
+ addTearDown(selectedFiles.dispose);
+ addTearDown(selectedAlbums.dispose);
+
+ final tabEvents = <TabChangedEvent>[];
+ final doubleTapEvents = <TabDoubleTapEvent>[];
+ final tabsSubscription = Bus.instance.on<TabChangedEvent>().listen(
+ tabEvents.add,
+ );
+ final doubleTapSubscription = Bus.instance
+ .on<TabDoubleTapEvent>()
+ .listen(doubleTapEvents.add);
+ addTearDown(tabsSubscription.cancel);
+ addTearDown(doubleTapSubscription.cancel);
+
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: ComponentTheme.lightTheme(),
+ home: Scaffold(
+ body: Align(
+ alignment: Alignment.bottomCenter,
+ child: HomeBottomNavigationBar(
+ selectedFiles,
+ selectedAlbums,
+ selectedTabIndex: 0,
+ showFeed: showFeed,
+ ),
+ ),
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.bySemanticsLabel("Home"), findsOneWidget);
+ expect(find.bySemanticsLabel("Albums"), findsOneWidget);
+ expect(
+ find.bySemanticsLabel("Feed"),
+ showFeed ? findsOneWidget : findsNothing,
+ );
+ final search = find.bySemanticsLabel("Search");
+ await tester.tap(search);
+ await tester.pumpAndSettle();
+ expect(tabEvents.single.selectedIndex, 3);
+
+ Bus.instance.fire(TabChangedEvent(3, TabChangedEventSource.pageView));
+ await tester.pumpAndSettle();
+ final searchButton = tester.widget<GButton>(
+ find.ancestor(of: search, matching: find.byType(GButton)),
+ );
+ expect(searchButton.active, isTrue);
+
+ await tester.tap(search);
+ await tester.pumpAndSettle();
+ expect(doubleTapEvents.single.selectedIndex, 3);
+
+ if (showFeed) {
+ await tester.tap(find.bySemanticsLabel("Feed"));
+ await tester.pumpAndSettle();
+ expect(tabEvents.last.selectedIndex, 2);
+ }
+ await tester.pumpWidget(const SizedBox.shrink());
+ },
+ );
+ }
+}