wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly filter hidden widgets 🙄

Browse Source
This commit is contained in:
Roland Geider
2026-01-19 16:39:06 +01:00
parent 1d2bcc62dd
commit 92aee1228e
8 changed files with 92 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/providers/user.dart
View File

@@ -100,7 +100,11 @@ class UserProvider with ChangeNotifier {
.map((w) => DashboardItem(w))
.toList();
List<DashboardWidget> get dashboardOrder => _dashboardItems.map((e) => e.widget).toList();
/// List of visible dashboard widgets in the configured order
List<DashboardWidget> get dashboardWidgets =>
_dashboardItems.where((w) => w.isVisible).map((w) => w.widget).toList();
List<DashboardWidget> get allDashboardWidgets => _dashboardItems.map((w) => w.widget).toList();
Future<void> _loadDashboardConfig() async {
final jsonString = await prefs.getString(PREFS_DASHBOARD_CONFIG);

19
lib/screens/dashboard.dart
View File

@@ -49,13 +49,6 @@ class DashboardScreen extends StatelessWidget {
case DashboardWidget.trophies:
return const DashboardTrophiesWidget();
}
/*
child: Column(
children: user.dashboardOrder
.where((w) => user.isDashboardWidgetVisible(w))
.map(_getDashboardWidget)
.toList(),
*/
}
@override
@@ -83,14 +76,16 @@ class DashboardScreen extends StatelessWidget {
child: isMobile
? ListView.builder(
padding: const EdgeInsets.all(10),
itemBuilder: (context, index) => _getDashboardWidget(user.dashboardOrder[index]),
itemCount: user.dashboardOrder.length,
itemBuilder: (context, index) =>
_getDashboardWidget(user.dashboardWidgets[index]),
itemCount: user.dashboardWidgets.length,
)
: GridView.builder(
padding: const EdgeInsets.all(10),
itemBuilder: (context, index) =>
SingleChildScrollView(child: _getDashboardWidget(user.dashboardOrder[index])),
itemCount: user.dashboardOrder.length,
itemBuilder: (context, index) => SingleChildScrollView(
child: _getDashboardWidget(user.dashboardWidgets[index]),
),
itemCount: user.dashboardWidgets.length,
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: crossAxisCount,
childAspectRatio: 0.7,

2
lib/widgets/core/settings/dashboard_visibility.dart
View File

@@ -51,7 +51,7 @@ class SettingsDashboardVisibility extends StatelessWidget {
physics: const NeverScrollableScrollPhysics(),
buildDefaultDragHandles: false,
onReorder: user.setDashboardOrder,
children: user.dashboardOrder.asMap().entries.map((entry) {
children: user.allDashboardWidgets.asMap().entries.map((entry) {
final index = entry.key;
final w = entry.value;

16
test/core/settings_dashboard_visibility_test.dart
View File

@@ -20,6 +20,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:provider/provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
import 'package:wger/l10n/generated/app_localizations.dart';
@@ -37,7 +38,7 @@ void main() {
setUp(() {
SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
mockBaseProvider = MockWgerBaseProvider();
userProvider = UserProvider(mockBaseProvider);
userProvider = UserProvider(mockBaseProvider, prefs: SharedPreferencesAsync());
});
Widget createWidget() {
@@ -78,7 +79,7 @@ void main() {
// Tap to toggle
await tester.tap(iconBtn);
await tester.pump(); // re-render
await tester.pump();
// Check provider state
expect(userProvider.isDashboardWidgetVisible(DashboardWidget.routines), false);
@@ -96,8 +97,9 @@ void main() {
await tester.pumpAndSettle();
// Initial order: trophies, routines, nutrition, weight...
expect(userProvider.dashboardOrder[0], DashboardWidget.trophies);
expect(userProvider.dashboardOrder[1], DashboardWidget.routines);
expect(userProvider.dashboardWidgets[0], DashboardWidget.trophies);
expect(userProvider.dashboardWidgets[1], DashboardWidget.routines);
expect(userProvider.dashboardWidgets[2], DashboardWidget.nutrition);
// Find drag handle for Trophies (index 0)
final handleFinder = find.byIcon(Icons.drag_handle);
@@ -110,8 +112,8 @@ void main() {
// Verify order changed
// 100px drag seems to skip 2 items (trophies moves to index 2)
// [routines, nutrition, trophies, ...]
expect(userProvider.dashboardOrder[0], DashboardWidget.routines);
expect(userProvider.dashboardOrder[1], DashboardWidget.nutrition);
expect(userProvider.dashboardOrder[2], DashboardWidget.trophies);
expect(userProvider.dashboardWidgets[0], DashboardWidget.routines);
expect(userProvider.dashboardWidgets[1], DashboardWidget.nutrition);
expect(userProvider.dashboardWidgets[2], DashboardWidget.trophies);
});
}

20
test/core/settings_test.mocks.dart
View File

@@ -1,3 +1,21 @@
/*
* This file is part of wger Workout Manager <https://github.com/wger-project>.
* Copyright (c) 2026 wger Team
*
* wger Workout Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Mocks generated by Mockito 5.4.6 from annotations
// in wger/test/core/settings_test.dart.
// Do not manually edit this file.
@@ -944,7 +962,7 @@ class MockUserProvider extends _i1.Mock implements _i21.UserProvider {
as _i14.SharedPreferencesAsync);
@override
List<_i21.DashboardWidget> get dashboardOrder =>
List<_i21.DashboardWidget> get dashboardWidgets =>
(super.noSuchMethod(
Invocation.getter(#dashboardOrder),
returnValue: <_i21.DashboardWidget>[],

20
test/exercises/contribute_exercise_test.mocks.dart
View File

@@ -1,3 +1,21 @@
/*
* This file is part of wger Workout Manager <https://github.com/wger-project>.
* Copyright (c) 2026 wger Team
*
* wger Workout Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Mocks generated by Mockito 5.4.6 from annotations
// in wger/test/exercises/contribute_exercise_test.dart.
// Do not manually edit this file.
@@ -390,7 +408,7 @@ class MockUserProvider extends _i1.Mock implements _i17.UserProvider {
as _i4.SharedPreferencesAsync);
@override
List<_i17.DashboardWidget> get dashboardOrder =>
List<_i17.DashboardWidget> get dashboardWidgets =>
(super.noSuchMethod(
Invocation.getter(#dashboardOrder),
returnValue: <_i17.DashboardWidget>[],

29
test/user/provider_test.dart
View File

@@ -54,7 +54,7 @@ void main() {
setUp(() {
SharedPreferencesAsyncPlatform.instance = InMemorySharedPreferencesAsync.empty();
mockWgerBaseProvider = MockWgerBaseProvider();
userProvider = UserProvider(mockWgerBaseProvider);
userProvider = UserProvider(mockWgerBaseProvider, prefs: SharedPreferencesAsync());
when(mockWgerBaseProvider.makeUrl(any)).thenReturn(tProfileUri);
when(
@@ -106,10 +106,10 @@ void main() {
group('dashboard config', () {
test('initial config should be default (all visible, default order)', () {
expect(userProvider.dashboardOrder.length, 6);
expect(userProvider.dashboardWidgets.length, 6);
expect(
userProvider.dashboardOrder,
userProvider.allDashboardWidgets,
orderedEquals([
DashboardWidget.trophies,
DashboardWidget.routines,
@@ -136,16 +136,16 @@ void main() {
test('reordering should update order', () async {
// arrange
final initialFirst = userProvider.dashboardOrder[0];
final initialSecond = userProvider.dashboardOrder[1];
final initialFirst = userProvider.dashboardWidgets[0];
final initialSecond = userProvider.dashboardWidgets[1];
// act: move first to second position
// oldIndex: 0, newIndex: 2 (because insert is before index)
await userProvider.setDashboardOrder(0, 2);
// assert
expect(userProvider.dashboardOrder[0], initialSecond);
expect(userProvider.dashboardOrder[1], initialFirst);
expect(userProvider.dashboardWidgets[0], initialSecond);
expect(userProvider.dashboardWidgets[1], initialFirst);
});
test('should load config from prefs', () async {
@@ -169,21 +169,18 @@ void main() {
// Missing: trophies (0), weight (3), measurements (4), calendar (5)
// 1. trophies (index 0) inserted at 0 -> [trophies, nutrition, routines]
// 2. weight (index 3) inserted at 3 -> [trophies, nutrition, routines, weight]
expect(newProvider.dashboardOrder[0], DashboardWidget.trophies);
expect(newProvider.dashboardOrder[1], DashboardWidget.nutrition);
expect(newProvider.dashboardOrder[2], DashboardWidget.routines);
expect(newProvider.dashboardOrder[3], DashboardWidget.weight);
expect(newProvider.allDashboardWidgets[0], DashboardWidget.trophies);
expect(newProvider.allDashboardWidgets[1], DashboardWidget.nutrition);
expect(newProvider.allDashboardWidgets[2], DashboardWidget.routines);
expect(newProvider.allDashboardWidgets[3], DashboardWidget.weight);
// Check visibility
expect(newProvider.isDashboardWidgetVisible(DashboardWidget.nutrition), true);
expect(newProvider.isDashboardWidgetVisible(DashboardWidget.routines), false);
// Missing items should be visible by default
expect(
newProvider.isDashboardWidgetVisible(DashboardWidget.weight),
true,
);
expect(newProvider.isDashboardWidgetVisible(DashboardWidget.weight), true);
expect(newProvider.isDashboardWidgetVisible(DashboardWidget.trophies), true);
});
});
}

20
test/weight/weight_screen_test.mocks.dart
View File

@@ -1,3 +1,21 @@
/*
* This file is part of wger Workout Manager <https://github.com/wger-project>.
* Copyright (c) 2026 wger Team
*
* wger Workout Manager is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Mocks generated by Mockito 5.4.6 from annotations
// in wger/test/weight/weight_screen_test.dart.
// Do not manually edit this file.
@@ -232,7 +250,7 @@ class MockUserProvider extends _i1.Mock implements _i13.UserProvider {
as _i4.SharedPreferencesAsync);
@override
List<_i13.DashboardWidget> get dashboardOrder =>
List<_i13.DashboardWidget> get dashboardWidgets =>
(super.noSuchMethod(
Invocation.getter(#dashboardOrder),
returnValue: <_i13.DashboardWidget>[],