Skip to content

Commit e851843

Browse files
ArmanKhanTechArmanKhanTech
committed
refactor: Update widget import paths for progress indicators
1 parent 4be0ba3 commit e851843

File tree

182 files changed

+1034
-1042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

182 files changed

+1034
-1042
lines changed

‎lib/component/text_form_builder.dart

-165
This file was deleted.

‎lib/component/custom_card.dart ‎lib/components/custom_card.dart

File renamed without changes.

‎lib/component/custom_image.dart ‎lib/components/custom_image.dart

File renamed without changes.

‎lib/component/pass_form_builder.dart ‎lib/components/pass_form_builder.dart

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:divine/component/custom_card.dart';
2-
import 'package:divine/utility/common_utility.dart';
1+
import 'package:divine/components/custom_card.dart';
2+
import 'package:divine/utilities/common_utility.dart';
33

44
import 'package:flutter/material.dart';
55
import 'package:google_fonts/google_fonts.dart';
@@ -67,8 +67,8 @@ class _PasswordFormBuilderState extends State<PasswordFormBuilder> {
6767
child: Theme(
6868
data: ThemeData(
6969
primaryColor: Theme.of(context).colorScheme.secondary,
70-
colorScheme: ColorScheme.fromSwatch().copyWith(
71-
secondary: Theme.of(context).colorScheme.secondary),
70+
colorScheme: ColorScheme.fromSwatch()
71+
.copyWith(secondary: Theme.of(context).colorScheme.secondary),
7272
),
7373
child: TextFormField(
7474
cursorColor: Theme.of(context).colorScheme.secondary,
@@ -82,10 +82,10 @@ class _PasswordFormBuilderState extends State<PasswordFormBuilder> {
8282
height: 1.2,
8383
),
8484
onChanged: (value) => {
85-
error = widget.validateFunction!(value),
86-
setState(() {}),
87-
widget.onChange!(value)
88-
},
85+
error = widget.validateFunction!(value),
86+
setState(() {}),
87+
widget.onChange!(value)
88+
},
8989
onFieldSubmitted: (term) {
9090
if (widget.nextFocusNode != null) {
9191
widget.focusNode!.unfocus();
@@ -115,9 +115,7 @@ class _PasswordFormBuilderState extends State<PasswordFormBuilder> {
115115
setState(() => obscureText = !obscureText);
116116
},
117117
child: Icon(
118-
obscureText
119-
? widget.suffix
120-
: Ionicons.eye_off_outline,
118+
obscureText ? widget.suffix : Ionicons.eye_off_outline,
121119
size: 25.0,
122120
color: widget.whichPage == 'login'
123121
? Colors.orange

‎lib/components/text_form_builder.dart

+163
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
import 'package:divine/utilities/common_utility.dart';
2+
3+
import 'package:flutter/material.dart';
4+
import 'package:google_fonts/google_fonts.dart';
5+
6+
import 'custom_card.dart';
7+
8+
class TextFormBuilder extends StatefulWidget {
9+
final String? initialValue;
10+
final String? hintText;
11+
final String? whichPage;
12+
13+
final TextInputType? textInputType;
14+
final TextEditingController? controller;
15+
final TextInputAction? textInputAction;
16+
17+
final bool capitalization;
18+
final bool obscureText;
19+
final bool? enabled;
20+
21+
final FocusNode? focusNode, nextFocusNode;
22+
final VoidCallback? submitAction;
23+
24+
final double? iconSize;
25+
26+
final FormFieldValidator<String>? validateFunction;
27+
28+
final void Function(String)? onSaved, onChange;
29+
30+
final CommonUtility commonUtility = CommonUtility();
31+
32+
// ignore: overridden_fields
33+
@override
34+
final Key? key;
35+
final IconData? prefix;
36+
final IconData? suffix;
37+
38+
TextFormBuilder(
39+
{this.prefix,
40+
this.suffix,
41+
this.initialValue,
42+
this.enabled,
43+
this.hintText,
44+
this.textInputType,
45+
this.controller,
46+
this.textInputAction,
47+
this.nextFocusNode,
48+
this.focusNode,
49+
this.submitAction,
50+
this.obscureText = false,
51+
this.validateFunction,
52+
this.onSaved,
53+
this.onChange,
54+
required this.whichPage,
55+
required this.capitalization,
56+
this.key,
57+
this.iconSize})
58+
: super(key: key);
59+
60+
@override
61+
State<TextFormBuilder> createState() => _TextFormBuilderState();
62+
}
63+
64+
class _TextFormBuilderState extends State<TextFormBuilder> {
65+
String? error;
66+
67+
@override
68+
Widget build(BuildContext context) {
69+
return Column(
70+
crossAxisAlignment: CrossAxisAlignment.center,
71+
children: [
72+
CustomCard(
73+
borderRadius: BorderRadius.circular(20.0),
74+
child: Theme(
75+
data: ThemeData(
76+
primaryColor: Theme.of(context).colorScheme.secondary,
77+
colorScheme: ColorScheme.fromSwatch()
78+
.copyWith(secondary: Theme.of(context).colorScheme.secondary),
79+
),
80+
child: TextFormField(
81+
cursorColor: Theme.of(context).colorScheme.secondary,
82+
textCapitalization: widget.capitalization == false
83+
? TextCapitalization.none
84+
: TextCapitalization.sentences,
85+
initialValue: widget.initialValue,
86+
enabled: widget.enabled,
87+
style: TextStyle(
88+
color: Theme.of(context).textTheme.bodyLarge!.color,
89+
fontSize: 18,
90+
fontFamily: GoogleFonts.ubuntu().fontFamily,
91+
height: 1.2,
92+
),
93+
onChanged: (value) => {
94+
error = widget.validateFunction!(value),
95+
setState(() {}),
96+
widget.onChange!(value)
97+
},
98+
key: widget.key,
99+
obscureText: widget.obscureText,
100+
validator: widget.validateFunction,
101+
controller: widget.controller,
102+
onSaved: (value) {
103+
error = widget.validateFunction!(value!);
104+
setState(() {});
105+
widget.onSaved!(value);
106+
},
107+
textInputAction: widget.textInputAction,
108+
focusNode: widget.focusNode,
109+
onFieldSubmitted: (term) {
110+
if (widget.nextFocusNode != null) {
111+
widget.focusNode!.unfocus();
112+
FocusScope.of(context).requestFocus(widget.nextFocusNode);
113+
} else {
114+
widget.submitAction!();
115+
}
116+
},
117+
keyboardType: widget.textInputType,
118+
decoration: InputDecoration(
119+
prefixIcon: Icon(
120+
widget.prefix,
121+
size: 25.0,
122+
color:
123+
widget.whichPage == "login" ? Colors.orange : Colors.blue,
124+
),
125+
suffixIcon: Icon(
126+
widget.suffix,
127+
size: 25.0,
128+
color:
129+
widget.whichPage == "login" ? Colors.orange : Colors.blue,
130+
),
131+
fillColor: Colors.grey[200],
132+
filled: true,
133+
hintText: widget.hintText,
134+
hintStyle: TextStyle(
135+
color: Colors.grey[400],
136+
fontWeight: FontWeight.w400,
137+
fontFamily: GoogleFonts.ubuntu().fontFamily,
138+
height: 1.2,
139+
),
140+
contentPadding: const EdgeInsets.all(15.0),
141+
border: widget.commonUtility.border(context),
142+
enabledBorder: widget.commonUtility.border(context),
143+
focusedBorder: widget.commonUtility.focusBorder(context),
144+
errorStyle: const TextStyle(height: 10.0, fontSize: 0.0),
145+
),
146+
textAlignVertical: TextAlignVertical.center,
147+
),
148+
),
149+
),
150+
Visibility(
151+
visible: error != null,
152+
child: Text(
153+
'$error',
154+
style: TextStyle(
155+
color: Colors.red[700],
156+
fontSize: 15.0,
157+
),
158+
),
159+
),
160+
],
161+
);
162+
}
163+
}

‎lib/main.dart

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import 'package:flutter/services.dart';
44
import 'package:google_fonts/google_fonts.dart';
55
import 'package:provider/provider.dart';
66

7-
import 'package:divine/module/main/screen/splash_screen.dart';
8-
import 'package:divine/service/user_service.dart';
9-
import 'package:divine/utility/constants.dart';
10-
import 'package:divine/utility/event_handlers/app_life_cycle_event_handler.dart';
11-
import 'package:divine/utility/no_thumb_scrollbar.dart';
12-
import 'package:divine/utility/providers.dart';
13-
import 'package:divine/viewmodel/theme/theme_provider.dart';
7+
import 'package:divine/modules/main/screens/splash_screen.dart';
8+
import 'package:divine/services/user_service.dart';
9+
import 'package:divine/utilities/constants.dart';
10+
import 'package:divine/utilities/event_handlers/app_life_cycle_event_handler.dart';
11+
import 'package:divine/utilities/no_thumb_scrollbar.dart';
12+
import 'package:divine/utilities/providers.dart';
13+
import 'package:divine/viewmodels/theme/theme_provider.dart';
1414

1515
import 'firebase_options.dart';
1616

‎lib/model/post_model.dart ‎lib/models/post_model.dart

File renamed without changes.

‎lib/model/story_model.dart ‎lib/models/story_model.dart

File renamed without changes.

‎lib/model/user_model.dart ‎lib/models/user_model.dart

File renamed without changes.

0 commit comments

Comments
 (0)