From c60d5072fd2e8a854dc1da11839b7464a7659949 Mon Sep 17 00:00:00 2001 From: WooSignal Date: Fri, 8 May 2020 16:06:38 +0100 Subject: [PATCH] Small bug fixes --- LabelStoreMax/CHANGELOG.md | 1 - .../ios/Runner.xcodeproj/project.pbxproj | 4 -- LabelStoreMax/lib/helpers/app_themes.dart | 72 +++++++++---------- LabelStoreMax/lib/labelconfig.dart | 2 +- LabelStoreMax/pubspec.lock | 20 +++--- LabelStoreMax/pubspec.yaml | 7 +- 6 files changed, 51 insertions(+), 55 deletions(-) diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md index c461e27..804f479 100644 --- a/LabelStoreMax/CHANGELOG.md +++ b/LabelStoreMax/CHANGELOG.md @@ -3,7 +3,6 @@ * Flutter 1.17.0 support * Sort by feature * Cash on delivery added -* RazorPay added * Login/register flow change for Apple user guidelines * Bug fixes * Pubspec.yaml update diff --git a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj index 1e9b492..37eed38 100644 --- a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj +++ b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj @@ -272,8 +272,6 @@ "${BUILT_PRODUCTS_DIR}/flutter_web_browser/flutter_web_browser.framework", "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework", "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", - "${PODS_ROOT}/razorpay-pod/Pod/Razorpay.framework", - "${BUILT_PRODUCTS_DIR}/razorpay_flutter/razorpay_flutter.framework", "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", @@ -289,8 +287,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_web_browser.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Razorpay.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/razorpay_flutter.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", diff --git a/LabelStoreMax/lib/helpers/app_themes.dart b/LabelStoreMax/lib/helpers/app_themes.dart index 196fddc..4c3f6da 100644 --- a/LabelStoreMax/lib/helpers/app_themes.dart +++ b/LabelStoreMax/lib/helpers/app_themes.dart @@ -14,37 +14,37 @@ import 'package:label_storemax/helpers/tools.dart'; TextTheme textThemeAccent() { return TextTheme( - display1: new TextStyle( + headline4: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w800, fontSize: 26), - display2: new TextStyle( + headline3: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w600), - display3: new TextStyle( + headline2: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w600), - display4: new TextStyle( + headline1: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w600), - headline: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - title: new TextStyle( + headline5: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline6: new TextStyle( color: Colors.black, fontFamily: appFontFamily, ), - subhead: new TextStyle( + subtitle1: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w800), - body2: new TextStyle( + bodyText1: new TextStyle( color: HexColor("#606060"), fontFamily: appFontFamily, fontWeight: FontWeight.w700), - body1: new TextStyle( + bodyText2: new TextStyle( color: HexColor("#a8a8a8"), fontFamily: appFontFamily, fontWeight: FontWeight.w700, @@ -63,37 +63,37 @@ TextTheme textThemeAccent() { TextTheme textThemePrimary() { return TextTheme( - display1: new TextStyle( + headline4: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w800, fontSize: 26), - display2: new TextStyle( + headline3: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w600), - display3: new TextStyle( + headline2: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w600), - display4: new TextStyle( + headline1: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w600), - headline: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - title: new TextStyle( + headline5: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline6: new TextStyle( color: Colors.black87, fontFamily: appFontFamily, fontWeight: FontWeight.w600), - subhead: new TextStyle( + subtitle1: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w800), - body2: new TextStyle( + bodyText1: new TextStyle( color: HexColor("#606060"), fontFamily: appFontFamily, fontWeight: FontWeight.w700), - body1: new TextStyle( + bodyText2: new TextStyle( color: HexColor("#a8a8a8"), fontFamily: appFontFamily, fontWeight: FontWeight.w700, @@ -112,18 +112,18 @@ TextTheme textThemePrimary() { TextTheme textThemeMain() { return TextTheme( - display1: new TextStyle( + headline4: new TextStyle( color: Colors.black, fontFamily: appFontFamily, ), - display2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - display3: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - display4: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - headline: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - title: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - subhead: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - body2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - body1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline3: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline5: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline6: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + subtitle1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + bodyText1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + bodyText2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), caption: new TextStyle( color: Colors.redAccent, fontSize: 16, fontFamily: appFontFamily), button: new TextStyle(color: Colors.black, fontFamily: appFontFamily), @@ -132,18 +132,18 @@ TextTheme textThemeMain() { TextTheme textThemeAppBar() { return TextTheme( - display1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - display2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - display3: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - display4: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - headline: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - title: new TextStyle( + headline4: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline3: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline5: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + headline6: new TextStyle( color: Colors.black, fontFamily: appFontFamily, fontWeight: FontWeight.w900), - subhead: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - body2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), - body1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + subtitle1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + bodyText1: new TextStyle(color: Colors.black, fontFamily: appFontFamily), + bodyText2: new TextStyle(color: Colors.black, fontFamily: appFontFamily), caption: new TextStyle(color: Colors.black, fontFamily: appFontFamily), button: new TextStyle(color: Colors.black, fontFamily: appFontFamily), ); diff --git a/LabelStoreMax/lib/labelconfig.dart b/LabelStoreMax/lib/labelconfig.dart index 2b57d92..4c40b91 100644 --- a/LabelStoreMax/lib/labelconfig.dart +++ b/LabelStoreMax/lib/labelconfig.dart @@ -60,7 +60,7 @@ const app_payment_methods = ["Stripe"]; // Your StripeAccount key from WooSignal // link: https://woosignal.com/dashboard -const app_stripe_account = "Your StripeAccount from WooSignal"; +const app_stripe_account = "Your Stripe Key from WooSignal"; const app_stripe_live_mode = false; // For Live Payments follow the below steps diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock index 0858f4e..0ad3c0b 100644 --- a/LabelStoreMax/pubspec.lock +++ b/LabelStoreMax/pubspec.lock @@ -42,7 +42,7 @@ packages: name: cached_network_image url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.2.0+1" charcode: dependency: transitive description: @@ -98,7 +98,7 @@ packages: name: device_info url: "https://pub.dartlang.org" source: hosted - version: "0.4.2+2" + version: "0.4.2+3" dio: dependency: "direct main" description: @@ -300,7 +300,7 @@ packages: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.4+1" + version: "0.0.4+2" path_provider_platform_interface: dependency: transitive description: @@ -314,7 +314,7 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.8.0+1" + version: "1.9.0" petitparser: dependency: transitive description: @@ -370,14 +370,14 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.7" + version: "0.5.7+1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+7" + version: "0.0.1+8" shared_preferences_platform_interface: dependency: transitive description: @@ -391,7 +391,7 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.2+4" + version: "0.1.2+5" sky_engine: dependency: transitive description: flutter @@ -410,14 +410,14 @@ packages: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.0+1" sqflite_common: dependency: transitive description: name: sqflite_common url: "https://pub.dartlang.org" source: hosted - version: "1.0.0+1" + version: "1.0.1" stack_trace: dependency: transitive description: @@ -508,7 +508,7 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.1+2" + version: "0.1.1+4" uuid: dependency: transitive description: diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml index 48942e7..86bab61 100644 --- a/LabelStoreMax/pubspec.yaml +++ b/LabelStoreMax/pubspec.yaml @@ -8,11 +8,12 @@ # 1 Open: "lib/labelconfig.dart" ### Change App Icon -# 1 Open: assets/icon/appicon.png (line 53) replace icon (1024px1024px icon size) +# 1 Replace: assets/icon/appicon.png (1024px1024px icon size) # 2 Run this command from Terminal: flutter pub run flutter_launcher_icons:main -### Submitting the IOS/Android app -# 1 Open our online documentation: https://woosignal.com/docs/app/ios/label-storemax +### Uploading the IOS/Android app +# IOS https://flutter.dev/docs/deployment/ios +# Android https://flutter.dev/docs/deployment/android name: label_storemax description: LabelStoreMAX