adding i18n base project
This commit is contained in:
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
import '../../Utils/color_constants.dart';
|
||||
import '../../l10n/app_localizations.dart';
|
||||
import '../../providers/token_manager.dart';
|
||||
import '../../utilities/make_api_request.dart';
|
||||
import '../main_app_screen/tabbed_layout_component.dart';
|
||||
@@ -60,8 +61,9 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
}
|
||||
// ignore: use_build_context_synchronously
|
||||
ScaffoldMessenger.of(context)
|
||||
.showSnackBar(const SnackBar(
|
||||
content: Text("Login Successful"),
|
||||
.showSnackBar(SnackBar(
|
||||
content:
|
||||
Text(AppLocalizations.of(context)!.loginSuccessful),
|
||||
backgroundColor: Colors.green,
|
||||
))
|
||||
.closed
|
||||
@@ -135,8 +137,8 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
textInputAction: TextInputAction.next,
|
||||
validator: (value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
errorMessageSetter(
|
||||
1, 'You must provide an email or username');
|
||||
errorMessageSetter(1,
|
||||
AppLocalizations.of(context)!.provideEmailOrUsername);
|
||||
} else {
|
||||
errorMessageSetter(1, "");
|
||||
|
||||
@@ -148,7 +150,7 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
return null;
|
||||
},
|
||||
autocorrect: false,
|
||||
decoration: const InputDecoration(
|
||||
decoration: InputDecoration(
|
||||
fillColor: Colors.white,
|
||||
border: InputBorder.none,
|
||||
focusedBorder: InputBorder.none,
|
||||
@@ -157,7 +159,8 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
disabledBorder: InputBorder.none,
|
||||
contentPadding:
|
||||
EdgeInsets.only(left: 15, bottom: 11, top: 11, right: 15),
|
||||
hintText: "Username or email address",
|
||||
hintText:
|
||||
AppLocalizations.of(context)!.usernameOrEmailHint,
|
||||
hintStyle: TextStyle(fontSize: 16, color: Color(0xFF929BAB)),
|
||||
),
|
||||
style: const TextStyle(fontSize: 16, color: Color(0xFF929BAB)),
|
||||
@@ -199,7 +202,8 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
onFieldSubmitted: (value) => _validateLoginDetails(),
|
||||
validator: (value) {
|
||||
if (value == null || value.isEmpty) {
|
||||
errorMessageSetter(2, 'Password cannot be empty');
|
||||
errorMessageSetter(
|
||||
2, AppLocalizations.of(context)!.passwordEmpty);
|
||||
} else {
|
||||
errorMessageSetter(2, "");
|
||||
setState(() {
|
||||
@@ -219,7 +223,7 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
disabledBorder: InputBorder.none,
|
||||
contentPadding: const EdgeInsets.only(
|
||||
left: 15, bottom: 11, top: 11, right: 15),
|
||||
hintText: "Password",
|
||||
hintText: AppLocalizations.of(context)!.password,
|
||||
hintStyle:
|
||||
const TextStyle(fontSize: 16, color: Color(0xFF929BAB)),
|
||||
suffixIcon: IconButton(
|
||||
@@ -246,7 +250,7 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
),
|
||||
CheckboxListTile(
|
||||
activeColor: ColorConstant.blue700,
|
||||
title: const Text('Stay Logged In'),
|
||||
title: Text(AppLocalizations.of(context)!.stayLoggedIn),
|
||||
value: stayLoggedIn,
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
@@ -266,8 +270,8 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
),
|
||||
),
|
||||
child: const Text(
|
||||
'Log in',
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.logIn,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: Colors.white,
|
||||
@@ -323,8 +327,9 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
if (_formKey.currentState!.validate()) {
|
||||
if (errorMessage1 != "" || errorMessage2 != "") {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(
|
||||
content: Text('Please provide all required details'),
|
||||
SnackBar(
|
||||
content: Text(
|
||||
AppLocalizations.of(context)!.provideRequiredDetails),
|
||||
backgroundColor: Colors.red,
|
||||
),
|
||||
);
|
||||
@@ -332,7 +337,7 @@ class LoginFormComponentState extends State<LoginFormComponent> {
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
onVisible: tryLoggingIn,
|
||||
content: const Text('Processing...'),
|
||||
content: Text(AppLocalizations.of(context)!.processing),
|
||||
backgroundColor: Colors.blue,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -403,6 +403,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
|
||||
import '../../Utils/color_constants.dart';
|
||||
import '../../l10n/app_localizations.dart';
|
||||
import '../../utilities/hadwin_markdown_viewer.dart';
|
||||
import '../../utilities/slide_right_route.dart';
|
||||
import '../sign_up_screen/SignUpUser.dart';
|
||||
@@ -425,22 +426,22 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
child: Center(
|
||||
child: InkWell(
|
||||
onTap: getLoginHelp,
|
||||
child: const Text(
|
||||
'Having trouble logging in?',
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.loginTrouble,
|
||||
style: TextStyle(fontSize: 14, color: Color(0xFF929BAB)),
|
||||
), // FOR LOGIN HELP
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
Widget signUpContainer = const SizedBox(
|
||||
Widget signUpContainer = SizedBox(
|
||||
width: double.infinity,
|
||||
height: 36,
|
||||
child: Center(
|
||||
child: InkWell(
|
||||
//onTap: goToSignUpScreen,
|
||||
child: Text(
|
||||
'Or Continue with',
|
||||
AppLocalizations.of(context)!.orContinueWith,
|
||||
style: TextStyle(fontSize: 14, color: Color(0xFF929BAB)),
|
||||
), // FOR SIGN UP
|
||||
),
|
||||
@@ -475,7 +476,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
'Sign Up',
|
||||
AppLocalizations.of(context)!.signUp,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: ColorConstant.blue700,
|
||||
@@ -507,7 +508,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
width: 10,
|
||||
),
|
||||
Text(
|
||||
'Sign in with Google',
|
||||
AppLocalizations.of(context)!.signInGoogle,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: Colors.grey, //ColorConstant.blue700,
|
||||
@@ -541,7 +542,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
width: 10,
|
||||
),
|
||||
Text(
|
||||
'Sign in with LinkedIn',
|
||||
AppLocalizations.of(context)!.signInLinkedin,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
color: Colors.grey, //ColorConstant.blue700,
|
||||
@@ -568,8 +569,9 @@ class _LoginScreenState extends State<LoginScreen> {
|
||||
Navigator.push(
|
||||
context,
|
||||
SlideRightRoute(
|
||||
page: const HadWinMarkdownViewer(
|
||||
screenName: 'Login Help',
|
||||
page: HadWinMarkdownViewer(
|
||||
screenName:
|
||||
AppLocalizations.of(context)!.loginHelp,
|
||||
urlRequested:
|
||||
'https://raw.githubusercontent.com/brownboycodes/HADWIN/master/docs/HADWIN_WIKI.md')));
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'package:http/http.dart' as http;
|
||||
import '../../Utils/color_constants.dart';
|
||||
import '../../Utils/image_constant.dart';
|
||||
import '../../Utils/size_utils.dart';
|
||||
import '../../l10n/app_localizations.dart';
|
||||
import '../../providers/token_manager.dart';
|
||||
import '../../resources/api_constants.dart';
|
||||
import '../../theme/app_style.dart';
|
||||
@@ -21,6 +22,7 @@ class ForgotPasswordPage extends StatefulWidget {
|
||||
class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
|
||||
final TextEditingController emailController = TextEditingController();
|
||||
String message = '';
|
||||
bool linkSent = false;
|
||||
bool isLoading = false; // Added to track loading state
|
||||
|
||||
Future<void> sendForgotPasswordRequest() async {
|
||||
@@ -42,7 +44,9 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
setState(() {
|
||||
message = 'An email with a reset link has been sent to $email.';
|
||||
message = AppLocalizations.of(context)!
|
||||
.forgotPasswordSentMessage(emailController.text);
|
||||
linkSent = true;
|
||||
});
|
||||
|
||||
// Delay for 3 seconds and then navigate to the login page
|
||||
@@ -52,7 +56,9 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
message = 'Failed to send the reset link. Please try again.';
|
||||
message =
|
||||
AppLocalizations.of(context)!.forgotPasswordFailedMessage;
|
||||
linkSent = false;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -76,7 +82,8 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
|
||||
Navigator.pop(context);
|
||||
}),
|
||||
centerTitle: true,
|
||||
title: AppbarTitle(text: "Forgot Password")),
|
||||
title: AppbarTitle(
|
||||
text: AppLocalizations.of(context)!.forgotPassword)),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.all(16.0),
|
||||
child: Column(
|
||||
@@ -88,19 +95,20 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Text("Email",
|
||||
Text(AppLocalizations.of(context)!.email,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.left,
|
||||
style: AppStyle.txtGilroyMedium16Bluegray900),
|
||||
CustomTextFormField(
|
||||
focusNode: FocusNode(),
|
||||
hintText: "Enter Email",
|
||||
hintText:
|
||||
AppLocalizations.of(context)!.enterEmail,
|
||||
controller: emailController,
|
||||
margin: getMargin(top: 6))
|
||||
])),
|
||||
CustomButton(
|
||||
height: getVerticalSize(50),
|
||||
text: "Send me an access link",
|
||||
text: AppLocalizations.of(context)!.sendAccessLink,
|
||||
margin: getMargin(top: 24, bottom: 5),
|
||||
onTap: () async {
|
||||
sendForgotPasswordRequest();
|
||||
@@ -111,9 +119,10 @@ class _ForgotPasswordPageState extends State<ForgotPasswordPage> {
|
||||
color: ColorConstant.blue700,
|
||||
) // Show loading indicator when isLoading is true
|
||||
: Text(message, style: AppStyle.txtGilroyMedium16Bluegray900),
|
||||
if (message.contains('An email with a reset link'))
|
||||
if (linkSent)
|
||||
InkWell(
|
||||
child: Text('Click here to return to login',
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.backToLogin,
|
||||
style: AppStyle.txtGilroyMedium16Bluegray900),
|
||||
onTap: () {
|
||||
Navigator.push(
|
||||
|
||||
@@ -6,6 +6,7 @@ import 'package:image_picker/image_picker.dart';
|
||||
|
||||
import '../../Utils/image_constant.dart';
|
||||
import '../../Utils/size_utils.dart';
|
||||
import '../../l10n/app_localizations.dart';
|
||||
import '../../providers/token_manager.dart';
|
||||
import '../../resources/api_constants.dart';
|
||||
import '../../theme/app_style.dart';
|
||||
@@ -14,6 +15,7 @@ import '../../widgets/app_bar/appbar_title.dart';
|
||||
import '../../widgets/app_bar/custom_app_bar.dart';
|
||||
import '../../widgets/custom_button.dart';
|
||||
import '../../widgets/custom_text_form_field.dart';
|
||||
import '../../widgets/language_switcher.dart';
|
||||
import '../Login Screen/login_screen.dart';
|
||||
import '../LogoutService/Logoutservice.dart';
|
||||
import 'apiserviceprofilemanagement.dart';
|
||||
@@ -332,6 +334,14 @@ class _ProfileSettingsScreenState extends State<ProfileSettingsScreen> {
|
||||
),
|
||||
),
|
||||
|
||||
SizedBox(height: 20),
|
||||
// Section: App language (EN | HI) - switches ARB + dynamic strings together
|
||||
Text(
|
||||
AppLocalizations.of(context)!.language,
|
||||
style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
|
||||
),
|
||||
SizedBox(height: 10),
|
||||
const LanguageSwitcher(),
|
||||
SizedBox(height: 20),
|
||||
// Section: Profile Form
|
||||
Text(
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../l10n/app_localizations.dart';
|
||||
import 'sign_up_steps.dart';
|
||||
|
||||
class SignUpScreen extends StatefulWidget {
|
||||
@@ -35,13 +36,13 @@ class _SignUpScreenState extends State<SignUpScreen> {
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
height: 16,
|
||||
child: Center(
|
||||
child: InkWell(
|
||||
child: const Text(
|
||||
'Already have an account? Sign in',
|
||||
style:
|
||||
TextStyle(fontSize: 14, color: Color(0xFF929BAB)),
|
||||
),
|
||||
child: Center(
|
||||
child: InkWell(
|
||||
child: Text(
|
||||
AppLocalizations.of(context)!.alreadyHaveAccount,
|
||||
style: TextStyle(
|
||||
fontSize: 14, color: Color(0xFF929BAB)),
|
||||
),
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user