π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile] Remove unused components and trim redundant tests (#13639)
aman-pilot1209c4b4c115
diff --git a/mobile/apps/locker/test/utils/file_util_test.dart b/mobile/apps/locker/test/utils/file_util_test.dartindex 5c1ec4eb5b..0ec74fe4ef 100644--- a/mobile/apps/locker/test/utils/file_util_test.dart+++ b/mobile/apps/locker/test/utils/file_util_test.dart@@ -117,7 +117,6 @@ void main() {expect(await handoffFile.readAsString(), 'current cache bytes');expect(await staleLocalPath.readAsString(), 'stale local bytes');- expect(cacheRelativePath(handoffFile), startsWith('open_handoff'));expect(cacheRelativePath(handoffFile),startsWith(p.join('open_handoff', '321')),diff --git a/mobile/packages/ente_components/example/lib/main.dart b/mobile/packages/ente_components/example/lib/main.dartindex 5e4d2befe0..dd5fa95e98 100644--- a/mobile/packages/ente_components/example/lib/main.dart+++ b/mobile/packages/ente_components/example/lib/main.dart@@ -309,7 +309,7 @@ class _CatalogHomeState extends State<CatalogHome> {CatalogSection(title: 'Selection controls',icon: HugeIcons.strokeRoundedSlidersHorizontal,- components: const ['Checkbox', 'Radio', 'Switch', 'Slider', 'Stepper'],+ components: const ['Checkbox', 'Radio', 'Switch'],previewBuilder: (_) => const _SelectionPreview(),),CatalogSection(@@ -3161,8 +3161,6 @@ class _SelectionPreviewState extends State<_SelectionPreview> {bool _checkbox = true;bool _radio = true;bool _switch = true;- double _slider = 0.42;- int _stepper = 3;@overrideWidget build(BuildContext context) {@@ -3226,35 +3224,6 @@ class _SelectionPreviewState extends State<_SelectionPreview> {],),),- _CatalogPreviewGroup(- title: 'Slider',- child: SliderComponent(- value: _slider,- onChanged: (value) => setState(() => _slider = value),- ),- ),- const _CatalogPreviewGroup(- title: 'Disabled slider',- child: SliderComponent(value: 0.7, onChanged: null),- ),- _CatalogPreviewGroup(- title: 'Stepper',- child: StepperComponent(- value: _stepper,- onChanged: (value) => setState(() => _stepper = value),- ),- ),- const _CatalogPreviewGroup(- title: 'Stepper limits',- child: Wrap(- spacing: Spacing.lg,- runSpacing: Spacing.md,- children: [- StepperComponent(value: 0, min: 0, max: 5, onChanged: null),- StepperComponent(value: 5, min: 0, max: 5, onChanged: null),- ],- ),- ),],);}diff --git a/mobile/packages/ente_components/lib/components/slider_component.dart b/mobile/packages/ente_components/lib/components/slider_component.dartdeleted file mode 100644index 1a688a231d..0000000000--- a/mobile/packages/ente_components/lib/components/slider_component.dart+++ /dev/null@@ -1,41 +0,0 @@-import 'package:ente_components/theme/theme.dart';-import 'package:flutter/material.dart';-import 'package:flutter/material.dart' as material show Slider;--// Figma: https://www.figma.com/design/BuBNPPytxlVnqfmCUW0mgz/Ente-Visual-Design?node-id=57-6281&m=dev-class SliderComponent extends StatelessWidget {- const SliderComponent({- super.key,- required this.value,- required this.onChanged,- this.min = 0,- this.max = 1,- this.divisions,- });-- final double value;- final ValueChanged<double>? onChanged;- final double min;- final double max;- final int? divisions;-- @override- Widget build(BuildContext context) {- final colors = context.componentColors;- return SliderTheme(- data: SliderTheme.of(context).copyWith(- activeTrackColor: colors.primary,- inactiveTrackColor: colors.strokeFaint,- thumbColor: colors.primary,- overlayColor: colors.primaryLight,- ),- child: material.Slider(- value: value.clamp(min, max),- min: min,- max: max,- divisions: divisions,- onChanged: onChanged,- ),- );- }-}diff --git a/mobile/packages/ente_components/lib/components/stepper_component.dart b/mobile/packages/ente_components/lib/components/stepper_component.dartdeleted file mode 100644index 95a3a4d97e..0000000000--- a/mobile/packages/ente_components/lib/components/stepper_component.dart+++ /dev/null@@ -1,81 +0,0 @@-import 'package:ente_components/theme/icon_sizes.dart';-import 'package:ente_components/theme/radii.dart';-import 'package:ente_components/theme/spacing.dart';-import 'package:ente_components/theme/text_styles.dart';-import 'package:ente_components/theme/theme.dart';-import 'package:flutter/material.dart';-import 'package:flutter/material.dart' as material show IconButton;--// Figma: https://www.figma.com/design/BuBNPPytxlVnqfmCUW0mgz/Ente-Visual-Design?node-id=57-6281&m=dev-class StepperComponent extends StatelessWidget {- const StepperComponent({- super.key,- required this.value,- required this.onChanged,- this.min = 0,- this.max = 999,- });-- final int value;- final ValueChanged<int>? onChanged;- final int min;- final int max;-- @override- Widget build(BuildContext context) {- final colors = context.componentColors;- return DecoratedBox(- decoration: BoxDecoration(- color: colors.fillLight,- borderRadius: BorderRadius.circular(Radii.md),- border: Border.all(color: colors.strokeFaint),- ),- child: Row(- mainAxisSize: MainAxisSize.min,- children: [- _StepButton(- icon: Icons.remove_rounded,- enabled: onChanged != null && value > min,- onPressed: () => onChanged?.call(value - 1),- ),- Padding(- padding: const EdgeInsets.symmetric(horizontal: Spacing.md),- child: Text(- '$value',- style: TextStyles.bodyBold.copyWith(color: colors.textBase),- ),- ),- _StepButton(- icon: Icons.add_rounded,- enabled: onChanged != null && value < max,- onPressed: () => onChanged?.call(value + 1),- ),- ],- ),- );- }-}--class _StepButton extends StatelessWidget {- const _StepButton({- required this.icon,- required this.enabled,- required this.onPressed,- });-- final IconData icon;- final bool enabled;- final VoidCallback onPressed;-- @override- Widget build(BuildContext context) {- final colors = context.componentColors;- return material.IconButton(- visualDensity: VisualDensity.compact,- onPressed: enabled ? onPressed : null,- icon: Icon(icon, size: IconSizes.small),- color: colors.textBase,- disabledColor: colors.textLighter,- );- }-}diff --git a/mobile/packages/ente_components/lib/ente_components.dart b/mobile/packages/ente_components/lib/ente_components.dartindex 067b646631..0628bc9266 100644--- a/mobile/packages/ente_components/lib/ente_components.dart+++ b/mobile/packages/ente_components/lib/ente_components.dart@@ -26,8 +26,6 @@ export 'components/selection_summary_chip_component.dart';export 'components/settings_item.dart';export 'components/settings_link.dart';export 'components/settings_page_scaffold.dart';-export 'components/slider_component.dart';-export 'components/stepper_component.dart';export 'components/tag_chip_component.dart';export 'components/text_input_component.dart';export 'components/toast_component.dart';diff --git a/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart b/mobile/packages/ente_components/test/components/app_surface_widgets_test.dartindex 4f9723fb3e..ec31348841 100644--- a/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart+++ b/mobile/packages/ente_components/test/components/app_surface_widgets_test.dart@@ -189,17 +189,16 @@ void main() {);expect(tester.takeException(), isNull);- expect(tester.getCenter(find.byIcon(Icons.arrow_back)).dy, closeTo(28, 1));- expect(tester.getSize(find.byIcon(Icons.arrow_back)).width, 24);expect(- tester.getSize(find.byKey(const ValueKey('header-leading'))),- const Size(38, 38),+ tester.getCenter(find.byKey(const ValueKey('header-leading'))).dy,+ closeTo(tester.getCenter(find.byIcon(Icons.add)).dy, 1),);expect(- tester.getCenter(find.byKey(const ValueKey('header-leading'))).dy,- closeTo(89, 1),+ tester.getBottomLeft(find.byIcon(Icons.arrow_back)).dy,+ lessThanOrEqualTo(+ tester.getTopLeft(find.byKey(const ValueKey('header-leading'))).dy,+ ),);- expect(tester.getCenter(find.byIcon(Icons.add)).dy, closeTo(89, 1));await tester.tap(find.byKey(const ValueKey('header-leading')));await tester.pump();@@ -346,8 +345,8 @@ void main() {expect(find.byIcon(Icons.arrow_back), findsNothing);if (showBack) {expect(- tester.getCenter(find.byIcon(Icons.close)),- const Offset(35, 28),+ tester.getBottomLeft(find.byIcon(Icons.close)).dy,+ lessThanOrEqualTo(tester.getTopLeft(find.text('Settings')).dy),);await tester.tap(find.byIcon(Icons.close));} else {@@ -612,9 +611,6 @@ void main() {await tester.pumpAndSettle();expect(scrollController.offset, closeTo(74, 1));- final collapsedTitle = tester.widget<Text>(find.text('Appearance'));- expect(collapsedTitle.style?.fontSize, closeTo(20, 0.01));- expect(collapsedTitle.style?.fontFamily, TextStyles.display3.fontFamily);expect(tester.getTopLeft(find.text('System theme')).dy, closeTo(56, 1));await tester.drag(find.byType(CustomScrollView), const Offset(0, 32));@@ -697,7 +693,10 @@ void main() {expect(tester.takeException(), isNull);expect(find.text(title), findsOneWidget);- expect(tester.getBottomLeft(find.text(title)).dy, lessThanOrEqualTo(128));+ expect(+ tester.getBottomLeft(find.text(title)).dy,+ lessThanOrEqualTo(tester.getTopLeft(find.text('Scaled item 0')).dy),+ );expect(tester.getSize(find.bySemanticsLabel('Back')), const Size(48, 48));await tester.drag(find.byType(CustomScrollView), const Offset(0, -240));diff --git a/mobile/packages/ente_components/test/components/bottom_sheet_component_test.dart b/mobile/packages/ente_components/test/components/bottom_sheet_component_test.dartindex 3b362ea267..8c8ff5b837 100644--- a/mobile/packages/ente_components/test/components/bottom_sheet_component_test.dart+++ b/mobile/packages/ente_components/test/components/bottom_sheet_component_test.dart@@ -143,9 +143,8 @@ void main() {Future<void> _pumpLauncher<T>(WidgetTester tester,- Future<T?> Function(BuildContext context) onTap, {- String label = 'Show sheet',-}) {+ Future<T?> Function(BuildContext context) onTap,+) {return tester.pumpWidget(MaterialApp(theme: ComponentTheme.lightTheme(),@@ -153,7 +152,7 @@ Future<void> _pumpLauncher<T>(builder: (context) {return Scaffold(body: ButtonComponent(- label: label,+ label: 'Show sheet',onTap: () async {await onTap(context);},@@ -165,11 +164,8 @@ Future<void> _pumpLauncher<T>();}-Future<void> _openLauncher(- WidgetTester tester, {- String label = 'Show sheet',-}) async {- await tester.tap(find.text(label));+Future<void> _openLauncher(WidgetTester tester) async {+ await tester.tap(find.text('Show sheet'));await tester.pump();await tester.pump(const Duration(milliseconds: 500));}diff --git a/mobile/packages/ente_components/test/components/button_test.dart b/mobile/packages/ente_components/test/components/button_test.dartindex 6d17609096..3bf1217027 100644--- a/mobile/packages/ente_components/test/components/button_test.dart+++ b/mobile/packages/ente_components/test/components/button_test.dart@@ -56,7 +56,6 @@ void main() {expect(find.byType(CircularProgressIndicator), findsNothing);await tester.pump(const Duration(milliseconds: 200));expect(find.text("Uploading"), findsOneWidget);- expect(tester.getSize(find.byType(AnimatedContainer)).height, 52);completer.complete();await tester.pump();@@ -305,14 +304,10 @@ void main() {});}-Widget _wrap(- Widget child, {- ComponentApp app = ComponentApp.photos,- Brightness brightness = Brightness.light,-}) {+Widget _wrap(Widget child) {return MaterialApp(themeAnimationDuration: Duration.zero,- theme: ComponentTheme.themeForApp(app, brightness: brightness),+ theme: ComponentTheme.themeForApp(ComponentApp.photos),home: Scaffold(body: Center(child: child)),);}diff --git a/mobile/packages/ente_components/test/components/loading_test.dart b/mobile/packages/ente_components/test/components/loading_test.dartindex 23502ccef9..53c5304c21 100644--- a/mobile/packages/ente_components/test/components/loading_test.dart+++ b/mobile/packages/ente_components/test/components/loading_test.dart@@ -226,8 +226,6 @@ void main() {expect(handle.isShowing(), isFalse);expect(find.text("Opening"), findsNothing);expect(find.text("Page"), findsOneWidget);- handle.update(message: "After dismissal");- await handle.hide();},);diff --git a/mobile/packages/ente_components/test/components/text_input_component_test.dart b/mobile/packages/ente_components/test/components/text_input_component_test.dartindex a17ffc6420..9d82e07d43 100644--- a/mobile/packages/ente_components/test/components/text_input_component_test.dart+++ b/mobile/packages/ente_components/test/components/text_input_component_test.dart@@ -63,27 +63,33 @@ void main() {_wrap(SizedBox(width: 240,- child: TextInputComponent(- suffix: const Icon(- Icons.close_rounded,- key: ValueKey("custom-suffix-icon"),- ),- onSuffixTap: () => suffixTapCount++,+ child: Column(+ children: [+ const TextInputComponent(),+ TextInputComponent(+ suffix: const Icon(+ Icons.close_rounded,+ key: ValueKey("custom-suffix-icon"),+ ),+ onSuffixTap: () => suffixTapCount++,+ ),+ ],),),),);- final fieldFinder = _fieldContainers().first;+ final fieldFinder = _fieldContainers().last;final fieldRect = tester.getRect(fieldFinder);- expect(fieldRect.height, 52);-await tester.tapAt(Offset(fieldRect.right - 51, fieldRect.center.dy));await tester.pump();expect(suffixTapCount, 1);- expect(tester.getRect(fieldFinder).height, 52);+ expect(+ tester.getSize(fieldFinder),+ tester.getSize(_fieldContainers().first),+ );},);@@ -226,14 +232,15 @@ void main() {}Finder _fieldContainers() {- return find.byWidgetPredicate((widget) {- if (widget is! Container || widget.decoration is! BoxDecoration) {- return false;- }- final decoration = widget.decoration! as BoxDecoration;- return decoration.borderRadius == BorderRadius.circular(16) &&- decoration.border is Border;- });+ return find.ancestor(+ of: find.byType(TextField),+ matching: find.byWidgetPredicate((widget) {+ if (widget is! Container || widget.decoration is! BoxDecoration) {+ return false;+ }+ return (widget.decoration! as BoxDecoration).border is Border;+ }),+ );}BoxDecoration _fieldDecoration(WidgetTester tester) {