From b9ec3e6104fd607db0f6241ea319a4ef74c39eff Mon Sep 17 00:00:00 2001 From: nutchayut Date: Thu, 9 Jan 2025 23:50:38 +0700 Subject: [PATCH] bug fixed --- .../.flutter-plugins-dependencies | 2 +- neowallet_mobile/assets/translations/en.json | 7 +- neowallet_mobile/assets/translations/th.json | 7 +- neowallet_mobile/lib/Home/ChangePassword.dart | 2 +- neowallet_mobile/lib/Login/Login.dart | 2 +- .../lib/Login/forgot_password.dart | 244 +++++++++--------- neowallet_mobile/lib/Pay/PayPromptPay.dart | 29 ++- neowallet_mobile/lib/Pay/PayQr.dart | 4 +- neowallet_mobile/lib/Pay/PayQrDialog.dart | 53 ++-- neowallet_mobile/lib/Pay/PayQrDialogV2.dart | 48 ++-- neowallet_mobile/lib/Pay/PayThaiQr.dart | 4 +- .../lib/TransferMoney/TransferCathayPay.dart | 4 +- .../TransferCathayPayDialog.dart | 50 ++-- .../lib/TransferMoney/TransferPromptPay.dart | 28 +- .../TransferPromtptPayDialog.dart | 48 ++-- .../lib/Withdraw/WithDrawDialog.dart | 50 ++-- neowallet_mobile/pubspec.yaml | 2 +- 17 files changed, 279 insertions(+), 305 deletions(-) diff --git a/neowallet_mobile/.flutter-plugins-dependencies b/neowallet_mobile/.flutter-plugins-dependencies index 84050403..9ce72b6e 100644 --- a/neowallet_mobile/.flutter-plugins-dependencies +++ b/neowallet_mobile/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"camera_avfoundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/camera_avfoundation-0.9.17+3/","native_build":true,"dependencies":[]},{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":true,"dependencies":[]},{"name":"image_picker_ios","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.12/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"permission_handler_apple","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.5/","native_build":true,"dependencies":[]},{"name":"qr_code_scanner","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/qr_code_scanner-1.0.1/","native_build":true,"dependencies":[]},{"name":"saver_gallery","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/saver_gallery-4.0.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.2/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_ios-6.3.1/","native_build":true,"dependencies":[]},{"name":"webview_flutter_wkwebview","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.14.0/","native_build":true,"dependencies":[]}],"android":[{"name":"camera_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/camera_android-0.10.9+2/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":true,"dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.19/","native_build":true,"dependencies":[]},{"name":"image_picker_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_android-0.8.12+1/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_android-2.2.4/","native_build":true,"dependencies":[]},{"name":"permission_handler_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13/","native_build":true,"dependencies":[]},{"name":"qr_code_scanner","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/qr_code_scanner-1.0.1/","native_build":true,"dependencies":[]},{"name":"saver_gallery","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/saver_gallery-4.0.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.2/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.2/","native_build":true,"dependencies":[]},{"name":"webview_flutter_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/webview_flutter_android-3.16.3/","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":true,"dependencies":[]},{"name":"file_selector_macos","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.4/","native_build":true,"dependencies":[]},{"name":"image_picker_macos","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.1+1/","native_build":false,"dependencies":["file_selector_macos"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.2/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.1/","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":false,"dependencies":[]},{"name":"file_selector_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.2+1/","native_build":true,"dependencies":[]},{"name":"image_picker_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.1+1/","native_build":false,"dependencies":["file_selector_linux"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.0/","native_build":true,"dependencies":[]}],"windows":[{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":false,"dependencies":[]},{"name":"file_selector_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.3+2/","native_build":true,"dependencies":[]},{"name":"image_picker_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.1+1/","native_build":false,"dependencies":["file_selector_windows"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[]},{"name":"permission_handler_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.2/","native_build":true,"dependencies":[]}],"web":[{"name":"camera_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/camera_web-0.3.5/","dependencies":[]},{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","dependencies":[]},{"name":"image_picker_for_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_for_web-2.1.12/","dependencies":[]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","dependencies":[]},{"name":"permission_handler_html","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+5/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_web-2.3.3/","dependencies":[]}]},"dependencyGraph":[{"name":"camera","dependencies":["camera_android","camera_avfoundation","camera_web","flutter_plugin_android_lifecycle"]},{"name":"camera_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"camera_avfoundation","dependencies":[]},{"name":"camera_web","dependencies":[]},{"name":"device_info_plus","dependencies":[]},{"name":"file_selector_linux","dependencies":[]},{"name":"file_selector_macos","dependencies":[]},{"name":"file_selector_windows","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["image_picker_android","image_picker_for_web","image_picker_ios","image_picker_linux","image_picker_macos","image_picker_windows"]},{"name":"image_picker_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"image_picker_ios","dependencies":[]},{"name":"image_picker_linux","dependencies":["file_selector_linux"]},{"name":"image_picker_macos","dependencies":["file_selector_macos"]},{"name":"image_picker_windows","dependencies":["file_selector_windows"]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_html","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_html","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"qr_code_scanner","dependencies":[]},{"name":"saver_gallery","dependencies":["path_provider"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2025-01-09 20:39:30.509365","version":"3.27.0","swift_package_manager_enabled":false} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"camera_avfoundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/camera_avfoundation-0.9.17+3/","native_build":true,"dependencies":[]},{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":true,"dependencies":[]},{"name":"image_picker_ios","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.12/","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"permission_handler_apple","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.5/","native_build":true,"dependencies":[]},{"name":"qr_code_scanner","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/qr_code_scanner-1.0.1/","native_build":true,"dependencies":[]},{"name":"saver_gallery","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/saver_gallery-4.0.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.2/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_ios","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_ios-6.3.1/","native_build":true,"dependencies":[]},{"name":"webview_flutter_wkwebview","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/webview_flutter_wkwebview-3.14.0/","native_build":true,"dependencies":[]}],"android":[{"name":"camera_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/camera_android-0.10.9+2/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":true,"dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.19/","native_build":true,"dependencies":[]},{"name":"image_picker_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_android-0.8.12+1/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":true,"dependencies":[]},{"name":"path_provider_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_android-2.2.4/","native_build":true,"dependencies":[]},{"name":"permission_handler_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.13/","native_build":true,"dependencies":[]},{"name":"qr_code_scanner","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/qr_code_scanner-1.0.1/","native_build":true,"dependencies":[]},{"name":"saver_gallery","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/saver_gallery-4.0.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_android-2.2.2/","native_build":true,"dependencies":[]},{"name":"url_launcher_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.2/","native_build":true,"dependencies":[]},{"name":"webview_flutter_android","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/webview_flutter_android-3.16.3/","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":true,"dependencies":[]},{"name":"file_selector_macos","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/file_selector_macos-0.9.4/","native_build":true,"dependencies":[]},{"name":"image_picker_macos","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_macos-0.2.1+1/","native_build":false,"dependencies":["file_selector_macos"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":true,"dependencies":[]},{"name":"path_provider_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"shared_preferences_foundation","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.2/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"url_launcher_macos","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.1/","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":false,"dependencies":[]},{"name":"file_selector_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.2+1/","native_build":true,"dependencies":[]},{"name":"image_picker_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.1+1/","native_build":false,"dependencies":["file_selector_linux"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.0/","native_build":true,"dependencies":[]}],"windows":[{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","native_build":false,"dependencies":[]},{"name":"file_selector_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/file_selector_windows-0.9.3+2/","native_build":true,"dependencies":[]},{"name":"image_picker_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_windows-0.2.1+1/","native_build":false,"dependencies":["file_selector_windows"]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[]},{"name":"permission_handler_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/","native_build":true,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.2/","native_build":true,"dependencies":[]}],"web":[{"name":"camera_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/camera_web-0.3.5/","dependencies":[]},{"name":"device_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/device_info_plus-9.1.2/","dependencies":[]},{"name":"image_picker_for_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/image_picker_for_web-2.1.12/","dependencies":[]},{"name":"package_info_plus","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/package_info_plus-8.0.2/","dependencies":[]},{"name":"permission_handler_html","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+5/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.1/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/nutchayut/.pub-cache/hosted/pub.dev/url_launcher_web-2.3.3/","dependencies":[]}]},"dependencyGraph":[{"name":"camera","dependencies":["camera_android","camera_avfoundation","camera_web","flutter_plugin_android_lifecycle"]},{"name":"camera_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"camera_avfoundation","dependencies":[]},{"name":"camera_web","dependencies":[]},{"name":"device_info_plus","dependencies":[]},{"name":"file_selector_linux","dependencies":[]},{"name":"file_selector_macos","dependencies":[]},{"name":"file_selector_windows","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["image_picker_android","image_picker_for_web","image_picker_ios","image_picker_linux","image_picker_macos","image_picker_windows"]},{"name":"image_picker_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"image_picker_for_web","dependencies":[]},{"name":"image_picker_ios","dependencies":[]},{"name":"image_picker_linux","dependencies":["file_selector_linux"]},{"name":"image_picker_macos","dependencies":["file_selector_macos"]},{"name":"image_picker_windows","dependencies":["file_selector_windows"]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_html","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_html","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"qr_code_scanner","dependencies":[]},{"name":"saver_gallery","dependencies":["path_provider"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2025-01-09 22:45:06.662835","version":"3.27.0","swift_package_manager_enabled":false} \ No newline at end of file diff --git a/neowallet_mobile/assets/translations/en.json b/neowallet_mobile/assets/translations/en.json index e9f77b4d..28e31478 100644 --- a/neowallet_mobile/assets/translations/en.json +++ b/neowallet_mobile/assets/translations/en.json @@ -148,5 +148,10 @@ "รหัสผ่านปัจจุบัน":"Current Password", "รหัสผ่านใหม่":"New Password", "กรอกรหัสผ่านใหม่อีกครั้ง":"Re-enter New Password", - "บันทึกและปิด":"Save and Close" + "บันทึกและปิด":"Save and Close", + "อีเมล":"Email", + "เลขที่บิล": "Bill no.", + "วันที่ทำรายการ": "Date", + "จาก": "From", + "ถึง": "To" } \ No newline at end of file diff --git a/neowallet_mobile/assets/translations/th.json b/neowallet_mobile/assets/translations/th.json index b8a7c86d..f9227e6b 100644 --- a/neowallet_mobile/assets/translations/th.json +++ b/neowallet_mobile/assets/translations/th.json @@ -148,5 +148,10 @@ "รหัสผ่านปัจจุบัน":"รหัสผ่านปัจจุบัน", "รหัสผ่านใหม่":"รหัสผ่านใหม่", "กรอกรหัสผ่านใหม่อีกครั้ง":"กรอกรหัสผ่านใหม่อีกครั้ง", - "บันทึกและปิด":"บันทึกและปิด" + "บันทึกและปิด":"บันทึกและปิด", + "อีเมล":"อีเมล", + "เลขที่บิล": "เลขที่บิล", + "วันที่ทำรายการ": "วันที่ทำรายการ", + "จาก": "จาก", + "ถึง": "ถึง" } \ No newline at end of file diff --git a/neowallet_mobile/lib/Home/ChangePassword.dart b/neowallet_mobile/lib/Home/ChangePassword.dart index 48c2b7d0..74868009 100644 --- a/neowallet_mobile/lib/Home/ChangePassword.dart +++ b/neowallet_mobile/lib/Home/ChangePassword.dart @@ -100,7 +100,7 @@ class _ChangePasswordPageState extends State { elevation: 0, centerTitle: true, title: Text( - "เปลี่ยนอีเมล".tr(), + "เปลี่ยนรหัสผ่าน".tr(), textAlign: TextAlign.center, style: GoogleFonts.kanit( color: Colors.black, diff --git a/neowallet_mobile/lib/Login/Login.dart b/neowallet_mobile/lib/Login/Login.dart index 38bbcf1c..e6b8c326 100644 --- a/neowallet_mobile/lib/Login/Login.dart +++ b/neowallet_mobile/lib/Login/Login.dart @@ -176,7 +176,7 @@ class _LoginPageState extends State { color: Colors.white, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(40), - side: BorderSide(color: ColorCustom.red, width: 1) + // side: BorderSide(color: ColorCustom.red, width: 1) ), child: Container( padding: EdgeInsets.all(10), diff --git a/neowallet_mobile/lib/Login/forgot_password.dart b/neowallet_mobile/lib/Login/forgot_password.dart index 583844bb..eed17742 100644 --- a/neowallet_mobile/lib/Login/forgot_password.dart +++ b/neowallet_mobile/lib/Login/forgot_password.dart @@ -9,6 +9,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:google_fonts/google_fonts.dart'; import '../api/api.dart'; +import '../utils/color_custom.dart'; class ForgotPassword extends StatefulWidget { const ForgotPassword({Key? key}) : super(key: key); @@ -70,141 +71,140 @@ class _LoginValidateState extends State { @override Widget build(BuildContext context) { return Scaffold( - body: Padding( - padding: const EdgeInsets.all(20.0), - child: Column( - children: [ - Row(children: [ - IconButton( - onPressed: () { - Navigator.of(context).pop(); - }, - icon: Icon( - Icons.arrow_back_ios, - color: Colors.black, - )), - Text( - "Forgot Password".tr(), - style: TextStyle( - color: Color(0xff050505), - fontSize: 20, + body: SafeArea( + child: Padding( + padding: const EdgeInsets.all(20.0), + child: Column( + children: [ + Row(children: [ + IconButton( + onPressed: () { + Navigator.of(context).pop(); + }, + icon: Icon( + Icons.arrow_back_ios, + color: Colors.black, + )), + Text( + "Forgot Password".tr(), + style: TextStyle( + color: Color(0xff050505), + fontSize: 20, + ), ), + ]), + SizedBox( + height: 50, ), - ]), - SizedBox( - height: 50, - ), - Container( - height: 48, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(100), - color: Color(0xfff2f2f2), - ), - child: Row( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - SizedBox( - width: 10, - ), - Center( - child: FaIcon( - FontAwesomeIcons.addressCard, - color: Color(0xff65676b), - )), - Expanded( - child: TextField( - keyboardType: TextInputType.emailAddress, - // inputFormatters: [ - // FilteringTextInputFormatter.allow(RegExp(r'[0-9]')), - // ], - controller: email, - decoration: InputDecoration( - hintText: 'Email', - border: InputBorder.none, - contentPadding: EdgeInsets.symmetric(horizontal: 16), - ), - ), - ), - ], - ), - ), - /* SizedBox( - height: 10, - ), - Container( - height: 48, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(100), - color: Color(0xfff2f2f2), - ), - child: Row( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - SizedBox( - width: 10, - ), - Center( - child: FaIcon( - FontAwesomeIcons.phone, - color: Color(0xff65676b), - )), - Expanded( - child: TextField( - keyboardType: TextInputType.phone, - // inputFormatters: [ - // FilteringTextInputFormatter.allow(RegExp(r'[0-9]')), - // ], - controller: phone, - decoration: InputDecoration( - hintText: 'เบอร์มือถือ', - border: InputBorder.none, - contentPadding: EdgeInsets.symmetric(horizontal: 16), - ), - ), - ), - ], - ), - ),*/ - SizedBox( - height: 60, - ), - InkWell( - onTap: () { - authen(context); - }, - child: Container( - width: 374, + Container( height: 48, decoration: BoxDecoration( borderRadius: BorderRadius.circular(100), - color: Color(0xff9d001b), + color: Color(0xfff2f2f2), ), child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, children: [ - Text( - "ยืนยัน", - textAlign: TextAlign.center, - style: GoogleFonts.kanit( - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.w500, + SizedBox( + width: 10, + ), + Center( + child: FaIcon( + FontAwesomeIcons.addressCard, + color: Color(0xff65676b), + )), + Expanded( + child: TextField( + keyboardType: TextInputType.emailAddress, + // inputFormatters: [ + // FilteringTextInputFormatter.allow(RegExp(r'[0-9]')), + // ], + controller: email, + decoration: InputDecoration( + hintText: 'อีเมล'.tr(), + border: InputBorder.none, + contentPadding: EdgeInsets.symmetric(horizontal: 16), + ), ), ), ], ), ), - ), - SizedBox( - height: 20, - ), - ], + /* SizedBox( + height: 10, + ), + Container( + height: 48, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(100), + color: Color(0xfff2f2f2), + ), + child: Row( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + SizedBox( + width: 10, + ), + Center( + child: FaIcon( + FontAwesomeIcons.phone, + color: Color(0xff65676b), + )), + Expanded( + child: TextField( + keyboardType: TextInputType.phone, + // inputFormatters: [ + // FilteringTextInputFormatter.allow(RegExp(r'[0-9]')), + // ], + controller: phone, + decoration: InputDecoration( + hintText: 'เบอร์มือถือ', + border: InputBorder.none, + contentPadding: EdgeInsets.symmetric(horizontal: 16), + ), + ), + ), + ], + ), + ),*/ + SizedBox( + height: 60, + ), + InkWell( + onTap: () { + authen(context); + }, + child: SizedBox( + width: double.infinity, + child: Card( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(40), + ), + child: Container( + padding: EdgeInsets.all(10), + child: Text( + "Confirm".tr(), + textAlign: TextAlign.center, + style: GoogleFonts.kanit( + color: ColorCustom.greyBorder, + fontSize: 20, + fontWeight: FontWeight.w500, + ), + ), + ), + ), + ) + ), + SizedBox( + height: 20, + ), + ], + ), ), ), ); diff --git a/neowallet_mobile/lib/Pay/PayPromptPay.dart b/neowallet_mobile/lib/Pay/PayPromptPay.dart index 6f4586f2..924ff218 100644 --- a/neowallet_mobile/lib/Pay/PayPromptPay.dart +++ b/neowallet_mobile/lib/Pay/PayPromptPay.dart @@ -517,7 +517,7 @@ class _TransferBankConfirmState extends State { color: Colors.black, )), Text( - "โอนเงินผ่านพร้อมเพย์", + "Transfer money via PromptPay".tr(), style: TextStyle( color: Color(0xff050505), fontSize: 20, @@ -554,7 +554,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - "เลขที่บิล", + "เลขที่บิล".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -580,7 +580,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "วันที่ทำรายการ", + "วันที่ทำรายการ".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -604,7 +604,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "จาก", + "จาก".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -651,7 +651,7 @@ class _TransferBankConfirmState extends State { Row( children: [ Text( - "ถึง", + "ถึง".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -701,7 +701,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "จำนวนเงิน", + "จำนวนเงิน".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -745,7 +745,7 @@ class _TransferBankConfirmState extends State { ), child: Center( child: Text( - "ยกเลิก", + "ยกเลิก".tr(), textAlign: TextAlign.center, style: TextStyle( color: Colors.white, @@ -764,20 +764,29 @@ class _TransferBankConfirmState extends State { confirmPromptPay(context); } }, + child: Container( margin: EdgeInsets.only(bottom: 15), width: MediaQuery.of(context).size.width / 4, height: 46, decoration: BoxDecoration( borderRadius: BorderRadius.circular(100), - color: Color(0xffad022c), + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 2, + blurRadius: 4, + offset: Offset(0, 2), // changes position of shadow + ), + ], ), child: Center( child: Text( - "ตกลง", + "Confirm".tr(), textAlign: TextAlign.center, style: TextStyle( - color: Colors.white, + color: ColorCustom.greyBorder, fontSize: 18, fontWeight: FontWeight.w300, ), diff --git a/neowallet_mobile/lib/Pay/PayQr.dart b/neowallet_mobile/lib/Pay/PayQr.dart index 89eb7f66..dfa68bc1 100644 --- a/neowallet_mobile/lib/Pay/PayQr.dart +++ b/neowallet_mobile/lib/Pay/PayQr.dart @@ -397,7 +397,7 @@ class _PayQrPageState extends State { child: Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(100), - color: Color(0xff9d001b), + color: Color(0xfff2f2f2), ), padding: const EdgeInsets.symmetric( horizontal: 20, @@ -412,7 +412,7 @@ class _PayQrPageState extends State { "100 ${"Baht".tr()}", textAlign: TextAlign.right, style: TextStyle( - color: Colors.white, + color: Color(0xff65676b), ), ), ], diff --git a/neowallet_mobile/lib/Pay/PayQrDialog.dart b/neowallet_mobile/lib/Pay/PayQrDialog.dart index a7bf38aa..c8ab5d33 100644 --- a/neowallet_mobile/lib/Pay/PayQrDialog.dart +++ b/neowallet_mobile/lib/Pay/PayQrDialog.dart @@ -293,6 +293,7 @@ import 'package:path_provider/path_provider.dart'; import 'package:saver_gallery/saver_gallery.dart'; import 'package:screenshot/screenshot.dart'; +import '../utils/color_custom.dart'; import '../utils/utils.dart'; class PayQrDialog extends StatefulWidget { @@ -386,48 +387,34 @@ class _PayQrDialogState extends State { .then((capturedImage) async { String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg"; SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false); - Utils.showAlertDialog(context, "บันทึกสำเร็จ"); + // Utils.showAlertDialog(context, "บันทึกสำเร็จ"); }).catchError((onError) { print(onError); }); Navigator.popUntil( context, ModalRoute.withName('/HomePage')); }, - child: Container( - margin: EdgeInsets.only(top: 20, bottom: 20), - width: MediaQuery - .of(context) - .size - .width, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(40), - color: Color(0xff9d001b), - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - vertical: 12, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 106, - height: 32, - child: Text( - "บันทึกและปิด".tr(), - textAlign: TextAlign.center, - style: GoogleFonts.kanit( - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.w500, - ), + child: SizedBox( + width: double.infinity, + child: Card( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(40), + ), + child: Container( + padding: EdgeInsets.all(10), + child: Text( + "บันทึกและปิด".tr(), + textAlign: TextAlign.center, + style: GoogleFonts.kanit( + color: ColorCustom.greyBorder, + fontSize: 20, + fontWeight: FontWeight.w500, ), ), - ], + ), ), - ), + ) ), ], ), diff --git a/neowallet_mobile/lib/Pay/PayQrDialogV2.dart b/neowallet_mobile/lib/Pay/PayQrDialogV2.dart index 9d04fc03..b8fee65d 100644 --- a/neowallet_mobile/lib/Pay/PayQrDialogV2.dart +++ b/neowallet_mobile/lib/Pay/PayQrDialogV2.dart @@ -7,6 +7,7 @@ import 'package:screenshot/screenshot.dart'; import '../api/api.dart'; import '../model/profile_model.dart'; +import '../utils/color_custom.dart'; import '../utils/utils.dart'; class PayQrDialogV2 extends StatefulWidget { @@ -402,38 +403,27 @@ class _PayQrDialogV2State extends State { Navigator.popUntil( context, ModalRoute.withName('/HomePage')); }, - child: Container( - margin: EdgeInsets.only(top: 20, bottom: 20), - width: MediaQuery.of(context).size.width, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(40), - color: Color(0xff9d001b), - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - vertical: 12, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 206, - height: 32, - child: Text( - "บันทึกและปิด".tr(), - textAlign: TextAlign.center, - style: GoogleFonts.kanit( - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.w500, - ), + child: SizedBox( + width: double.infinity, + child: Card( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(40), + ), + child: Container( + padding: EdgeInsets.all(10), + child: Text( + "บันทึกและปิด".tr(), + textAlign: TextAlign.center, + style: GoogleFonts.kanit( + color: ColorCustom.greyBorder, + fontSize: 20, + fontWeight: FontWeight.w500, ), ), - ], + ), ), - ), + ) ), SizedBox( height: 20, diff --git a/neowallet_mobile/lib/Pay/PayThaiQr.dart b/neowallet_mobile/lib/Pay/PayThaiQr.dart index b112ab8f..435cfb1e 100644 --- a/neowallet_mobile/lib/Pay/PayThaiQr.dart +++ b/neowallet_mobile/lib/Pay/PayThaiQr.dart @@ -247,7 +247,7 @@ class _PayQrPageState extends State { child: Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(100), - color: Color(0xff9d001b), + color: Color(0xfff2f2f2), ), padding: const EdgeInsets.symmetric( horizontal: 20, @@ -262,7 +262,7 @@ class _PayQrPageState extends State { "100 ${"Baht".tr()}", textAlign: TextAlign.right, style: TextStyle( - color: Colors.white, + color: Color(0xff65676b), ), ), ], diff --git a/neowallet_mobile/lib/TransferMoney/TransferCathayPay.dart b/neowallet_mobile/lib/TransferMoney/TransferCathayPay.dart index 2115fb0d..e3c80dfa 100644 --- a/neowallet_mobile/lib/TransferMoney/TransferCathayPay.dart +++ b/neowallet_mobile/lib/TransferMoney/TransferCathayPay.dart @@ -412,7 +412,7 @@ class _TransferCathayPayDetailState extends State { width: 161, decoration: BoxDecoration( borderRadius: BorderRadius.circular(100), - color: Color(0xff9d001b), + color: Color(0xfff2f2f2), ), padding: const EdgeInsets.symmetric( horizontal: 20, @@ -427,7 +427,7 @@ class _TransferCathayPayDetailState extends State { "100 ${"Baht".tr()}", textAlign: TextAlign.right, style: TextStyle( - color: Colors.white, + color: Color(0xff65676b), ), ), ], diff --git a/neowallet_mobile/lib/TransferMoney/TransferCathayPayDialog.dart b/neowallet_mobile/lib/TransferMoney/TransferCathayPayDialog.dart index 652d96aa..04ee4fec 100644 --- a/neowallet_mobile/lib/TransferMoney/TransferCathayPayDialog.dart +++ b/neowallet_mobile/lib/TransferMoney/TransferCathayPayDialog.dart @@ -6,6 +6,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:saver_gallery/saver_gallery.dart'; import 'package:screenshot/screenshot.dart'; +import '../utils/color_custom.dart'; import '../utils/utils.dart'; class TransferCathayPayDialog extends StatefulWidget { @@ -258,45 +259,34 @@ class _TransferCathayPayDialogState extends State { .then((capturedImage) async { String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg"; SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false); - Utils.showAlertDialog(context, "บันทึกสำเร็จ"); + // Utils.showAlertDialog(context, "บันทึกสำเร็จ"); }).catchError((onError) { print(onError); }); Navigator.popUntil( context, ModalRoute.withName('/HomePage')); }, - child: Container(margin: EdgeInsets.only(top: 20,bottom: 20), - width: MediaQuery.of(context).size.width, - height: 51, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(40), - color: Color(0xff9d001b), - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - vertical: 12, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 106, - height: 32, - child: Text( - "บันทึกและปิด".tr(), - textAlign: TextAlign.center, - style: GoogleFonts.kanit( - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.w500, - ), + child: SizedBox( + width: double.infinity, + child: Card( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(40), + ), + child: Container( + padding: EdgeInsets.all(10), + child: Text( + "บันทึกและปิด".tr(), + textAlign: TextAlign.center, + style: GoogleFonts.kanit( + color: ColorCustom.greyBorder, + fontSize: 20, + fontWeight: FontWeight.w500, ), ), - ], + ), ), - ), + ) ), ], diff --git a/neowallet_mobile/lib/TransferMoney/TransferPromptPay.dart b/neowallet_mobile/lib/TransferMoney/TransferPromptPay.dart index 41825b1f..ff456c7e 100644 --- a/neowallet_mobile/lib/TransferMoney/TransferPromptPay.dart +++ b/neowallet_mobile/lib/TransferMoney/TransferPromptPay.dart @@ -822,7 +822,7 @@ class _TransferBankConfirmState extends State { color: Colors.black, )), Text( - "โอนเงินผ่านพร้อมเพย์", + "Transfer money via PromptPay".tr(), style: TextStyle( color: Color(0xff050505), fontSize: 20, @@ -859,7 +859,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ Text( - "เลขที่บิล", + "เลขที่บิล".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -885,7 +885,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "วันที่ทำรายการ", + "วันที่ทำรายการ".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -909,7 +909,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "จาก", + "จาก".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -956,7 +956,7 @@ class _TransferBankConfirmState extends State { Row( children: [ Text( - "ถึง", + "ถึง".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -1006,7 +1006,7 @@ class _TransferBankConfirmState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - "จำนวนเงิน", + "จำนวนเงิน".tr(), style: TextStyle( color: Color(0xff65676b), fontSize: 16, @@ -1050,7 +1050,7 @@ class _TransferBankConfirmState extends State { ), child: Center( child: Text( - "ยกเลิก", + "ยกเลิก".tr(), textAlign: TextAlign.center, style: TextStyle( color: Colors.white, @@ -1075,14 +1075,22 @@ class _TransferBankConfirmState extends State { height: 46, decoration: BoxDecoration( borderRadius: BorderRadius.circular(100), - color: Color(0xffad022c), + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 2, + blurRadius: 4, + offset: Offset(0, 2), // changes position of shadow + ), + ], ), child: Center( child: Text( - "ตกลง", + "Confirm".tr(), textAlign: TextAlign.center, style: TextStyle( - color: Colors.white, + color: ColorCustom.greyBorder, fontSize: 18, fontWeight: FontWeight.w300, ), diff --git a/neowallet_mobile/lib/TransferMoney/TransferPromtptPayDialog.dart b/neowallet_mobile/lib/TransferMoney/TransferPromtptPayDialog.dart index c79b8a6d..5f1595d3 100644 --- a/neowallet_mobile/lib/TransferMoney/TransferPromtptPayDialog.dart +++ b/neowallet_mobile/lib/TransferMoney/TransferPromtptPayDialog.dart @@ -12,6 +12,7 @@ import 'package:screenshot/screenshot.dart'; import '../api/api.dart'; import '../model/profile_model.dart'; +import '../utils/color_custom.dart'; class TransferPromtptPayDialog extends StatefulWidget { const TransferPromtptPayDialog({Key? key, required this.name, required this.phone, required this.price, required this.bill}) : super(key: key); @@ -249,43 +250,32 @@ class _TransferPromtptPayDialogState extends State { .then((capturedImage) async { String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg"; SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false); - Utils.showAlertDialog(context, "บันทึกสำเร็จ"); + // Utils.showAlertDialog(context, "บันทึกสำเร็จ"); }).catchError((onError) { print(onError); }); Navigator.popUntil( context, ModalRoute.withName('/HomePage')); }, - child: Container( - margin: EdgeInsets.only(bottom: 15), - width: MediaQuery - .of(context) - .size - .width, - height: 46, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(100), - color: Color(0xffad022c), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 106, - height: 32, - child: Text( - "บันทึกและปิด".tr(), - textAlign: TextAlign.center, - style: GoogleFonts.kanit( - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.w500, - ), + child: SizedBox( + width: double.infinity, + child: Card( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(40), + ), + child: Container( + padding: EdgeInsets.all(10), + child: Text( + "บันทึกและปิด".tr(), + textAlign: TextAlign.center, + style: GoogleFonts.kanit( + color: ColorCustom.greyBorder, + fontSize: 20, + fontWeight: FontWeight.w500, ), ), - ], + ), ), )), diff --git a/neowallet_mobile/lib/Withdraw/WithDrawDialog.dart b/neowallet_mobile/lib/Withdraw/WithDrawDialog.dart index e22b00e4..fab119a7 100644 --- a/neowallet_mobile/lib/Withdraw/WithDrawDialog.dart +++ b/neowallet_mobile/lib/Withdraw/WithDrawDialog.dart @@ -5,6 +5,7 @@ import 'package:intl/intl.dart'; import 'package:saver_gallery/saver_gallery.dart'; import 'package:screenshot/screenshot.dart'; +import '../utils/color_custom.dart'; import '../utils/utils.dart'; class WithDrawDialog extends StatefulWidget { @@ -163,7 +164,7 @@ class _WithDrawDialogState extends State { .then((capturedImage) async { String fileName = "neopay_${DateTime.now().millisecondsSinceEpoch}.jpg"; SaverGallery.saveImage(capturedImage!, fileName: fileName, skipIfExists: false); - Utils.showAlertDialog(context, "บันทึกสำเร็จ"); + // Utils.showAlertDialog(context, "บันทึกสำเร็จ"); }).catchError((onError) { print(onError); }); @@ -171,38 +172,27 @@ class _WithDrawDialogState extends State { Navigator.popUntil( context, ModalRoute.withName('/HomePage')); }, - child: Container( - width: MediaQuery.of(context).size.width, - height: 51, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(40), - color: Color(0xff9d001b), - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - vertical: 12, - ), - child: Row( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 106, - height: 32, - child: Text( - "บันทึกและปิด".tr(), - textAlign: TextAlign.center, - style: GoogleFonts.kanit( - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.w500, - ), + child: SizedBox( + width: double.infinity, + child: Card( + color: Colors.white, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(40), + ), + child: Container( + padding: EdgeInsets.all(10), + child: Text( + "บันทึกและปิด".tr(), + textAlign: TextAlign.center, + style: GoogleFonts.kanit( + color: ColorCustom.greyBorder, + fontSize: 20, + fontWeight: FontWeight.w500, ), ), - ], + ), ), - ), + ) ), ]))))); diff --git a/neowallet_mobile/pubspec.yaml b/neowallet_mobile/pubspec.yaml index 94ffc270..db5262b7 100644 --- a/neowallet_mobile/pubspec.yaml +++ b/neowallet_mobile/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.4+3 +version: 1.0.4+4 environment: sdk: '>=2.19.3 <3.0.0'