aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: add necessary info to subscription options

Browse Source
pull/1688/head
ggurdin 8 months ago committed by GitHub
parent 872db04582
commit 12951c3c48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 211 additions and 99 deletions
Show Stats Download Patch File Download Diff File

23
assets/l10n/intl_en.arb
Unescape Escape View File

@ -4830,5 +4830,26 @@
"noSpaceDescriptionYet": "No space description created yet.", "noSpaceDescriptionYet": "No space description created yet.",
"tooLargeToSend": "This message is too large to send", "tooLargeToSend": "This message is too large to send",
"leaveRoomDescription": "You're about to leave this chat. Other users will see that you have left the chat.", "leaveRoomDescription": "You're about to leave this chat. Other users will see that you have left the chat.",
"confirmUserId": "Please confirm your Pangea Chat username in order to delete your account." "confirmUserId": "Please confirm your Pangea Chat username in order to delete your account.",
"startingToday": "Starting today",
"oneWeekFreeTrial": "One week free trial",
"paidSubscriptionStarts": "Starting {startDate}",
"@paidSubscriptionStarts": {
"type": "String",
"placeholders": {
"startDate": {
"type": "String"
}
}
},
"cancelInSubscriptionSettings": "• Cancel at any time in subscription settings",
"cancelToAvoidCharges": "• Cancel before {trialEnds} to avoid charges",
"@cancelToAvoidCharges": {
"type": "String",
"placeholders": {
"trialEnds": {
"type": "String"
}
}
}
} }

4
lib/pangea/subscription/controllers/subscription_controller.dart
Unescape Escape View File

@ -147,7 +147,7 @@ class SubscriptionController extends BaseController {
} }
} }
void submitSubscriptionChange( Future<void> submitSubscriptionChange(
SubscriptionDetails? selectedSubscription, SubscriptionDetails? selectedSubscription,
BuildContext context, { BuildContext context, {
bool isPromo = false, bool isPromo = false,
@ -185,11 +185,13 @@ class SubscriptionController extends BaseController {
return; return;
} }
if (selectedSubscription.package == null) { if (selectedSubscription.package == null) {
final offerings = await Purchases.getOfferings();
ErrorHandler.logError( ErrorHandler.logError(
m: "Tried to subscribe to SubscriptionDetails with Null revenuecat Package", m: "Tried to subscribe to SubscriptionDetails with Null revenuecat Package",
s: StackTrace.current, s: StackTrace.current,
data: { data: {
"selectedSubscription": selectedSubscription.toJson(), "selectedSubscription": selectedSubscription.toJson(),
"offerings": offerings.toJson(),
}, },
); );
return; return;

193
lib/pangea/subscription/pages/change_subscription.dart
Unescape Escape View File

@ -1,10 +1,13 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:intl/intl.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart';
import 'package:fluffychat/pangea/subscription/controllers/subscription_controller.dart';
import 'package:fluffychat/pangea/subscription/pages/settings_subscription.dart'; import 'package:fluffychat/pangea/subscription/pages/settings_subscription.dart';
import 'package:fluffychat/pangea/subscription/widgets/subscription_buttons.dart';
import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/matrix.dart';
class ChangeSubscription extends StatelessWidget { class ChangeSubscription extends StatelessWidget {
@ -16,51 +19,187 @@ class ChangeSubscription extends StatelessWidget {
final PangeaController pangeaController = MatrixState.pangeaController; final PangeaController pangeaController = MatrixState.pangeaController;
List<SubscriptionDetails> get subscriptions =>
pangeaController.subscriptionController.availableSubscriptionInfo
?.availableSubscriptions ??
[];
bool get inTrialWindow => pangeaController.userController.inTrialWindow();
String get trialEnds => DateFormat.yMMMd()
.format(DateTime.now().add(const Duration(days: kIsWeb ? 0 : 7)));
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return controller.subscriptionsAvailable if (!controller.subscriptionsAvailable) {
? Column( return const Center(
mainAxisSize: MainAxisSize.min, child: Padding(
mainAxisAlignment: MainAxisAlignment.start, padding: EdgeInsets.all(16.0),
child: CircularProgressIndicator.adaptive(
strokeWidth: 2,
),
),
);
}
return Column(
spacing: 16.0,
children: [ children: [
Text( Text(
L10n.of(context).selectYourPlan, L10n.of(context).selectYourPlan,
style: const TextStyle(fontSize: 16), style: const TextStyle(fontSize: 16),
), ),
const SizedBox(height: 16.0), Column(
const Divider(height: 1), children: [
SubscriptionButtons(controller: controller), for (final subscription in subscriptions)
const SizedBox(height: 32), DecoratedBox(
IntrinsicWidth( decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 1.0,
),
),
),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
OutlinedButton( ListTile(
onPressed: controller.selectedSubscription != null title: Text(
? () => controller.submitChange() subscription.displayName(context),
: null, ),
child: controller.loading trailing: Icon(
? const CircularProgressIndicator.adaptive() controller.selectedSubscription?.id != subscription.id
? Icons.keyboard_arrow_right_outlined
: Icons.keyboard_arrow_down_outlined,
),
enabled: (!subscription.isTrial || inTrialWindow) &&
!controller.isCurrentSubscription(subscription),
onTap: () => controller.selectSubscription(subscription),
),
AnimatedSize(
duration: FluffyThemes.animationDuration,
child: controller.selectedSubscription?.id !=
subscription.id
? const SizedBox()
: Column(
children: [
Container(
constraints: const BoxConstraints(
maxWidth: 400.0,
),
decoration: BoxDecoration(
border: Border.all(
color: Theme.of(context).dividerColor,
),
borderRadius: const BorderRadius.all(
Radius.circular(16.0),
),
),
margin: const EdgeInsets.all(8.0),
child: Column(
children: [
if (!kIsWeb)
Container(
decoration: BoxDecoration(
color: Theme.of(context)
.colorScheme
.onPrimary,
borderRadius:
const BorderRadius.only(
topLeft: Radius.circular(16.0),
topRight: Radius.circular(16.0),
),
),
padding: const EdgeInsets.all(16.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
L10n.of(context).startingToday,
),
Text(
L10n.of(context)
.oneWeekFreeTrial,
),
],
),
),
Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
L10n.of(context)
.paidSubscriptionStarts(
trialEnds,
),
),
Text(
"${subscription.displayPrice(context)}/${subscription.duration?.value}",
style: const TextStyle(
fontWeight: FontWeight.bold,
),
),
],
),
),
],
),
),
Container(
constraints: const BoxConstraints(
maxWidth: 400.0,
),
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
L10n.of(context)
.cancelInSubscriptionSettings,
),
if (!kIsWeb)
Text(
L10n.of(context)
.cancelToAvoidCharges(trialEnds),
),
const SizedBox(height: 20.0),
ElevatedButton(
onPressed: () => controller
.submitChange(subscription),
child: Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
controller.loading
? const CircularProgressIndicator
.adaptive()
: Text( : Text(
controller.selectedSubscription?.isTrial ?? false subscription.isTrial
? L10n.of(context).activateTrial ? L10n.of(context)
.activateTrial
: L10n.of(context).pay, : L10n.of(context).pay,
), ),
],
),
), ),
const SizedBox(height: 20),
], ],
), ),
), ),
], ],
)
: const Center(
child: Padding(
padding: EdgeInsets.all(16.0),
child: CircularProgressIndicator.adaptive(
strokeWidth: 2,
), ),
), ),
],
),
),
],
),
const SizedBox(height: 20.0),
],
); );
} }
} }

11
lib/pangea/subscription/pages/settings_subscription.dart
Unescape Escape View File

@ -102,12 +102,15 @@ class SubscriptionManagementController extends State<SubscriptionManagement> {
.currentSubscriptionInfo!.currentPlatformMatchesPurchasePlatform; .currentSubscriptionInfo!.currentPlatformMatchesPurchasePlatform;
} }
Future<void> submitChange({bool isPromo = false}) async { Future<void> submitChange(
SubscriptionDetails subscription, {
bool isPromo = false,
}) async {
setState(() => loading = true); setState(() => loading = true);
await showFutureLoadingDialog( await showFutureLoadingDialog(
context: context, context: context,
future: () async => subscriptionController.submitSubscriptionChange( future: () async => subscriptionController.submitSubscriptionChange(
selectedSubscription, subscription,
context, context,
isPromo: isPromo, isPromo: isPromo,
), ),
@ -170,6 +173,10 @@ class SubscriptionManagementController extends State<SubscriptionManagement> {
} }
void selectSubscription(SubscriptionDetails? subscription) { void selectSubscription(SubscriptionDetails? subscription) {
if (selectedSubscription == subscription) {
setState(() => selectedSubscription = null);
return;
}
setState(() => selectedSubscription = subscription); setState(() => selectedSubscription = subscription);
} }

57
lib/pangea/subscription/widgets/subscription_buttons.dart
Unescape Escape View File

@ -1,57 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:fluffychat/pangea/common/controllers/pangea_controller.dart';
import 'package:fluffychat/pangea/subscription/controllers/subscription_controller.dart';
import 'package:fluffychat/pangea/subscription/pages/settings_subscription.dart';
import 'package:fluffychat/widgets/matrix.dart';
class SubscriptionButtons extends StatelessWidget {
final SubscriptionManagementController controller;
final PangeaController pangeaController = MatrixState.pangeaController;
SubscriptionButtons({
required this.controller,
super.key,
});
@override
Widget build(BuildContext context) {
final bool inTrialWindow = pangeaController.userController.inTrialWindow();
return ListView.builder(
shrinkWrap: true,
itemCount: controller.subscriptionController.availableSubscriptionInfo!
.availableSubscriptions.length,
itemBuilder: (BuildContext context, int i) {
final SubscriptionDetails subscription = pangeaController
.subscriptionController
.availableSubscriptionInfo!
.availableSubscriptions[i];
return Column(
children: [
ListTile(
title: Text(
subscription.displayName(context),
),
subtitle: Text(
subscription.isTrial && !inTrialWindow
? L10n.of(context).trialPeriodExpired
: subscription.displayPrice(context),
),
trailing: const Icon(Icons.keyboard_arrow_right_outlined),
selected: controller.selectedSubscription == subscription,
selectedTileColor:
Theme.of(context).colorScheme.secondary.withAlpha(16),
enabled: (!subscription.isTrial || inTrialWindow) &&
!controller.isCurrentSubscription(subscription),
onTap: () {
controller.selectSubscription(subscription);
},
),
const Divider(height: 1),
],
);
},
);
}
}
Write Preview
Loading…
Cancel
Save