Skip to content

Commit 2235a25

Browse files
committed
Imports Rearranged,Reduced Redundant Widgets and Updated Tests.
1 parent 719b463 commit 2235a25

File tree

3 files changed

+26
-46
lines changed

3 files changed

+26
-46
lines changed

lib/screens/home_page/collection_pane.dart

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import 'package:apidash/consts.dart';
2-
import 'package:apidash/models/models.dart';
1+
import 'package:flutter/material.dart';
2+
import 'package:flutter_riverpod/flutter_riverpod.dart';
33
import 'package:apidash/providers/providers.dart';
44
import 'package:apidash/widgets/overlay_widget.dart';
55
import 'package:apidash/widgets/widgets.dart';
6-
import 'package:flutter/material.dart';
7-
import 'package:flutter_riverpod/flutter_riverpod.dart';
6+
import 'package:apidash/models/models.dart';
7+
import 'package:apidash/consts.dart';
88

99
class CollectionPane extends ConsumerWidget {
1010
const CollectionPane({
@@ -35,14 +35,16 @@ class CollectionPane extends ConsumerWidget {
3535
onPressed: savingData
3636
? null
3737
: () async {
38-
overlayWidget.show(widget: const SavingOverlay());
38+
overlayWidget.show(
39+
widget:
40+
const SavingOverlay(saveCompleted: false));
3941

4042
await ref
4143
.read(collectionStateNotifierProvider.notifier)
4244
.saveData();
43-
4445
overlayWidget.hide();
45-
overlayWidget.show(widget: const CompletedOverlay());
46+
overlayWidget.show(
47+
widget: const SavingOverlay(saveCompleted: true));
4648
await Future.delayed(const Duration(seconds: 1));
4749
overlayWidget.hide();
4850
},

lib/widgets/overlay_widget.dart

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:lottie/lottie.dart';
3-
43
import '../consts.dart';
54

65
class OverlayWidgetTemplate {
@@ -32,7 +31,8 @@ class OverlayWidgetTemplate {
3231
}
3332

3433
class SavingOverlay extends StatelessWidget {
35-
const SavingOverlay({super.key});
34+
final bool saveCompleted;
35+
const SavingOverlay({super.key, required this.saveCompleted});
3636

3737
@override
3838
Widget build(BuildContext context) {
@@ -43,11 +43,16 @@ class SavingOverlay extends StatelessWidget {
4343
child: Column(
4444
mainAxisSize: MainAxisSize.min,
4545
children: [
46-
Lottie.asset("assets/saving.json", width: 100, height: 100),
46+
Lottie.asset(
47+
saveCompleted
48+
? "assets/completed.json"
49+
: "assets/saving.json",
50+
width: 100,
51+
height: 100),
4752
kHSpacer20,
48-
const Text(
49-
kLabelSaving,
50-
style: TextStyle(
53+
Text(
54+
saveCompleted ? kLabelSaved : kLabelSaving,
55+
style: const TextStyle(
5156
fontSize: kDefaultFontSize,
5257
),
5358
)
@@ -58,30 +63,3 @@ class SavingOverlay extends StatelessWidget {
5863
);
5964
}
6065
}
61-
62-
class CompletedOverlay extends StatelessWidget {
63-
const CompletedOverlay({super.key});
64-
65-
@override
66-
Widget build(BuildContext context) {
67-
return Center(
68-
child: Card(
69-
child: Padding(
70-
padding: kPh60v60,
71-
child: Column(
72-
mainAxisSize: MainAxisSize.min,
73-
children: [
74-
Lottie.asset("assets/completed.json",
75-
width: 100, height: 100, repeat: false),
76-
kHSpacer20,
77-
const Text(
78-
kLabelSaved,
79-
style: TextStyle(fontSize: kDefaultFontSize),
80-
)
81-
],
82-
),
83-
),
84-
),
85-
);
86-
}
87-
}

test/widgets/overlay_widget_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@ void main() {
3232
await tester.pumpWidget(
3333
const MaterialApp(
3434
home: Scaffold(
35-
body: SavingOverlay(),
35+
body: SavingOverlay(
36+
saveCompleted: false,
37+
),
3638
),
3739
),
3840
);
39-
4041
expect(find.byType(Card), findsOneWidget);
4142
expect(find.byType(Lottie), findsOneWidget);
4243
expect(find.text(kLabelSaving), findsOneWidget);
43-
});
4444

45-
testWidgets('CompletedOverlay Test', (WidgetTester tester) async {
4645
await tester.pumpWidget(
4746
const MaterialApp(
4847
home: Scaffold(
49-
body: CompletedOverlay(),
48+
body: SavingOverlay(
49+
saveCompleted: true,
50+
),
5051
),
5152
),
5253
);
53-
5454
expect(find.byType(Card), findsOneWidget);
5555
expect(find.byType(Lottie), findsOneWidget);
5656
expect(find.text(kLabelSaved), findsOneWidget);

0 commit comments

Comments
 (0)