Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] refactor referral and Cast navigation

r4khulc18b47b361f3
diff --git a/mobile/apps/photos/lib/ui/growth/referral_screen.dart b/mobile/apps/photos/lib/ui/growth/referral_screen.dart
index 34acc85478..e0cf32a197 100644
--- a/mobile/apps/photos/lib/ui/growth/referral_screen.dart
+++ b/mobile/apps/photos/lib/ui/growth/referral_screen.dart
@@ -15,55 +15,54 @@ import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/share_util.dart";
import "package:tuple/tuple.dart";
-class ReferralScreen extends StatefulWidget {
- const ReferralScreen({this.initialData, super.key});
+Future<void> openReferralScreen(
+ BuildContext context, {
+ bool showLoadingDialog = false,
+}) async {
+ final dialog = showLoadingDialog
+ ? createProgressDialog(
+ context,
+ context.strings.pleaseWait,
+ isDismissible: true,
+ )
+ : null;
+ if (dialog != null) await dialog.show();
- final Tuple2<ReferralView, UserDetails>? initialData;
-
- static Future<void> open(
- BuildContext context, {
- bool showLoadingDialog = false,
- }) async {
- final dialog = showLoadingDialog
- ? createProgressDialog(
- context,
- context.strings.pleaseWait,
- isDismissible: true,
- )
- : null;
- if (dialog != null) await dialog.show();
-
- late final Tuple2<ReferralView, UserDetails> data;
- try {
- data = await _fetchData();
- } catch (error) {
- if (dialog != null && !await dialog.hide()) return;
- if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) {
- return;
- }
- await showGenericErrorDialog(context: context, error: error);
+ late final Tuple2<ReferralView, UserDetails> data;
+ try {
+ data = await _fetchReferralData();
+ } catch (error) {
+ if (dialog != null && !await dialog.hide()) return;
+ if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) {
return;
}
- if (dialog != null && !await dialog.hide()) return;
- if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) return;
- await routeToPage(context, ReferralScreen(initialData: data));
+ await showGenericErrorDialog(context: context, error: error);
+ return;
}
+ if (dialog != null && !await dialog.hide()) return;
+ if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) return;
+ await routeToPage(context, _ReferralScreen(initialData: data));
+}
- static Future<Tuple2<ReferralView, UserDetails>> _fetchData() async {
- UserDetails? cachedUserDetails = UserService.instance
- .getCachedUserDetails();
- cachedUserDetails ??= await UserService.instance.getUserDetailsV2(
- memoryCount: false,
- );
- final referralView = await storageBonusService.getReferralView();
- return Tuple2(referralView, cachedUserDetails);
- }
+Future<Tuple2<ReferralView, UserDetails>> _fetchReferralData() async {
+ UserDetails? cachedUserDetails = UserService.instance.getCachedUserDetails();
+ cachedUserDetails ??= await UserService.instance.getUserDetailsV2(
+ memoryCount: false,
+ );
+ final referralView = await storageBonusService.getReferralView();
+ return Tuple2(referralView, cachedUserDetails);
+}
+
+class _ReferralScreen extends StatefulWidget {
+ const _ReferralScreen({required this.initialData});
+
+ final Tuple2<ReferralView, UserDetails> initialData;
@override
- State<ReferralScreen> createState() => _ReferralScreenState();
+ State<_ReferralScreen> createState() => _ReferralScreenState();
}
-class _ReferralScreenState extends State<ReferralScreen> {
+class _ReferralScreenState extends State<_ReferralScreen> {
late Future<Tuple2<ReferralView, UserDetails>> _dataFuture;
Tuple2<ReferralView, UserDetails>? _initialData;
@@ -71,16 +70,14 @@ class _ReferralScreenState extends State<ReferralScreen> {
void initState() {
super.initState();
_initialData = widget.initialData;
- _dataFuture = widget.initialData == null
- ? ReferralScreen._fetchData()
- : Future.value(widget.initialData!);
+ _dataFuture = Future.value(widget.initialData);
}
void _safeUIUpdate() {
if (mounted) {
setState(() {
_initialData = null;
- _dataFuture = ReferralScreen._fetchData();
+ _dataFuture = _fetchReferralData();
});
}
}
diff --git a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
index 72cbfe1cc5..b11b2b2ae6 100644
--- a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
@@ -15,27 +15,27 @@ import "package:photos/theme/ente_theme.dart";
import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/relative_time_formatter.dart";
-class CastSettingsPage extends StatelessWidget {
- const CastSettingsPage({required this.initialSessions, super.key});
-
- final List<CastInfo> initialSessions;
-
- static Future<void> open(BuildContext context) async {
- late final List<CastInfo> sessions;
- try {
- sessions = await CastGateway(
- NetworkClient.instance.enteDio,
- ).getAllCastSessions();
- } catch (error) {
- if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) {
- return;
- }
- await showGenericErrorDialog(context: context, error: error);
+Future<void> openCastSettingsPage(BuildContext context) async {
+ late final List<CastInfo> sessions;
+ try {
+ sessions = await CastGateway(
+ NetworkClient.instance.enteDio,
+ ).getAllCastSessions();
+ } catch (error) {
+ if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) {
return;
}
- if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) return;
- await routeToPage(context, CastSettingsPage(initialSessions: sessions));
+ await showGenericErrorDialog(context: context, error: error);
+ return;
}
+ if (!context.mounted || ModalRoute.of(context)?.isCurrent != true) return;
+ await routeToPage(context, _CastSettingsPage(initialSessions: sessions));
+}
+
+class _CastSettingsPage extends StatelessWidget {
+ const _CastSettingsPage({required this.initialSessions});
+
+ final List<CastInfo> initialSessions;
@override
Widget build(BuildContext context) {
diff --git a/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart b/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart
index 7d9748e296..fbf731108c 100644
--- a/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/debug/debug_settings_page.dart
@@ -205,7 +205,7 @@ class _DebugSettingsPageState extends State<DebugSettingsPage> {
action != ChangeLogPageAction.openReferrals) {
return;
}
- await ReferralScreen.open(
+ await openReferralScreen(
context,
showLoadingDialog: true,
);
diff --git a/mobile/apps/photos/lib/ui/settings_page.dart b/mobile/apps/photos/lib/ui/settings_page.dart
index 684db09adf..526ee47022 100644
--- a/mobile/apps/photos/lib/ui/settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings_page.dart
@@ -361,7 +361,7 @@ class _SettingsBody extends StatelessWidget {
icon: HugeIcons.strokeRoundedTicketStar,
showOnlyLoadingState: true,
onTap: () async {
- await ReferralScreen.open(context);
+ await openReferralScreen(context);
},
),
],
@@ -420,7 +420,7 @@ class _SettingsBody extends StatelessWidget {
icon: HugeIcons.strokeRoundedTvSmart,
showOnlyLoadingState: true,
onTap: () async {
- await CastSettingsPage.open(context);
+ await openCastSettingsPage(context);
},
),
_buildMapsMenuItem(context),
diff --git a/mobile/apps/photos/lib/ui/tabs/home_widget.dart b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
index ac9d96ee85..0673316b29 100644
--- a/mobile/apps/photos/lib/ui/tabs/home_widget.dart
+++ b/mobile/apps/photos/lib/ui/tabs/home_widget.dart
@@ -1251,7 +1251,7 @@ class _HomeWidgetState extends State<HomeWidget> {
}
if (sheetAction == ChangeLogPageAction.openReferrals) {
if (!context.mounted) return;
- await ReferralScreen.open(context, showLoadingDialog: true);
+ await openReferralScreen(context, showLoadingDialog: true);
}
} finally {
_isShowingChangeLog = false;