diff --git a/lib/constants/app_constants.dart b/lib/constants/app_constants.dart index 2cbeb19..9dcb22b 100644 --- a/lib/constants/app_constants.dart +++ b/lib/constants/app_constants.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:logger/logger.dart'; -bool useTestIP = false; +bool useTestIP = true; Logger logger = Logger(printer: PrettyPrinter(printEmojis: false, colors: true, dateTimeFormat: DateTimeFormat.none)); // app globals @@ -52,6 +52,8 @@ class AppColors { } class AppAssets { + static String poppinsMedium = "assets/fonts/Poppins/Poppins-Medium.ttf"; + static String hmgLogo = "assets/images/hmglogo.svg"; static String hmgLogoPharmacy = "assets/images/hmglogo_pharmacy.svg"; static String noInternetImage = "assets/images/undraw_connected_world_wuay.png"; @@ -77,7 +79,6 @@ class AppAssets { static String windIcon = "assets/icons/windy.svg"; //Tones - static String callTone = "assets/tones/call_tone.mp3"; } diff --git a/lib/views/common_widgets/app_general_widgets.dart b/lib/views/common_widgets/app_general_widgets.dart index 02058bb..34ac287 100644 --- a/lib/views/common_widgets/app_general_widgets.dart +++ b/lib/views/common_widgets/app_general_widgets.dart @@ -159,7 +159,7 @@ Widget commonSelectionCardKiosk({required ScreenConfigViewModel screenConfigView child: SizedBox( child: Container( constraints: BoxConstraints(minWidth: SizeConfig.getWidthMultiplier() * 30), - padding: const EdgeInsets.all(5), + padding: const EdgeInsets.all(10), margin: const EdgeInsets.all(10), decoration: AppColors.configWidgetDecoration, child: Directionality( diff --git a/lib/views/kiosk_screens/kiosk_main_screen.dart b/lib/views/kiosk_screens/kiosk_main_screen.dart index 3de6796..441769f 100644 --- a/lib/views/kiosk_screens/kiosk_main_screen.dart +++ b/lib/views/kiosk_screens/kiosk_main_screen.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import 'package:flutter/material.dart'; import 'package:hmg_qline/constants/app_constants.dart'; import 'package:hmg_qline/utilities/enums.dart'; @@ -7,6 +9,7 @@ import 'package:hmg_qline/views/common_widgets/app_footer.dart'; import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart'; import 'package:hmg_qline/views/common_widgets/app_header.dart'; import 'package:hmg_qline/views/common_widgets/app_scaffold.dart'; +import 'package:hmg_qline/views/common_widgets/app_texts_widget.dart'; import 'package:hmg_qline/views/view_helpers/size_config.dart'; import 'package:provider/provider.dart'; @@ -90,18 +93,47 @@ class KioskMainScreen extends StatelessWidget { title: "New Latest Certificate Generation ${index + 1}", icon: AppAssets.languageIcon, onTap: () { - screenConfigViewModel.updateKioskScreenState(KioskScreenStateEnums.languageState); + screenConfigViewModel.updateKioskScreenState(KioskScreenStateEnums.ticketNoState); }), ]); }); } Widget kioskTicketNumberStateWidget(ScreenConfigViewModel screenConfigViewModel) { - return Row( + bool isEnglish = screenConfigViewModel.currentSelectedKioskLanguage == LanguageEnum.english; + return Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - commonSelectionCardKiosk(screenConfigViewModel: screenConfigViewModel, title: "English", icon: AppAssets.languageIcon, onTap: () {}), - commonSelectionCardKiosk(screenConfigViewModel: screenConfigViewModel, title: "عربي", icon: AppAssets.languageIcon, onTap: () {}), + AppText( + isEnglish ? "Your Ticket Number is: " : "رقم تذكرتك هو:", + fontSize: SizeConfig.getWidthMultiplier() * 6, + textDirection: isEnglish ? TextDirection.ltr : TextDirection.rtl, + fontHeight: 1, + fontFamily: isEnglish ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins, + ), + const SizedBox(height: 20), + InkWell( + onTap: () { + screenConfigViewModel.updateKioskScreenState(KioskScreenStateEnums.languageState); + }, + child: AppText( + isEnglish ? "PHR-45" : "بي اتش ار-٤٥", + fontSize: SizeConfig.getWidthMultiplier() * 10, + fontHeight: 1, + fontWeight: FontWeight.bold, + textDirection: isEnglish ? TextDirection.ltr : TextDirection.rtl, + fontFamily: isEnglish ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins, + ), + ), + const SizedBox(height: 20), + AppText( + isEnglish ? "Please take the receipt and wait for your turn. \nThank you 😊" : "يرجى أخذ الإيصال وانتظار دورك.\n شكرًا لك 😊", + fontSize: SizeConfig.getWidthMultiplier() * 3, + textAlign: TextAlign.center, + textDirection: isEnglish ? TextDirection.ltr : TextDirection.rtl, + fontHeight: 1, + fontFamily: isEnglish ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins, + ), ], ); } diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index e71a16d..e6f8ec0 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -6,6 +6,10 @@ #include "generated_plugin_registrant.h" +#include void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) charset_converter_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "CharsetConverterPlugin"); + charset_converter_plugin_register_with_registrar(charset_converter_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 2e1de87..9fcfdc3 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + charset_converter ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/pubspec.lock b/pubspec.lock index bb55096..6a5e217 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,6 +1,14 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + archive: + dependency: transitive + description: + name: archive + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d + url: "https://pub.dev" + source: hosted + version: "3.6.1" args: dependency: transitive description: @@ -49,6 +57,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + charset_converter: + dependency: transitive + description: + name: charset_converter + sha256: a601f27b78ca86c3d88899d53059786d9c3f3c485b64974e9105c06c2569aef5 + url: "https://pub.dev" + source: hosted + version: "2.3.0" clock: dependency: transitive description: @@ -89,6 +105,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.6" + csslib: + dependency: transitive + description: + name: csslib + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" + url: "https://pub.dev" + source: hosted + version: "1.0.2" cupertino_icons: dependency: "direct main" description: @@ -113,6 +137,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.7" + esc_pos_printer: + dependency: "direct main" + description: + name: esc_pos_printer + sha256: "312b05f909f3f7dd1e6a3332cf384dcee2c3a635138823654cd9c0133d8b5c45" + url: "https://pub.dev" + source: hosted + version: "4.1.0" + esc_pos_utils: + dependency: "direct main" + description: + name: esc_pos_utils + sha256: "8ec0013d7a7f1e790ced6b09b95ce3bf2c6f9468a3e2bc49ece000761d86c6f8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" fading_edge_scrollview: dependency: transitive description: @@ -200,6 +240,14 @@ packages: url: "https://pub.dev" source: hosted version: "8.2.8" + gbk_codec: + dependency: transitive + description: + name: gbk_codec + sha256: "3af5311fc9393115e3650ae6023862adf998051a804a08fb804f042724999f61" + url: "https://pub.dev" + source: hosted + version: "0.4.0" get_it: dependency: "direct main" description: @@ -208,6 +256,22 @@ packages: url: "https://pub.dev" source: hosted version: "8.0.3" + hex: + dependency: transitive + description: + name: hex + sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a" + url: "https://pub.dev" + source: hosted + version: "0.2.0" + html: + dependency: transitive + description: + name: html + sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec" + url: "https://pub.dev" + source: hosted + version: "0.15.5" http: dependency: "direct main" description: @@ -224,6 +288,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6" + url: "https://pub.dev" + source: hosted + version: "3.3.0" intl: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 42341f0..1eda80a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -51,6 +51,8 @@ dependencies: marquee: ^2.2.3 logger: ^2.4.0 fluttertoast: ^8.2.8 + esc_pos_printer: ^4.0.0 # Ensure you are using the latest version + esc_pos_utils: ^1.0.0 # win32: ^5.8.0 # tuple: ^2.0.2 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 661b0ef..b646fab 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,10 +6,13 @@ #include "generated_plugin_registrant.h" +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { + CharsetConverterPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("CharsetConverterPlugin")); ConnectivityPlusWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin")); FlutterTtsPluginRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 7363fb2..52d668b 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + charset_converter connectivity_plus flutter_tts )