Merge pull request #32 from woosignal/master

agordn52 · web-flow · commit 2580b11ef22b · 2022-02-12T11:39:45.000Z
v5.7.2 - updates
diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [5.7.2] - 2022-02-12
+
+* Button UI loading state added
+* Fix payments on Android for Stripe
+* v2 embedding for Android
+
 ## [5.7.1] - 2022-02-07
 
 * Refactor account order detail page
diff --git a/LabelStoreMax/README.md b/LabelStoreMax/README.md
@@ -4,7 +4,7 @@
 
 # WooCommerce App: Label StoreMax
 
-### Label StoreMax - v5.7.1
+### Label StoreMax - v5.7.2
 
 
 [Official WooSignal WooCommerce App](https://woosignal.com)
diff --git a/LabelStoreMax/android/app/build.gradle b/LabelStoreMax/android/app/build.gradle
@@ -30,7 +30,7 @@ android {
         exclude 'META-INF/DEPENDENCIES'
     }
 
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
diff --git a/LabelStoreMax/android/app/src/main/AndroidManifest.xml b/LabelStoreMax/android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.VIBRATE"/>
 
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="Label StoreMax"
         android:icon="@mipmap/launcher_icon">
         <activity
@@ -43,14 +43,6 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data
-                    android:scheme="stripesdk"
-                    android:host="3ds.stripesdk.io" />
-            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
diff --git a/LabelStoreMax/android/app/src/main/res/values/styles.xml b/LabelStoreMax/android/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="LaunchTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
diff --git a/LabelStoreMax/android/build.gradle b/LabelStoreMax/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/LabelStoreMax/android/gradle/wrapper/gradle-wrapper.properties b/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.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
diff --git a/LabelStoreMax/lib/resources/pages/account_billing_details.dart b/LabelStoreMax/lib/resources/pages/account_billing_details.dart
@@ -172,8 +172,9 @@ class _AccountBillingDetailsPageState extends State<AccountBillingDetailsPage> {
                         children: <Widget>[
                           PrimaryButton(
                               title: trans("UPDATE DETAILS"),
-                              action:
-                                  _isUpdating ? () {} : _updateBillingDetails),
+                              isLoading: _isUpdating,
+                              action: _updateBillingDetails,
+                          ),
                         ],
                       ),
                     ],
diff --git a/LabelStoreMax/lib/resources/pages/account_landing.dart b/LabelStoreMax/lib/resources/pages/account_landing.dart
@@ -98,7 +98,8 @@ class _AccountLandingPageState extends State<AccountLandingPage> {
                             obscureText: true),
                         PrimaryButton(
                           title: trans("Login"),
-                          action: _hasTappedLogin == true ? () {} : _loginUser,
+                          isLoading: _hasTappedLogin,
+                          action: _loginUser,
                         ),
                       ],
                     ),
diff --git a/LabelStoreMax/lib/resources/pages/account_profile_update.dart b/LabelStoreMax/lib/resources/pages/account_profile_update.dart
@@ -109,7 +109,9 @@ class _AccountProfileUpdatePageState extends State<AccountProfileUpdatePage> {
                           ),
                           PrimaryButton(
                               title: trans("Update details"),
-                              action: _updateDetails)
+                              isLoading: isLoading,
+                              action: _updateDetails,
+                          )
                         ],
                       ),
                       margin: EdgeInsets.all(8),
diff --git a/LabelStoreMax/lib/resources/pages/account_register.dart b/LabelStoreMax/lib/resources/pages/account_register.dart
@@ -106,7 +106,9 @@ class _AccountRegistrationPageState extends State<AccountRegistrationPage> {
             Padding(
               child: PrimaryButton(
                   title: trans("Sign up"),
-                  action: _hasTappedRegister ? () {} : _signUpTapped),
+                  isLoading: _hasTappedRegister,
+                  action: _signUpTapped,
+              ),
               padding: EdgeInsets.only(top: 10),
             ),
             Padding(
diff --git a/LabelStoreMax/lib/resources/pages/account_shipping_details.dart b/LabelStoreMax/lib/resources/pages/account_shipping_details.dart
@@ -189,8 +189,9 @@ class _AccountShippingDetailsPageState
                         children: <Widget>[
                           PrimaryButton(
                               title: trans("UPDATE DETAILS"),
-                              action:
-                                  _isUpdating ? () {} : _updateShippingDetails),
+                              isLoading: _isUpdating,
+                              action: _updateShippingDetails,
+                          ),
                         ],
                       ),
                     ],
diff --git a/LabelStoreMax/lib/resources/widgets/buttons.dart b/LabelStoreMax/lib/resources/widgets/buttons.dart
@@ -11,22 +11,26 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app/bootstrap/helpers.dart';
+import 'package:flutter_app/resources/widgets/app_loader_widget.dart';
 
 class PrimaryButton extends StatelessWidget {
   const PrimaryButton({
     Key key,
     this.title,
     this.action,
+    this.isLoading = false
   }) : super(key: key);
 
   final String title;
   final void Function() action;
+  final bool isLoading;
 
   @override
   Widget build(BuildContext context) => WooSignalButton(
         key: key,
         title: title,
         action: action,
+        isLoading: isLoading,
         textStyle: Theme.of(context).textTheme.button.copyWith(
             fontSize: 16,
             fontWeight: FontWeight.bold,
@@ -68,13 +72,20 @@ class LinkButton extends StatelessWidget {
   final void Function() action;
 
   @override
-  Widget build(BuildContext context) => WooSignalButton(
-        key: key,
-        title: title,
-        action: action,
-        textStyle: Theme.of(context).textTheme.bodyText1,
-        bgColor: Colors.transparent,
-      );
+  Widget build(BuildContext context) {
+    final double screenWidth = MediaQuery.of(context).size.width;
+    return InkWell(
+      key: key,
+      child:  Container(
+        height: (screenWidth >= 385 ? 55 : 49),
+        width: double.infinity,
+        decoration: BoxDecoration(
+          color: Colors.transparent,
+        ),
+        child: Center(child: Text(title, textAlign: TextAlign.center, style: Theme.of(context).textTheme.bodyText1,)),),
+      onTap: action,
+    );
+  }
 }
 
 class WooSignalButton extends StatelessWidget {
@@ -83,13 +94,15 @@ class WooSignalButton extends StatelessWidget {
     this.title,
     this.action,
     this.textStyle,
+    this.isLoading = false,
     this.bgColor,
   }) : super(key: key);
 
   final String title;
   final void Function() action;
   final TextStyle textStyle;
   final Color bgColor;
+  final bool isLoading;
 
   @override
   Widget build(BuildContext context) {
@@ -108,15 +121,16 @@ class WooSignalButton extends StatelessWidget {
             padding: EdgeInsets.all(8),
             elevation: 0,
             primary: bgColor,
-            shadowColor: Colors.transparent),
-        child: AutoSizeText(
+            shadowColor: Colors.transparent,
+        ),
+        child: isLoading ? AppLoaderWidget() : AutoSizeText(
           title,
           style: textStyle,
           maxLines: (screenWidth >= 385 ? 2 : 1),
           textAlign: TextAlign.center,
           overflow: TextOverflow.ellipsis,
         ),
-        onPressed: action,
+        onPressed: isLoading == true ? () {} : action,
       ),
     );
   }
diff --git a/LabelStoreMax/pubspec.lock b/LabelStoreMax/pubspec.lock
diff --git a/LabelStoreMax/pubspec.yaml b/LabelStoreMax/pubspec.yaml
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ android {`
`30`	`30`	`exclude 'META-INF/DEPENDENCIES'`
`31`	`31`	`}`
`32`	`32`
`33`		`- compileSdkVersion 30`
	`33`	`+ compileSdkVersion 31`
`34`	`34`
`35`	`35`	`sourceSets {`
`36`	`36`	`main.java.srcDirs += 'src/main/kotlin'`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:4.1.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.2.2'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`}`
`12`	`12`	`}`