π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile] Share Auth's More from Ente footer
r4khulc2e1161afee1
diff --git a/mobile/apps/auth/lib/ui/settings_page.dart b/mobile/apps/auth/lib/ui/settings_page.dartindex 2830ad02d0..b0f683cb4c 100644--- a/mobile/apps/auth/lib/ui/settings_page.dart+++ b/mobile/apps/auth/lib/ui/settings_page.dart@@ -13,7 +13,6 @@ import 'package:ente_auth/ui/settings/data/data_settings_page.dart';import 'package:ente_auth/ui/settings/data/export_widget.dart';import 'package:ente_auth/ui/settings/developer_settings_widget.dart';import 'package:ente_auth/ui/settings/general_settings_page.dart';-import 'package:ente_auth/ui/settings/more_from_ente_section.dart';import 'package:ente_auth/ui/settings/notification_banner_widget.dart';import 'package:ente_auth/ui/settings/security_settings_page.dart';import 'package:ente_auth/ui/settings/support_settings_page.dart';@@ -24,12 +23,10 @@ import 'package:ente_lock_screen/local_authentication_service.dart';import 'package:ente_strings/ente_strings.dart';import 'package:ente_ui/components/buttons/button_widget.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:ente_ui/components/settings/more_from_ente_footer.dart';import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:hugeicons/hugeicons.dart';-import 'package:url_launcher/url_launcher_string.dart';class SettingsPage extends StatelessWidget {const SettingsPage({@@ -167,25 +164,7 @@ class SettingsPage extends StatelessWidget {}contents.addAll([- const SizedBox(height: 40),- MoreFromEnteSection(- currentApp: ComponentApp.auth,- moreFromLabel: context.strings.moreFrom,- onAppTap: (app) {- launchUrlString(- moreFromEnteUri(- sourceApp: ComponentApp.auth,- destinationApp: app,- ).toString(),- mode: LaunchMode.externalApplication,- ).ignore();- },- ),- const SizedBox(height: 40),- const SocialIconsRow(),- const SizedBox(height: Spacing.md),- const AppVersionWidget(),- const SizedBox(height: Spacing.xxl),+ const MoreFromEnteFooter(currentApp: ComponentApp.auth),const DeveloperSettingsWidget(),const NotificationBannerWidget(),const SizedBox(height: 60),diff --git a/mobile/apps/auth/assets/svg/ente_wordmark.svg b/mobile/packages/ente_components/assets/ente_wordmark.svgsimilarity index 100%rename from mobile/apps/auth/assets/svg/ente_wordmark.svgrename to mobile/packages/ente_components/assets/ente_wordmark.svgdiff --git a/mobile/packages/ente_components/fonts/GochiHand-MoreFromEnte.ttf b/mobile/packages/ente_components/fonts/GochiHand-MoreFromEnte.ttfnew file mode 100644index 0000000000..fc18f60fe3Binary files /dev/null and b/mobile/packages/ente_components/fonts/GochiHand-MoreFromEnte.ttf differdiff --git a/mobile/apps/auth/lib/ui/settings/more_from_ente_section.dart b/mobile/packages/ente_components/lib/components/more_from_ente_section.dartsimilarity index 90%rename from mobile/apps/auth/lib/ui/settings/more_from_ente_section.dartrename to mobile/packages/ente_components/lib/components/more_from_ente_section.dartindex aa29e865f2..808d38c378 100644--- a/mobile/apps/auth/lib/ui/settings/more_from_ente_section.dart+++ b/mobile/packages/ente_components/lib/components/more_from_ente_section.dart@@ -1,4 +1,7 @@-import 'package:ente_components/ente_components.dart';+import 'package:ente_components/components/ente_app_icon.dart';+import 'package:ente_components/theme/colors.dart';+import 'package:ente_components/theme/text_styles.dart';+import 'package:ente_components/theme/theme.dart';import 'package:flutter/material.dart';import 'package:flutter_svg/flutter_svg.dart';@@ -40,18 +43,6 @@ class MoreFromEnteSection extends StatelessWidget {}}-Uri moreFromEnteUri({- required ComponentApp sourceApp,- required ComponentApp destinationApp,-}) {- final path = switch (destinationApp) {- ComponentApp.photos => '/',- ComponentApp.locker => '/locker',- ComponentApp.auth => '/auth',- };- return Uri.https('ente.com', path, {'from': sourceApp.name});-}-class _MoreFromEnteBrand extends StatelessWidget {const _MoreFromEnteBrand({required this.label});@@ -75,7 +66,8 @@ class _MoreFromEnteBrand extends StatelessWidget {maxLines: 1,style: TextStyle(color: colors.primary,- fontFamily: 'Gochi Hand',+ fontFamily: 'More from Ente Gochi Hand',+ package: 'ente_components',fontFamilyFallback: const [TextStyles.fontFamily],fontSize: 26.279,height: 1.02,@@ -84,7 +76,7 @@ class _MoreFromEnteBrand extends StatelessWidget {),),SvgPicture.asset(- 'assets/svg/ente_wordmark.svg',+ 'packages/ente_components/assets/ente_wordmark.svg',width: _wordmarkWidth,height: _wordmarkHeight,fit: BoxFit.fill,diff --git a/mobile/packages/ente_components/lib/ente_components.dart b/mobile/packages/ente_components/lib/ente_components.dartindex 75bef0305a..cd3af84e81 100644--- a/mobile/packages/ente_components/lib/ente_components.dart+++ b/mobile/packages/ente_components/lib/ente_components.dart@@ -13,6 +13,7 @@ export 'components/ente_app_icon.dart';export 'components/filter_chip_component.dart';export 'components/menu_component.dart';export 'components/menu_group_component.dart';+export 'components/more_from_ente_section.dart';export 'components/pin_input_component.dart';export 'components/popup_menu_component.dart';export 'components/selection_controls/checkbox_component.dart';diff --git a/mobile/packages/ente_components/pubspec.yaml b/mobile/packages/ente_components/pubspec.yamlindex d61b63f9b8..3e23ab8a72 100644--- a/mobile/packages/ente_components/pubspec.yaml+++ b/mobile/packages/ente_components/pubspec.yaml@@ -21,6 +21,7 @@ dev_dependencies:flutter:assets:- assets/apps/+ - assets/ente_wordmark.svgfonts:- family: Interfonts:@@ -45,3 +46,6 @@ flutter:- family: Gochi Handfonts:- asset: fonts/GochiHand-Regular.ttf+ - family: More from Ente Gochi Hand+ fonts:+ - asset: fonts/GochiHand-MoreFromEnte.ttfdiff --git a/mobile/packages/ui/lib/components/settings/more_from_ente_footer.dart b/mobile/packages/ui/lib/components/settings/more_from_ente_footer.dartnew file mode 100644index 0000000000..ba5014b72e--- /dev/null+++ b/mobile/packages/ui/lib/components/settings/more_from_ente_footer.dart@@ -0,0 +1,61 @@+import 'package:ente_components/ente_components.dart';+import 'package:ente_strings/ente_strings.dart';+import 'package:ente_ui/components/settings/app_version_widget.dart';+import 'package:ente_ui/components/settings/social_icons_row.dart';+import 'package:flutter/material.dart';+import 'package:url_launcher/url_launcher_string.dart';++class MoreFromEnteFooter extends StatelessWidget {+ const MoreFromEnteFooter({+ super.key,+ required this.currentApp,+ this.onVersionTap,+ });++ final ComponentApp currentApp;+ final VoidCallback? onVersionTap;++ @override+ Widget build(BuildContext context) {+ return SizedBox(+ width: double.infinity,+ child: Column(+ mainAxisSize: MainAxisSize.min,+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: [+ const SizedBox(height: 40),+ MoreFromEnteSection(+ currentApp: currentApp,+ moreFromLabel: context.strings.moreFrom,+ onAppTap: (app) {+ launchUrlString(+ _moreFromEnteUri(+ sourceApp: currentApp,+ destinationApp: app,+ ).toString(),+ mode: LaunchMode.externalApplication,+ ).ignore();+ },+ ),+ const SizedBox(height: 40),+ const SocialIconsRow(),+ const SizedBox(height: Spacing.md),+ AppVersionWidget(onTap: onVersionTap),+ const SizedBox(height: Spacing.xxl),+ ],+ ),+ );+ }+}++Uri _moreFromEnteUri({+ required ComponentApp sourceApp,+ required ComponentApp destinationApp,+}) {+ final path = switch (destinationApp) {+ ComponentApp.photos => '/',+ ComponentApp.locker => '/locker',+ ComponentApp.auth => '/auth',+ };+ return Uri.https('ente.com', path, {'from': sourceApp.name});+}