Merge pull request #16 from woosignal/master

v5.2.0

Author: agordn52

LabelStoreMax/.env

@@ -23,14 +23,12 @@ APP_KEY="your app key"
 STRIPE_ACCOUNT="Stripe account key from WooSignal"
 # Stripe account key from WooSignal https://woosignal.com/dashboard
 
+STRIPE_COUNTRY_CODE="GB"
+# Alpha-2 country code list: https://www.iban.com/country-codes
+
 STRIPE_LIVE_MODE=null
 # Change to 'true' for live payments and update the "Environment for Stripe" here https://woosignal.com/dashboard
 
-# *<! ------ RAYZORPAY (OPTIONAL) ------!>*
-
-RAZORPAY_ID=""
-# Razorpay ID from https://razorpay.com
-
 # *<! ------ PAYPAL (OPTIONAL) ------!>*
 
 PAYPAL_ACCOUNT_EMAIL="mystore@business.com"

LabelStoreMax/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [5.2.0] - 2020-10-12
+
+* Migrate to Nylo 2.1.0
+* Use flutter_stripe library for payments
+* Remove RazorPay for build fails
+* Pubspec.yaml dependency updates
+* Android compileSdkVersion 30
+* Bug fixes
+
 ## [5.1.0] - 2020-07-19
 
 * Add support for simplified Chinese locale (zh)

LabelStoreMax/README.md

@@ -4,7 +4,7 @@
 
 # WooCommerce App: Label StoreMax
 
-### Label StoreMax - v5.1.0
+### Label StoreMax - v5.2.0
 
 
 [Official WooSignal WooCommerce App](https://woosignal.com)
@@ -44,7 +44,7 @@ Full documentation this available [here](https://woosignal.com/docs/app/ios/labe
 - Browse products, make orders, customer login (via WordPress)
 - Change app name, logo, customize default language, currency + more
 - Light and dark mode
-- Stripe, Cash On Delivery, RazorPay, PayPal
+- Stripe, Cash On Delivery, PayPal
 - Localized for en, es, pt, it, hi, fr, zh
 - Orders show as normal in WooCommerce
 

LabelStoreMax/android/app/build.gradle

@@ -26,7 +26,11 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+    }
+
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,8 +43,8 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.woosignal.android"
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion 21
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true

LabelStoreMax/android/app/src/main/kotlin/com/woosignal/android/MainActivity.kt

@@ -1,6 +1,7 @@
 package com.woosignal.android
 
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity() {
+class MainActivity: FlutterFragmentActivity() {
 }

LabelStoreMax/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

LabelStoreMax/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

LabelStoreMax/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

LabelStoreMax/ios/Runner/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>NSCameraUsageDescription</key>
-        <string>$(PRODUCT_NAME) photo use</string>
+    <string>You can take photos of your payment details.</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
     <key>MinimumOSVersion</key>

LabelStoreMax/lang/de.json

@@ -184,5 +184,6 @@
   "Payment Cancelled": "Zahlung storniert",
   "The payment has been cancelled": "Die Zahlung wurde storniert",
   "Must have": "Haben müssen",
-  "Our selection of new items": "Unsere Auswahl an Neuheiten"
+  "Our selection of new items": "Unsere Auswahl an Neuheiten",
+  "Register": "Registrieren"
 }