diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 80354ca..0f523cb 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png index 2af6cc2..42fa42d 100644 Binary files a/android/app/src/main/ic_launcher-playstore.png and b/android/app/src/main/ic_launcher-playstore.png differ diff --git a/android/app/src/main/playstore-icon.png b/android/app/src/main/playstore-icon.png index c6d46b1..2dcd7f0 100644 Binary files a/android/app/src/main/playstore-icon.png and b/android/app/src/main/playstore-icon.png differ diff --git a/android/app/src/main/playstore-icon1.png b/android/app/src/main/playstore-icon1.png new file mode 100644 index 0000000..c6d46b1 Binary files /dev/null and b/android/app/src/main/playstore-icon1.png differ diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 304732f..b5ab9b0 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -4,9 +4,9 @@ - + android:src="@drawable/launch_image" /> + diff --git a/android/app/src/main/res/drawable/launch_image.png b/android/app/src/main/res/drawable/launch_image.png new file mode 100644 index 0000000..25f9fa6 Binary files /dev/null and b/android/app/src/main/res/drawable/launch_image.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 182ffbd..a209085 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher0.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher0.png new file mode 100644 index 0000000..b942ef7 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher0.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground0.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground0.png new file mode 100644 index 0000000..a482329 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground0.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round0.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round0.png new file mode 100644 index 0000000..b5f3bf4 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round0.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round1.png similarity index 100% rename from android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_round1.png diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 3b0dfde..a958e6d 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 432f1ee..9aa1098 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 55bcf86..9961571 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 9adb783..df44dd4 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/images/logo.xcf b/images/logo.xcf new file mode 100644 index 0000000..48651e9 Binary files /dev/null and b/images/logo.xcf differ diff --git a/images/logokulakpos.png b/images/logokulakpos.png new file mode 100644 index 0000000..a43236e Binary files /dev/null and b/images/logokulakpos.png differ diff --git a/images/splashkulakpos.png b/images/splashkulakpos.png new file mode 100644 index 0000000..25f9fa6 Binary files /dev/null and b/images/splashkulakpos.png differ diff --git a/images/splashkulakpos.xcf b/images/splashkulakpos.xcf new file mode 100644 index 0000000..94f37f0 Binary files /dev/null and b/images/splashkulakpos.xcf differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index eabd851..d807305 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -2,117 +2,115 @@ "images": [ { "filename": "Icon-App-20x20@2x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "2x", - "size": "20x20" + "size": "20x20", + "platform": "ios" }, { "filename": "Icon-App-20x20@3x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "3x", - "size": "20x20" - }, - { - "filename": "Icon-App-29x29@1x.png", - "idiom": "iphone", - "scale": "1x", - "size": "29x29" + "size": "20x20", + "platform": "ios" }, { "filename": "Icon-App-29x29@2x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "2x", - "size": "29x29" + "size": "29x29", + "platform": "ios" }, { "filename": "Icon-App-29x29@3x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "3x", - "size": "29x29" + "size": "29x29", + "platform": "ios" + }, + { + "filename": "Icon-App-38x38@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "38x38", + "platform": "ios" + }, + { + "filename": "Icon-App-38x38@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "38x38", + "platform": "ios" }, { "filename": "Icon-App-40x40@2x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "2x", - "size": "40x40" + "size": "40x40", + "platform": "ios" }, { "filename": "Icon-App-40x40@3x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "3x", - "size": "40x40" + "size": "40x40", + "platform": "ios" }, { "filename": "Icon-App-60x60@2x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "2x", - "size": "60x60" + "size": "60x60", + "platform": "ios" }, { "filename": "Icon-App-60x60@3x.png", - "idiom": "iphone", + "idiom": "universal", "scale": "3x", - "size": "60x60" + "size": "60x60", + "platform": "ios" }, { - "filename": "Icon-App-20x20@1x.png", - "idiom": "ipad", - "scale": "1x", - "size": "20x20" - }, - { - "filename": "Icon-App-20x20@2x.png", - "idiom": "ipad", + "filename": "Icon-App-64x64@2x.png", + "idiom": "universal", "scale": "2x", - "size": "20x20" + "size": "64x64", + "platform": "ios" }, { - "filename": "Icon-App-29x29@1x.png", - "idiom": "ipad", - "scale": "1x", - "size": "29x29" + "filename": "Icon-App-64x64@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "64x64", + "platform": "ios" }, { - "filename": "Icon-App-29x29@2x.png", - "idiom": "ipad", + "filename": "Icon-App-68x68@2x.png", + "idiom": "universal", "scale": "2x", - "size": "29x29" - }, - { - "filename": "Icon-App-40x40@1x.png", - "idiom": "ipad", - "scale": "1x", - "size": "40x40" - }, - { - "filename": "Icon-App-40x40@2x.png", - "idiom": "ipad", - "scale": "2x", - "size": "40x40" - }, - { - "filename": "Icon-App-76x76@1x.png", - "idiom": "ipad", - "scale": "1x", - "size": "76x76" + "size": "68x68", + "platform": "ios" }, { "filename": "Icon-App-76x76@2x.png", - "idiom": "ipad", + "idiom": "universal", "scale": "2x", - "size": "76x76" + "size": "76x76", + "platform": "ios" }, { "filename": "Icon-App-83.5x83.5@2x.png", - "idiom": "ipad", + "idiom": "universal", "scale": "2x", - "size": "83.5x83.5" + "size": "83.5x83.5", + "platform": "ios" }, { "filename": "Icon-App-1024x1024@1x.png", - "idiom": "ios-marketing", + "idiom": "universal", "scale": "1x", - "size": "1024x1024" + "size": "1024x1024", + "platform": "ios" } ], "info": { diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 3b2abdf..698db9c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 7820aa5..6b1c8a0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index a8ca0bf..0c35797 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 4d8bcc3..dc66c1e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index fa91874..d78e890 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@2x.png new file mode 100644 index 0000000..3a4db35 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@3x.png new file mode 100644 index 0000000..3a7c295 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-38x38@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index a1e57bf..4657c05 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 324593a..f280ee7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 324593a..f280ee7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index db1c96e..8cc1e72 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@2x.png new file mode 100644 index 0000000..0583d8f Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@3x.png new file mode 100644 index 0000000..c93c105 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-64x64@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-68x68@2x.png new file mode 100644 index 0000000..106ddd3 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-68x68@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 77b839a..3b2bd98 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index a647d84..694ae24 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/Screens/Home/home.dart b/lib/Screens/Home/home.dart index f7177ed..e1d6db2 100644 --- a/lib/Screens/Home/home.dart +++ b/lib/Screens/Home/home.dart @@ -15,14 +15,16 @@ import '../../Provider/profile_provider.dart'; import '../../service/check_actions_when_no_branch.dart'; class Home extends StatefulWidget { - const Home({super.key}); + const Home({super.key, this.initialIndex = 0}); + + final int initialIndex; @override _HomeState createState() => _HomeState(); } class _HomeState extends State { - int _tabIndex = 0; + late int _tabIndex = widget.initialIndex; late final PageController pageController = PageController(initialPage: _tabIndex); @override diff --git a/lib/Screens/invoice_details/sales_invoice_details_screen.dart b/lib/Screens/invoice_details/sales_invoice_details_screen.dart index 09e5c9e..293d10e 100644 --- a/lib/Screens/invoice_details/sales_invoice_details_screen.dart +++ b/lib/Screens/invoice_details/sales_invoice_details_screen.dart @@ -26,6 +26,7 @@ import '../../widgets/universal_image.dart'; import '../Products/add product/modle/create_product_model.dart'; import '../language/language_provider.dart'; import '../../Provider/product_provider.dart'; +import '../Home/home.dart'; class SalesInvoiceDetails extends StatefulWidget { const SalesInvoiceDetails({ @@ -165,7 +166,7 @@ class _SalesInvoiceDetailsState extends State { businessSettingData.when( data: (business) { final isSvg = business.data?.thermalInvoiceLogo?.endsWith('.svg'); - final imageUrl = '${APIConfig.domain}${business.data?.thermalInvoiceLogo}'; + final imageUrl = '${APIConfig.domain}${business.data?.thermalInvoiceLogo ?? ""}'; const placeholder = AssetImage(mainConstant.logo); return (business.data?.thermalInvoiceLogo?.isEmptyOrNull ?? true) ? buildInvoiceLogo(image: placeholder) @@ -1217,7 +1218,7 @@ class _SalesInvoiceDetailsState extends State { color: const Color(0xffF5F3F3), image: DecorationImage( image: NetworkImage( - '${APIConfig.domain}${widget.saleTransaction.image}', + '${APIConfig.domain}${widget.saleTransaction.image ?? ""}', ), fit: BoxFit.contain), ), @@ -1247,12 +1248,14 @@ class _SalesInvoiceDetailsState extends State { textAlign: TextAlign.center, ), ), - if (widget.businessInfo.data?.showInvoiceScannerLogo == 1) + if (widget.businessInfo.data?.showInvoiceScannerLogo == 1 && + widget.businessInfo.data?.invoiceScannerLogo != null) Padding( padding: const EdgeInsets.symmetric(vertical: 10), child: Center( child: UniversalImage( - imagePath: '${APIConfig.domain}${widget.businessInfo.data?.invoiceScannerLogo}', + imagePath: + '${APIConfig.domain}${widget.businessInfo.data?.invoiceScannerLogo ?? ""}', height: 120, width: 120, ), @@ -1314,12 +1317,21 @@ class _SalesInvoiceDetailsState extends State { PrintSalesTransactionModel model = PrintSalesTransactionModel( transitionModel: widget.saleTransaction, personalInformationModel: widget.businessInfo); - await printerData.printSalesThermalInvoiceNow( + bool printed = await printerData.printSalesThermalInvoiceNow( transaction: model, productList: model.transitionModel!.salesDetails, context: context, products: products.value, ); + if (printed && context.mounted) { + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute( + builder: (context) => const Home(initialIndex: 1), + ), + (route) => false, + ); + } // final defould = true; // if (defould) { diff --git a/lib/constant.dart b/lib/constant.dart index f56f979..31955b0 100644 --- a/lib/constant.dart +++ b/lib/constant.dart @@ -42,14 +42,14 @@ String noProductImageUrl = 'images/no_product_image.png'; ///---------update information--------------- -const String splashLogo = 'images/splashLogo.png'; +const String splashLogo = 'images/splashkulakpos.png'; const String onboard1 = 'images/onbord1.png'; const String onboard2 = 'images/onbord2.png'; const String onboard3 = 'images/onbord3.png'; -const String logo = 'images/logo.png'; -const String appsName = 'POSpro'; -const String companyWebsite = 'https://acnoo.com'; -const String companyName = 'Acnoo'; +const String logo = 'images/logokulakpos.png'; +const String appsName = 'KULAKPOS'; +const String companyWebsite = 'https://kulakpos.id'; +const String companyName = 'KULAKPOS'; bool connected = false; diff --git a/lib/thermal priting invoices/provider/print_thermal_invoice_provider.dart b/lib/thermal priting invoices/provider/print_thermal_invoice_provider.dart index 70e6f0a..4d28d4e 100644 --- a/lib/thermal priting invoices/provider/print_thermal_invoice_provider.dart +++ b/lib/thermal priting invoices/provider/print_thermal_invoice_provider.dart @@ -129,16 +129,27 @@ class ThermalPrinter extends ChangeNotifier { ); } - Future printSalesThermalInvoiceNow( + Future printSalesThermalInvoiceNow( {required PrintSalesTransactionModel transaction, required List? productList, required BuildContext context, List? products}) async { await getBluetooth(); - isBluetoothConnected - ? SalesThermalPrinterInvoice().printSalesTicket( - printTransactionModel: transaction, productList: productList, context: context, products: products) - : listOfBluDialog(context: context); + if (isBluetoothConnected) { + await SalesThermalPrinterInvoice().printSalesTicket( + printTransactionModel: transaction, productList: productList, context: context, products: products); + return true; + } else { + if (context.mounted) { + await listOfBluDialog(context: context); + } + if (isBluetoothConnected) { + await SalesThermalPrinterInvoice().printSalesTicket( + printTransactionModel: transaction, productList: productList, context: context, products: products); + return true; + } + return false; + } } Future printPurchaseThermalInvoiceNow( diff --git a/pubspec.yaml b/pubspec.yaml index 0865bab..d7ead8b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -135,14 +135,14 @@ flutter_intl: icons_launcher: - image_path: "images/appIcon.png" + image_path: "images/logokulakpos.png" platforms: android: enable: true ios: enable: true - image_path: "images/appIcon.png" + image_path: "images/logokulakpos.png" dependency_overrides: vector_math: ^2.2.0