Revert the project to the previous structure with applying null safety

merge-requests/4/head
zaid_daoud 2 years ago
parent cd4ff9e3a0
commit d9d26a0fe0

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

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

Loading…
Cancel
Save