Add country dropdown selector to login screens of siro_service and siro_admin
This commit is contained in:
@@ -23,6 +23,13 @@ class OtpHelper extends GetxController {
|
|||||||
static final String _checkAdminLogin =
|
static final String _checkAdminLogin =
|
||||||
'${AppLink.server}/Admin/auth/login.php';
|
'${AppLink.server}/Admin/auth/login.php';
|
||||||
|
|
||||||
|
var selectedCountry = 'Jordan'.obs;
|
||||||
|
|
||||||
|
void changeCountry(String country) {
|
||||||
|
selectedCountry.value = country;
|
||||||
|
box.write(BoxName.countryCode, country);
|
||||||
|
}
|
||||||
|
|
||||||
/// إرسال OTP
|
/// إرسال OTP
|
||||||
static Future<bool> sendOtp(String phoneNumber) async {
|
static Future<bool> sendOtp(String phoneNumber) async {
|
||||||
try {
|
try {
|
||||||
@@ -281,6 +288,7 @@ class OtpHelper extends GetxController {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void onInit() {
|
void onInit() {
|
||||||
|
selectedCountry.value = box.read(BoxName.countryCode) ?? 'Jordan';
|
||||||
super.onInit();
|
super.onInit();
|
||||||
DeviceHelper.getDeviceFingerprint().then((deviceFingerprint) {
|
DeviceHelper.getDeviceFingerprint().then((deviceFingerprint) {
|
||||||
box.write(BoxName.fingerPrint, deviceFingerprint);
|
box.write(BoxName.fingerPrint, deviceFingerprint);
|
||||||
|
|||||||
@@ -297,6 +297,57 @@ class _AdminLoginPageState extends State<AdminLoginPage>
|
|||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: 20),
|
||||||
|
|
||||||
|
// ── Country Dropdown ───────────────────────────
|
||||||
|
const Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.public_rounded,
|
||||||
|
color: _C.accent, size: 16),
|
||||||
|
SizedBox(width: 8),
|
||||||
|
Text(
|
||||||
|
'الدولة',
|
||||||
|
style: TextStyle(
|
||||||
|
color: _C.textSec,
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
letterSpacing: 0.3,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Obx(() {
|
||||||
|
final otpHelper = Get.find<OtpHelper>();
|
||||||
|
return Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: _C.inputBg,
|
||||||
|
borderRadius: BorderRadius.circular(14),
|
||||||
|
border: Border.all(color: _C.border, width: 1),
|
||||||
|
),
|
||||||
|
child: DropdownButtonHideUnderline(
|
||||||
|
child: DropdownButton<String>(
|
||||||
|
value: otpHelper.selectedCountry.value,
|
||||||
|
icon: const Icon(Icons.arrow_drop_down, color: _C.accent),
|
||||||
|
isExpanded: true,
|
||||||
|
dropdownColor: _C.card,
|
||||||
|
style: const TextStyle(color: _C.textPrimary, fontSize: 16),
|
||||||
|
items: ['Jordan', 'Egypt', 'Syria'].map((String country) {
|
||||||
|
return DropdownMenuItem<String>(
|
||||||
|
value: country,
|
||||||
|
child: Text(country.tr),
|
||||||
|
);
|
||||||
|
}).toList(),
|
||||||
|
onChanged: (String? val) {
|
||||||
|
if (val != null) {
|
||||||
|
otpHelper.changeCountry(val);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}),
|
||||||
const SizedBox(height: 28),
|
const SizedBox(height: 28),
|
||||||
|
|
||||||
// ── Submit button ────────────────────────────
|
// ── Submit button ────────────────────────────
|
||||||
|
|||||||
@@ -21,6 +21,13 @@ class LoginController extends GetxController {
|
|||||||
|
|
||||||
final FlutterSecureStorage storage = const FlutterSecureStorage();
|
final FlutterSecureStorage storage = const FlutterSecureStorage();
|
||||||
|
|
||||||
|
var selectedCountry = 'Jordan'.obs;
|
||||||
|
|
||||||
|
void changeCountry(String country) {
|
||||||
|
selectedCountry.value = country;
|
||||||
|
box.write(BoxName.countryCode, country);
|
||||||
|
}
|
||||||
|
|
||||||
void login() async {
|
void login() async {
|
||||||
// Ensure fingerprint is ready
|
// Ensure fingerprint is ready
|
||||||
String fingerprint = box.read(BoxName.fingerPrint) ?? '';
|
String fingerprint = box.read(BoxName.fingerPrint) ?? '';
|
||||||
@@ -177,6 +184,7 @@ class LoginController extends GetxController {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void onInit() async {
|
void onInit() async {
|
||||||
|
selectedCountry.value = box.read(BoxName.countryCode) ?? 'Jordan';
|
||||||
await EncryptionHelper.initialize();
|
await EncryptionHelper.initialize();
|
||||||
await DeviceHelper.getDeviceFingerprint();
|
await DeviceHelper.getDeviceFingerprint();
|
||||||
|
|
||||||
|
|||||||
@@ -100,7 +100,36 @@ class LoginPage extends StatelessWidget {
|
|||||||
hint: 'أدخل كلمة المرور',
|
hint: 'أدخل كلمة المرور',
|
||||||
type: TextInputType.visiblePassword,
|
type: TextInputType.visiblePassword,
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: 20),
|
||||||
|
|
||||||
|
Obx(() => Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.grey.withOpacity(0.08),
|
||||||
|
borderRadius: BorderRadius.circular(16),
|
||||||
|
border: Border.all(color: Colors.grey.withOpacity(0.2)),
|
||||||
|
),
|
||||||
|
child: DropdownButtonHideUnderline(
|
||||||
|
child: DropdownButton<String>(
|
||||||
|
value: controller.selectedCountry.value,
|
||||||
|
icon: const Icon(Icons.arrow_drop_down, color: AppColor.blueColor),
|
||||||
|
isExpanded: true,
|
||||||
|
dropdownColor: Colors.white,
|
||||||
|
style: const TextStyle(color: Colors.black87, fontSize: 16),
|
||||||
|
items: ['Jordan', 'Egypt', 'Syria'].map((String country) {
|
||||||
|
return DropdownMenuItem<String>(
|
||||||
|
value: country,
|
||||||
|
child: Text(country.tr),
|
||||||
|
);
|
||||||
|
}).toList(),
|
||||||
|
onChanged: (String? val) {
|
||||||
|
if (val != null) {
|
||||||
|
controller.changeCountry(val);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)),
|
||||||
const SizedBox(height: 40),
|
const SizedBox(height: 40),
|
||||||
|
|
||||||
// Login Button
|
// Login Button
|
||||||
|
|||||||
Reference in New Issue
Block a user