diff --git a/assets/icons/bg_auth_dam.svg b/assets/icons/bg_auth_dam.svg deleted file mode 100644 index 8e609c2..0000000 --- a/assets/icons/bg_auth_dam.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/icons/dam_pattern.svg b/assets/icons/dam_pattern.svg deleted file mode 100644 index 8f7ca71..0000000 --- a/assets/icons/dam_pattern.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/icons/pattern_dam.svg b/assets/icons/pattern_dam.svg new file mode 100644 index 0000000..6e273a6 --- /dev/null +++ b/assets/icons/pattern_dam.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/vec/bg_auth_dam.svg.vec b/assets/vec/bg_auth_dam.svg.vec deleted file mode 100644 index fcfe36b..0000000 Binary files a/assets/vec/bg_auth_dam.svg.vec and /dev/null differ diff --git a/assets/vec/dam_pattern.svg.vec b/assets/vec/dam_pattern.svg.vec deleted file mode 100644 index f958e3f..0000000 Binary files a/assets/vec/dam_pattern.svg.vec and /dev/null differ diff --git a/assets/vec/pattern_dam.svg.vec b/assets/vec/pattern_dam.svg.vec new file mode 100644 index 0000000..b8e15ee Binary files /dev/null and b/assets/vec/pattern_dam.svg.vec differ diff --git a/packages/chicken/lib/data/di/chicken_di.dart b/packages/chicken/lib/data/di/chicken_di.dart index 483852e..7877e69 100644 --- a/packages/chicken/lib/data/di/chicken_di.dart +++ b/packages/chicken/lib/data/di/chicken_di.dart @@ -1,10 +1,6 @@ import 'package:rasadyar_chicken/data/common/dio_error_handler.dart'; import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/features/common/data/di/common_di.dart'; -import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote.dart'; -import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote_impl.dart'; -import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository.dart'; -import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository_impl.dart'; import 'package:rasadyar_chicken/features/poultry_science/data/di/poultry_science_di.dart'; import 'package:rasadyar_chicken/features/steward/data/di/steward_di.dart'; import 'package:rasadyar_chicken/features/province_operator/data/di/province_operator_di.dart'; @@ -86,14 +82,7 @@ Future setupChickenDI() async { // Setup jahad feature DI await setupJahadDI(diChicken, dioRemote); - //region kill house module DI - diChicken.registerLazySingleton( - () => KillHouseRemoteDataSourceImpl(diChicken.get()), - ); - diChicken.registerLazySingleton( - () => KillHouseRepositoryImpl(diChicken.get()), - ); - //endregion + } Future newSetupAuthDI(String newUrl) async { diff --git a/packages/chicken/lib/features/common/auth/logic.dart b/packages/chicken/lib/features/common/auth/logic.dart deleted file mode 100644 index fa74d23..0000000 --- a/packages/chicken/lib/features/common/auth/logic.dart +++ /dev/null @@ -1,244 +0,0 @@ -import 'dart:async'; -import 'dart:io'; - -import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/common/dio_error_handler.dart'; -import 'package:rasadyar_chicken/data/di/chicken_di.dart'; -import 'package:rasadyar_chicken/features/common/data/model/response/user_info/user_info_model.dart'; -import 'package:rasadyar_chicken/features/common/data/model/response/user_profile_model/user_profile_model.dart'; -import 'package:rasadyar_chicken/features/common/data/repositories/auth/auth_repository.dart'; -import 'package:rasadyar_chicken/features/common/presentation/routes/routes.dart'; -import 'package:rasadyar_chicken/features/steward/presentation/routes/routes.dart'; -import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart'; -import 'package:rasadyar_core/core.dart'; - -enum AuthType { useAndPass, otp } - -enum AuthStatus { init } - -enum OtpStatus { init, sent, verified, reSend } - -class AuthLogic extends GetxController with GetTickerProviderStateMixin { - GlobalKey formKey = GlobalKey(); - late AnimationController _textAnimationController; - late Animation textAnimation; - RxBool showCard = false.obs; - RxBool rememberMe = false.obs; - - Rx> formKeyOtp = GlobalKey().obs; - Rx> formKeySentOtp = GlobalKey().obs; - Rx usernameController = TextEditingController().obs; - Rx passwordController = TextEditingController().obs; - Rx phoneOtpNumberController = - TextEditingController().obs; - Rx otpCodeController = TextEditingController().obs; - - var captchaController = Get.find(); - - RxnString phoneNumber = RxnString(null); - RxBool isLoading = false.obs; - RxBool isDisabled = true.obs; - - GService gService = Get.find(); - TokenStorageService tokenStorageService = Get.find(); - - Rx authType = AuthType.useAndPass.obs; - Rx authStatus = AuthStatus.init.obs; - Rx otpStatus = OtpStatus.init.obs; - RxnString deviceName = RxnString(null); - - RxInt secondsRemaining = 120.obs; - Timer? _timer; - - AuthRepository authRepository = diChicken.get(); - - final Module _module = Get.arguments; - - @override - void onInit() { - super.onInit(); - _textAnimationController = - AnimationController( - vsync: this, - duration: const Duration(milliseconds: 1200), - ) - ..repeat(reverse: true, count: 2).whenComplete(() { - showCard.value = true; - }); - - textAnimation = CurvedAnimation( - parent: _textAnimationController, - curve: Curves.easeInOut, - ); - - initUserPassData(); - getDeviceModel(); - } - - @override - void onClose() { - _textAnimationController.dispose(); - _timer?.cancel(); - super.onClose(); - } - - void startTimer() { - _timer?.cancel(); - secondsRemaining.value = 120; - - _timer = Timer.periodic(const Duration(seconds: 1), (timer) { - if (secondsRemaining.value > 0) { - secondsRemaining.value--; - } else { - timer.cancel(); - } - }); - } - - void stopTimer() { - _timer?.cancel(); - } - - String get timeFormatted { - final minutes = secondsRemaining.value ~/ 60; - final seconds = secondsRemaining.value % 60; - return '${minutes.toString().padLeft(2, '0')}:${seconds.toString().padLeft(2, '0')}'; - } - - bool _isFormValid() { - final isCaptchaValid = - captchaController.formKey.currentState?.validate() ?? false; - final isFormValid = formKey.currentState?.validate() ?? false; - return isCaptchaValid && isFormValid; - } - - Future submitLoginForm() async { - if (!_isFormValid()) return; - AuthRepository authTmp = diChicken.get(); - isLoading.value = true; - await safeCall( - call: () => authTmp.login( - authRequest: { - "username": usernameController.value.text, - "password": passwordController.value.text, - }, - ), - onSuccess: (result) async { - await gService.saveSelectedModule(_module); - await tokenStorageService.saveModule(_module); - await tokenStorageService.saveAccessToken( - _module, - result?.accessToken ?? '', - ); - await tokenStorageService.saveRefreshToken( - _module, - result?.accessToken ?? '', - ); - var tmpRoles = result?.role?.where((element) { - final allowedRoles = { - 'poultryscience', - 'steward', - 'killhouse', - 'provinceinspector', - 'cityjahad', - 'jahad', - 'vetfarm', - 'provincesupervisor', - 'superadmin', - }; - - final lowerElement = element.toString().toLowerCase().trim(); - return allowedRoles.contains(lowerElement); - }).toList(); - if (tmpRoles?.length==1) { - await tokenStorageService.saveRoles(_module, tmpRoles ?? []); - } - - await tokenStorageService.saveRoles(_module, tmpRoles ?? []); - if (rememberMe.value) { - await tokenStorageService.saveUserPass( - _module, - usernameController.value.text, - passwordController.value.text, - ); - } - - authTmp.stewardAppLogin( - token: result?.accessToken ?? '', - queryParameters: { - "mobile": usernameController.value.text, - "device_name": deviceName.value, - }, - ); - - - Get.offAndToNamed(CommonRoutes.role); - - -/* if (tmpRoles!.length > 1) { - Get.offAndToNamed(CommonRoutes.role); - } else { - Get.offAllNamed(StewardRoutes.initSteward); - } */ - }, - onError: (error, stackTrace) { - if (error is DioException) { - diChicken.get().handle(error); - if ((error.type == DioExceptionType.unknown) || - (error.type == DioExceptionType.connectionError)) { - getUserInfo(usernameController.value.text); - } - } - captchaController.getCaptcha(); - }, - ); - isLoading.value = false; - } - - Future getUserInfo(String value) async { - isLoading.value = true; - await safeCall( - call: () async => await authRepository.getUserInfo(value), - onSuccess: (result) async { - if (result != null) { - await newSetupAuthDI(result.backend ?? ''); - await diChicken.allReady(); - } - }, - onError: (error, stackTrace) { - if (error is DioException) { - diChicken.get().handle(error); - } - captchaController.getCaptcha(); - }, - ); - isLoading.value = false; - } - - void initUserPassData() { - UserLocalModel? userLocalModel = tokenStorageService.getUserLocal( - Module.chicken, - ); - if (userLocalModel?.username != null && userLocalModel?.password != null) { - usernameController.value.text = userLocalModel?.username ?? ''; - passwordController.value.text = userLocalModel?.password ?? ''; - rememberMe.value = true; - } - } - - Future getDeviceModel() async { - final deviceInfo = DeviceInfoPlugin(); - - if (Platform.isAndroid) { - final info = await deviceInfo.androidInfo; - - deviceName.value = - 'Device:${info.manufacturer} Model:${info.model} version ${info.version.release}'; - } else if (Platform.isIOS) { - final info = await deviceInfo.iosInfo; - - deviceName.value = - 'Device:${info.utsname.machine} Model:${info.model} version ${info.systemVersion}'; - } else {} - } -} diff --git a/packages/chicken/lib/features/common/auth/view.dart b/packages/chicken/lib/features/common/auth/view.dart deleted file mode 100644 index 8e52e08..0000000 --- a/packages/chicken/lib/features/common/auth/view.dart +++ /dev/null @@ -1,394 +0,0 @@ -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; -import 'package:rasadyar_chicken/presentation/widget/captcha/view.dart'; -import 'package:rasadyar_core/core.dart'; - -import 'logic.dart'; - -class AuthPage extends GetView { - const AuthPage({super.key}); - - @override - Widget build(BuildContext context) { - return ChickenBasePage( - isFullScreen: true, - backGroundWidget: backGroundDecoration( - gradient: LinearGradient( - begin: Alignment.topRight, - end: Alignment.bottomLeft, - colors: [ - const Color(0xFFB2C9FF).withValues(alpha: 1.0), // 0% - const Color(0xFF40BB93).withValues(alpha: 0.11), // 50% - const Color(0xFF93B6D3).withValues(alpha: 1.0), // 100% - ], - stops: const [0.0, 0.5, 1.0], - ), - backgroundPath: Assets.images.patternChicken.path, - ), - onPopScopTaped: () => Get.back(result: -1), - child: Stack( - children: [ - Center( - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 10.r), - child: FadeTransition( - opacity: controller.textAnimation, - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - spacing: 12, - children: [ - Text( - 'به سامانه رصدطیور خوش آمدید!', - textAlign: TextAlign.right, - style: AppFonts.yekan25Bold.copyWith( - color: AppColor.darkGreyDarkActive, - ), - ), - Text( - 'سامانه رصد و پایش زنجیره تامین، تولید و توزیع کالا های اساسی', - textAlign: TextAlign.center, - style: AppFonts.yekan16.copyWith( - color: AppColor.darkGreyDarkActive, - ), - ), - ], - ), - ), - ), - ), - - Obx(() { - final screenHeight = MediaQuery.of(context).size.height; - final targetTop = (screenHeight - 676) / 2; - - return AnimatedPositioned( - duration: const Duration(milliseconds: 1200), - curve: Curves.linear, - top: controller.showCard.value ? targetTop : screenHeight, - left: 10.r, - right: 10.r, - child: Container( - width: 381.w, - height: 676.h, - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(40), - ), - child: Column( - children: [ - SizedBox(height: 50.h), - LogoWidget( - vecPath: Assets.vec.rasadToyorSvg.path, - width: 85.w, - height: 85.h, - titleStyle: AppFonts.yekan20Bold.copyWith( - color: Color(0xFF4665AF), - ), - title: 'رصدطیور', - ), - SizedBox(height: 20.h), - useAndPassFrom(), - SizedBox(height: 24.h), - RichText( - text: TextSpan( - children: [ - TextSpan( - text: 'مطالعه بیانیه ', - style: AppFonts.yekan16.copyWith( - color: AppColor.darkGreyDark, - ), - ), - TextSpan( - recognizer: TapGestureRecognizer() - ..onTap = () { - Get.bottomSheet( - privacyPolicyWidget(), - isScrollControlled: true, - enableDrag: true, - ignoreSafeArea: false, - ); - }, - text: 'حریم خصوصی', - style: AppFonts.yekan16.copyWith( - color: AppColor.blueNormal, - ), - ), - ], - ), - ), - ], - ), - ), - ); - }), - ], - ), - ); - } - - Widget useAndPassFrom() { - return Padding( - padding: EdgeInsets.symmetric(horizontal: 30.r), - child: Form( - key: controller.formKey, - child: AutofillGroup( - child: Column( - children: [ - RTextField( - height: 40.h, - label: 'نام کاربری', - maxLength: 11, - maxLines: 1, - controller: controller.usernameController.value, - keyboardType: TextInputType.number, - inputFormatters: [PersianFormatter()], - initText: controller.usernameController.value.text, - autofillHints: [AutofillHints.username], - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), - borderSide: BorderSide(color: AppColor.textColor, width: 1), - ), - onChanged: (value) async { - controller.usernameController.value.text = value; - if (value.length == 11) { - await controller.getUserInfo(value); - } - }, - prefixIcon: Padding( - padding: const EdgeInsets.fromLTRB(0, 8, 6, 8), - child: Assets.vec.callSvg.svg(width: 12, height: 12), - ), - suffixIcon: - controller.usernameController.value.text.trim().isNotEmpty - ? clearButton(() { - controller.usernameController.value.clear(); - controller.usernameController.refresh(); - }) - : null, - validator: (value) { - if (value == null || value.isEmpty) { - return '⚠️ شماره موبایل را وارد کنید'; - } else if (value.length < 10) { - return '⚠️ شماره موبایل باید 11 رقم باشد'; - } - return null; - }, - style: AppFonts.yekan13, - errorStyle: AppFonts.yekan13.copyWith( - color: AppColor.redNormal, - ), - labelStyle: AppFonts.yekan13, - boxConstraints: const BoxConstraints( - maxHeight: 40, - minHeight: 40, - maxWidth: 40, - minWidth: 40, - ), - ), - const SizedBox(height: 26), - ObxValue( - (passwordController) => RTextField( - height: 40.h, - label: 'رمز عبور', - filled: false, - obscure: true, - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), - borderSide: BorderSide(color: AppColor.textColor, width: 1), - ), - controller: passwordController.value, - autofillHints: [AutofillHints.password], - variant: RTextFieldVariant.password, - initText: passwordController.value.text, - inputFormatters: [PersianFormatter()], - onChanged: (value) { - passwordController.refresh(); - }, - validator: (value) { - if (value == null || value.isEmpty) { - return '⚠️ رمز عبور را وارد کنید'; - } - return null; - }, - style: AppFonts.yekan13, - errorStyle: AppFonts.yekan13.copyWith( - color: AppColor.redNormal, - ), - labelStyle: AppFonts.yekan13, - prefixIcon: Padding( - padding: const EdgeInsets.fromLTRB(0, 8, 8, 8), - child: Assets.vec.keySvg.svg(width: 12, height: 12), - ), - boxConstraints: const BoxConstraints( - maxHeight: 34, - minHeight: 34, - maxWidth: 34, - minWidth: 34, - ), - ), - controller.passwordController, - ), - SizedBox(height: 26), - CaptchaWidget(), - - GestureDetector( - onTap: () { - controller.rememberMe.value = !controller.rememberMe.value; - }, - child: Row( - children: [ - ObxValue((data) { - return Checkbox( - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - visualDensity: VisualDensity( - horizontal: -4, - vertical: 4, - ), - tristate: true, - value: data.value, - onChanged: (value) { - data.value = value ?? false; - }, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(4), - ), - activeColor: AppColor.blueNormal, - ); - }, controller.rememberMe), - Text( - 'مرا به خاطر بسپار', - style: AppFonts.yekan14.copyWith( - color: AppColor.darkGreyDark, - ), - ), - ], - ), - ), - - Obx(() { - return RElevated( - text: 'ورود', - isLoading: controller.isLoading.value, - onPressed: controller.isDisabled.value - ? null - : () async { - await controller.submitLoginForm(); - }, - width: Get.width, - height: 48, - ); - }), - ], - ), - ), - ), - ); - } - - Widget privacyPolicyWidget() { - return BaseBottomSheet( - child: Column( - spacing: 5, - children: [ - Container( - padding: EdgeInsets.all(8.w), - - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: AppColor.darkGreyLight, width: 1), - ), - child: Column( - spacing: 3, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'بيانيه حريم خصوصی', - style: AppFonts.yekan16Bold.copyWith( - color: AppColor.blueNormal, - ), - ), - Text( - 'اطلاعات مربوط به هر شخص، حریم خصوصی وی محسوب می‌شود. حفاظت و حراست از اطلاعات شخصی در سامانه رصد یار، نه تنها موجب حفظ امنیت کاربران می‌شود، بلکه باعث اعتماد بیشتر و مشارکت آنها در فعالیت‌های جاری می‌گردد. هدف از این بیانیه، آگاه ساختن شما درباره ی نوع و نحوه ی استفاده از اطلاعاتی است که در هنگام استفاده از سامانه رصد یار ، از جانب شما دریافت می‌گردد. شرکت هوشمند سازان خود را ملزم به رعایت حریم خصوصی همه شهروندان و کاربران سامانه دانسته و آن دسته از اطلاعات کاربران را که فقط به منظور ارائه خدمات کفایت می‌کند، دریافت کرده و از انتشار آن یا در اختیار قرار دادن آن به دیگران خودداری مینماید.', - style: AppFonts.yekan14.copyWith( - color: AppColor.bgDark, - height: 1.8, - ), - ), - ], - ), - ), - Container( - padding: EdgeInsets.all(8.w), - - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: AppColor.darkGreyLight, width: 1), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - spacing: 4, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Text( - 'چگونگی جمع آوری و استفاده از اطلاعات کاربران', - style: AppFonts.yekan16Bold.copyWith( - color: AppColor.blueNormal, - ), - ), - Text( - '''الف: اطلاعاتی که شما خود در اختيار این سامانه قرار می‌دهيد، شامل موارد زيرهستند: -اقلام اطلاعاتی شامل شماره تلفن همراه، تاریخ تولد، کد پستی و کد ملی کاربران را دریافت مینماییم که از این اقلام، صرفا جهت احراز هویت کاربران استفاده خواهد شد. -ب: برخی اطلاعات ديگر که به صورت خودکار از شما دريافت میشود شامل موارد زير می‌باشد: -⦁ دستگاهی که از طریق آن سامانه رصد یار را مشاهده می‌نمایید( تلفن همراه، تبلت، رایانه). -⦁ نام و نسخه سیستم عامل و browser کامپیوتر شما. -⦁ اطلاعات صفحات بازدید شده. -⦁ تعداد بازدیدهای روزانه در درگاه. -⦁ هدف ما از دریافت این اطلاعات استفاده از آنها در تحلیل عملکرد کاربران درگاه می باشد تا بتوانیم در خدمت رسانی بهتر عمل کنیم. -''', - style: AppFonts.yekan14.copyWith( - color: AppColor.bgDark, - height: 1.8, - ), - ), - ], - ), - ), - Container( - padding: EdgeInsets.all(8.w), - - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: AppColor.darkGreyLight, width: 1), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - spacing: 4, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Text( - 'امنیت اطلاعات', - style: AppFonts.yekan16Bold.copyWith( - color: AppColor.blueNormal, - ), - ), - Text( - 'متعهدیم که امنیت اطلاعات شما را تضمین نماییم و برای جلوگیری از هر نوع دسترسی غیرمجاز و افشای اطلاعات شما از همه شیوه‌‌های لازم استفاده می‌کنیم تا امنیت اطلاعاتی را که به صورت آنلاین گردآوری می‌کنیم، حفظ شود. لازم به ذکر است در سامانه ما، ممکن است به سایت های دیگری لینک شوید، وقتی که شما از طریق این لینک‌ها از سامانه ما خارج می‌شوید، توجه داشته باشید که ما بر دیگر سایت ها کنترل نداریم و سازمان تعهدی بر حفظ حریم شخصی آنان در سایت مقصد نخواهد داشت و مراجعه کنندگان میبایست به بیانیه حریم شخصی آن سایت ها مراجعه نمایند.', - style: AppFonts.yekan14.copyWith( - color: AppColor.bgDark, - height: 1.8, - ), - ), - ], - ), - ), - ], - ), - ); - } -} diff --git a/packages/chicken/lib/features/common/profile/logic.dart b/packages/chicken/lib/features/common/profile/logic.dart deleted file mode 100644 index 9622ecf..0000000 --- a/packages/chicken/lib/features/common/profile/logic.dart +++ /dev/null @@ -1,257 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/di/chicken_di.dart'; -import 'package:rasadyar_chicken/features/common/data/model/request/change_password/change_password_request_model.dart'; -import 'package:rasadyar_chicken/features/common/data/model/response/iran_province_city/iran_province_city_model.dart'; -import 'package:rasadyar_chicken/features/common/data/model/response/user_profile/user_profile.dart'; -import 'package:rasadyar_chicken/features/common/data/repositories/common/common_repository.dart'; -import 'package:rasadyar_core/core.dart'; - -class ProfileLogic extends GetxController { - CommonRepository commonRepository = diChicken.get(); - GService gService = Get.find(); - TokenStorageService tokenService = Get.find(); - RxInt selectedInformationType = 0.obs; - Rxn birthDate = Rxn(); - - Rx> userProfile = Rx>( - Resource.loading(), - ); - Rx> userLocal = Rx>( - Resource.loading(), - ); - - TextEditingController nameController = TextEditingController(); - TextEditingController lastNameController = TextEditingController(); - TextEditingController nationalCodeController = TextEditingController(); - TextEditingController nationalIdController = TextEditingController(); - TextEditingController birthdayController = TextEditingController(); - - TextEditingController oldPasswordController = TextEditingController(); - TextEditingController newPasswordController = TextEditingController(); - TextEditingController retryNewPasswordController = TextEditingController(); - - RxList cites = [].obs; - Rxn selectedProvince = Rxn(); - Rxn selectedCity = Rxn(); - - GlobalKey formKey = GlobalKey(); - ImagePicker imagePicker = ImagePicker(); - Rxn selectedImage = Rxn(); - final RxnString _base64Image = RxnString(); - RxBool isOnLoading = false.obs; - - RxBool isUserInformationOpen = true.obs; - RxBool isUnitInformationOpen = false.obs; - - ScrollController scrollController = ScrollController(); - - @override - void onInit() { - super.onInit(); - ever(selectedImage, (data) async { - if (data?.path != null) { - _base64Image.value = await convertImageToBase64(data!.path); - } - }); - } - - @override - void onReady() { - super.onReady(); - getUserProfile(); - getUserRole(); - selectedProvince.listen((p0) => getCites()); - userProfile.listen((data) { - nameController.text = data.data?.firstName ?? ''; - lastNameController.text = data.data?.lastName ?? ''; - nationalCodeController.text = data.data?.nationalCode ?? ''; - nationalIdController.text = data.data?.nationalId ?? ''; - birthdayController.text = - data.data?.birthday?.toJalali.formatCompactDate() ?? ''; - birthDate.value = data.data?.birthday?.toJalali; - selectedProvince.value = IranProvinceCityModel( - name: data.data?.province ?? '', - id: data.data?.provinceNumber ?? 0, - ); - - selectedCity.value = IranProvinceCityModel( - name: data.data?.city ?? '', - id: data.data?.cityNumber ?? 0, - ); - }); - } - - Future getUserProfile() async { - userProfile.value = Resource.loading(); - await safeCall( - call: () async => await commonRepository.getUserProfile( - token: tokenService.accessToken.value!, - ), - onSuccess: (result) { - if (result != null) { - userProfile.value = Resource.success(result); - } - }, - onError: (error, stackTrace) {}, - ); - } - - Future getCites() async { - await safeCall( - call: () => commonRepository.getCity( - provinceName: selectedProvince.value?.name ?? '', - ), - onSuccess: (result) { - if (result != null && result.isNotEmpty) { - cites.value = result; - } - }, - ); - } - - Future updateUserProfile() async { - UserProfile userProfile = UserProfile( - firstName: nameController.text, - lastName: lastNameController.text, - nationalCode: nationalCodeController.text, - nationalId: nationalIdController.text, - birthday: birthDate.value - ?.toDateTime() - .formattedDashedGregorian - .toString(), - image: _base64Image.value, - personType: 'self', - type: 'self_profile', - ); - isOnLoading.value = true; - await safeCall( - call: () async => await commonRepository.updateUserProfile( - token: tokenService.accessToken.value!, - userProfile: userProfile, - ), - onSuccess: (result) { - isOnLoading.value = false; - }, - onError: (error, stackTrace) { - isOnLoading.value = false; - }, - ); - } - - Future updatePassword() async { - if (formKey.currentState?.validate() ?? false) { - ChangePasswordRequestModel model = ChangePasswordRequestModel( - username: userProfile.value.data?.mobile, - password: newPasswordController.text, - ); - - await safeCall( - call: () async => await commonRepository.updatePassword( - token: tokenService.accessToken.value!, - model: model, - ), - ); - } - } - - Future getUserRole() async { - userLocal.value = Resource.loading(); - await safeCall( - call: () async => tokenService.getUserLocal(Module.chicken), - onSuccess: (result) { - if (result != null) { - userLocal.value = Resource.success(result); - } - }, - onError: (error, stackTrace) {}, - ); - } - - void clearPasswordForm() { - oldPasswordController.clear(); - newPasswordController.clear(); - retryNewPasswordController.clear(); - } - - Future changeUserRole(String newRole) async { - dLog(newRole); - await gService.saveRoute(Module.chicken, newRole); - - Get.offAllNamed(newRole); - } - - void scrollToSelectedItem( - int index, { - double chipWidth = 100, - double spacing = 8, - GlobalKey? itemKey, - }) { - if (!scrollController.hasClients) { - WidgetsBinding.instance.addPostFrameCallback((_) { - _performScroll(index, chipWidth, spacing, itemKey); - }); - } else { - _performScroll(index, chipWidth, spacing, itemKey); - } - } - - void _performScroll( - int index, - double chipWidth, - double spacing, - GlobalKey? itemKey, - ) { - if (!scrollController.hasClients) return; - - double targetOffset; - - // If we have a GlobalKey, use it for precise positioning - if (itemKey?.currentContext != null) { - final RenderBox? renderBox = - itemKey!.currentContext?.findRenderObject() as RenderBox?; - if (renderBox != null) { - final position = renderBox.localToGlobal(Offset.zero); - final scrollPosition = scrollController.position; - final viewportWidth = scrollPosition.viewportDimension; - final chipWidth = renderBox.size.width; - - // Get the scroll position of the item - final itemScrollPosition = position.dx - scrollPosition.pixels; - // Center the item - targetOffset = - scrollPosition.pixels + - itemScrollPosition - - (viewportWidth / 2) + - (chipWidth / 2); - } else { - // Fallback to estimated position - targetOffset = _calculateEstimatedPosition(index, chipWidth, spacing); - } - } else { - // Use estimated position - targetOffset = _calculateEstimatedPosition(index, chipWidth, spacing); - } - - scrollController.animateTo( - targetOffset.clamp(0.0, scrollController.position.maxScrollExtent), - duration: const Duration(milliseconds: 300), - curve: Curves.easeInOut, - ); - } - - double _calculateEstimatedPosition( - int index, - double chipWidth, - double spacing, - ) { - final double itemPosition = (chipWidth + spacing) * index; - final double viewportWidth = scrollController.position.viewportDimension; - return itemPosition - (viewportWidth / 2) + (chipWidth / 2); - } - - @override - void onClose() { - scrollController.dispose(); - super.onClose(); - } -} diff --git a/packages/chicken/lib/features/common/profile/view.dart b/packages/chicken/lib/features/common/profile/view.dart deleted file mode 100644 index 3b3f635..0000000 --- a/packages/chicken/lib/features/common/profile/view.dart +++ /dev/null @@ -1,902 +0,0 @@ -import 'dart:io'; - -import 'package:flutter/cupertino.dart' hide Image; -import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/common/fa_user_role.dart'; -import 'package:rasadyar_chicken/data/di/chicken_di.dart'; -import 'package:rasadyar_chicken/features/common/data/model/response/user_profile/user_profile.dart'; -import 'package:rasadyar_core/core.dart'; - -import 'logic.dart'; - -class ProfilePage extends GetView { - const ProfilePage({super.key}); - - @override - Widget build(BuildContext context) { - return Column( - spacing: 30, - children: [ - Expanded( - child: Container( - color: AppColor.blueNormal, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row(), - ObxValue((data) { - final status = data.value.status; - - if (status == ResourceStatus.loading) { - return Container( - width: 128.w, - height: 128.h, - child: Center(child: CupertinoActivityIndicator(color: AppColor.greenNormal)), - ); - } - - if (status == ResourceStatus.error) { - return Container( - width: 128.w, - height: 128.h, - child: Center(child: Text('خطا در دریافت اطلاعات')), - ); - } - - // Default UI - - return Container( - width: 128.w, - height: 128.h, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: AppColor.blueLightActive, - ), - child: Center( - child: data.value.data?.image != null - ? CircleAvatar( - radius: 64.w, - backgroundImage: NetworkImage(data.value.data!.image!), - ) - : Icon(Icons.person, size: 64.w), - ), - ); - }, controller.userProfile), - ], - ), - ), - ), - Expanded( - flex: 3, - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - rolesWidget(), - SizedBox(height: 12.h), - - ObxValue((data) { - if (data.value.status == ResourceStatus.loading) { - return LoadingWidget(); - } else if (data.value.status == ResourceStatus.error) { - return ErrorWidget('خطا در دریافت اطلاعات کاربر'); - } else if (data.value.status == ResourceStatus.success) { - return Column( - spacing: 6, - children: [ - ObxValue((isOpen) { - return GestureDetector( - onTap: () => isOpen.toggle(), - child: AnimatedContainer( - height: isOpen.value ? 320.h : 47.h, - duration: Duration(milliseconds: 500), - curve: Curves.linear, - child: userProfileInformation(data.value), - ), - ); - }, controller.isUserInformationOpen), - - Visibility( - visible: - data.value.data?.unitName != null || - data.value.data?.unitAddress != null || - data.value.data?.unitPostalCode != null || - data.value.data?.unitRegistrationNumber != null || - data.value.data?.unitEconomicalNumber != null || - data.value.data?.unitCity != null || - data.value.data?.unitProvince != null || - data.value.data?.unitNationalId != null, - - child: ObxValue((isOpen) { - return GestureDetector( - onTap: () => isOpen.toggle(), - child: AnimatedContainer( - height: isOpen.value ? 320.h : 47.h, - duration: Duration(milliseconds: 500), - curve: Curves.linear, - child: unitInformation(data.value), - ), - ); - }, controller.isUnitInformationOpen), - ), - ], - ); - } else { - return SizedBox.shrink(); - } - }, controller.userProfile), - GestureDetector( - onTap: () { - Get.bottomSheet(changePasswordBottomSheet(), isScrollControlled: true); - }, - child: Container( - height: 47.h, - margin: EdgeInsets.symmetric(horizontal: 8, vertical: 8.h), - padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 1, color: const Color(0xFFD6D6D6)), - ), - child: Row( - spacing: 6, - children: [ - Assets.vec.lockSvg.svg( - width: 24.w, - height: 24.h, - colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn), - ), - Text( - 'تغییر رمز عبور', - textAlign: TextAlign.center, - style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal), - ), - ], - ), - ), - ), - GestureDetector( - onTap: () { - Get.bottomSheet(exitBottomSheet(), isScrollControlled: true); - }, - child: Container( - height: 47.h, - margin: EdgeInsets.symmetric(horizontal: 8), - padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 1, color: const Color(0xFFD6D6D6)), - ), - child: Row( - spacing: 6, - children: [ - Assets.vec.logoutSvg.svg( - width: 24.w, - height: 24.h, - colorFilter: ColorFilter.mode(AppColor.redNormal, BlendMode.srcIn), - ), - Text( - 'خروج', - textAlign: TextAlign.center, - style: AppFonts.yekan14.copyWith(color: AppColor.redNormal), - ), - ], - ), - ), - ), - - SizedBox(height: 100), - ], - ), - ), - ), - ], - ); - } - - Container invoiceIssuanceInformation() => Container(); - - Widget bankInformationWidget() => Column( - spacing: 16, - children: [ - itemList(title: 'نام بانک', content: 'سامان'), - itemList(title: 'نام صاحب حساب', content: 'رضا رضایی'), - itemList(title: 'شماره کارت ', content: '54154545415'), - itemList(title: 'شماره حساب', content: '62565263263652'), - itemList(title: 'شماره شبا', content: '62565263263652'), - ], - ); - - Widget userProfileInformation(Resource value) { - UserProfile item = value.data!; - return Stack( - clipBehavior: Clip.none, - children: [ - Positioned.fill( - child: ObxValue( - (val) => Container( - height: val.value ? 320.h : 47.h, - margin: EdgeInsets.symmetric(horizontal: 8, vertical: val.value ? 8 : 0), - padding: EdgeInsets.symmetric(horizontal: 11.h, vertical: 8.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 0.5, color: AppColor.darkGreyLight), - ), - child: val.value - ? Column( - spacing: 6, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - GestureDetector( - onTap: () { - Get.bottomSheet( - userInformationBottomSheet(), - isScrollControlled: true, - ignoreSafeArea: false, - ); - }, - child: Assets.vec.editSvg.svg( - width: 24.w, - height: 24.h, - colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn), - ), - ), - ], - ), - - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0), - child: Column( - children: [ - itemList( - title: 'نام و نام خانوادگی', - content: item.fullname ?? 'نامشخص', - icon: Assets.vec.userSvg.path, - hasColoredBox: true, - ), - itemList( - title: 'کدملی', - content: item.nationalId ?? 'نامشخص', - icon: Assets.vec.tagUserSvg.path, - ), - itemList( - title: 'موبایل', - content: item.mobile ?? 'نامشخص', - icon: Assets.vec.callSvg.path, - ), - - itemList( - title: 'شماره شناسنامه', - content: item.nationalCode ?? 'نامشخص', - icon: Assets.vec.userSquareSvg.path, - ), - itemList( - title: 'تاریخ تولد', - content: item.birthday?.toJalali.formatCompactDate() ?? 'نامشخص', - icon: Assets.vec.calendarSvg.path, - ), - //todo - itemList( - title: 'استان', - content: item.province ?? 'نامشخص', - icon: Assets.vec.pictureFrameSvg.path, - ), - itemList( - title: 'شهر', - content: item.city ?? 'نامشخص', - icon: Assets.vec.mapSvg.path, - ), - ], - ), - ), - ], - ) - : Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [Icon(CupertinoIcons.chevron_down, color: AppColor.iconColor)], - ), - ), - controller.isUserInformationOpen, - ), - ), - ObxValue( - (isOpen) => AnimatedPositioned( - right: 16, - top: isOpen.value ? -7 : 11, - duration: Duration(milliseconds: 500), - child: Container( - padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: isOpen.value - ? BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 0.5, color: Color(0xFFA9A9A9)), - ) - : null, - child: Text( - 'اطلاعات هویتی', - style: AppFonts.yekan16.copyWith(color: AppColor.iconColor), - ), - ), - ), - controller.isUserInformationOpen, - ), - ], - ); - } - - Widget unitInformation(Resource value) { - UserProfile item = value.data!; - return Stack( - clipBehavior: Clip.none, - children: [ - Positioned.fill( - child: ObxValue( - (val) => Container( - height: val.value ? 320.h : 47.h, - margin: EdgeInsets.symmetric(horizontal: 8, vertical: val.value ? 12 : 0), - padding: EdgeInsets.symmetric(horizontal: 11.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 0.5, color: AppColor.darkGreyLight), - ), - child: val.value - ? Column( - children: [ - SizedBox(height: 5.h), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - GestureDetector( - onTap: () { - Get.bottomSheet( - userInformationBottomSheet(), - isScrollControlled: true, - ignoreSafeArea: false, - ); - }, - child: Assets.vec.editSvg.svg( - width: 24.w, - height: 24.h, - colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn), - ), - ), - ], - ), - - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0), - child: Column( - spacing: 2, - children: [ - itemList( - title: 'نام صنفی', - content: item.unitName ?? 'نامشخص', - hasColoredBox: true, - visible: item.unitName != null, - ), - itemList( - title: 'شناسنامه ملی', - content: item.unitNationalId ?? 'نامشخص', - visible: item.unitName != null, - ), - itemList( - title: 'شماره ثبت', - content: item.unitRegistrationNumber ?? 'نامشخص', - visible: item.unitName != null, - ), - - itemList( - title: 'کد اقتصادی', - content: item.unitEconomicalNumber ?? 'نامشخص', - visible: item.unitName != null, - ), - itemList( - title: 'کد پستی', - content: item.unitPostalCode ?? 'نامشخص', - visible: item.unitName != null, - ), - - itemList( - title: 'استان', - content: item.province ?? 'نامشخص', - visible: item.unitName != null, - ), - itemList( - title: 'شهر', - content: item.city ?? 'نامشخص', - visible: item.unitName != null, - ), - itemList(title: 'آدرس', content: item.unitAddress ?? 'نامشخص'), - ], - ), - ), - ], - ) - : Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [Icon(CupertinoIcons.chevron_down, color: AppColor.iconColor)], - ), - ), - controller.isUnitInformationOpen, - ), - ), - ObxValue( - (isOpen) => AnimatedPositioned( - right: 16, - top: isOpen.value ? -2 : 11, - duration: Duration(milliseconds: 500), - child: Container( - padding: EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: isOpen.value - ? BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 0.5, color: Color(0xFFA9A9A9)), - ) - : null, - child: Text( - 'اطلاعات صنفی', - style: AppFonts.yekan16.copyWith(color: AppColor.iconColor), - ), - ), - ), - controller.isUnitInformationOpen, - ), - ], - ); - } - - Widget itemList({ - required String title, - required String content, - String? icon, - bool hasColoredBox = false, - bool? visible, - }) => Visibility( - visible: visible ?? true, - child: Container( - padding: EdgeInsets.symmetric(horizontal: 12.h, vertical: 6.h), - decoration: BoxDecoration( - color: hasColoredBox ? AppColor.greenLight : Colors.transparent, - borderRadius: BorderRadius.circular(8), - border: hasColoredBox - ? Border.all(width: 0.25, color: AppColor.bgDark) - : Border.all(width: 0, color: Colors.transparent), - ), - child: Row( - spacing: 4, - children: [ - if (icon != null) - Padding( - padding: const EdgeInsets.only(left: 8.0), - child: SvgGenImage.vec(icon).svg( - width: 20.w, - height: 20.h, - colorFilter: ColorFilter.mode(AppColor.textColor, BlendMode.srcIn), - ), - ), - Text(title, style: AppFonts.yekan14.copyWith(color: AppColor.textColor)), - Spacer(), - Text(content, style: AppFonts.yekan14.copyWith(color: AppColor.textColor)), - ], - ), - ), - ); - - Widget cardActionWidget({ - required String title, - required VoidCallback onPressed, - required String icon, - bool selected = false, - ColorFilter? color, - Color? cardColor, - Color? cardIconColor, - Color? textColor, - }) { - return GestureDetector( - onTap: onPressed, - child: Column( - spacing: 4, - children: [ - Container( - width: 52.w, - height: 52.h, - padding: EdgeInsets.all(6), - decoration: ShapeDecoration( - color: cardColor ?? AppColor.blueLight, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), - ), - child: Container( - padding: EdgeInsets.all(4), - decoration: BoxDecoration( - color: cardIconColor, - borderRadius: BorderRadius.circular(8), - ), - child: SvgGenImage.vec(icon).svg( - width: 40.w, - height: 40.h, - colorFilter: color ?? ColorFilter.mode(Colors.white, BlendMode.srcIn), - ), - ), - ), - SizedBox(height: 2), - Text( - title, - style: AppFonts.yekan10.copyWith(color: AppColor.textColor), - textAlign: TextAlign.center, - ), - ], - ), - ); - } - - Widget userInformationBottomSheet() { - return BaseBottomSheet( - height: 750.h, - child: SingleChildScrollView( - child: Column( - spacing: 8, - children: [ - Text( - 'ویرایش اطلاعات هویتی', - style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover), - ), - - Container( - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: AppColor.darkGreyLight, width: 1), - ), - child: Column( - spacing: 12, - children: [ - RTextField( - controller: controller.nameController, - label: 'نام', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - ), - RTextField( - controller: controller.lastNameController, - label: 'نام خانوادگی', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - ), - RTextField( - controller: controller.nationalCodeController, - label: 'شماره شناسنامه', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - ), - RTextField( - controller: controller.nationalIdController, - label: 'کد ملی', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - ), - - ObxValue((data) { - return RTextField( - controller: controller.birthdayController, - label: 'تاریخ تولد', - initText: data.value?.formatCompactDate() ?? '', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - onTap: () {}, - ); - }, controller.birthDate), - - SizedBox(), - ], - ), - ), - SizedBox(), - - Container( - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: AppColor.darkGreyLight, width: 1), - ), - child: Column( - spacing: 8, - children: [ - Text( - 'عکس پروفایل', - style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal), - ), - ObxValue((data) { - return Container( - width: Get.width, - height: 270, - decoration: BoxDecoration( - color: AppColor.lightGreyNormal, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 1, color: AppColor.blackLight), - ), - child: Center( - child: data.value == null - ? Padding( - padding: const EdgeInsets.fromLTRB(30, 10, 10, 30), - child: Image.network( - controller.userProfile.value.data?.image ?? '', - ), - ) - : Image.file(File(data.value!.path), fit: BoxFit.cover), - ), - ); - }, controller.selectedImage), - - Row( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - RElevated( - text: 'گالری', - width: 150.w, - height: 40.h, - textStyle: AppFonts.yekan20.copyWith(color: Colors.white), - onPressed: () async { - controller.selectedImage.value = await controller.imagePicker.pickImage( - source: ImageSource.gallery, - imageQuality: 60, - maxWidth: 1080, - maxHeight: 720, - ); - }, - ), - SizedBox(width: 16), - ROutlinedElevated( - text: 'دوربین', - width: 150.w, - height: 40.h, - textStyle: AppFonts.yekan20.copyWith(color: AppColor.blueNormal), - onPressed: () async { - controller.selectedImage.value = await controller.imagePicker.pickImage( - source: ImageSource.camera, - imageQuality: 60, - maxWidth: 1080, - maxHeight: 720, - ); - }, - ), - ], - ), - ], - ), - ), - Row( - spacing: 16, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - ObxValue((data) { - return RElevated( - height: 40.h, - text: 'ویرایش', - isLoading: data.value, - onPressed: () async { - await controller.updateUserProfile(); - controller.getUserProfile(); - Get.back(); - }, - ); - }, controller.isOnLoading), - ROutlinedElevated( - height: 40.h, - text: 'انصراف', - borderColor: AppColor.blueNormal, - onPressed: () { - Get.back(); - }, - ), - ], - ), - ], - ), - ), - ); - } - - Widget changePasswordBottomSheet() { - return BaseBottomSheet( - height: 400.h, - child: SingleChildScrollView( - child: Form( - key: controller.formKey, - child: Column( - spacing: 8, - children: [ - Text( - 'تغییر رمز عبور', - style: AppFonts.yekan16Bold.copyWith(color: AppColor.darkGreyDarkHover), - ), - SizedBox(), - RTextField( - controller: controller.oldPasswordController, - hintText: 'رمز عبور قبلی', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - validator: (value) { - if (value == null || value.isEmpty) { - return 'رمز عبور را وارد کنید'; - } else if (controller.userProfile.value.data?.password != value) { - return 'رمز عبور صحیح نیست'; - } - return null; - }, - ), - RTextField( - controller: controller.newPasswordController, - hintText: 'رمز عبور جدید', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - validator: (value) { - if (value == null || value.isEmpty) { - return 'رمز عبور را وارد کنید'; - } else if (value.length < 6) { - return 'رمز عبور باید بیش از 6 کارکتر باشد.'; - } - return null; - }, - ), - RTextField( - controller: controller.retryNewPasswordController, - hintText: 'تکرار رمز عبور جدید', - borderColor: AppColor.darkGreyLight, - filledColor: AppColor.bgLight, - filled: true, - validator: (value) { - if (value == null || value.isEmpty) { - return 'رمز عبور را وارد کنید'; - } else if (value.length < 6) { - return 'رمز عبور باید بیش از 6 کارکتر باشد.'; - } else if (controller.newPasswordController.text != value) { - return 'رمز عبور جدید یکسان نیست'; - } - return null; - }, - ), - - SizedBox(), - - Row( - spacing: 16, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - RElevated( - height: 40.h, - text: 'ویرایش', - onPressed: () async { - if (controller.formKey.currentState?.validate() != true) { - return; - } - await controller.updatePassword(); - controller.getUserProfile(); - controller.clearPasswordForm(); - Get.back(); - }, - ), - ROutlinedElevated( - height: 40.h, - text: 'انصراف', - borderColor: AppColor.blueNormal, - onPressed: () { - Get.back(); - }, - ), - ], - ), - ], - ), - ), - ), - ); - } - - Widget exitBottomSheet() { - return BaseBottomSheet( - height: 220.h, - child: SingleChildScrollView( - child: Form( - key: controller.formKey, - child: Column( - spacing: 8, - children: [ - Text('خروج', style: AppFonts.yekan16Bold.copyWith(color: AppColor.error)), - SizedBox(), - Text( - 'آیا مطمئن هستید که می‌خواهید از حساب کاربری خود خارج شوید؟', - textAlign: TextAlign.center, - style: AppFonts.yekan16Bold.copyWith(color: AppColor.textColor), - ), - - SizedBox(), - - Row( - spacing: 16, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - RElevated( - height: 40.h, - text: 'خروج', - backgroundColor: AppColor.error, - onPressed: () async { - await Future.wait([ - controller.tokenService.deleteModuleTokens(Module.chicken), - controller.gService.clearSelectedModule(), - ]).then((value) async { - await removeChickenDI(); - Get.offAllNamed("/moduleList"); - }); - }, - ), - ROutlinedElevated( - height: 40.h, - text: 'انصراف', - borderColor: AppColor.blueNormal, - onPressed: () { - Get.back(); - }, - ), - ], - ), - ], - ), - ), - ), - ); - } - - Widget rolesWidget() { - return ObxValue((data) { - if (data.value.status == ResourceStatus.loading) { - return CupertinoActivityIndicator(); - } else if (data.value.status == ResourceStatus.error) { - return ErrorWidget('خطا در دریافت اطلاعات کاربر'); - } else if (data.value.status == ResourceStatus.success) { - List? item = data.value.data?.roles; - return SingleChildScrollView( - scrollDirection: Axis.horizontal, - padding: EdgeInsets.symmetric(horizontal: 8.w), - physics: BouncingScrollPhysics(), - - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - spacing: 8.w, - children: List.generate(item?.length ?? 0, (index) { - Map tmpRole = getFaUserRoleWithOnTap(item?[index]); - return CustomChip( - isSelected: controller.gService.getRoute(Module.chicken) == tmpRole.values.first, - title: tmpRole.keys.first, - index: index, - onTap: (int p1) { - controller.changeUserRole(tmpRole.values.first); - }, - ); - }), - ), - ); - } else { - return SizedBox.shrink(); - } - }, controller.userLocal); - } -} diff --git a/packages/chicken/lib/features/common/role/logic.dart b/packages/chicken/lib/features/common/role/logic.dart deleted file mode 100644 index 3253738..0000000 --- a/packages/chicken/lib/features/common/role/logic.dart +++ /dev/null @@ -1,18 +0,0 @@ -import 'package:rasadyar_core/core.dart'; - -class RoleLogic extends GetxController { - TokenStorageService tokenService = Get.find(); - GService gService = Get.find(); - RxList roles = [].obs; - - @override - void onInit() { - super.onInit(); - List items = tokenService.getUserLocal(Module.chicken)!.roles ?? []; - if (items.isNotEmpty) { - roles.assignAll(items); - } - } - - -} diff --git a/packages/chicken/lib/features/common/role/view.dart b/packages/chicken/lib/features/common/role/view.dart deleted file mode 100644 index 0f36180..0000000 --- a/packages/chicken/lib/features/common/role/view.dart +++ /dev/null @@ -1,79 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/common/fa_user_role.dart'; -import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; -import 'package:rasadyar_core/core.dart'; - -import 'logic.dart'; - -class RolePage extends GetView { - const RolePage({super.key}); - - @override - Widget build(BuildContext context) { - return ChickenBasePage( - isBase: true, - child: Column( - children: [ - Assets.images.selectRole.image(height: 212.h, width: Get.width.w, fit: BoxFit.cover), - ObxValue((data) { - return Expanded( - child: GridView.builder( - physics: BouncingScrollPhysics(), - gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 3, - mainAxisSpacing: 12.h, - crossAxisSpacing: 12.w, - childAspectRatio: 2, - ), - itemCount: data.length, - hitTestBehavior: HitTestBehavior.opaque, - itemBuilder: (BuildContext context, int index) { - Map role = getFaUserRoleWithOnTap(data[index]); - return roleCard( - title: role.keys.first, - onTap: () async { - try { - String route = role.values.first; - await controller.gService.saveRoute(Module.chicken, route); - - await controller.gService.saveRole(Module.chicken, data[index]); - Get.offAllNamed(route); - } catch (e) { - eLog( - "احتمالا در\n ``getFaUserRoleWithOnTap`` \nروت اش را تعریف نکردی 👻👻 ==>$e ", - ); - } - }, - ); - }, - ), - ); - }, controller.roles), - ], - ), - ); - } -} - -Widget roleCard({required String title, Function()? onTap, int? width, int? height}) { - return Container( - width: width?.w ?? 128.w, - height: height?.h ?? 48.h, - margin: EdgeInsets.all(8.w), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8.r), - border: Border.all(color: AppColor.blueNormal, width: 1.w), - ), - child: InkWell( - onTap: onTap, - child: Center( - child: Text( - title, - style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal), - textAlign: TextAlign.center, - ), - ), - ), - ); -} diff --git a/packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote.dart b/packages/chicken/lib/features/kill_house/data/data_source/remote/kill_house/kill_house_remote.dart similarity index 60% rename from packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote.dart rename to packages/chicken/lib/features/kill_house/data/data_source/remote/kill_house/kill_house_remote.dart index b84f17b..8b1c867 100644 --- a/packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote.dart +++ b/packages/chicken/lib/features/kill_house/data/data_source/remote/kill_house/kill_house_remote.dart @@ -1,9 +1,9 @@ -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart' +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart' as listModel; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; import 'package:rasadyar_core/core.dart'; abstract class KillHouseRemoteDataSource { diff --git a/packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote_impl.dart b/packages/chicken/lib/features/kill_house/data/data_source/remote/kill_house/kill_house_remote_impl.dart similarity index 79% rename from packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote_impl.dart rename to packages/chicken/lib/features/kill_house/data/data_source/remote/kill_house/kill_house_remote_impl.dart index a1282f6..7d50659 100644 --- a/packages/chicken/lib/data/data_source/remote/kill_house/kill_house_remote_impl.dart +++ b/packages/chicken/lib/features/kill_house/data/data_source/remote/kill_house/kill_house_remote_impl.dart @@ -1,10 +1,10 @@ -import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart' +import 'package:rasadyar_chicken/features/kill_house/data/data_source/remote/kill_house/kill_house_remote.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart' as listModel; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; import 'package:rasadyar_core/core.dart'; class KillHouseRemoteDataSourceImpl extends KillHouseRemoteDataSource { diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/request/kill_request_response.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/request/kill_request_response.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/request/kill_request_response.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/request/kill_request_response.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/request/kill_request_response.freezed.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/request/kill_request_response.freezed.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/request/kill_request_response.freezed.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/request/kill_request_response.freezed.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/request/kill_request_response.g.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/request/kill_request_response.g.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/request/kill_request_response.g.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/request/kill_request_response.g.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.freezed.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.freezed.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.freezed.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.freezed.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.g.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.g.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.g.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.g.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.freezed.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.freezed.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.freezed.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.freezed.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.g.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.g.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.g.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.g.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.freezed.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.freezed.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.freezed.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.freezed.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.g.dart b/packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.g.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.g.dart rename to packages/chicken/lib/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.g.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart b/packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart rename to packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.freezed.dart b/packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.freezed.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.freezed.dart rename to packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.freezed.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.g.dart b/packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.g.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.g.dart rename to packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.g.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart b/packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart rename to packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.freezed.dart b/packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.freezed.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.freezed.dart rename to packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.freezed.dart diff --git a/packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.g.dart b/packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.g.dart similarity index 100% rename from packages/chicken/lib/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.g.dart rename to packages/chicken/lib/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.g.dart diff --git a/packages/chicken/lib/data/repositories/kill_house/kill_house_repository.dart b/packages/chicken/lib/features/kill_house/data/repository/kill_house_repository.dart similarity index 57% rename from packages/chicken/lib/data/repositories/kill_house/kill_house_repository.dart rename to packages/chicken/lib/features/kill_house/data/repository/kill_house_repository.dart index 95ded99..50d1b10 100644 --- a/packages/chicken/lib/data/repositories/kill_house/kill_house_repository.dart +++ b/packages/chicken/lib/features/kill_house/data/repository/kill_house_repository.dart @@ -1,11 +1,11 @@ -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/request/kill_request_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart' +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/request/kill_request_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart' as listModel show KillRequestList; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; import 'package:rasadyar_core/data/model/pagination_model/pagination_model.dart'; diff --git a/packages/chicken/lib/data/repositories/kill_house/kill_house_repository_impl.dart b/packages/chicken/lib/features/kill_house/data/repository/kill_house_repository_impl.dart similarity index 70% rename from packages/chicken/lib/data/repositories/kill_house/kill_house_repository_impl.dart rename to packages/chicken/lib/features/kill_house/data/repository/kill_house_repository_impl.dart index d6dfc35..ca61f1d 100644 --- a/packages/chicken/lib/data/repositories/kill_house/kill_house_repository_impl.dart +++ b/packages/chicken/lib/features/kill_house/data/repository/kill_house_repository_impl.dart @@ -1,11 +1,11 @@ -import 'package:rasadyar_chicken/data/data_source/remote/kill_house/kill_house_remote.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/request/kill_request_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart' +import 'package:rasadyar_chicken/features/kill_house/data/data_source/remote/kill_house/kill_house_remote.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/request/kill_request_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart' as ListModel; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; import 'package:rasadyar_core/core.dart'; import 'kill_house_repository.dart'; diff --git a/packages/chicken/lib/features/kill_house/root/logic.dart b/packages/chicken/lib/features/kill_house/root/logic.dart index bd778a0..1afd1aa 100644 --- a/packages/chicken/lib/features/kill_house/root/logic.dart +++ b/packages/chicken/lib/features/kill_house/root/logic.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/data/di/chicken_di.dart'; -import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/repository/kill_house_repository.dart'; import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart'; import 'package:rasadyar_chicken/presentation/routes/pages.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; diff --git a/packages/chicken/lib/features/kill_house/submit_request/logic.dart b/packages/chicken/lib/features/kill_house/submit_request/logic.dart index ed600b6..7bffb42 100644 --- a/packages/chicken/lib/features/kill_house/submit_request/logic.dart +++ b/packages/chicken/lib/features/kill_house/submit_request/logic.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/request/kill_request_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_house/kill_house_response.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart' +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/request/kill_request_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/chicken_commission_prices/chicken_commission_prices.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_house/kill_house_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart' as listModel; import 'package:rasadyar_chicken/features/kill_house/root/logic.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart'; diff --git a/packages/chicken/lib/features/kill_house/submit_request/view.dart b/packages/chicken/lib/features/kill_house/submit_request/view.dart index 18bc36f..52a0de3 100644 --- a/packages/chicken/lib/features/kill_house/submit_request/view.dart +++ b/packages/chicken/lib/features/kill_house/submit_request/view.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/register_request/response/kill_request_list/kill_request_list.dart' +import 'package:rasadyar_chicken/features/kill_house/data/model/register_request/response/kill_request_list/kill_request_list.dart' as listModel show KillRequestList; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; diff --git a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/logic.dart b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/logic.dart index 0e07c55..7a80a51 100644 --- a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/logic.dart +++ b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/logic.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/root/logic.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/view.dart b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/view.dart index 7096209..71d2dd7 100644 --- a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/view.dart +++ b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_entered/view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/logic.dart b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/logic.dart index b13b26c..d1ad64d 100644 --- a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/logic.dart +++ b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/logic.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/root/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/view.dart b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/view.dart index f7271ad..78def48 100644 --- a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/view.dart +++ b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/buy_in_province_waiting/view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_bars/kill_house_bars_response.dart'; import 'package:rasadyar_core/core.dart'; import 'logic.dart'; diff --git a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart index 752eec8..1f675c1 100644 --- a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart +++ b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:rasadyar_chicken/data/di/chicken_di.dart'; -import 'package:rasadyar_chicken/data/models/kill_house_module/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; -import 'package:rasadyar_chicken/data/repositories/kill_house/kill_house_repository.dart'; -import 'package:rasadyar_chicken/features/common/profile/view.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/model/warehouse_and_distribution/response/kill_house_sales_info_dashboard/kill_house_sales_info_dashboard.dart'; +import 'package:rasadyar_chicken/features/kill_house/data/repository/kill_house_repository.dart'; +import 'package:rasadyar_chicken/features/common/presentation/page/profile/view.dart'; import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/buy/view.dart'; import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/home/view.dart'; import 'package:rasadyar_chicken/features/kill_house/warehouse_and_distribution/sale/view.dart'; diff --git a/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json b/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json index 22034ac..4bccc33 100644 --- a/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json +++ b/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json @@ -434,4 +434,3 @@ - diff --git a/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/card_info.dart b/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/card_info.dart index 0ccdc56..3c9dc3b 100644 --- a/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/card_info.dart +++ b/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/card_info.dart @@ -4,7 +4,7 @@ import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/s import 'package:rasadyar_core/core.dart'; Widget farmInfoWidget({ - required CreateInspectionBottomSheetLogic controller, + CreateInspectionBottomSheetLogic? controller, required String title, required Widget child, EdgeInsets? padding, diff --git a/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/step1_page.dart b/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/step1_page.dart index c8883a2..2dfc2ea 100644 --- a/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/step1_page.dart +++ b/packages/chicken/lib/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/step1_page.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/card_info.dart'; diff --git a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart index 19da44e..059c884 100644 --- a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart +++ b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source.dart @@ -12,4 +12,6 @@ abstract class VetFarmRemoteDataSource { required String token, required SubmitInspectionResponse request, }); + + Future>> getSDUIForm({String? token}); } diff --git a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart index 038718d..36596af 100644 --- a/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart +++ b/packages/chicken/lib/features/vet_farm/data/datasources/remote/vet_farm_remote_data_source_impl.dart @@ -36,4 +36,20 @@ class VetFarmRemoteDataSourceImpl implements VetFarmRemoteDataSource { data: request.toJson(), ); } + + @override + Future>> getSDUIForm({String? token}) async { + DioRemote dio = DioRemote(baseUrl: "http://testbackend.rasadyaar.ir/"); + await dio.init(); + + + var res = await dio.get( + 'inspection_form_sd_ui/', + + fromJson: (json) { + return json; + }, + ); + return res; + } } diff --git a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart index 5d55bb7..4048948 100644 --- a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart +++ b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository.dart @@ -12,4 +12,7 @@ abstract class VetFarmRepository { required String token, required SubmitInspectionResponse request, }); + + + Future>> getSDUIForm({String? token}); } diff --git a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart index cfed199..8fcb38e 100644 --- a/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart +++ b/packages/chicken/lib/features/vet_farm/data/repositories/vet_farm_repository_impl.dart @@ -27,4 +27,8 @@ class VetFarmRepositoryImpl implements VetFarmRepository { }) async { return await _remote.submitInspection(token: token, request: request); } + @override + Future>> getSDUIForm({String? token}) async { + return await _remote.getSDUIForm(token: token); + } } diff --git a/packages/chicken/lib/features/vet_farm/presentation/pages/home/logic.dart b/packages/chicken/lib/features/vet_farm/presentation/pages/home/logic.dart index 25da47a..68311e3 100644 --- a/packages/chicken/lib/features/vet_farm/presentation/pages/home/logic.dart +++ b/packages/chicken/lib/features/vet_farm/presentation/pages/home/logic.dart @@ -21,5 +21,10 @@ class VetFarmHomeLogic extends GetxController { route: VetFarmRoutes.newInspectionVetFarm, icon: Assets.vec.activeFramSvg.path, ), + VetFarmHomeItem( + title: "صفحه جدید", + route: VetFarmRoutes.newPageVetFarm, + icon: Assets.vec.activeFramSvg.path, + ), ].obs; } diff --git a/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/logic.dart b/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/logic.dart new file mode 100644 index 0000000..dc85dae --- /dev/null +++ b/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/logic.dart @@ -0,0 +1,46 @@ +import 'package:rasadyar_chicken/features/vet_farm/data/repositories/vet_farm_repository.dart'; +import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.dart'; +import 'package:rasadyar_core/core.dart'; + +class NewPageLogic extends GetxController { + VetFarmRootLogic rootLogic = Get.find(); + + Rxn textFormFieldSDUIModel = + Rxn(); + + @override + void onInit() { + super.onInit(); + + getSDUIForm(); + } + + @override + void onReady() { + super.onReady(); + // Ready logic here + } + + @override + void onClose() { + super.onClose(); + // Cleanup logic here + } + + Future getSDUIForm() async { + await safeCall( + call: () async => await rootLogic.vetFarmRepository.getSDUIForm(), + onSuccess: (result) { + textFormFieldSDUIModel.value = TextFormFieldSDUIModel.fromJson( + result.data ?? {}, + ); + }, + onError: (error, stackTrace) { + print(error); + }, + ); + } + + void onButtonPressed() {} +} diff --git a/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/view.dart b/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/view.dart new file mode 100644 index 0000000..4efea5e --- /dev/null +++ b/packages/chicken/lib/features/vet_farm/presentation/pages/new_page/view.dart @@ -0,0 +1,44 @@ +import 'package:flutter/material.dart'; +import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; +import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; +import 'package:rasadyar_chicken/presentation/widget/sdui/widgets/text_form_filed/text_form_filed_sdui.dart'; +import 'package:rasadyar_core/core.dart'; + +import 'logic.dart'; + +class NewPage extends GetView { + const NewPage({super.key}); + + @override + Widget build(BuildContext context) { + return ChickenBasePage( + hasBack: true, + backId: vetFarmActionKey, + child: contentWidget(), + ); + } + + Widget contentWidget() { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ObxValue((data) { + if (data.value == null) { + return const SizedBox.shrink(); + } + return textFormFiledSDUI(model: data.value!); + }, controller.textFormFieldSDUIModel), + + SizedBox(height: 24.h), + RElevated( + text: 'دکمه نمونه', + onPressed: () { + controller.onButtonPressed(); + }, + ), + ], + ), + ); + } +} diff --git a/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart b/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart index 2e889a7..36ea705 100644 --- a/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart +++ b/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart @@ -7,6 +7,8 @@ import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/active_hat import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/active_hatching/view.dart'; import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/new_inspection/logic.dart'; import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/new_inspection/view.dart'; +import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/new_page/logic.dart'; +import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/new_page/view.dart'; import 'package:rasadyar_chicken/features/vet_farm/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/routes/global_binding.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart'; @@ -72,5 +74,18 @@ class VetFarmPages { }), ], ), + GetPage( + name: VetFarmRoutes.newPageVetFarm, + page: () => NewPage(), + middlewares: [AuthMiddleware()], + bindings: [ + GlobalBinding(), + + BindingsBuilder(() { + Get.lazyPut(() => NewPageLogic()); + }), + + ], + ), ]; } diff --git a/packages/chicken/lib/features/vet_farm/presentation/routes/routes.dart b/packages/chicken/lib/features/vet_farm/presentation/routes/routes.dart index 8021045..eae3e06 100644 --- a/packages/chicken/lib/features/vet_farm/presentation/routes/routes.dart +++ b/packages/chicken/lib/features/vet_farm/presentation/routes/routes.dart @@ -7,4 +7,5 @@ sealed class VetFarmRoutes { static const actionVetFarm = '$_base/action'; static const activeHatchingVetFarm = '$_base/activeHatching'; static const newInspectionVetFarm = '$_base/newInspection'; + static const newPageVetFarm = '$_base/newPage'; } diff --git a/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget.dart b/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget.dart new file mode 100644 index 0000000..e69de29 diff --git a/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget_controller.dart b/packages/chicken/lib/presentation/widget/sdui/form/sdui_form_widget_controller.dart new file mode 100644 index 0000000..e69de29 diff --git a/packages/chicken/lib/presentation/widget/sdui/sdui.json b/packages/chicken/lib/presentation/widget/sdui/sdui.json new file mode 100644 index 0000000..a053d9d --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/sdui.json @@ -0,0 +1,13 @@ +{ + "type": "card_label_item", + "visible": true, + "data": { + "title": "اطلاعات مزرعه", + "padding_horizontal": 12.0, + "padding_vertical": 11.0 + }, + "child": { + + } +} + diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/card_label_item_sdui.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/card_label_item_sdui.dart new file mode 100644 index 0000000..7c13098 --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/card_label_item_sdui.dart @@ -0,0 +1,60 @@ +import 'package:rasadyar_core/core.dart'; + +import 'model/card_label_item_sdui_model.dart'; +import 'package:flutter/material.dart'; + +Widget cardLabelItemSDUI({required CardLabelItemSDUI model}) { + return farmInfoWidget( + title: model.data?.title ?? '', + child: Container(), + padding: + model.data?.paddingHorizontal != null && + model.data?.paddingVertical != null + ? EdgeInsets.symmetric( + horizontal: model.data?.paddingHorizontal ?? 0, + vertical: model.data?.paddingVertical ?? 0, + ) + : null, + ); +} + +Widget farmInfoWidget({ + required String title, + required Widget child, + EdgeInsets? padding, +}) { + return Stack( + clipBehavior: Clip.none, + children: [ + Positioned.fill( + child: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.50, color: AppColor.mediumGrey), + ), + + padding: + padding ?? EdgeInsets.symmetric(horizontal: 12.w, vertical: 11.h), + child: child, + ), + ), + Positioned( + top: -17, + right: 7, + child: Container( + padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 5.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.50, color: AppColor.mediumGrey), + ), + child: Text( + title, + style: AppFonts.yekan14.copyWith(color: AppColor.iconColor), + ), + ), + ), + ], + ); +} diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.dart new file mode 100644 index 0000000..708af85 --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.dart @@ -0,0 +1,29 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'card_label_item_sdui_model.freezed.dart'; +part 'card_label_item_sdui_model.g.dart'; + +@freezed +abstract class CardLabelItemSDUI with _$CardLabelItemSDUI { + const factory CardLabelItemSDUI({ + String? type, + bool? visible, + CardLabelItemData? data, + Map? child, + }) = _CardLabelItemSDUI; + + factory CardLabelItemSDUI.fromJson(Map json) => + _$CardLabelItemSDUIFromJson(json); +} + +@freezed +abstract class CardLabelItemData with _$CardLabelItemData { + const factory CardLabelItemData({ + String? title, + double? paddingHorizontal, + double? paddingVertical, + }) = _CardLabelItemData; + + factory CardLabelItemData.fromJson(Map json) => + _$CardLabelItemDataFromJson(json); +} diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.freezed.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.freezed.dart new file mode 100644 index 0000000..d543d51 --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.freezed.dart @@ -0,0 +1,587 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'card_label_item_sdui_model.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +// dart format off +T _$identity(T value) => value; + +/// @nodoc +mixin _$CardLabelItemSDUI { + + String? get type; bool? get visible; CardLabelItemData? get data; Map? get child; +/// Create a copy of CardLabelItemSDUI +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$CardLabelItemSDUICopyWith get copyWith => _$CardLabelItemSDUICopyWithImpl(this as CardLabelItemSDUI, _$identity); + + /// Serializes this CardLabelItemSDUI to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is CardLabelItemSDUI&&(identical(other.type, type) || other.type == type)&&(identical(other.visible, visible) || other.visible == visible)&&(identical(other.data, data) || other.data == data)&&const DeepCollectionEquality().equals(other.child, child)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,type,visible,data,const DeepCollectionEquality().hash(child)); + +@override +String toString() { + return 'CardLabelItemSDUI(type: $type, visible: $visible, data: $data, child: $child)'; +} + + +} + +/// @nodoc +abstract mixin class $CardLabelItemSDUICopyWith<$Res> { + factory $CardLabelItemSDUICopyWith(CardLabelItemSDUI value, $Res Function(CardLabelItemSDUI) _then) = _$CardLabelItemSDUICopyWithImpl; +@useResult +$Res call({ + String? type, bool? visible, CardLabelItemData? data, Map? child +}); + + +$CardLabelItemDataCopyWith<$Res>? get data; + +} +/// @nodoc +class _$CardLabelItemSDUICopyWithImpl<$Res> + implements $CardLabelItemSDUICopyWith<$Res> { + _$CardLabelItemSDUICopyWithImpl(this._self, this._then); + + final CardLabelItemSDUI _self; + final $Res Function(CardLabelItemSDUI) _then; + +/// Create a copy of CardLabelItemSDUI +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? type = freezed,Object? visible = freezed,Object? data = freezed,Object? child = freezed,}) { + return _then(_self.copyWith( +type: freezed == type ? _self.type : type // ignore: cast_nullable_to_non_nullable +as String?,visible: freezed == visible ? _self.visible : visible // ignore: cast_nullable_to_non_nullable +as bool?,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable +as CardLabelItemData?,child: freezed == child ? _self.child : child // ignore: cast_nullable_to_non_nullable +as Map?, + )); +} +/// Create a copy of CardLabelItemSDUI +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$CardLabelItemDataCopyWith<$Res>? get data { + if (_self.data == null) { + return null; + } + + return $CardLabelItemDataCopyWith<$Res>(_self.data!, (value) { + return _then(_self.copyWith(data: value)); + }); +} +} + + +/// Adds pattern-matching-related methods to [CardLabelItemSDUI]. +extension CardLabelItemSDUIPatterns on CardLabelItemSDUI { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _CardLabelItemSDUI value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _CardLabelItemSDUI() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _CardLabelItemSDUI value) $default,){ +final _that = this; +switch (_that) { +case _CardLabelItemSDUI(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _CardLabelItemSDUI value)? $default,){ +final _that = this; +switch (_that) { +case _CardLabelItemSDUI() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( String? type, bool? visible, CardLabelItemData? data, Map? child)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _CardLabelItemSDUI() when $default != null: +return $default(_that.type,_that.visible,_that.data,_that.child);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( String? type, bool? visible, CardLabelItemData? data, Map? child) $default,) {final _that = this; +switch (_that) { +case _CardLabelItemSDUI(): +return $default(_that.type,_that.visible,_that.data,_that.child);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? type, bool? visible, CardLabelItemData? data, Map? child)? $default,) {final _that = this; +switch (_that) { +case _CardLabelItemSDUI() when $default != null: +return $default(_that.type,_that.visible,_that.data,_that.child);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _CardLabelItemSDUI implements CardLabelItemSDUI { + const _CardLabelItemSDUI({this.type, this.visible, this.data, final Map? child}): _child = child; + factory _CardLabelItemSDUI.fromJson(Map json) => _$CardLabelItemSDUIFromJson(json); + +@override final String? type; +@override final bool? visible; +@override final CardLabelItemData? data; + final Map? _child; +@override Map? get child { + final value = _child; + if (value == null) return null; + if (_child is EqualUnmodifiableMapView) return _child; + // ignore: implicit_dynamic_type + return EqualUnmodifiableMapView(value); +} + + +/// Create a copy of CardLabelItemSDUI +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$CardLabelItemSDUICopyWith<_CardLabelItemSDUI> get copyWith => __$CardLabelItemSDUICopyWithImpl<_CardLabelItemSDUI>(this, _$identity); + +@override +Map toJson() { + return _$CardLabelItemSDUIToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _CardLabelItemSDUI&&(identical(other.type, type) || other.type == type)&&(identical(other.visible, visible) || other.visible == visible)&&(identical(other.data, data) || other.data == data)&&const DeepCollectionEquality().equals(other._child, _child)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,type,visible,data,const DeepCollectionEquality().hash(_child)); + +@override +String toString() { + return 'CardLabelItemSDUI(type: $type, visible: $visible, data: $data, child: $child)'; +} + + +} + +/// @nodoc +abstract mixin class _$CardLabelItemSDUICopyWith<$Res> implements $CardLabelItemSDUICopyWith<$Res> { + factory _$CardLabelItemSDUICopyWith(_CardLabelItemSDUI value, $Res Function(_CardLabelItemSDUI) _then) = __$CardLabelItemSDUICopyWithImpl; +@override @useResult +$Res call({ + String? type, bool? visible, CardLabelItemData? data, Map? child +}); + + +@override $CardLabelItemDataCopyWith<$Res>? get data; + +} +/// @nodoc +class __$CardLabelItemSDUICopyWithImpl<$Res> + implements _$CardLabelItemSDUICopyWith<$Res> { + __$CardLabelItemSDUICopyWithImpl(this._self, this._then); + + final _CardLabelItemSDUI _self; + final $Res Function(_CardLabelItemSDUI) _then; + +/// Create a copy of CardLabelItemSDUI +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? type = freezed,Object? visible = freezed,Object? data = freezed,Object? child = freezed,}) { + return _then(_CardLabelItemSDUI( +type: freezed == type ? _self.type : type // ignore: cast_nullable_to_non_nullable +as String?,visible: freezed == visible ? _self.visible : visible // ignore: cast_nullable_to_non_nullable +as bool?,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable +as CardLabelItemData?,child: freezed == child ? _self._child : child // ignore: cast_nullable_to_non_nullable +as Map?, + )); +} + +/// Create a copy of CardLabelItemSDUI +/// with the given fields replaced by the non-null parameter values. +@override +@pragma('vm:prefer-inline') +$CardLabelItemDataCopyWith<$Res>? get data { + if (_self.data == null) { + return null; + } + + return $CardLabelItemDataCopyWith<$Res>(_self.data!, (value) { + return _then(_self.copyWith(data: value)); + }); +} +} + + +/// @nodoc +mixin _$CardLabelItemData { + + String? get title; double? get paddingHorizontal; double? get paddingVertical; +/// Create a copy of CardLabelItemData +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$CardLabelItemDataCopyWith get copyWith => _$CardLabelItemDataCopyWithImpl(this as CardLabelItemData, _$identity); + + /// Serializes this CardLabelItemData to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is CardLabelItemData&&(identical(other.title, title) || other.title == title)&&(identical(other.paddingHorizontal, paddingHorizontal) || other.paddingHorizontal == paddingHorizontal)&&(identical(other.paddingVertical, paddingVertical) || other.paddingVertical == paddingVertical)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,title,paddingHorizontal,paddingVertical); + +@override +String toString() { + return 'CardLabelItemData(title: $title, paddingHorizontal: $paddingHorizontal, paddingVertical: $paddingVertical)'; +} + + +} + +/// @nodoc +abstract mixin class $CardLabelItemDataCopyWith<$Res> { + factory $CardLabelItemDataCopyWith(CardLabelItemData value, $Res Function(CardLabelItemData) _then) = _$CardLabelItemDataCopyWithImpl; +@useResult +$Res call({ + String? title, double? paddingHorizontal, double? paddingVertical +}); + + + + +} +/// @nodoc +class _$CardLabelItemDataCopyWithImpl<$Res> + implements $CardLabelItemDataCopyWith<$Res> { + _$CardLabelItemDataCopyWithImpl(this._self, this._then); + + final CardLabelItemData _self; + final $Res Function(CardLabelItemData) _then; + +/// Create a copy of CardLabelItemData +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? title = freezed,Object? paddingHorizontal = freezed,Object? paddingVertical = freezed,}) { + return _then(_self.copyWith( +title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable +as String?,paddingHorizontal: freezed == paddingHorizontal ? _self.paddingHorizontal : paddingHorizontal // ignore: cast_nullable_to_non_nullable +as double?,paddingVertical: freezed == paddingVertical ? _self.paddingVertical : paddingVertical // ignore: cast_nullable_to_non_nullable +as double?, + )); +} + +} + + +/// Adds pattern-matching-related methods to [CardLabelItemData]. +extension CardLabelItemDataPatterns on CardLabelItemData { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _CardLabelItemData value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _CardLabelItemData() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _CardLabelItemData value) $default,){ +final _that = this; +switch (_that) { +case _CardLabelItemData(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _CardLabelItemData value)? $default,){ +final _that = this; +switch (_that) { +case _CardLabelItemData() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( String? title, double? paddingHorizontal, double? paddingVertical)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _CardLabelItemData() when $default != null: +return $default(_that.title,_that.paddingHorizontal,_that.paddingVertical);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( String? title, double? paddingHorizontal, double? paddingVertical) $default,) {final _that = this; +switch (_that) { +case _CardLabelItemData(): +return $default(_that.title,_that.paddingHorizontal,_that.paddingVertical);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? title, double? paddingHorizontal, double? paddingVertical)? $default,) {final _that = this; +switch (_that) { +case _CardLabelItemData() when $default != null: +return $default(_that.title,_that.paddingHorizontal,_that.paddingVertical);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _CardLabelItemData implements CardLabelItemData { + const _CardLabelItemData({this.title, this.paddingHorizontal, this.paddingVertical}); + factory _CardLabelItemData.fromJson(Map json) => _$CardLabelItemDataFromJson(json); + +@override final String? title; +@override final double? paddingHorizontal; +@override final double? paddingVertical; + +/// Create a copy of CardLabelItemData +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$CardLabelItemDataCopyWith<_CardLabelItemData> get copyWith => __$CardLabelItemDataCopyWithImpl<_CardLabelItemData>(this, _$identity); + +@override +Map toJson() { + return _$CardLabelItemDataToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _CardLabelItemData&&(identical(other.title, title) || other.title == title)&&(identical(other.paddingHorizontal, paddingHorizontal) || other.paddingHorizontal == paddingHorizontal)&&(identical(other.paddingVertical, paddingVertical) || other.paddingVertical == paddingVertical)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,title,paddingHorizontal,paddingVertical); + +@override +String toString() { + return 'CardLabelItemData(title: $title, paddingHorizontal: $paddingHorizontal, paddingVertical: $paddingVertical)'; +} + + +} + +/// @nodoc +abstract mixin class _$CardLabelItemDataCopyWith<$Res> implements $CardLabelItemDataCopyWith<$Res> { + factory _$CardLabelItemDataCopyWith(_CardLabelItemData value, $Res Function(_CardLabelItemData) _then) = __$CardLabelItemDataCopyWithImpl; +@override @useResult +$Res call({ + String? title, double? paddingHorizontal, double? paddingVertical +}); + + + + +} +/// @nodoc +class __$CardLabelItemDataCopyWithImpl<$Res> + implements _$CardLabelItemDataCopyWith<$Res> { + __$CardLabelItemDataCopyWithImpl(this._self, this._then); + + final _CardLabelItemData _self; + final $Res Function(_CardLabelItemData) _then; + +/// Create a copy of CardLabelItemData +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? title = freezed,Object? paddingHorizontal = freezed,Object? paddingVertical = freezed,}) { + return _then(_CardLabelItemData( +title: freezed == title ? _self.title : title // ignore: cast_nullable_to_non_nullable +as String?,paddingHorizontal: freezed == paddingHorizontal ? _self.paddingHorizontal : paddingHorizontal // ignore: cast_nullable_to_non_nullable +as double?,paddingVertical: freezed == paddingVertical ? _self.paddingVertical : paddingVertical // ignore: cast_nullable_to_non_nullable +as double?, + )); +} + + +} + +// dart format on diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.g.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.g.dart new file mode 100644 index 0000000..c3d8878 --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/model/card_label_item_sdui_model.g.dart @@ -0,0 +1,39 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'card_label_item_sdui_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_CardLabelItemSDUI _$CardLabelItemSDUIFromJson(Map json) => + _CardLabelItemSDUI( + type: json['type'] as String?, + visible: json['visible'] as bool?, + data: json['data'] == null + ? null + : CardLabelItemData.fromJson(json['data'] as Map), + child: json['child'] as Map?, + ); + +Map _$CardLabelItemSDUIToJson(_CardLabelItemSDUI instance) => + { + 'type': instance.type, + 'visible': instance.visible, + 'data': instance.data, + 'child': instance.child, + }; + +_CardLabelItemData _$CardLabelItemDataFromJson(Map json) => + _CardLabelItemData( + title: json['title'] as String?, + paddingHorizontal: (json['padding_horizontal'] as num?)?.toDouble(), + paddingVertical: (json['padding_vertical'] as num?)?.toDouble(), + ); + +Map _$CardLabelItemDataToJson(_CardLabelItemData instance) => + { + 'title': instance.title, + 'padding_horizontal': instance.paddingHorizontal, + 'padding_vertical': instance.paddingVertical, + }; diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/sdui.json b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/sdui.json new file mode 100644 index 0000000..a053d9d --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/card_label_item/sdui.json @@ -0,0 +1,13 @@ +{ + "type": "card_label_item", + "visible": true, + "data": { + "title": "اطلاعات مزرعه", + "padding_horizontal": 12.0, + "padding_vertical": 11.0 + }, + "child": { + + } +} + diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.dart new file mode 100644 index 0000000..4d90416 --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.dart @@ -0,0 +1,29 @@ +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'text_form_field_sdui_model.freezed.dart'; +part 'text_form_field_sdui_model.g.dart'; + +@freezed +abstract class TextFormFieldSDUIModel with _$TextFormFieldSDUIModel { + const factory TextFormFieldSDUIModel({ + String? key, + String? label, + String? hintText, + String? variant, + String? keyboardType, + String? value, + int? maxLength, + int? minLine, + int? maxLine, + bool? required, + bool? enabled, + bool? readonly, + bool? commaSperator, + bool? decimal, + int? decimalPlaces, + String? type, + }) = _TextFormFieldSDUIModel; + + factory TextFormFieldSDUIModel.fromJson(Map json) => + _$TextFormFieldSDUIModelFromJson(json); +} diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.freezed.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.freezed.dart new file mode 100644 index 0000000..5129a0f --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.freezed.dart @@ -0,0 +1,322 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND +// coverage:ignore-file +// ignore_for_file: type=lint +// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark + +part of 'text_form_field_sdui_model.dart'; + +// ************************************************************************** +// FreezedGenerator +// ************************************************************************** + +// dart format off +T _$identity(T value) => value; + +/// @nodoc +mixin _$TextFormFieldSDUIModel { + + String? get key; String? get label; String? get hintText; String? get variant; String? get keyboardType; String? get value; int? get maxLength; int? get minLine; int? get maxLine; bool? get required; bool? get enabled; bool? get readonly; bool? get commaSperator; bool? get decimal; int? get decimalPlaces; String? get type; +/// Create a copy of TextFormFieldSDUIModel +/// with the given fields replaced by the non-null parameter values. +@JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +$TextFormFieldSDUIModelCopyWith get copyWith => _$TextFormFieldSDUIModelCopyWithImpl(this as TextFormFieldSDUIModel, _$identity); + + /// Serializes this TextFormFieldSDUIModel to a JSON map. + Map toJson(); + + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is TextFormFieldSDUIModel&&(identical(other.key, key) || other.key == key)&&(identical(other.label, label) || other.label == label)&&(identical(other.hintText, hintText) || other.hintText == hintText)&&(identical(other.variant, variant) || other.variant == variant)&&(identical(other.keyboardType, keyboardType) || other.keyboardType == keyboardType)&&(identical(other.value, value) || other.value == value)&&(identical(other.maxLength, maxLength) || other.maxLength == maxLength)&&(identical(other.minLine, minLine) || other.minLine == minLine)&&(identical(other.maxLine, maxLine) || other.maxLine == maxLine)&&(identical(other.required, required) || other.required == required)&&(identical(other.enabled, enabled) || other.enabled == enabled)&&(identical(other.readonly, readonly) || other.readonly == readonly)&&(identical(other.commaSperator, commaSperator) || other.commaSperator == commaSperator)&&(identical(other.decimal, decimal) || other.decimal == decimal)&&(identical(other.decimalPlaces, decimalPlaces) || other.decimalPlaces == decimalPlaces)&&(identical(other.type, type) || other.type == type)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,key,label,hintText,variant,keyboardType,value,maxLength,minLine,maxLine,required,enabled,readonly,commaSperator,decimal,decimalPlaces,type); + +@override +String toString() { + return 'TextFormFieldSDUIModel(key: $key, label: $label, hintText: $hintText, variant: $variant, keyboardType: $keyboardType, value: $value, maxLength: $maxLength, minLine: $minLine, maxLine: $maxLine, required: $required, enabled: $enabled, readonly: $readonly, commaSperator: $commaSperator, decimal: $decimal, decimalPlaces: $decimalPlaces, type: $type)'; +} + + +} + +/// @nodoc +abstract mixin class $TextFormFieldSDUIModelCopyWith<$Res> { + factory $TextFormFieldSDUIModelCopyWith(TextFormFieldSDUIModel value, $Res Function(TextFormFieldSDUIModel) _then) = _$TextFormFieldSDUIModelCopyWithImpl; +@useResult +$Res call({ + String? key, String? label, String? hintText, String? variant, String? keyboardType, String? value, int? maxLength, int? minLine, int? maxLine, bool? required, bool? enabled, bool? readonly, bool? commaSperator, bool? decimal, int? decimalPlaces, String? type +}); + + + + +} +/// @nodoc +class _$TextFormFieldSDUIModelCopyWithImpl<$Res> + implements $TextFormFieldSDUIModelCopyWith<$Res> { + _$TextFormFieldSDUIModelCopyWithImpl(this._self, this._then); + + final TextFormFieldSDUIModel _self; + final $Res Function(TextFormFieldSDUIModel) _then; + +/// Create a copy of TextFormFieldSDUIModel +/// with the given fields replaced by the non-null parameter values. +@pragma('vm:prefer-inline') @override $Res call({Object? key = freezed,Object? label = freezed,Object? hintText = freezed,Object? variant = freezed,Object? keyboardType = freezed,Object? value = freezed,Object? maxLength = freezed,Object? minLine = freezed,Object? maxLine = freezed,Object? required = freezed,Object? enabled = freezed,Object? readonly = freezed,Object? commaSperator = freezed,Object? decimal = freezed,Object? decimalPlaces = freezed,Object? type = freezed,}) { + return _then(_self.copyWith( +key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable +as String?,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable +as String?,hintText: freezed == hintText ? _self.hintText : hintText // ignore: cast_nullable_to_non_nullable +as String?,variant: freezed == variant ? _self.variant : variant // ignore: cast_nullable_to_non_nullable +as String?,keyboardType: freezed == keyboardType ? _self.keyboardType : keyboardType // ignore: cast_nullable_to_non_nullable +as String?,value: freezed == value ? _self.value : value // ignore: cast_nullable_to_non_nullable +as String?,maxLength: freezed == maxLength ? _self.maxLength : maxLength // ignore: cast_nullable_to_non_nullable +as int?,minLine: freezed == minLine ? _self.minLine : minLine // ignore: cast_nullable_to_non_nullable +as int?,maxLine: freezed == maxLine ? _self.maxLine : maxLine // ignore: cast_nullable_to_non_nullable +as int?,required: freezed == required ? _self.required : required // ignore: cast_nullable_to_non_nullable +as bool?,enabled: freezed == enabled ? _self.enabled : enabled // ignore: cast_nullable_to_non_nullable +as bool?,readonly: freezed == readonly ? _self.readonly : readonly // ignore: cast_nullable_to_non_nullable +as bool?,commaSperator: freezed == commaSperator ? _self.commaSperator : commaSperator // ignore: cast_nullable_to_non_nullable +as bool?,decimal: freezed == decimal ? _self.decimal : decimal // ignore: cast_nullable_to_non_nullable +as bool?,decimalPlaces: freezed == decimalPlaces ? _self.decimalPlaces : decimalPlaces // ignore: cast_nullable_to_non_nullable +as int?,type: freezed == type ? _self.type : type // ignore: cast_nullable_to_non_nullable +as String?, + )); +} + +} + + +/// Adds pattern-matching-related methods to [TextFormFieldSDUIModel]. +extension TextFormFieldSDUIModelPatterns on TextFormFieldSDUIModel { +/// A variant of `map` that fallback to returning `orElse`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeMap(TResult Function( _TextFormFieldSDUIModel value)? $default,{required TResult orElse(),}){ +final _that = this; +switch (_that) { +case _TextFormFieldSDUIModel() when $default != null: +return $default(_that);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// Callbacks receives the raw object, upcasted. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case final Subclass2 value: +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult map(TResult Function( _TextFormFieldSDUIModel value) $default,){ +final _that = this; +switch (_that) { +case _TextFormFieldSDUIModel(): +return $default(_that);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `map` that fallback to returning `null`. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case final Subclass value: +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? mapOrNull(TResult? Function( _TextFormFieldSDUIModel value)? $default,){ +final _that = this; +switch (_that) { +case _TextFormFieldSDUIModel() when $default != null: +return $default(_that);case _: + return null; + +} +} +/// A variant of `when` that fallback to an `orElse` callback. +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return orElse(); +/// } +/// ``` + +@optionalTypeArgs TResult maybeWhen(TResult Function( String? key, String? label, String? hintText, String? variant, String? keyboardType, String? value, int? maxLength, int? minLine, int? maxLine, bool? required, bool? enabled, bool? readonly, bool? commaSperator, bool? decimal, int? decimalPlaces, String? type)? $default,{required TResult orElse(),}) {final _that = this; +switch (_that) { +case _TextFormFieldSDUIModel() when $default != null: +return $default(_that.key,_that.label,_that.hintText,_that.variant,_that.keyboardType,_that.value,_that.maxLength,_that.minLine,_that.maxLine,_that.required,_that.enabled,_that.readonly,_that.commaSperator,_that.decimal,_that.decimalPlaces,_that.type);case _: + return orElse(); + +} +} +/// A `switch`-like method, using callbacks. +/// +/// As opposed to `map`, this offers destructuring. +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case Subclass2(:final field2): +/// return ...; +/// } +/// ``` + +@optionalTypeArgs TResult when(TResult Function( String? key, String? label, String? hintText, String? variant, String? keyboardType, String? value, int? maxLength, int? minLine, int? maxLine, bool? required, bool? enabled, bool? readonly, bool? commaSperator, bool? decimal, int? decimalPlaces, String? type) $default,) {final _that = this; +switch (_that) { +case _TextFormFieldSDUIModel(): +return $default(_that.key,_that.label,_that.hintText,_that.variant,_that.keyboardType,_that.value,_that.maxLength,_that.minLine,_that.maxLine,_that.required,_that.enabled,_that.readonly,_that.commaSperator,_that.decimal,_that.decimalPlaces,_that.type);case _: + throw StateError('Unexpected subclass'); + +} +} +/// A variant of `when` that fallback to returning `null` +/// +/// It is equivalent to doing: +/// ```dart +/// switch (sealedClass) { +/// case Subclass(:final field): +/// return ...; +/// case _: +/// return null; +/// } +/// ``` + +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? key, String? label, String? hintText, String? variant, String? keyboardType, String? value, int? maxLength, int? minLine, int? maxLine, bool? required, bool? enabled, bool? readonly, bool? commaSperator, bool? decimal, int? decimalPlaces, String? type)? $default,) {final _that = this; +switch (_that) { +case _TextFormFieldSDUIModel() when $default != null: +return $default(_that.key,_that.label,_that.hintText,_that.variant,_that.keyboardType,_that.value,_that.maxLength,_that.minLine,_that.maxLine,_that.required,_that.enabled,_that.readonly,_that.commaSperator,_that.decimal,_that.decimalPlaces,_that.type);case _: + return null; + +} +} + +} + +/// @nodoc +@JsonSerializable() + +class _TextFormFieldSDUIModel implements TextFormFieldSDUIModel { + const _TextFormFieldSDUIModel({this.key, this.label, this.hintText, this.variant, this.keyboardType, this.value, this.maxLength, this.minLine, this.maxLine, this.required, this.enabled, this.readonly, this.commaSperator, this.decimal, this.decimalPlaces, this.type}); + factory _TextFormFieldSDUIModel.fromJson(Map json) => _$TextFormFieldSDUIModelFromJson(json); + +@override final String? key; +@override final String? label; +@override final String? hintText; +@override final String? variant; +@override final String? keyboardType; +@override final String? value; +@override final int? maxLength; +@override final int? minLine; +@override final int? maxLine; +@override final bool? required; +@override final bool? enabled; +@override final bool? readonly; +@override final bool? commaSperator; +@override final bool? decimal; +@override final int? decimalPlaces; +@override final String? type; + +/// Create a copy of TextFormFieldSDUIModel +/// with the given fields replaced by the non-null parameter values. +@override @JsonKey(includeFromJson: false, includeToJson: false) +@pragma('vm:prefer-inline') +_$TextFormFieldSDUIModelCopyWith<_TextFormFieldSDUIModel> get copyWith => __$TextFormFieldSDUIModelCopyWithImpl<_TextFormFieldSDUIModel>(this, _$identity); + +@override +Map toJson() { + return _$TextFormFieldSDUIModelToJson(this, ); +} + +@override +bool operator ==(Object other) { + return identical(this, other) || (other.runtimeType == runtimeType&&other is _TextFormFieldSDUIModel&&(identical(other.key, key) || other.key == key)&&(identical(other.label, label) || other.label == label)&&(identical(other.hintText, hintText) || other.hintText == hintText)&&(identical(other.variant, variant) || other.variant == variant)&&(identical(other.keyboardType, keyboardType) || other.keyboardType == keyboardType)&&(identical(other.value, value) || other.value == value)&&(identical(other.maxLength, maxLength) || other.maxLength == maxLength)&&(identical(other.minLine, minLine) || other.minLine == minLine)&&(identical(other.maxLine, maxLine) || other.maxLine == maxLine)&&(identical(other.required, required) || other.required == required)&&(identical(other.enabled, enabled) || other.enabled == enabled)&&(identical(other.readonly, readonly) || other.readonly == readonly)&&(identical(other.commaSperator, commaSperator) || other.commaSperator == commaSperator)&&(identical(other.decimal, decimal) || other.decimal == decimal)&&(identical(other.decimalPlaces, decimalPlaces) || other.decimalPlaces == decimalPlaces)&&(identical(other.type, type) || other.type == type)); +} + +@JsonKey(includeFromJson: false, includeToJson: false) +@override +int get hashCode => Object.hash(runtimeType,key,label,hintText,variant,keyboardType,value,maxLength,minLine,maxLine,required,enabled,readonly,commaSperator,decimal,decimalPlaces,type); + +@override +String toString() { + return 'TextFormFieldSDUIModel(key: $key, label: $label, hintText: $hintText, variant: $variant, keyboardType: $keyboardType, value: $value, maxLength: $maxLength, minLine: $minLine, maxLine: $maxLine, required: $required, enabled: $enabled, readonly: $readonly, commaSperator: $commaSperator, decimal: $decimal, decimalPlaces: $decimalPlaces, type: $type)'; +} + + +} + +/// @nodoc +abstract mixin class _$TextFormFieldSDUIModelCopyWith<$Res> implements $TextFormFieldSDUIModelCopyWith<$Res> { + factory _$TextFormFieldSDUIModelCopyWith(_TextFormFieldSDUIModel value, $Res Function(_TextFormFieldSDUIModel) _then) = __$TextFormFieldSDUIModelCopyWithImpl; +@override @useResult +$Res call({ + String? key, String? label, String? hintText, String? variant, String? keyboardType, String? value, int? maxLength, int? minLine, int? maxLine, bool? required, bool? enabled, bool? readonly, bool? commaSperator, bool? decimal, int? decimalPlaces, String? type +}); + + + + +} +/// @nodoc +class __$TextFormFieldSDUIModelCopyWithImpl<$Res> + implements _$TextFormFieldSDUIModelCopyWith<$Res> { + __$TextFormFieldSDUIModelCopyWithImpl(this._self, this._then); + + final _TextFormFieldSDUIModel _self; + final $Res Function(_TextFormFieldSDUIModel) _then; + +/// Create a copy of TextFormFieldSDUIModel +/// with the given fields replaced by the non-null parameter values. +@override @pragma('vm:prefer-inline') $Res call({Object? key = freezed,Object? label = freezed,Object? hintText = freezed,Object? variant = freezed,Object? keyboardType = freezed,Object? value = freezed,Object? maxLength = freezed,Object? minLine = freezed,Object? maxLine = freezed,Object? required = freezed,Object? enabled = freezed,Object? readonly = freezed,Object? commaSperator = freezed,Object? decimal = freezed,Object? decimalPlaces = freezed,Object? type = freezed,}) { + return _then(_TextFormFieldSDUIModel( +key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable +as String?,label: freezed == label ? _self.label : label // ignore: cast_nullable_to_non_nullable +as String?,hintText: freezed == hintText ? _self.hintText : hintText // ignore: cast_nullable_to_non_nullable +as String?,variant: freezed == variant ? _self.variant : variant // ignore: cast_nullable_to_non_nullable +as String?,keyboardType: freezed == keyboardType ? _self.keyboardType : keyboardType // ignore: cast_nullable_to_non_nullable +as String?,value: freezed == value ? _self.value : value // ignore: cast_nullable_to_non_nullable +as String?,maxLength: freezed == maxLength ? _self.maxLength : maxLength // ignore: cast_nullable_to_non_nullable +as int?,minLine: freezed == minLine ? _self.minLine : minLine // ignore: cast_nullable_to_non_nullable +as int?,maxLine: freezed == maxLine ? _self.maxLine : maxLine // ignore: cast_nullable_to_non_nullable +as int?,required: freezed == required ? _self.required : required // ignore: cast_nullable_to_non_nullable +as bool?,enabled: freezed == enabled ? _self.enabled : enabled // ignore: cast_nullable_to_non_nullable +as bool?,readonly: freezed == readonly ? _self.readonly : readonly // ignore: cast_nullable_to_non_nullable +as bool?,commaSperator: freezed == commaSperator ? _self.commaSperator : commaSperator // ignore: cast_nullable_to_non_nullable +as bool?,decimal: freezed == decimal ? _self.decimal : decimal // ignore: cast_nullable_to_non_nullable +as bool?,decimalPlaces: freezed == decimalPlaces ? _self.decimalPlaces : decimalPlaces // ignore: cast_nullable_to_non_nullable +as int?,type: freezed == type ? _self.type : type // ignore: cast_nullable_to_non_nullable +as String?, + )); +} + + +} + +// dart format on diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.g.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.g.dart new file mode 100644 index 0000000..4f7e44e --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/model/text_form_field_sdui_model.g.dart @@ -0,0 +1,49 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'text_form_field_sdui_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +_TextFormFieldSDUIModel _$TextFormFieldSDUIModelFromJson( + Map json, +) => _TextFormFieldSDUIModel( + key: json['key'] as String?, + label: json['label'] as String?, + hintText: json['hint_text'] as String?, + variant: json['variant'] as String?, + keyboardType: json['keyboard_type'] as String?, + value: json['value'] as String?, + maxLength: (json['max_length'] as num?)?.toInt(), + minLine: (json['min_line'] as num?)?.toInt(), + maxLine: (json['max_line'] as num?)?.toInt(), + required: json['required'] as bool?, + enabled: json['enabled'] as bool?, + readonly: json['readonly'] as bool?, + commaSperator: json['comma_sperator'] as bool?, + decimal: json['decimal'] as bool?, + decimalPlaces: (json['decimal_places'] as num?)?.toInt(), + type: json['type'] as String?, +); + +Map _$TextFormFieldSDUIModelToJson( + _TextFormFieldSDUIModel instance, +) => { + 'key': instance.key, + 'label': instance.label, + 'hint_text': instance.hintText, + 'variant': instance.variant, + 'keyboard_type': instance.keyboardType, + 'value': instance.value, + 'max_length': instance.maxLength, + 'min_line': instance.minLine, + 'max_line': instance.maxLine, + 'required': instance.required, + 'enabled': instance.enabled, + 'readonly': instance.readonly, + 'comma_sperator': instance.commaSperator, + 'decimal': instance.decimal, + 'decimal_places': instance.decimalPlaces, + 'type': instance.type, +}; diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/sdui.txt b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/sdui.txt new file mode 100644 index 0000000..7447b6f --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/sdui.txt @@ -0,0 +1,28 @@ +{ + "type": "text_form_field", + + "data": { + + "key": "user_full_name", + "label": "نام و نام خانوادگی", + "hintText": "لطفاً نام خود را وارد کنید", + "variant": "normal", + "keyboardType": "text", + "maxLength": 100, + "minLine":1, + "maxLine":1, + "required": true, + "enabled": true, + "readonly": true, + "commaSperator":true, + "decimal":true, + "decimalPlaces":2, + "type": "normal" + + } +} + + +// type => normal / date_picker / +// keyboardType => text / number + diff --git a/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/text_form_filed_sdui.dart b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/text_form_filed_sdui.dart new file mode 100644 index 0000000..5c7bc3c --- /dev/null +++ b/packages/chicken/lib/presentation/widget/sdui/widgets/text_form_filed/text_form_filed_sdui.dart @@ -0,0 +1,39 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:rasadyar_core/core.dart'; + +import 'model/text_form_field_sdui_model.dart'; + +Widget textFormFiledSDUI({required TextFormFieldSDUIModel model}) { + List? inputFormatters = []; + TextInputType? keyboardType; + + if (model.keyboardType == 'text') { + keyboardType = TextInputType.text; + } else if (model.keyboardType == 'number') { + keyboardType = TextInputType.numberWithOptions( + decimal: model.decimal ?? false, + ); + + inputFormatters.add(FilteringTextInputFormatter.digitsOnly); + } + + if (model.commaSperator ?? false) { + inputFormatters.add(SeparatorInputFormatter()); + } + + return RTextField( + controller: TextEditingController(text: model.value), + label: model.label, + filled: true, + filledColor: AppColor.bgLight, + hintText: model.hintText, + keyboardType: keyboardType, + maxLength: model.maxLength, + minLines: model.minLine, + maxLines: model.maxLine, + enabled: model.enabled ?? false, + inputFormatters: inputFormatters, + readonly: model.readonly ?? false, + ); +} diff --git a/packages/core/lib/presentation/common/assets.gen.dart b/packages/core/lib/presentation/common/assets.gen.dart index abe9e58..c0cdd1a 100644 --- a/packages/core/lib/presentation/common/assets.gen.dart +++ b/packages/core/lib/presentation/common/assets.gen.dart @@ -49,9 +49,6 @@ class $AssetsIconsGen { /// File path: assets/icons/bg_auth.svg SvgGenImage get bgAuth => const SvgGenImage('assets/icons/bg_auth.svg'); - /// File path: assets/icons/bg_auth_dam.svg - SvgGenImage get bgAuthDam => const SvgGenImage('assets/icons/bg_auth_dam.svg'); - /// File path: assets/icons/bg_header_user_profile.svg SvgGenImage get bgHeaderUserProfile => const SvgGenImage('assets/icons/bg_header_user_profile.svg'); @@ -166,9 +163,6 @@ class $AssetsIconsGen { /// File path: assets/icons/cube_watting.svg SvgGenImage get cubeWatting => const SvgGenImage('assets/icons/cube_watting.svg'); - /// File path: assets/icons/dam_pattern.svg - SvgGenImage get damPattern => const SvgGenImage('assets/icons/dam_pattern.svg'); - /// File path: assets/icons/diagram.svg SvgGenImage get diagram => const SvgGenImage('assets/icons/diagram.svg'); @@ -274,6 +268,9 @@ class $AssetsIconsGen { /// File path: assets/icons/outside.svg SvgGenImage get outside => const SvgGenImage('assets/icons/outside.svg'); + /// File path: assets/icons/pattern_dam.svg + SvgGenImage get patternDam => const SvgGenImage('assets/icons/pattern_dam.svg'); + /// File path: assets/icons/pdf_download.svg SvgGenImage get pdfDownload => const SvgGenImage('assets/icons/pdf_download.svg'); @@ -402,7 +399,6 @@ class $AssetsIconsGen { arrowLeft, arrowRight, bgAuth, - bgAuthDam, bgHeaderUserProfile, boxRemove, boxTick, @@ -441,7 +437,6 @@ class $AssetsIconsGen { cubeSearch, cubeTopRotation, cubeWatting, - damPattern, diagram, directPurchase, download, @@ -477,6 +472,7 @@ class $AssetsIconsGen { noteRemove, ordersReceived, outside, + patternDam, pdfDownload, people, pictureFrame, @@ -576,9 +572,6 @@ class $AssetsVecGen { /// File path: assets/vec/bg_auth.svg.vec SvgGenImage get bgAuthSvg => const SvgGenImage.vec('assets/vec/bg_auth.svg.vec'); - /// File path: assets/vec/bg_auth_dam.svg.vec - SvgGenImage get bgAuthDamSvg => const SvgGenImage.vec('assets/vec/bg_auth_dam.svg.vec'); - /// File path: assets/vec/bg_header_user_profile.svg.vec SvgGenImage get bgHeaderUserProfileSvg => const SvgGenImage.vec('assets/vec/bg_header_user_profile.svg.vec'); @@ -693,9 +686,6 @@ class $AssetsVecGen { /// File path: assets/vec/cube_watting.svg.vec SvgGenImage get cubeWattingSvg => const SvgGenImage.vec('assets/vec/cube_watting.svg.vec'); - /// File path: assets/vec/dam_pattern.svg.vec - SvgGenImage get damPatternSvg => const SvgGenImage.vec('assets/vec/dam_pattern.svg.vec'); - /// File path: assets/vec/diagram.svg.vec SvgGenImage get diagramSvg => const SvgGenImage.vec('assets/vec/diagram.svg.vec'); @@ -801,6 +791,9 @@ class $AssetsVecGen { /// File path: assets/vec/outside.svg.vec SvgGenImage get outsideSvg => const SvgGenImage.vec('assets/vec/outside.svg.vec'); + /// File path: assets/vec/pattern_dam.svg.vec + SvgGenImage get patternDamSvg => const SvgGenImage.vec('assets/vec/pattern_dam.svg.vec'); + /// File path: assets/vec/pdf_download.svg.vec SvgGenImage get pdfDownloadSvg => const SvgGenImage.vec('assets/vec/pdf_download.svg.vec'); @@ -929,7 +922,6 @@ class $AssetsVecGen { arrowLeftSvg, arrowRightSvg, bgAuthSvg, - bgAuthDamSvg, bgHeaderUserProfileSvg, boxRemoveSvg, boxTickSvg, @@ -968,7 +960,6 @@ class $AssetsVecGen { cubeSearchSvg, cubeTopRotationSvg, cubeWattingSvg, - damPatternSvg, diagramSvg, directPurchaseSvg, downloadSvg, @@ -1004,6 +995,7 @@ class $AssetsVecGen { noteRemoveSvg, ordersReceivedSvg, outsideSvg, + patternDamSvg, pdfDownloadSvg, peopleSvg, pictureFrameSvg, diff --git a/packages/livestock/lib/features/auth/presentation/pages/view.dart b/packages/livestock/lib/features/auth/presentation/pages/view.dart index 636a3da..1d117b9 100644 --- a/packages/livestock/lib/features/auth/presentation/pages/view.dart +++ b/packages/livestock/lib/features/auth/presentation/pages/view.dart @@ -20,7 +20,7 @@ class AuthPage extends GetView { alignment: Alignment.center, fit: StackFit.expand, children: [ - Assets.icons.bgAuthDam.svg(fit: BoxFit.fill), + // Assets.icons.bgAuthDam.svg(fit: BoxFit.fill), Center( child: Padding(