Skip to content

Commit fa19631

Browse files
authored
Merge pull request #148 from Gaurav-Kushwaha-1225/AppConstants
Updated AppConstants as Required #89
2 parents 9ba1e1d + ca46a0d commit fa19631

File tree

7 files changed

+325
-311
lines changed

7 files changed

+325
-311
lines changed

lib/pages/modules/atoz.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ class _AtoZState extends State<AtoZ> {
259259
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
260260
children: [
261261
const Text(
262-
'A-Z',
262+
AppConstants.a_z,
263263
style: TextStyle(fontWeight: FontWeight.bold),
264264
),
265265
Expanded(

lib/pages/modules/colours.dart

+7-66
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import 'package:learn/utils/assets_path.dart';
77
// import '../../utils/const_dimensions.dart';
88
import 'package:learn/models/colours_model.dart';
99

10+
import '../../utils/constants.dart';
11+
1012
class ColoursPage extends StatefulWidget {
1113
const ColoursPage({Key? key}) : super(key: key);
1214

@@ -15,81 +17,20 @@ class ColoursPage extends StatefulWidget {
1517
}
1618

1719
class _ColoursPageState extends State<ColoursPage> {
18-
final List<Colours> colours = [
19-
Colours(
20-
name: 'Blue',
21-
jpgAsset: AssetsPath.getColoursImage(ColorImages.blue),
22-
bgColor: Colors.lightBlueAccent,
23-
fontColor: Colors.lightBlueAccent,
24-
),
25-
Colours(
26-
name: 'Yellow',
27-
jpgAsset: AssetsPath.getColoursImage(ColorImages.yellow),
28-
bgColor: Colors.yellow.shade600,
29-
fontColor: Colors.yellow.shade600,
30-
),
31-
Colours(
32-
name: 'Black',
33-
jpgAsset: AssetsPath.getColoursImage(ColorImages.black),
34-
bgColor: Colors.black,
35-
fontColor: Colors.black,
36-
),
37-
Colours(
38-
name: 'Green',
39-
jpgAsset: AssetsPath.getColoursImage(ColorImages.green),
40-
bgColor: Colors.green,
41-
fontColor: Colors.green,
42-
),
43-
Colours(
44-
name: 'Pink',
45-
jpgAsset: AssetsPath.getColoursImage(ColorImages.pink),
46-
bgColor: Colors.pink.shade300,
47-
fontColor: Colors.pink.shade300,
48-
),
49-
Colours(
50-
name: 'White',
51-
jpgAsset: AssetsPath.getColoursImage(ColorImages.white),
52-
bgColor: Colors.grey.shade400,
53-
fontColor: Colors.grey.shade400,
54-
),
55-
Colours(
56-
name: 'Red',
57-
jpgAsset: AssetsPath.getColoursImage(ColorImages.red),
58-
bgColor: Colors.red,
59-
fontColor: Colors.red,
60-
),
61-
Colours(
62-
name: 'Violet',
63-
jpgAsset: AssetsPath.getColoursImage(ColorImages.violet),
64-
bgColor: Colors.deepPurple,
65-
fontColor: Colors.deepPurple,
66-
),
67-
Colours(
68-
name: 'Brown',
69-
jpgAsset: AssetsPath.getColoursImage(ColorImages.brown),
70-
bgColor: const Color(0xFF964B00),
71-
fontColor: const Color(0xFF964B00),
72-
),
73-
Colours(
74-
name: 'Orange',
75-
jpgAsset: AssetsPath.getColoursImage(ColorImages.orange),
76-
bgColor: Colors.orange,
77-
fontColor: Colors.orange,
78-
),
79-
];
20+
8021

8122
final FlutterTts flutterTts = FlutterTts();
8223
int currentIndex = 0;
8324

8425
void _navigateToNextColour() {
8526
setState(() {
86-
currentIndex = (currentIndex + 1) % colours.length;
27+
currentIndex = (currentIndex + 1) % AppConstants.colours.length;
8728
});
8829
}
8930

9031
void _navigateToPreviousColour() {
9132
setState(() {
92-
currentIndex = (currentIndex - 1 + colours.length) % colours.length;
33+
currentIndex = (currentIndex - 1 + AppConstants.colours.length) % AppConstants.colours.length;
9334
});
9435
}
9536

@@ -100,11 +41,11 @@ class _ColoursPageState extends State<ColoursPage> {
10041

10142
@override
10243
Widget build(BuildContext context) {
103-
Colours colour = colours[currentIndex];
44+
Colours colour = AppConstants.colours[currentIndex];
10445
return Scaffold(
10546
appBar: AppBar(
10647
title: Text(
107-
'Colours',
48+
AppConstants.color,
10849
style: TextStyle(
10950
fontWeight: FontWeight.bold,
11051
fontSize: 30,

0 commit comments

Comments
 (0)