Skip to content

GitLab

Commits (2)
  • Sai Srinivas's avatar
    Responsive and ui correction · 558ac0d8
    Sai Srinivas authored
    558ac0d8
  • Sai Srinivas's avatar
    Merge remote-tracking branch 'origin/main' · e6241d05
    Sai Srinivas authored 
    # Conflicts:
#	lib/Screens/BillScreens/BillDetailScreen.dart
#	lib/Screens/DashboardScreen.dart
#	lib/Screens/HelpScreens/OrderHelpScreen.dart
#	lib/Screens/ProductsDetailScreen.dart
#	lib/Screens/ProfileScreen.dart
#	lib/Screens/TransactionScreens/BillStatusToast.dart
#	lib/Screens/authScreen/LoginScreen.dart
#	lib/Screens/authScreen/OTP_Screen.dart
    e6241d05
Expand all Show whitespace changes
Inline Side-by-side
android/app/build.gradle.kts
View file @ e6241d05
......@@ -32,7 +32,7 @@ android {
applicationId = "in.webgrid.genrentals"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = 23
minSdk = flutter.minSdkVersion
targetSdk = 36
versionCode = flutter.versionCode
versionName = flutter.versionName
......
lib/Screens/BillScreens/BillDetailScreen.dart
View file @ e6241d05
......@@ -111,8 +111,8 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
"Bill Details",
style: TextStyle(
fontSize: getResponsiveTextSize(context, 16),
fontFamily: "Plus Jakarta Sans",
fontWeight: FontWeight.w600,
fontFamily: "Poppins",
fontWeight: FontWeight.w500,
color: Colors.black87,
),
),
......@@ -276,7 +276,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
"Pay Now",
style: TextStyle(
fontSize: getResponsiveTextSize(context, 14),
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w600,
),
),
......@@ -537,6 +537,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
title,
maxLines: 2,
style: TextStyle(
fontFamily: "Poppins",
fontSize: getResponsiveTextSize(context, 14),
color: AppColors.subtitleText,
fontWeight: FontWeight.w400,
......@@ -546,6 +547,7 @@ class _BillDetailScreenState extends State<BillDetailScreen> {
Text(
value,
style: TextStyle(
fontFamily: "Poppins",
fontSize: getResponsiveTextSize(context, 14),
fontWeight: isBold ? FontWeight.w700 : FontWeight.w400,
color: highlight
......
lib/Screens/DashboardScreen.dart
View file @ e6241d05
This diff is collapsed.
lib/Screens/HelpScreens/EnquiryScreen.dart
View file @ e6241d05
......@@ -54,6 +54,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
"Enquiry",
style: TextStyle(
fontSize: 16,
fontFamily: "Poppins",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
color: Colors.black87,
......@@ -205,6 +206,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
: const Text(
"Submit",
style: TextStyle(
fontFamily: "Poppins",
fontSize: 15,
fontWeight: FontWeight.w400,
),
......@@ -225,6 +227,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
title,
style: const TextStyle(
fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
color: Colors.black,
......@@ -267,10 +270,17 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
keyboardType: keyboardType,
maxLines: maxLines,
onChanged: (_) => field.didChange(controller.text),
style: TextStyle(
fontSize: 14,
fontFamily: "Poppins",
color: Colors.black,
fontWeight: FontWeight.w400,
),
decoration: InputDecoration(
hintText: hint,
hintStyle: TextStyle(
fontSize: 14,
fontFamily: "Poppins",
color: Colors.grey[400],
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
......@@ -287,6 +297,7 @@ class _EnquiryScreenState extends State<EnquiryScreen> {
child: Text(
field.errorText ?? '',
style: const TextStyle(
fontFamily: "Poppins",
color: Colors.red,
fontSize: 12,
),
......
lib/Screens/HelpScreens/HelpScreen.dart
View file @ e6241d05
......@@ -368,6 +368,7 @@ class CommonListItem extends StatelessWidget {
"#${orderId}",
style: TextStyle(
fontSize: 12,
fontFamily: "Poppins",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
color: AppColors.subtitleText,
......@@ -377,6 +378,7 @@ class CommonListItem extends StatelessWidget {
title,
style: TextStyle(
fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
color: Colors.black87,
......@@ -408,6 +410,7 @@ class CommonListItem extends StatelessWidget {
status,
style: TextStyle(
fontSize: 12,
fontFamily: "Poppins",
fontWeight: FontWeight.w400,
fontStyle: FontStyle.normal,
color: Colors.black87,
......
lib/Screens/HelpScreens/TicketChatScreen.dart
View file @ e6241d05
......@@ -93,6 +93,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
child: Text(
widget.status,
style: TextStyle(
fontFamily: "Poppins",
fontSize: 12,
fontWeight: FontWeight.w400,
color: status ? Colors.black87 : Colors.red,
......@@ -155,6 +156,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
child: const Text(
"Send a Message",
style: TextStyle(
fontFamily: "Poppins",
fontSize: 14,
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
......@@ -230,6 +232,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
name,
style: const TextStyle(
fontSize: 16,
fontFamily: "Poppins",
fontWeight: FontWeight.w500,
color: Colors.black87,
),
......@@ -239,6 +242,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
date,
style: TextStyle(
fontSize: 12,
fontFamily: "Poppins",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
color: Colors.grey[600],
......@@ -314,6 +318,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
message,
style: const TextStyle(
fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
color: Colors.black87,
......@@ -411,6 +416,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
hintText: "Write your message",
hintStyle: TextStyle(
fontSize: 14,
fontFamily: "Poppins",
color: Colors.grey[400],
fontWeight: FontWeight.w400
),
......@@ -628,6 +634,7 @@ class _TicketChatScreenState extends State<TicketChatScreen> {
"Send Message",
style: TextStyle(
fontSize: 14,
fontFamily: "Poppins",
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
),
......
lib/Screens/ProductsDetailScreen.dart
View file @ e6241d05
......@@ -807,6 +807,7 @@ class _ProductsDetailScreenState extends State<ProductsDetailScreen> {
textAlign: TextAlign.center,
style: TextStyle(
color: AppColors.nearDarkText,
fontFamily: "Poppins",
fontSize: isSmallScreen ? 11 : 13, // Slightly smaller font
fontStyle: FontStyle.normal,
fontWeight: FontWeight.w400,
......
lib/Screens/ProfileScreen.dart
View file @ e6241d05
......@@ -84,7 +84,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text(
"Logout",
style: TextStyle(
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w700,
fontSize: 20,
color: Colors.black87,
......@@ -97,7 +97,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
"Are you sure you want to logout?",
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontSize: 14,
fontWeight: FontWeight.w400,
color: Colors.grey[600],
......@@ -129,7 +129,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
child: Text(
"Cancel",
style: TextStyle(
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w600,
fontSize: 14,
color: Colors.grey[700],
......@@ -159,7 +159,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text(
"Logout",
style: TextStyle(
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w600,
fontSize: 14,
color: Colors.white,
......@@ -206,7 +206,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text(
"Logging out...",
style: TextStyle(
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w600,
fontSize: 16,
color: Colors.grey[800],
......@@ -254,7 +254,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text(
"Logged out successfully",
style: TextStyle(
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w500,
),
),
......@@ -295,7 +295,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
Text(
"Logout failed. Please try again.",
style: TextStyle(
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w500,
),
),
......@@ -506,7 +506,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
"Logout",
style: TextStyle(
fontSize: 16,
fontFamily: "Plus Jakarta Sans",
fontFamily: "Poppins",
fontWeight: FontWeight.w600,
color: Colors.white,
),
......@@ -537,12 +537,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
const SizedBox(height: 6),
Text(title,
style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black87)),
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black87)),
const SizedBox(height: 2),
Text(value,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black54)),
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black54)),
],
);
}
......@@ -552,11 +552,11 @@ class _ProfileScreenState extends State<ProfileScreen> {
children: [
Text(title,
style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black87)),
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black87)),
const SizedBox(height: 4),
Text(value,
style: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Plus Jakarta Sans", color: Colors.black54)),
fontSize: 14, fontWeight: FontWeight.w400, fontFamily: "Poppins", color: Colors.black54)),
],
);
}
......
lib/Screens/TransactionScreens/BillStatusToast.dart
View file @ e6241d05
......@@ -247,10 +247,11 @@ class _BillStatusToastState extends State<BillStatusToast> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
flex: 5,
flex: 4,
child: Text(
title,
style: const TextStyle(
maxLines: 2,
style: TextStyle(
fontSize: 14,
fontFamily: "Poppins",
color: Colors.black54,
......
lib/Screens/authScreen/LoginScreen.dart
View file @ e6241d05
......@@ -135,6 +135,7 @@ class _LoginScreenState extends State<LoginScreen> {
"Rental Power,\nManaged in a Tap",
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: "Poppins",
color: Colors.white,
fontSize: 35,
fontWeight: FontWeight.w400,
......@@ -151,6 +152,7 @@ class _LoginScreenState extends State<LoginScreen> {
child: Text(
"Enter Registered Mobile No.",
style: TextStyle(
fontFamily: "Poppins",
color: Colors.white,
fontSize: 14,
fontWeight: FontWeight.w400,
......@@ -169,7 +171,7 @@ class _LoginScreenState extends State<LoginScreen> {
style: const TextStyle(color: Colors.black),
decoration: InputDecoration(
hintText: "Enter Mobile No.",
hintStyle: const TextStyle(color: Colors.grey),
hintStyle: const TextStyle(color: Colors.grey,fontFamily: "Poppins",),
filled: true,
fillColor: Colors.white,
counterText: "", // Remove character counter
......@@ -201,6 +203,7 @@ class _LoginScreenState extends State<LoginScreen> {
child: Text(
"*Invalid number. Enter your registered number.",
style: TextStyle(
fontFamily: "Poppins",
color: Colors.redAccent,
fontSize: 12,
),
......@@ -246,6 +249,7 @@ class _LoginScreenState extends State<LoginScreen> {
Text(
"Continue",
style: TextStyle(
fontFamily: "Poppins",
color: _isValid
? const Color(0xFFFFFFFF)
: const Color(0xFF03456C),
......
lib/Screens/authScreen/OTP_Screen.dart
View file @ e6241d05
......@@ -284,6 +284,7 @@ class _OtpScreenState extends State<OtpScreen> {
"Rental Power,\nManaged in a Tap",
textAlign: TextAlign.center,
style: TextStyle(
fontFamily: "Poppins",
color: Colors.white,
fontSize: 32,
fontWeight: FontWeight.w500,
......@@ -298,6 +299,7 @@ class _OtpScreenState extends State<OtpScreen> {
"Enter the OTP sent to +91 ${widget.mob}",
textAlign: TextAlign.center,
style: const TextStyle(
fontFamily: "Poppins",
color: Colors.white70,
fontSize: 14,
),
......@@ -381,6 +383,7 @@ class _OtpScreenState extends State<OtpScreen> {
Text(
"Continue",
style: TextStyle(
fontFamily: "Poppins",
color: _isValid
? Colors.white
: const Color(0xFF03456C),
......
lib/Utility/AdvancedSnackbar.dart
View file @ e6241d05
......@@ -293,6 +293,7 @@ class _AnimatedSnackBarContentState extends State<_AnimatedSnackBarContent>
Text(
widget.title!,
style: const TextStyle(
fontFamily: "Poppins",
color: Colors.white,
fontWeight: FontWeight.w700,
fontSize: 16,
......@@ -305,6 +306,7 @@ class _AnimatedSnackBarContentState extends State<_AnimatedSnackBarContent>
Text(
widget.message,
style: TextStyle(
fontFamily: "Poppins",
color: Colors.white.withOpacity(0.9),
fontSize: 14,
height: 1.4,
......
lib/Utility/CustomSnackbar.dart
View file @ e6241d05
......@@ -98,6 +98,7 @@ class CustomSnackBar {
title,
style: const TextStyle(
color: Colors.white,
fontFamily: "Poppins",
fontWeight: FontWeight.w700,
fontSize: 15,
letterSpacing: -0.2,
......@@ -108,6 +109,7 @@ class CustomSnackBar {
Text(
message,
style: TextStyle(
fontFamily: "Poppins",
color: Colors.white.withOpacity(0.9),
fontSize: 14,
height: 1.3,
......@@ -142,6 +144,7 @@ class CustomSnackBar {
child: Text(
action.label,
style: TextStyle(
fontFamily: "Poppins",
color: Colors.white,
fontSize: 12,
fontWeight: FontWeight.w600,
......
pubspec.lock
View file @ e6241d05
......@@ -157,10 +157,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev"
source: hosted
version: "1.3.2"
version: "1.3.3"
ffi:
dependency: transitive
description:
......@@ -396,26 +396,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev"
source: hosted
version: "10.0.8"
version: "11.0.2"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev"
source: hosted
version: "3.0.9"
version: "3.0.10"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
version: "3.0.2"
lints:
dependency: transitive
description:
......@@ -841,10 +841,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
url: "https://pub.dev"
source: hosted
version: "0.7.4"
version: "0.7.6"
typed_data:
dependency: transitive
description:
......@@ -889,10 +889,10 @@ packages:
dependency: transitive
description:
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.2.0"
vm_service:
dependency: transitive
description:
......@@ -942,5 +942,5 @@ packages:
source: hosted
version: "6.5.0"
sdks:
dart: ">=3.7.2 <4.0.0"
dart: ">=3.8.0-0 <4.0.0"
flutter: ">=3.29.0"