Skip to content

fix(storage): size clear-cache spinners via AppActivityIndicator.size #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iebb merged 1 commit into from
Oct 15, 2026
+139 −11
Merged

fix(storage): size clear-cache spinners via AppActivityIndicator.size #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions lib/settings/storage_usage_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,7 @@ class _StorageActionCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
final c = context.colors;
final actionColor = destructive ? AppTheme.tagRed : AppTheme.brand;
return SettingsPanel(
padding: EdgeInsets.all(desktopDense ? 14 : 17),
child: Row(
Expand Down Expand Up @@ -1100,15 +1101,11 @@ class _StorageActionCard extends StatelessWidget {
borderRadius: BorderRadius.circular(AppRadius.control),
),
child: showProgress
? const SizedBox(
width: 15,
height: 15,
child: AppActivityIndicator(),
)
? AppActivityIndicator(size: 15, color: actionColor)
: Text(
action,
style: TextStyle(
color: destructive ? AppTheme.tagRed : AppTheme.brand,
color: actionColor,
fontSize: desktopDense ? 12 : 14,
fontWeight: FontWeight.w600,
),
Expand Down Expand Up @@ -1368,11 +1365,7 @@ class _StorageManagerViewState extends State<_StorageManagerView> {
borderRadius: BorderRadius.circular(AppRadius.control),
),
child: _working
? const SizedBox(
width: 14,
height: 14,
child: AppActivityIndicator(),
)
? AppActivityIndicator(size: 14, color: AppTheme.tagRed)
: Text(
AppStrings.t(
AppStringKeys.storageManagerClearSelected,
Expand Down
135 changes: 135 additions & 0 deletions test/storage_usage_view_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import 'dart:async';
import 'dart:math' as math;

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mithka/components/ui_components.dart';
import 'package:mithka/l10n/app_localizations.dart';
import 'package:mithka/settings/data_storage_service.dart';
import 'package:mithka/settings/storage_usage_view.dart';
Expand Down Expand Up @@ -156,6 +160,131 @@ void main() {
]);
expect(service.optimizeCalls.single, isNot(contains('@type')));
});

testWidgets(
'clear cache spinners size their icon to the indicator and rotate around the button center',
(tester) async {
SharedPreferences.setMockInitialValues({});
final optimizeCompleter = Completer<Map<String, dynamic>>();
final service = _FakeDataStorageService(
optimizeGate: optimizeCompleter.future,
);
final prefs = await SharedPreferences.getInstance();
final theme = ThemeController(prefs);
addTearDown(theme.dispose);
tester.view.physicalSize = const Size(430, 900);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.resetPhysicalSize);
addTearDown(tester.view.resetDevicePixelRatio);

await tester.pumpWidget(
ChangeNotifierProvider<ThemeController>.value(
value: theme,
child: _testApp(StorageUsageView(service: service)),
),
);
await tester.pumpAndSettle();

await tester.tap(find.text('Clear cache'));
await tester.pumpAndSettle();
await tester.tap(find.text('Clear cache').last);
await tester.pump();
await tester.pump(const Duration(milliseconds: 250));

final cacheCard = find.byKey(const ValueKey('storage-cache-card'));
final indicatorFinder = find.descendant(
of: cacheCard,
matching: find.byType(AppActivityIndicator),
);
expect(indicatorFinder, findsOneWidget);
final iconFinder = find.descendant(
of: indicatorFinder,
matching: find.byType(Icon),
);
final icon = tester.widget<Icon>(iconFinder);
expect(icon.size, 15);
expect(icon.color, AppTheme.tagRed);

var maxPivotDrift = 0.0;
final indicatorCenter = tester.getCenter(indicatorFinder);
for (var step = 0; step < 8; step++) {
await tester.pump(const Duration(milliseconds: 100));
final iconCenter = tester.getCenter(iconFinder);
maxPivotDrift = math.max(
maxPivotDrift,
(iconCenter - indicatorCenter).distance,
);
}
expect(maxPivotDrift, lessThan(0.01));

optimizeCompleter.complete(const {'@type': 'storageStatistics'});
await tester.pumpAndSettle();
},
);

testWidgets(
'storage manager clear selected spinner sizes its icon to the indicator and rotates in place',
(tester) async {
SharedPreferences.setMockInitialValues({});
final optimizeCompleter = Completer<Map<String, dynamic>>();
final service = _FakeDataStorageService(
optimizeGate: optimizeCompleter.future,
);
final prefs = await SharedPreferences.getInstance();
final theme = ThemeController(prefs);
addTearDown(theme.dispose);
tester.view.physicalSize = const Size(430, 900);
tester.view.devicePixelRatio = 1;
addTearDown(tester.view.resetPhysicalSize);
addTearDown(tester.view.resetDevicePixelRatio);

await tester.pumpWidget(
ChangeNotifierProvider<ThemeController>.value(
value: theme,
child: _testApp(StorageUsageView(service: service)),
),
);
await tester.pumpAndSettle();

await tester.tap(find.text('Manage'));
await tester.pumpAndSettle();
await tester.tap(find.byKey(const ValueKey('storage-chat-7')));
await tester.pump();
await tester.tap(find.byKey(const ValueKey('storage-clear-selected')));
await tester.pumpAndSettle();
await tester.tap(find.text('Clear selected').last);
await tester.pump();

final clearButton = find.byKey(const ValueKey('storage-clear-selected'));
final indicatorFinder = find.descendant(
of: clearButton,
matching: find.byType(AppActivityIndicator),
);
expect(indicatorFinder, findsOneWidget);
final iconFinder = find.descendant(
of: indicatorFinder,
matching: find.byType(Icon),
);
final icon = tester.widget<Icon>(iconFinder);
expect(icon.size, 14);
expect(icon.color, AppTheme.tagRed);

var maxPivotDrift = 0.0;
final indicatorCenter = tester.getCenter(indicatorFinder);
for (var step = 0; step < 8; step++) {
await tester.pump(const Duration(milliseconds: 100));
final iconCenter = tester.getCenter(iconFinder);
maxPivotDrift = math.max(
maxPivotDrift,
(iconCenter - indicatorCenter).distance,
);
}
expect(maxPivotDrift, lessThan(0.01));

optimizeCompleter.complete(const {'@type': 'storageStatistics'});
await tester.pumpAndSettle();
},
);
}

Widget _testApp(Widget home) => MaterialApp(
Expand All @@ -172,6 +301,9 @@ Widget _testApp(Widget home) => MaterialApp(
);

class _FakeDataStorageService extends DataStorageService {
_FakeDataStorageService({this.optimizeGate});

final Future<Map<String, dynamic>>? optimizeGate;
final List<Map<String, dynamic>> optimizeCalls = [];

@override
Expand Down Expand Up @@ -258,6 +390,9 @@ class _FakeDataStorageService extends DataStorageService {
'return_deleted_file_statistics': returnDeletedStatistics,
'chat_limit': chatLimit,
});
if (optimizeGate != null) {
return await optimizeGate!;
}
return const {'@type': 'storageStatistics'};
}
}
Loading