常守达 / doublefeel_flutter · Commits

Go to a project

Commit 67367a1106c39791136e1784bb17b78b0cfb860f

Authored by 刘宏哲
1 parent 390702b6
build: skipped

feat(app): bug fixed

Inline Side-by-side
Showing 6 changed files with 87 additions and 95 deletions
import 'package:doublefeel_flutter/app/modules/login/views/email_login_contact_us_bottom_sheet.dart';
import 'package:doublefeel_flutter/core/logging/app_logger.dart';
import 'package:doublefeel_flutter/core/network/api/pay_api.dart';
import 'package:doublefeel_flutter/core/network/api/vip_api.dart';
... ... @@ -176,7 +177,7 @@ class MembershipDetailController extends GetxController {
}
void openContactUs() {
Get.toNamed(Routes.SUBMIT_FEEDBACK);
feedbackCompat(pageName: 'Subscription page');
}
Future<void> manageSubscription() async {
... ...
... ... @@ -8,6 +8,7 @@ import 'package:doublefeel_flutter/data/local/user_preferences_storage.dart';
import 'package:doublefeel_flutter/data/models/local/user_preferences.dart';
import 'package:doublefeel_flutter/l10n/l10n_extensions.dart';
import 'package:doublefeel_flutter/l10n/l10n_extensions.dart' as context;
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
... ... @@ -410,7 +411,7 @@ class _LegalNotes extends StatelessWidget {
}
}
class _LegalText extends StatelessWidget {
class _LegalText extends StatefulWidget {
const _LegalText({
required this.prefix,
required this.text,
... ... @@ -425,6 +426,31 @@ class _LegalText extends StatelessWidget {
final String? linkSuffix;
final VoidCallback? onLinkTap;
@override
State<_LegalText> createState() => _LegalTextState();
}
class _LegalTextState extends State<_LegalText> {
late final TapGestureRecognizer _linkRecognizer;
@override
void initState() {
super.initState();
_linkRecognizer = TapGestureRecognizer()..onTap = widget.onLinkTap;
}
@override
void didUpdateWidget(covariant _LegalText oldWidget) {
super.didUpdateWidget(oldWidget);
_linkRecognizer.onTap = widget.onLinkTap;
}
@override
void dispose() {
_linkRecognizer.dispose();
super.dispose();
}
static const _baseStyle = TextStyle(
color: PurchaseColors.subtitle,
fontSize: 12,
... ... @@ -441,48 +467,25 @@ class _LegalText extends StatelessWidget {
TextSpan _buildTextSpan() => TextSpan(
style: _baseStyle,
children: [
TextSpan(text: text),
if (linkText case final linkText?)
TextSpan(text: linkText, style: _linkStyle),
if (linkSuffix case final linkSuffix?) TextSpan(text: linkSuffix),
TextSpan(text: widget.text),
if (widget.linkText case final linkText?)
TextSpan(
text: linkText,
style: _linkStyle,
recognizer: widget.onLinkTap == null ? null : _linkRecognizer,
),
if (widget.linkSuffix case final linkSuffix?)
TextSpan(text: linkSuffix),
],
);
void _handleTapUp(
BuildContext context,
BoxConstraints constraints,
TapUpDetails details,
) {
final linkText = this.linkText;
if (linkText == null || onLinkTap == null) return;
final painter = TextPainter(
text: _buildTextSpan(),
textDirection: Directionality.of(context),
textScaler: MediaQuery.textScalerOf(context),
)..layout(maxWidth: constraints.maxWidth);
final linkStart = text.length;
final linkBoxes = painter.getBoxesForSelection(
TextSelection(
baseOffset: linkStart,
extentOffset: linkStart + linkText.length,
),
);
if (linkBoxes.any(
(box) => box.toRect().inflate(10).contains(details.localPosition),
)) {
onLinkTap!.call();
}
}
@override
Widget build(BuildContext context) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
prefix,
widget.prefix,
style: const TextStyle(
color: PurchaseColors.subtitle,
fontSize: 12,
... ... @@ -490,17 +493,9 @@ class _LegalText extends StatelessWidget {
),
),
Expanded(
child: LayoutBuilder(
builder: (context, constraints) => GestureDetector(
behavior: HitTestBehavior.opaque,
onTapUp: linkText == null || onLinkTap == null
? null
: (details) => _handleTapUp(context, constraints, details),
child: Text.rich(
_buildTextSpan(),
textScaler: MediaQuery.textScalerOf(context),
),
),
child: Text.rich(
_buildTextSpan(),
textScaler: MediaQuery.textScalerOf(context),
),
),
],
... ...
import 'dart:async';
import 'package:doublefeel_flutter/app/modules/login/views/email_login_contact_us_bottom_sheet.dart';
import 'package:doublefeel_flutter/app/routes/app_pages.dart';
import 'package:doublefeel_flutter/core/config/app_environment_config.dart';
import 'package:doublefeel_flutter/core/constants/app_const.dart';
... ... @@ -394,7 +395,7 @@ class PurchaseController extends GetxController {
void openContactUs() {
_trackClickVipCenter('联系我们');
Get.toNamed(Routes.SUBMIT_FEEDBACK);
feedbackCompat(pageName: 'Subscription page');
}
void openUserTerms() {
... ...
... ... @@ -3,6 +3,7 @@ import 'package:doublefeel_flutter/app/widget/premium_benefit_list_view.dart';
import 'package:doublefeel_flutter/core/util/size_extensions.dart';
import 'package:doublefeel_flutter/l10n/l10n_extensions.dart';
import 'package:doublefeel_flutter/r.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
... ... @@ -287,7 +288,7 @@ class _LegalNotes extends StatelessWidget {
}
}
class _LegalText extends StatelessWidget {
class _LegalText extends StatefulWidget {
const _LegalText({
required this.prefix,
required this.text,
... ... @@ -302,6 +303,31 @@ class _LegalText extends StatelessWidget {
final String? linkSuffix;
final VoidCallback? onLinkTap;
@override
State<_LegalText> createState() => _LegalTextState();
}
class _LegalTextState extends State<_LegalText> {
late final TapGestureRecognizer _linkRecognizer;
@override
void initState() {
super.initState();
_linkRecognizer = TapGestureRecognizer()..onTap = widget.onLinkTap;
}
@override
void didUpdateWidget(covariant _LegalText oldWidget) {
super.didUpdateWidget(oldWidget);
_linkRecognizer.onTap = widget.onLinkTap;
}
@override
void dispose() {
_linkRecognizer.dispose();
super.dispose();
}
static const _baseStyle = TextStyle(
color: PurchaseColors.subtitle,
fontSize: 12,
... ... @@ -318,48 +344,25 @@ class _LegalText extends StatelessWidget {
TextSpan _buildTextSpan() => TextSpan(
style: _baseStyle,
children: [
TextSpan(text: text),
if (linkText case final linkText?)
TextSpan(text: linkText, style: _linkStyle),
if (linkSuffix case final linkSuffix?) TextSpan(text: linkSuffix),
TextSpan(text: widget.text),
if (widget.linkText case final linkText?)
TextSpan(
text: linkText,
style: _linkStyle,
recognizer: widget.onLinkTap == null ? null : _linkRecognizer,
),
if (widget.linkSuffix case final linkSuffix?)
TextSpan(text: linkSuffix),
],
);
void _handleTapUp(
BuildContext context,
BoxConstraints constraints,
TapUpDetails details,
) {
final linkText = this.linkText;
if (linkText == null || onLinkTap == null) return;
final painter = TextPainter(
text: _buildTextSpan(),
textDirection: Directionality.of(context),
textScaler: MediaQuery.textScalerOf(context),
)..layout(maxWidth: constraints.maxWidth);
final linkStart = text.length;
final linkBoxes = painter.getBoxesForSelection(
TextSelection(
baseOffset: linkStart,
extentOffset: linkStart + linkText.length,
),
);
if (linkBoxes.any(
(box) => box.toRect().inflate(10).contains(details.localPosition),
)) {
onLinkTap!.call();
}
}
@override
Widget build(BuildContext context) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
prefix,
widget.prefix,
style: const TextStyle(
color: PurchaseColors.subtitle,
fontSize: 12,
... ... @@ -367,17 +370,9 @@ class _LegalText extends StatelessWidget {
),
),
Expanded(
child: LayoutBuilder(
builder: (context, constraints) => GestureDetector(
behavior: HitTestBehavior.opaque,
onTapUp: linkText == null || onLinkTap == null
? null
: (details) => _handleTapUp(context, constraints, details),
child: Text.rich(
_buildTextSpan(),
textScaler: MediaQuery.textScalerOf(context),
),
),
child: Text.rich(
_buildTextSpan(),
textScaler: MediaQuery.textScalerOf(context),
),
),
],
... ...
... ... @@ -666,7 +666,7 @@
"premiumActivatedContinue": "Continue",
"purchaseHeroTitle": "Unlock Pro, Care Better",
"purchaseBenefitsTitle": "Unlock All Pro Benefits",
"purchaseUnlockNow": "Unlock",
"purchaseUnlockNow": "Next",
"purchaseRestore": "Restore",
"purchaseTermsOfService": "Terms of Service",
"purchasePrivacyPolicy": "Privacy Policy",
... ... @@ -1065,4 +1065,4 @@
}
},
"updatePassword": "Update password"
}
\ No newline at end of file
}
... ...
... ... @@ -1926,7 +1926,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get purchaseBenefitsTitle => 'Unlock All Pro Benefits';
@override
String get purchaseUnlockNow => 'Unlock';
String get purchaseUnlockNow => 'Next';
@override
String get purchaseRestore => 'Restore';
... ...