Skip to content

armgit / ente

Public Imported from GitHub
0

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

Share app version across mobile apps

Neeraj Gupta61d33c8e2270
diff --git a/mobile/apps/auth/lib/ui/settings/app_version_widget.dart b/mobile/apps/auth/lib/ui/settings/app_version_widget.dart
deleted file mode 100644
index 62cd314791..0000000000
--- a/mobile/apps/auth/lib/ui/settings/app_version_widget.dart
+++ /dev/null
@@ -1,75 +0,0 @@
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:ente_components/ente_components.dart';
-import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-
-class AppVersionWidget extends StatefulWidget {
- const AppVersionWidget({super.key});
-
- @override
- State<AppVersionWidget> createState() => _AppVersionWidgetState();
-}
-
-class _AppVersionWidgetState extends State<AppVersionWidget> {
- static const kTapThresholdForInspector = 5;
- static const kConsecutiveTapTimeWindowInMilliseconds = 2000;
- static const kDummyDelayDurationInMilliseconds = 1500;
-
- int? _lastTap;
- int _consecutiveTaps = 0;
-
- @override
- Widget build(BuildContext context) {
- return GestureDetector(
- behavior: HitTestBehavior.translucent,
- onTap: () async {
- final int now = DateTime.now().millisecondsSinceEpoch;
- if (now - (_lastTap ?? now) < kConsecutiveTapTimeWindowInMilliseconds) {
- _consecutiveTaps++;
- if (_consecutiveTaps == kTapThresholdForInspector) {
- final dialog = createProgressDialog(
- context,
- "Starting network inspector...",
- );
- await dialog.show();
- await Future.delayed(
- const Duration(milliseconds: kDummyDelayDurationInMilliseconds),
- );
- await dialog.hide();
- }
- } else {
- _consecutiveTaps = 1;
- }
- _lastTap = now;
- },
- child: FutureBuilder<String>(
- future: _getAppVersion(),
- builder: (context, snapshot) {
- if (snapshot.hasData) {
- return SizedBox(
- width: double.infinity,
- height: 16,
- child: Semantics(
- identifier: 'auth_settings_app_version',
- child: Center(
- child: Text(
- "Version ${snapshot.data!}",
- style: TextStyles.mini.copyWith(
- color: context.componentColors.textLight,
- ),
- ),
- ),
- ),
- );
- }
- return Container();
- },
- ),
- );
- }
-
- Future<String> _getAppVersion() async {
- final pkgInfo = await PackageInfo.fromPlatform();
- return pkgInfo.version;
- }
-}
diff --git a/mobile/apps/auth/lib/ui/settings_page.dart b/mobile/apps/auth/lib/ui/settings_page.dart
index 7d59ec077d..2d70e10c35 100644
--- a/mobile/apps/auth/lib/ui/settings_page.dart
+++ b/mobile/apps/auth/lib/ui/settings_page.dart
@@ -8,7 +8,6 @@ import 'package:ente_auth/store/code_store.dart';
import 'package:ente_auth/ui/components/buttons/button_widget.dart';
import 'package:ente_auth/ui/settings/about_settings_page.dart';
import 'package:ente_auth/ui/settings/account_settings_page.dart';
-import 'package:ente_auth/ui/settings/app_version_widget.dart';
import 'package:ente_auth/ui/settings/components/auth_settings_navigation.dart';
import 'package:ente_auth/ui/settings/components/auth_settings_page_scaffold.dart';
import 'package:ente_auth/ui/settings/data/data_settings_page.dart';
@@ -25,6 +24,7 @@ import 'package:ente_components/ente_components.dart';
import 'package:ente_lock_screen/local_authentication_service.dart';
import 'package:ente_strings/ente_strings.dart';
import 'package:ente_ui/components/settings/app_engagement_section.dart';
+import 'package:ente_ui/components/settings/app_version_widget.dart';
import 'package:ente_ui/components/settings/social_icons_row.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
diff --git a/mobile/apps/locker/lib/ui/settings/settings_page.dart b/mobile/apps/locker/lib/ui/settings/settings_page.dart
index 87882693a2..a95c9643d9 100644
--- a/mobile/apps/locker/lib/ui/settings/settings_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/settings_page.dart
@@ -4,6 +4,7 @@ import "package:ente_accounts/services/user_service.dart";
import "package:ente_components/ente_components.dart";
import "package:ente_strings/ente_strings.dart";
import "package:ente_ui/components/settings/app_engagement_section.dart";
+import "package:ente_ui/components/settings/app_version_widget.dart";
import "package:ente_ui/components/settings/social_icons_row.dart";
import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
@@ -15,7 +16,6 @@ import "package:locker/ui/settings/pages/general_settings_page.dart";
import "package:locker/ui/settings/pages/security_settings_page.dart";
import "package:locker/ui/settings/pages/support_page.dart";
import "package:locker/ui/settings/pages/theme_settings_page.dart";
-import "package:locker/ui/settings/widgets/app_version_widget.dart";
import "package:locker/utils/bottom_sheet_illustration.dart";
class SettingsWidget extends StatelessWidget {
diff --git a/mobile/apps/locker/lib/ui/settings/widgets/app_version_widget.dart b/mobile/apps/locker/lib/ui/settings/widgets/app_version_widget.dart
deleted file mode 100644
index c08defb419..0000000000
--- a/mobile/apps/locker/lib/ui/settings/widgets/app_version_widget.dart
+++ /dev/null
@@ -1,103 +0,0 @@
-import "dart:async";
-
-import "package:ente_components/ente_components.dart";
-import "package:flutter/material.dart";
-import "package:package_info_plus/package_info_plus.dart";
-
-/// Widget that displays the app version centered at the bottom
-/// with an easter egg for tapping multiple times
-class AppVersionWidget extends StatefulWidget {
- const AppVersionWidget({super.key});
-
- @override
- State<AppVersionWidget> createState() => _AppVersionWidgetState();
-}
-
-class _AppVersionWidgetState extends State<AppVersionWidget> {
- static const _kTapThresholdForInspector = 5;
- static const _kConsecutiveTapTimeWindowInMilliseconds = 2000;
- static const _kDummyDelayDurationInMilliseconds = 1500;
-
- int? _lastTap;
- int _consecutiveTaps = 0;
-
- @override
- Widget build(BuildContext context) {
- final colors = context.componentColors;
-
- return GestureDetector(
- behavior: HitTestBehavior.translucent,
- onTap: () async {
- final int now = DateTime.now().millisecondsSinceEpoch;
- if (now - (_lastTap ?? now) <
- _kConsecutiveTapTimeWindowInMilliseconds) {
- _consecutiveTaps++;
- if (_consecutiveTaps == _kTapThresholdForInspector) {
- unawaited(
- showBottomSheetComponent<void>(
- context: context,
- isDismissible: false,
- enableDrag: false,
- builder: (_) => BottomSheetComponent(
- title: "Starting network inspector...",
- showCloseButton: false,
- content: Row(
- children: [
- SizedBox.square(
- dimension: 20,
- child: CircularProgressIndicator(
- strokeWidth: 2,
- color: colors.primary,
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: Text(
- "Please wait",
- style: TextStyles.body.copyWith(
- color: colors.textLight,
- ),
- ),
- ),
- ],
- ),
- ),
- ),
- );
- await Future.delayed(
- const Duration(milliseconds: _kDummyDelayDurationInMilliseconds),
- );
- if (context.mounted) {
- Navigator.of(context).pop();
- }
- }
- } else {
- _consecutiveTaps = 1;
- }
- _lastTap = now;
- },
- child: FutureBuilder<String>(
- future: _getAppVersion(),
- builder: (context, snapshot) {
- if (snapshot.hasData) {
- return Padding(
- padding: const EdgeInsets.symmetric(vertical: 20),
- child: Center(
- child: Text(
- "Version ${snapshot.data!}",
- style: TextStyles.mini.copyWith(color: colors.textLight),
- ),
- ),
- );
- }
- return const SizedBox.shrink();
- },
- ),
- );
- }
-
- Future<String> _getAppVersion() async {
- final pkgInfo = await PackageInfo.fromPlatform();
- return pkgInfo.version;
- }
-}
diff --git a/mobile/apps/photos/lib/ui/settings/app_version_widget.dart b/mobile/apps/photos/lib/ui/settings/app_version_widget.dart
deleted file mode 100644
index a00fa9544d..0000000000
--- a/mobile/apps/photos/lib/ui/settings/app_version_widget.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-import "package:ente_strings/ente_strings.dart";
-import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import "package:photos/theme/ente_theme.dart";
-
-class AppVersionWidget extends StatefulWidget {
- const AppVersionWidget({super.key});
-
- @override
- State<AppVersionWidget> createState() => _AppVersionWidgetState();
-}
-
-class _AppVersionWidgetState extends State<AppVersionWidget> {
- static const kTapThresholdForInspector = 5;
- static const kConsecutiveTapTimeWindowInMilliseconds = 2000;
-
- int? _lastTap;
- int _consecutiveTaps = 0;
- late final Future<String> _versionFuture;
-
- @override
- void initState() {
- super.initState();
- _versionFuture = _getAppVersion();
- }
-
- @override
- Widget build(BuildContext context) {
- return GestureDetector(
- behavior: HitTestBehavior.translucent,
- onTap: () async {
- final int now = DateTime.now().millisecondsSinceEpoch;
- if (now - (_lastTap ?? now) < kConsecutiveTapTimeWindowInMilliseconds) {
- _consecutiveTaps++;
- if (_consecutiveTaps == kTapThresholdForInspector) {
- // Do nothing
- }
- } else {
- _consecutiveTaps = 1;
- }
- _lastTap = now;
- },
- child: FutureBuilder<String>(
- future: _versionFuture,
- builder: (context, snapshot) {
- if (snapshot.hasData) {
- final textTheme = getEnteTextTheme(context);
- return Padding(
- padding: const EdgeInsets.symmetric(vertical: 20),
- child: Center(
- child: Text(
- context.strings.appVersion(versionValue: snapshot.data!),
- style: textTheme.smallMuted,
- ),
- ),
- );
- }
- return const SizedBox.shrink();
- },
- ),
- );
- }
-
- Future<String> _getAppVersion() async {
- final pkgInfo = await PackageInfo.fromPlatform();
- return pkgInfo.version;
- }
-}
diff --git a/mobile/apps/photos/lib/ui/settings_page.dart b/mobile/apps/photos/lib/ui/settings_page.dart
index 53e9ccdad5..5ebbb6ac7c 100644
--- a/mobile/apps/photos/lib/ui/settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings_page.dart
@@ -3,6 +3,7 @@ import "package:ente_lock_screen/local_authentication_service.dart";
import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
import "package:ente_ui/components/settings/app_engagement_section.dart";
+import "package:ente_ui/components/settings/app_version_widget.dart";
import "package:ente_ui/components/settings/social_icons_row.dart";
import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
@@ -21,7 +22,6 @@ import "package:photos/ui/growth/referral_screen.dart";
import "package:photos/ui/notification/toast.dart";
import "package:photos/ui/settings/about/about_us_page.dart";
import "package:photos/ui/settings/account/account_settings_page.dart";
-import "package:photos/ui/settings/app_version_widget.dart";
import "package:photos/ui/settings/appearance/appearance_settings_page.dart";
import "package:photos/ui/settings/backup/backup_settings_page.dart";
import "package:photos/ui/settings/backup/free_space_options.dart";
diff --git a/mobile/packages/ui/lib/components/settings/app_version_widget.dart b/mobile/packages/ui/lib/components/settings/app_version_widget.dart
new file mode 100644
index 0000000000..ff4e2f1b2a
--- /dev/null
+++ b/mobile/packages/ui/lib/components/settings/app_version_widget.dart
@@ -0,0 +1,45 @@
+import 'package:ente_components/ente_components.dart';
+import 'package:ente_strings/ente_strings.dart';
+import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+
+class AppVersionWidget extends StatefulWidget {
+ const AppVersionWidget({super.key});
+
+ @override
+ State<AppVersionWidget> createState() => _AppVersionWidgetState();
+}
+
+class _AppVersionWidgetState extends State<AppVersionWidget> {
+ late final Future<PackageInfo> _packageInfo;
+
+ @override
+ void initState() {
+ super.initState();
+ _packageInfo = PackageInfo.fromPlatform();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return FutureBuilder<PackageInfo>(
+ future: _packageInfo,
+ builder: (context, snapshot) {
+ if (!snapshot.hasData) {
+ return const SizedBox.shrink();
+ }
+
+ return Padding(
+ padding: const EdgeInsets.symmetric(vertical: Spacing.xl),
+ child: Center(
+ child: Text(
+ context.strings.appVersion(versionValue: snapshot.data!.version),
+ style: TextStyles.mini.copyWith(
+ color: context.componentColors.textLight,
+ ),
+ ),
+ ),
+ );
+ },
+ );
+ }
+}
diff --git a/mobile/packages/ui/pubspec.yaml b/mobile/packages/ui/pubspec.yaml
index 79e00487a0..9010d2c9cf 100644
--- a/mobile/packages/ui/pubspec.yaml
+++ b/mobile/packages/ui/pubspec.yaml
@@ -26,6 +26,7 @@ dependencies:
fluttertoast: 8.2.14
hugeicons: 1.1.7
modal_bottom_sheet: 3.0.0
+ package_info_plus: 8.3.1
url_launcher: 6.3.2
dev_dependencies: