BASE: Fix Buttons Radiuses.
This commit is contained in:
@@ -4,6 +4,7 @@ import 'package:customer/screen_ui/location_enable_screens/location_permission_s
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import '../../constant/assets.dart';
|
||||
import '../../constant/constant.dart';
|
||||
@@ -29,7 +30,11 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
elevation: 0,
|
||||
automaticallyImplyLeading: false,
|
||||
leading: IconButton(
|
||||
icon: Icon(Icons.arrow_back, size: 20, color: isDark ? AppThemeData.greyDark500 : AppThemeData.grey500),
|
||||
icon: Icon(
|
||||
Icons.arrow_back,
|
||||
size: 20,
|
||||
color: isDark ? AppThemeData.greyDark500 : AppThemeData.grey500,
|
||||
),
|
||||
onPressed: () {
|
||||
Get.back();
|
||||
},
|
||||
@@ -39,12 +44,34 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
onPressed: () {
|
||||
Get.to(() => LocationPermissionScreen());
|
||||
},
|
||||
style: TextButton.styleFrom(padding: const EdgeInsets.symmetric(horizontal: 12), minimumSize: const Size(0, 40), tapTargetSize: MaterialTapTargetSize.shrinkWrap),
|
||||
style: TextButton.styleFrom(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
minimumSize: const Size(0, 40),
|
||||
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text("Skip".tr, style: AppThemeData.mediumTextStyle(color: isDark ? AppThemeData.greyDark500 : AppThemeData.grey500)),
|
||||
Padding(padding: const EdgeInsets.only(top: 2, left: 4), child: Icon(Icons.arrow_forward_ios, size: 16, color: isDark ? AppThemeData.greyDark500 : AppThemeData.grey500)),
|
||||
Text(
|
||||
"Skip".tr,
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark500
|
||||
: AppThemeData.grey500,
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 2, left: 4),
|
||||
child: Icon(
|
||||
Icons.arrow_forward_ios,
|
||||
size: 16,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark500
|
||||
: AppThemeData.grey500,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -62,67 +89,163 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(
|
||||
"Use your mobile number to Log in easily and securely.".tr,
|
||||
style: AppThemeData.boldTextStyle(fontSize: 24, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900),
|
||||
"Use your mobile number to Log in easily and securely."
|
||||
.tr,
|
||||
style: AppThemeData.boldTextStyle(
|
||||
fontSize: 24,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark900
|
||||
: AppThemeData.grey900,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 25),
|
||||
TextFieldWidget(
|
||||
title: "Mobile Number*".tr,
|
||||
hintText: "Enter Mobile number".tr,
|
||||
controller: controller.mobileController.value,
|
||||
textInputType: const TextInputType.numberWithOptions(signed: true, decimal: true),
|
||||
textInputType:
|
||||
const TextInputType.numberWithOptions(
|
||||
signed: true,
|
||||
decimal: true,
|
||||
),
|
||||
textInputAction: TextInputAction.done,
|
||||
inputFormatters: [FilteringTextInputFormatter.allow(RegExp('[0-9]')), LengthLimitingTextInputFormatter(10)],
|
||||
inputFormatters: [
|
||||
FilteringTextInputFormatter.allow(
|
||||
RegExp('[0-9]'),
|
||||
),
|
||||
LengthLimitingTextInputFormatter(10),
|
||||
],
|
||||
prefix: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
CountryCodePicker(
|
||||
onChanged: (value) {
|
||||
controller.countryCodeController.value.text = value.dialCode ?? Constant.defaultCountryCode;
|
||||
controller
|
||||
.countryCodeController
|
||||
.value
|
||||
.text = value.dialCode ??
|
||||
Constant.defaultCountryCode;
|
||||
},
|
||||
initialSelection: controller.countryCodeController.value.text.isNotEmpty ? controller.countryCodeController.value.text : Constant.defaultCountryCode,
|
||||
initialSelection:
|
||||
controller
|
||||
.countryCodeController
|
||||
.value
|
||||
.text
|
||||
.isNotEmpty
|
||||
? controller
|
||||
.countryCodeController
|
||||
.value
|
||||
.text
|
||||
: Constant.defaultCountryCode,
|
||||
showCountryOnly: false,
|
||||
showOnlyCountryWhenClosed: false,
|
||||
alignLeft: false,
|
||||
textStyle: TextStyle(fontSize: 16, color: isDark ? AppThemeData.greyDark900 : Colors.black),
|
||||
dialogTextStyle: TextStyle(fontSize: 16, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900),
|
||||
searchStyle: TextStyle(fontSize: 16, color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900),
|
||||
dialogBackgroundColor: isDark ? AppThemeData.surfaceDark : AppThemeData.surface,
|
||||
textStyle: TextStyle(
|
||||
fontSize: 16,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark900
|
||||
: Colors.black,
|
||||
),
|
||||
dialogTextStyle: TextStyle(
|
||||
fontSize: 16,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark900
|
||||
: AppThemeData.grey900,
|
||||
),
|
||||
searchStyle: TextStyle(
|
||||
fontSize: 16,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark900
|
||||
: AppThemeData.grey900,
|
||||
),
|
||||
dialogBackgroundColor:
|
||||
isDark
|
||||
? AppThemeData.surfaceDark
|
||||
: AppThemeData.surface,
|
||||
padding: EdgeInsets.zero,
|
||||
),
|
||||
// const Icon(Icons.keyboard_arrow_down_rounded, size: 24, color: AppThemeData.grey400),
|
||||
Container(height: 24, width: 1, color: AppThemeData.grey400),
|
||||
Container(
|
||||
height: 24,
|
||||
width: 1,
|
||||
color: AppThemeData.grey400,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 30),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: "Send Code".tr,
|
||||
onPress: controller.sendOtp,
|
||||
color: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900,
|
||||
textColor: isDark ? AppThemeData.surfaceDark : Colors.white,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark900
|
||||
: AppThemeData.grey900,
|
||||
textColor:
|
||||
isDark
|
||||
? AppThemeData.surfaceDark
|
||||
: Colors.white,
|
||||
),
|
||||
const SizedBox(height: 25),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
Container(width: 52, height: 1, color: isDark ? AppThemeData.greyDark300 : AppThemeData.grey300),
|
||||
Container(
|
||||
width: 52,
|
||||
height: 1,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark300
|
||||
: AppThemeData.grey300,
|
||||
),
|
||||
const SizedBox(width: 15),
|
||||
Text("or continue with".tr, style: AppThemeData.regularTextStyle(color: isDark ? AppThemeData.greyDark400 : AppThemeData.grey400)),
|
||||
Text(
|
||||
"or continue with".tr,
|
||||
style: AppThemeData.regularTextStyle(
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark400
|
||||
: AppThemeData.grey400,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 15),
|
||||
Container(width: 52, height: 1, color: isDark ? AppThemeData.greyDark400 : AppThemeData.grey400),
|
||||
Container(
|
||||
width: 52,
|
||||
height: 1,
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark400
|
||||
: AppThemeData.grey400,
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 25),
|
||||
RoundedButtonFill(
|
||||
borderRadius: 10.r,
|
||||
title: "Email address".tr,
|
||||
onPress: () => Get.to(() => const SignUpScreen()),
|
||||
isRight: false,
|
||||
isCenter: true,
|
||||
icon: Image.asset(AppAssets.icMessage, width: 20, height: 18, color: isDark ? AppThemeData.greyDark900 : null),
|
||||
color: isDark ? AppThemeData.greyDark200 : AppThemeData.grey200,
|
||||
textColor: isDark ? AppThemeData.greyDark900 : AppThemeData.grey900,
|
||||
icon: Image.asset(
|
||||
AppAssets.icMessage,
|
||||
width: 20,
|
||||
height: 18,
|
||||
color: isDark ? AppThemeData.greyDark900 : null,
|
||||
),
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark200
|
||||
: AppThemeData.grey200,
|
||||
textColor:
|
||||
isDark
|
||||
? AppThemeData.greyDark900
|
||||
: AppThemeData.grey900,
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -134,7 +257,12 @@ class MobileLoginScreen extends StatelessWidget {
|
||||
child: Text.rich(
|
||||
TextSpan(
|
||||
text: "Didn't have an account?".tr,
|
||||
style: AppThemeData.mediumTextStyle(color: isDark ? AppThemeData.greyDark800 : AppThemeData.grey800),
|
||||
style: AppThemeData.mediumTextStyle(
|
||||
color:
|
||||
isDark
|
||||
? AppThemeData.greyDark800
|
||||
: AppThemeData.grey800,
|
||||
),
|
||||
children: [
|
||||
TextSpan(
|
||||
text: "Sign up".tr,
|
||||
|
||||
Reference in New Issue
Block a user