Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Revert the project to the previous structure with applying null safety

Browse Source
merge-requests/4/head
zaid_daoud 3 years ago
parent cd4ff9e3a0
commit d9d26a0fe0
4 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File

0
assets/translations/ar.json → assets/subtitles/ar_subtitle.json
Unescape Escape View File

0
assets/translations/en.json → assets/subtitles/en_subtitle.json
Unescape Escape View File

67
lib/views/pages/login.dart
Unescape Escape View File

@ -15,9 +15,10 @@ import '../widgets/buttons/app_button.dart';
import '../widgets/loaders/loading_manager.dart'; import '../widgets/loaders/loading_manager.dart';
import 'user/land_page.dart'; import 'user/land_page.dart';
class Login extends StatefulWidget { class Login extends StatefulWidget {
static final String id = "/login"; static const String id = "/login";
const Login({super.key});
@override @override
_LoginState createState() => _LoginState(); _LoginState createState() => _LoginState();
@ -26,9 +27,9 @@ class Login extends StatefulWidget {
class _LoginState extends State<Login> { class _LoginState extends State<Login> {
UserProvider? _userProvider; UserProvider? _userProvider;
SettingProvider? _settingProvider; SettingProvider? _settingProvider;
User _user = User(); final User _user = User();
bool _obscurePassword = true; bool _obscurePassword = true;
bool _firstTime = true; final bool _firstTime = true;
late double _height; late double _height;
late double _width; late double _width;
late String _payload; late String _payload;
@ -41,12 +42,13 @@ class _LoginState extends State<Login> {
_settingProvider = Provider.of<SettingProvider>(context); _settingProvider = Provider.of<SettingProvider>(context);
_height = MediaQuery.of(context).size.height; _height = MediaQuery.of(context).size.height;
_width = MediaQuery.of(context).size.width; _width = MediaQuery.of(context).size.width;
Subtitle? _subtitle = AppLocalization.of(context)?.subtitle; Subtitle? subtitle = AppLocalization.of(context)?.subtitle;
return Scaffold( return Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
body: SafeArea( body: SafeArea(
child: LoadingManager( child: LoadingManager(
isLoading: (_userProvider?.isLoading??false) || !(_settingProvider?.isLoaded??false), isLoading: (_userProvider?.isLoading ?? false) ||
!(_settingProvider?.isLoaded ?? false),
isFailedLoading: false, isFailedLoading: false,
stateCode: 200, stateCode: 200,
onRefresh: () async {}, onRefresh: () async {},
@ -65,37 +67,44 @@ class _LoginState extends State<Login> {
child: Image( child: Image(
height: _height / 6, height: _height / 6,
fit: BoxFit.contain, fit: BoxFit.contain,
image: AssetImage("assets/images/logo.png"), image: const AssetImage("assets/images/logo.png"),
), ),
), ),
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 24 * AppStyle.getScaleFactor(context), vertical: 24 * AppStyle.getScaleFactor(context)), padding: EdgeInsets.symmetric(
horizontal: 24 * AppStyle.getScaleFactor(context),
vertical: 24 * AppStyle.getScaleFactor(context)),
child: Column( child: Column(
children: [ children: [
SizedBox( SizedBox(
height: 24 * AppStyle.getScaleFactor(context), height: 24 * AppStyle.getScaleFactor(context),
), ),
ATextFormField( ATextFormField(
initialValue: _user?.userName??"", initialValue: _user.userName ?? "",
hintText: _subtitle?.name??"", hintText: subtitle?.name ?? "",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: Theme.of(context).textTheme.bodyText1, style: Theme.of(context).textTheme.bodyText1,
prefixIconData: Icons.account_circle, prefixIconData: Icons.account_circle,
validator: (value) => Validator.hasValue(value!) ? '' : _subtitle?.nameValidateMessage??"", validator: (value) => Validator.hasValue(value!)
? ''
: subtitle?.nameValidateMessage ?? "",
textInputType: TextInputType.name, textInputType: TextInputType.name,
onSaved: (value) { onSaved: (value) {
_user.userName = value!; _user.userName = value!;
}, },
), ),
SizedBox(height: 12), const SizedBox(height: 12),
ATextFormField( ATextFormField(
initialValue: _user.password, initialValue: _user.password,
hintText: _subtitle?.password??"", hintText: subtitle?.password ?? "",
obscureText: _obscurePassword, obscureText: _obscurePassword,
style: Theme.of(context).textTheme.bodyText1, style: Theme.of(context).textTheme.bodyText1,
prefixIconData: Icons.vpn_key_sharp, prefixIconData: Icons.vpn_key_sharp,
textAlign: TextAlign.left, textAlign: TextAlign.left,
validator: (value) => Validator.isValidPassword(value!) ? '' : _subtitle?.passwordValidateMessage??"", validator: (value) =>
Validator.isValidPassword(value!)
? ''
: subtitle?.passwordValidateMessage ?? "",
showPassword: () { showPassword: () {
_obscurePassword = !_obscurePassword; _obscurePassword = !_obscurePassword;
setState(() {}); setState(() {});
@ -108,23 +117,33 @@ class _LoginState extends State<Login> {
height: 32 * AppStyle.getScaleFactor(context), height: 32 * AppStyle.getScaleFactor(context),
), ),
AButton( AButton(
text: _subtitle?.signIn??"", text: subtitle?.signIn ?? "",
onPressed: () async { onPressed: () async {
if (!(_formKey.currentState?.validate()??false)) return; if (!(_formKey.currentState?.validate() ?? false))
return;
_formKey.currentState?.save(); _formKey.currentState?.save();
int? status = await _userProvider?.login( int? status = await _userProvider?.login(
user: _user, user: _user,
host: _settingProvider?.host??"", host: _settingProvider?.host ?? "",
); );
if (status !=null && status >= 200 && status < 300) { if (status != null &&
_settingProvider?.setUser(_userProvider?.user??User()); status >= 200 &&
if (_userProvider?.user?.isActive??false) status < 300) {
_settingProvider
?.setUser(_userProvider?.user ?? User());
if (_userProvider?.user?.isActive ?? false) {
Navigator.of(context).pushNamed(LandPage.id); Navigator.of(context).pushNamed(LandPage.id);
else
Fluttertoast.showToast(msg: _subtitle?.activationAlert??"");
} else { } else {
String errorMessage = status == 400 ? _subtitle?.wrongEmailOrPassword??"" : HttpStatusManger.getStatusMessage(status: status, subtitle: _subtitle); Fluttertoast.showToast(
ScaffoldMessenger.of(context).showSnackBar(SnackBar( msg: subtitle?.activationAlert ?? "");
}
} else {
String errorMessage = status == 400
? subtitle?.wrongEmailOrPassword ?? ""
: HttpStatusManger.getStatusMessage(
status: status, subtitle: subtitle);
ScaffoldMessenger.of(context)
.showSnackBar(SnackBar(
content: Text(errorMessage), content: Text(errorMessage),
)); ));
} }

2
pubspec.yaml
Unescape Escape View File

@ -89,7 +89,7 @@ flutter:
assets: assets:
- assets/ - assets/
- assets/images/ - assets/images/
- assets/translations/ - assets/subtitles/
- assets/rives/ - assets/rives/
fonts: fonts:
- family: Swiss - family: Swiss

Write Preview
Loading…
Cancel
Save