π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][locker] Remove legacy title bar title widget (#11882)
aman-pilote749347ef9b6
diff --git a/mobile/apps/locker/lib/ui/pages/file_upload_screen.dart b/mobile/apps/locker/lib/ui/pages/file_upload_screen.dartindex 452faff0bf..0a4ebae9ff 100644--- a/mobile/apps/locker/lib/ui/pages/file_upload_screen.dart+++ b/mobile/apps/locker/lib/ui/pages/file_upload_screen.dart@@ -2,7 +2,6 @@ import 'dart:io';import "package:ente_components/ente_components.dart";import 'package:ente_strings/ente_strings.dart';-import "package:ente_ui/components/title_bar_title_widget.dart";import 'package:flutter/material.dart';import "package:hugeicons/hugeicons.dart";import 'package:locker/services/collections/models/collection.dart';@@ -104,7 +103,14 @@ class _FileUploadScreenState extends State<FileUploadScreen> {Column(crossAxisAlignment: CrossAxisAlignment.start,children: [- TitleBarTitleWidget(title: context.strings.uploadFiles),+ Text(+ context.strings.uploadFiles,+ style: TextStyles.display2.copyWith(+ color: colors.textBase,+ ),+ overflow: TextOverflow.ellipsis,+ maxLines: 1,+ ),Text(context.strings.filesSelected(count: _files.length),style: TextStyles.body.copyWith(@@ -173,8 +179,13 @@ class _FileUploadScreenState extends State<FileUploadScreen> {),const SizedBox(height: 24),],- TitleBarTitleWidget(- title: context.strings.collectionLabel,+ Text(+ context.strings.collectionLabel,+ style: TextStyles.display2.copyWith(+ color: colors.textBase,+ ),+ overflow: TextOverflow.ellipsis,+ maxLines: 1,),const SizedBox(height: 16),CollectionSelectionWidget(diff --git a/mobile/packages/legacy/lib/pages/other_contact_page.dart b/mobile/packages/legacy/lib/pages/other_contact_page.dartindex fb166f35fb..b1843d9d4c 100644--- a/mobile/packages/legacy/lib/pages/other_contact_page.dart+++ b/mobile/packages/legacy/lib/pages/other_contact_page.dart@@ -2,6 +2,7 @@ import "dart:async";import "package:collection/collection.dart";import "package:ente_base/models/key_attributes.dart";+import "package:ente_components/ente_components.dart";import "package:ente_configuration/base_configuration.dart";import "package:ente_legacy/components/gradient_button.dart";import "package:ente_legacy/models/emergency_models.dart";@@ -10,7 +11,6 @@ import "package:ente_legacy/services/emergency_service.dart";import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/ente_strings.dart";import "package:ente_ui/components/alert_bottom_sheet.dart";-import "package:ente_ui/components/title_bar_title_widget.dart";import "package:ente_ui/theme/ente_theme.dart";import "package:ente_ui/utils/dialog_util.dart";import "package:flutter/material.dart";@@ -77,6 +77,7 @@ class _OtherContactPageState extends State<OtherContactPage> {}final colorScheme = getEnteColorScheme(context);final textTheme = getEnteTextTheme(context);+ final componentColors = context.componentColors;return Scaffold(appBar: AppBar(toolbarHeight: 48,@@ -93,7 +94,14 @@ class _OtherContactPageState extends State<OtherContactPage> {child: Column(crossAxisAlignment: CrossAxisAlignment.start,children: [- TitleBarTitleWidget(title: context.strings.recoverAccount),+ Text(+ context.strings.recoverAccount,+ style: TextStyles.display2.copyWith(+ color: componentColors.textBase,+ ),+ overflow: TextOverflow.ellipsis,+ maxLines: 1,+ ),Text(accountEmail, style: textTheme.smallMuted),const SizedBox(height: 12),// Description text based on recovery statediff --git a/mobile/packages/ui/lib/components/title_bar_title_widget.dart b/mobile/packages/ui/lib/components/title_bar_title_widget.dartdeleted file mode 100644index 5cf9010a70..0000000000--- a/mobile/packages/ui/lib/components/title_bar_title_widget.dart+++ /dev/null@@ -1,67 +0,0 @@-import 'package:ente_ui/theme/ente_theme.dart';-import 'package:flutter/material.dart';--class TitleBarTitleWidget extends StatelessWidget {- final String? title;- final bool isTitleH2;- final IconData? icon;- final List<Widget>? trailingWidgets;- const TitleBarTitleWidget({- super.key,- this.title,- this.isTitleH2 = false,- this.icon,- this.trailingWidgets,- });-- @override- Widget build(BuildContext context) {- final textTheme = getEnteTextTheme(context);- final colorTheme = getEnteColorScheme(context);- if (title != null) {- Widget titleWidget;- if (icon != null) {- titleWidget = Row(- mainAxisSize: MainAxisSize.min,- crossAxisAlignment: CrossAxisAlignment.center,- children: <Widget>[- Text(- title!,- style: textTheme.h3Bold,- overflow: TextOverflow.ellipsis,- maxLines: 1,- ),- const SizedBox(width: 8),- Icon(icon, size: 20, color: colorTheme.strokeMuted),- ],- );- } else if (isTitleH2) {- titleWidget = Text(- title!,- style: textTheme.h2Bold,- overflow: TextOverflow.ellipsis,- maxLines: 1,- );- } else {- titleWidget = Text(- title!,- style: textTheme.h3Bold,- overflow: TextOverflow.ellipsis,- maxLines: 1,- );- }-- if (trailingWidgets != null && trailingWidgets!.isNotEmpty) {- return Row(- children: [- Expanded(child: titleWidget),- ...trailingWidgets!,- ],- );- }- return titleWidget;- }-- return const SizedBox.shrink();- }-}