Refactor: reorganize login screen structure and remove unused components
- Updated import path for the login screen. - Removed the AppStrings class from constants as it has been integrated into core constants. - Deleted unused files related to the home page and login components, including progress bars, statistics cards, and tenders list items. - Cleaned up widget imports in the login screen to streamline the codebase.
This commit is contained in:
@@ -1,14 +0,0 @@
|
|||||||
class AppStrings {
|
|
||||||
AppStrings._();
|
|
||||||
|
|
||||||
static const String home = 'Home';
|
|
||||||
|
|
||||||
static const String partnership = 'Partnership';
|
|
||||||
static const String selfApply = 'Self-apply';
|
|
||||||
static const String contracting = 'Contracting';
|
|
||||||
static const String tenderSubmitting = 'Tender submitting';
|
|
||||||
static const String approvedTenders = 'Approved tenders';
|
|
||||||
static const String tenderValue = 'Tender Value';
|
|
||||||
static const String thunderStatus = 'Thunder status';
|
|
||||||
static const String yourTenders = 'Your tenders';
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
class AppStrings {
|
class AppStrings {
|
||||||
|
AppStrings._();
|
||||||
// App Titles
|
// App Titles
|
||||||
static const String appName = 'My Awesome App';
|
static const String appName = 'My Awesome App';
|
||||||
static const String loginTitle = 'Welcome Back';
|
static const String loginTitle = 'Welcome Back';
|
||||||
|
|
||||||
// Labels and Buttons
|
// Labels and Buttons
|
||||||
static const String loginButton = 'Sign In';
|
|
||||||
static const String signupButton = 'Create Account';
|
static const String signupButton = 'Create Account';
|
||||||
static const String forgotPassword = 'Forgot Password?';
|
static const String forgotPassword = 'Forgot Password?';
|
||||||
static const String emailHint = 'Email address';
|
static const String emailHint = 'Email address';
|
||||||
@@ -14,4 +14,23 @@ class AppStrings {
|
|||||||
static const String loginFailed =
|
static const String loginFailed =
|
||||||
'Login failed. Please check your credentials.';
|
'Login failed. Please check your credentials.';
|
||||||
static const String networkError = 'Network error. Please try again.';
|
static const String networkError = 'Network error. Please try again.';
|
||||||
|
|
||||||
|
//Login
|
||||||
|
static const signInTitle = 'Sign In';
|
||||||
|
static const signInSubtitle = 'Enter valid username & password to continue';
|
||||||
|
static const usernameLabel = 'User Name';
|
||||||
|
static const passwordLabel = 'Password';
|
||||||
|
static const loginButton = 'Login';
|
||||||
|
|
||||||
|
//Home
|
||||||
|
static const String home = 'Home';
|
||||||
|
|
||||||
|
static const String partnership = 'Partnership';
|
||||||
|
static const String selfApply = 'Self-apply';
|
||||||
|
static const String contracting = 'Contracting';
|
||||||
|
static const String tenderSubmitting = 'Tender submitting';
|
||||||
|
static const String approvedTenders = 'Approved tenders';
|
||||||
|
static const String tenderValue = 'Tender Value';
|
||||||
|
static const String thunderStatus = 'Thunder status';
|
||||||
|
static const String yourTenders = 'Your tenders';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
class TextManager {
|
|
||||||
static const signInTitle = 'Sign In';
|
|
||||||
static const signInSubtitle = 'Enter valid username & password to continue';
|
|
||||||
static const usernameLabel = 'User Name';
|
|
||||||
static const passwordLabel = 'Password';
|
|
||||||
static const loginButton = 'Login';
|
|
||||||
}
|
|
||||||
+1
-1
@@ -6,7 +6,7 @@ import 'data/repositories/auth_repository.dart';
|
|||||||
import 'data/services/auth_service.dart';
|
import 'data/services/auth_service.dart';
|
||||||
import 'size_config.dart';
|
import 'size_config.dart';
|
||||||
import 'view_models/auth_view_model.dart';
|
import 'view_models/auth_view_model.dart';
|
||||||
import 'views/login_screen.dart';
|
import 'views/login/login_screen.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
runApp(
|
runApp(
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../../bottom_navigation.dart';
|
import '../../../bottom_navigation.dart';
|
||||||
import '../../constants/app_strings.dart';
|
import '../../../core/constants/strings.dart';
|
||||||
import '../../size_config.dart';
|
import '../../../size_config.dart';
|
||||||
import 'widgets.dart';
|
import 'widgets.dart';
|
||||||
|
|
||||||
class HomePage extends StatelessWidget {
|
class Homescreen extends StatelessWidget {
|
||||||
const HomePage({super.key});
|
const Homescreen({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../size_config.dart';
|
import '../../size_config.dart';
|
||||||
|
|
||||||
class ProgressBarColumn extends StatefulWidget {
|
class ProgressBarColumn extends StatefulWidget {
|
||||||
const ProgressBarColumn({
|
const ProgressBarColumn({
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
import '../size_config.dart';
|
import '../../size_config.dart';
|
||||||
|
|
||||||
class StatisticsCard extends StatelessWidget {
|
class StatisticsCard extends StatelessWidget {
|
||||||
const StatisticsCard({
|
const StatisticsCard({
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
import '../size_config.dart';
|
import '../../size_config.dart';
|
||||||
|
|
||||||
class TendersListItem extends StatelessWidget {
|
class TendersListItem extends StatelessWidget {
|
||||||
const TendersListItem({super.key});
|
const TendersListItem({super.key});
|
||||||
@@ -1,13 +1,10 @@
|
|||||||
// lib/views/login_screen.dart
|
// lib/views/login_screen.dart
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../core/constants/assets.dart';
|
import '../../core/constants/assets.dart';
|
||||||
import '../core/constants/texts.dart';
|
import '../../core/constants/strings.dart';
|
||||||
import '../size_config.dart';
|
import '../../size_config.dart';
|
||||||
import '../views/widget/login_button.dart';
|
import 'widgets/widgets.dart';
|
||||||
import '../views/widget/login_logo.dart';
|
|
||||||
import '../views/widget/login_textfield.dart';
|
|
||||||
import '../views/widget/login_title.dart';
|
|
||||||
|
|
||||||
class LoginScreen extends StatefulWidget {
|
class LoginScreen extends StatefulWidget {
|
||||||
const LoginScreen({super.key});
|
const LoginScreen({super.key});
|
||||||
@@ -69,7 +66,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||||||
LoginTextField(
|
LoginTextField(
|
||||||
controller: _usernameController,
|
controller: _usernameController,
|
||||||
focusNode: _usernameFocus,
|
focusNode: _usernameFocus,
|
||||||
label: TextManager.usernameLabel,
|
label: AppStrings.usernameLabel,
|
||||||
iconPath: AssetsManager.userIcon,
|
iconPath: AssetsManager.userIcon,
|
||||||
),
|
),
|
||||||
|
|
||||||
@@ -78,7 +75,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||||||
LoginTextField(
|
LoginTextField(
|
||||||
controller: _passwordController,
|
controller: _passwordController,
|
||||||
focusNode: _passwordFocus,
|
focusNode: _passwordFocus,
|
||||||
label: TextManager.passwordLabel,
|
label: AppStrings.passwordLabel,
|
||||||
iconPath: AssetsManager.passwordIcon,
|
iconPath: AssetsManager.passwordIcon,
|
||||||
isPassword: true,
|
isPassword: true,
|
||||||
obscureText: _obscurePassword,
|
obscureText: _obscurePassword,
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../../core/constants/colors.dart';
|
import '../../../core/constants/colors.dart';
|
||||||
import '../../core/constants/texts.dart';
|
import '../../../core/constants/strings.dart';
|
||||||
import '../../size_config.dart';
|
import '../../../size_config.dart';
|
||||||
|
|
||||||
class LoginButton extends StatelessWidget {
|
class LoginButton extends StatelessWidget {
|
||||||
final bool isEnabled;
|
final bool isEnabled;
|
||||||
@@ -29,7 +29,7 @@ class LoginButton extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
TextManager.loginButton,
|
AppStrings.loginButton,
|
||||||
style: TextStyle(fontSize: 16.0.sp(), fontWeight: FontWeight.bold),
|
style: TextStyle(fontSize: 16.0.sp(), fontWeight: FontWeight.bold),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../../core/constants/assets.dart';
|
import '../../../core/constants/assets.dart';
|
||||||
import '../../size_config.dart';
|
import '../../../size_config.dart';
|
||||||
|
|
||||||
class LoginLogo extends StatelessWidget {
|
class LoginLogo extends StatelessWidget {
|
||||||
const LoginLogo({super.key});
|
const LoginLogo({super.key});
|
||||||
+3
-3
@@ -1,9 +1,9 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
import '../../core/constants/assets.dart';
|
import '../../../core/constants/assets.dart';
|
||||||
import '../../core/constants/colors.dart';
|
import '../../../core/constants/colors.dart';
|
||||||
import '../../size_config.dart';
|
import '../../../size_config.dart';
|
||||||
|
|
||||||
class LoginTextField extends StatelessWidget {
|
class LoginTextField extends StatelessWidget {
|
||||||
final TextEditingController controller;
|
final TextEditingController controller;
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../../core/constants/texts.dart';
|
import '../../../core/constants/strings.dart';
|
||||||
import '../../size_config.dart';
|
import '../../../size_config.dart';
|
||||||
|
|
||||||
class LoginTitle extends StatelessWidget {
|
class LoginTitle extends StatelessWidget {
|
||||||
const LoginTitle({super.key});
|
const LoginTitle({super.key});
|
||||||
@@ -11,12 +11,12 @@ class LoginTitle extends StatelessWidget {
|
|||||||
return Column(
|
return Column(
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
TextManager.signInTitle,
|
AppStrings.signInTitle,
|
||||||
style: TextStyle(fontSize: 28.0.sp(), fontWeight: FontWeight.w700),
|
style: TextStyle(fontSize: 28.0.sp(), fontWeight: FontWeight.w700),
|
||||||
),
|
),
|
||||||
SizedBox(height: 8.0.h()),
|
SizedBox(height: 8.0.h()),
|
||||||
Text(
|
Text(
|
||||||
TextManager.signInSubtitle,
|
AppStrings.signInSubtitle,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 14.0.sp(),
|
fontSize: 14.0.sp(),
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w400,
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
export 'login_button.dart';
|
||||||
|
export 'login_logo.dart';
|
||||||
|
export 'login_textfield.dart';
|
||||||
|
export 'login_title.dart';
|
||||||
Reference in New Issue
Block a user