igiqr/flutter-woocommerce-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32 from woosignal/master

Browse Source 
v5.7.2 - updates
This commit is contained in:
Anthony Gordon 2022-02-12 11:39:45 +00:00 committed by GitHub
commit 2580b11ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 142 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LabelStoreMax/CHANGELOG.md
View File

@ -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

2
LabelStoreMax/README.md
View File

@ -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)

2
LabelStoreMax/android/app/build.gradle
View File

@ -30,7 +30,7 @@ android {
exclude 'META-INF/DEPENDENCIES'
}
compileSdkVersion 30
compileSdkVersion 31
sourceSets {
main.java.srcDirs += 'src/main/kotlin'

10
LabelStoreMax/android/app/src/main/AndroidManifest.xml
View File

@ -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 -->

2
LabelStoreMax/android/app/src/main/res/values/styles.xml
View File

@ -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>

2
LabelStoreMax/android/build.gradle
View File

@ -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"
}
}

2
LabelStoreMax/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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

5
LabelStoreMax/lib/resources/pages/account_billing_details.dart
View File

@ -172,8 +172,9 @@ class _AccountBillingDetailsPageState extends State<AccountBillingDetailsPage> {
children: <Widget>[
PrimaryButton(
title: trans("UPDATE DETAILS"),
action:
_isUpdating ? () {} : _updateBillingDetails),
isLoading: _isUpdating,
action: _updateBillingDetails,
),
],
),
],

3
LabelStoreMax/lib/resources/pages/account_landing.dart
View File

@ -98,7 +98,8 @@ class _AccountLandingPageState extends State<AccountLandingPage> {
obscureText: true),
PrimaryButton(
title: trans("Login"),
action: _hasTappedLogin == true ? () {} : _loginUser,
isLoading: _hasTappedLogin,
action: _loginUser,
),
],
),

4
LabelStoreMax/lib/resources/pages/account_profile_update.dart
View File

@ -109,7 +109,9 @@ class _AccountProfileUpdatePageState extends State<AccountProfileUpdatePage> {
),
PrimaryButton(
title: trans("Update details"),
action: _updateDetails)
isLoading: isLoading,
action: _updateDetails,
)
],
),
margin: EdgeInsets.all(8),

4
LabelStoreMax/lib/resources/pages/account_register.dart
View File

@ -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(

5
LabelStoreMax/lib/resources/pages/account_shipping_details.dart
View File

@ -189,8 +189,9 @@ class _AccountShippingDetailsPageState
children: <Widget>[
PrimaryButton(
title: trans("UPDATE DETAILS"),
action:
_isUpdating ? () {} : _updateShippingDetails),
isLoading: _isUpdating,
action: _updateShippingDetails,
),
],
),
],

34
LabelStoreMax/lib/resources/widgets/buttons.dart
View File

@ -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,6 +94,7 @@ class WooSignalButton extends StatelessWidget {
this.title,
this.action,
this.textStyle,
this.isLoading = false,
this.bgColor,
}) : super(key: key);
@ -90,6 +102,7 @@ class WooSignalButton extends StatelessWidget {
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,
),
);
}

145
LabelStoreMax/pubspec.lock
View File

@ -28,7 +28,7 @@ packages:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.2"
version: "3.1.11"
args:
dependency: transitive
description:
@ -119,7 +119,7 @@ packages:
name: cli_util
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.3"
version: "0.3.5"
clock:
dependency: transitive
description:
@ -154,7 +154,7 @@ packages:
name: csslib
url: "https://pub.dartlang.org"
source: hosted
version: "0.17.0"
version: "0.17.1"
cupertino_icons:
dependency: "direct main"
description:
@ -346,7 +346,7 @@ packages:
name: flutter_svg
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.3"
flutter_swiper:
dependency: "direct main"
description:
@ -384,7 +384,7 @@ packages:
name: flutter_widget_from_html_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.4"
version: "0.8.5+1"
freezed_annotation:
dependency: transitive
description:
@ -433,7 +433,7 @@ packages:
name: fwfh_text_style
url: "https://pub.dartlang.org"
source: hosted
version: "2.7.2"
version: "2.7.3+1"
fwfh_url_launcher:
dependency: transitive
description:
@ -454,7 +454,7 @@ packages:
name: glob
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.0.2"
google_fonts:
dependency: "direct main"
description:
@ -475,7 +475,7 @@ packages:
name: http
url: "https://pub.dartlang.org"
source: hosted
version: "0.13.3"
version: "0.13.4"
http_parser:
dependency: transitive
description:
@ -489,7 +489,7 @@ packages:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.2"
version: "3.1.1"
intl:
dependency: "direct main"
description:
@ -517,21 +517,21 @@ packages:
name: just_audio
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.18"
version: "0.9.19"
just_audio_platform_interface:
dependency: transitive
description:
name: just_audio_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.0"
version: "4.1.0"
just_audio_web:
dependency: transitive
description:
name: just_audio_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.2"
version: "0.4.4"
lints:
dependency: "direct dev"
description:
@ -553,6 +553,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.3"
math_expressions:
dependency: "direct main"
description:
@ -601,14 +608,14 @@ packages:
name: octo_image
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0+1"
version: "1.0.1"
package_config:
dependency: transitive
description:
name: package_config
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "2.0.2"
package_info:
dependency: "direct main"
description:
@ -650,35 +657,49 @@ packages:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.3"
version: "2.0.9"
path_provider_android:
dependency: transitive
description:
name: path_provider_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.11"
path_provider_ios:
dependency: transitive
description:
name: path_provider_ios
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.7"
path_provider_linux:
dependency: transitive
description:
name: path_provider_linux
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.1.5"
path_provider_macos:
dependency: transitive
description:
name: path_provider_macos
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.0.5"
path_provider_platform_interface:
dependency: transitive
description:
name: path_provider_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.0.3"
path_provider_windows:
dependency: transitive
description:
name: path_provider_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.3"
version: "2.0.5"
pedantic:
dependency: transitive
description:
@ -692,14 +713,14 @@ packages:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "4.3.0"
version: "4.4.0"
platform:
dependency: transitive
description:
name: platform
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.2"
version: "3.1.0"
platform_alert_dialog:
dependency: "direct main"
description:
@ -713,14 +734,14 @@ packages:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
version: "2.1.2"
process:
dependency: transitive
description:
name: process
url: "https://pub.dartlang.org"
source: hosted
version: "4.2.3"
version: "4.2.4"
provider:
dependency: transitive
description:
@ -734,7 +755,7 @@ packages:
name: pub_semver
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
version: "2.1.0"
pull_to_refresh:
dependency: "direct main"
description:
@ -755,42 +776,42 @@ packages:
name: rxdart
url: "https://pub.dartlang.org"
source: hosted
version: "0.27.2"
version: "0.27.3"
shared_preferences:
dependency: transitive
description:
name: shared_preferences
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.12"
version: "2.0.13"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.9"
version: "2.0.11"
shared_preferences_ios:
dependency: transitive
description:
name: shared_preferences_ios
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
version: "2.0.10"
shared_preferences_linux:
dependency: transitive
description:
name: shared_preferences_linux
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.1.0"
shared_preferences_macos:
dependency: transitive
description:
name: shared_preferences_macos
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.0.3"
shared_preferences_platform_interface:
dependency: transitive
description:
@ -804,14 +825,14 @@ packages:
name: shared_preferences_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.0.3"
shared_preferences_windows:
dependency: transitive
description:
name: shared_preferences_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "2.1.0"
sky_engine:
dependency: transitive
description: flutter
@ -830,14 +851,14 @@ packages:
name: sqflite
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0+4"
version: "2.0.2"
sqflite_common:
dependency: transitive
description:
name: sqflite_common
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1+1"
version: "2.2.0"
stack_trace:
dependency: transitive
description:
@ -907,7 +928,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.3"
version: "0.4.8"
theme_provider:
dependency: transitive
description:
@ -935,56 +956,56 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.18"
version: "6.0.20"
url_launcher_android:
dependency: transitive
description:
name: url_launcher_android
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.13"
version: "6.0.15"
url_launcher_ios:
dependency: transitive
description:
name: url_launcher_ios
url: "https://pub.dartlang.org"
source: hosted
version: "6.0.13"
version: "6.0.15"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "3.0.0"
url_launcher_macos:
dependency: transitive
description:
name: url_launcher_macos
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "3.0.0"
url_launcher_platform_interface:
dependency: transitive
description:
name: url_launcher_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.4"
version: "2.0.5"
url_launcher_web:
dependency: transitive
description:
name: url_launcher_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.5"
version: "2.0.8"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.2"
version: "3.0.0"
uuid:
dependency: transitive
description:
@ -1012,21 +1033,35 @@ packages:
name: video_player
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.13"
version: "2.2.18"
video_player_android:
dependency: transitive
description:
name: video_player_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.17"
video_player_avfoundation:
dependency: transitive
description:
name: video_player_avfoundation
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.18"
video_player_platform_interface:
dependency: transitive
description:
name: video_player_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.0"
version: "5.0.2"
video_player_web:
dependency: transitive
description:
name: video_player_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.6"
version: "2.0.7"
wakelock:
dependency: transitive
description:
@ -1068,42 +1103,42 @@ packages:
name: watcher
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
version: "1.0.1"
webview_flutter:
dependency: "direct main"
description:
name: webview_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.1"
version: "2.8.0"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
version: "2.8.2"
webview_flutter_platform_interface:
dependency: transitive
description:
name: webview_flutter_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.8.1"
webview_flutter_wkwebview:
dependency: transitive
description:
name: webview_flutter_wkwebview
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0"
version: "2.7.1"
win32:
dependency: transitive
description:
name: win32
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.9"
version: "2.3.11"
woosignal:
dependency: "direct main"
description:
@ -1124,14 +1159,14 @@ packages:
name: xdg_directories
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0"
version: "0.2.0+1"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "5.3.0"
version: "5.3.1"
yaml:
dependency: transitive
description:
@ -1141,4 +1176,4 @@ packages:
version: "3.1.0"
sdks:
dart: ">=2.15.0 <3.0.0"
flutter: ">=2.8.0"
flutter: ">=2.10.0"

2
LabelStoreMax/pubspec.yaml
View File

@ -1,7 +1,7 @@
# Official WooSignal App Template for WooCommerce
# Label StoreMax
# Version: 5.7.1
# Version: 5.7.2
# Author: Anthony Gordon
# Homepage: https://woosignal.com
# Documentation: https://woosignal.com/docs/app/label-storemax

2
README.md
View File

@ -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)