Merge pull request #32 from pangeachat/freezing-fix

more testing

lib/pangea/controllers/subscription_controller.dart

@@ -13,6 +13,8 @@ import 'package:fluffychat/pangea/network/requests.dart';
 import 'package:fluffychat/pangea/network/urls.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:fluffychat/pangea/utils/firebase_analytics.dart';
+import 'package:fluffychat/pangea/widgets/subscription/subscription_paywall.dart';
+import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -145,18 +147,18 @@ class SubscriptionController extends BaseController {
         return;
       }
       if (!forceShow && isSubscribed) return;
-      // await showModalBottomSheet(
+      await showModalBottomSheet(
-      //   isScrollControlled: true,
+        isScrollControlled: true,
-      //   useRootNavigator: !PlatformInfos.isMobile,
+        useRootNavigator: !PlatformInfos.isMobile,
-      //   clipBehavior: Clip.hardEdge,
+        clipBehavior: Clip.hardEdge,
-      //   context: context,
+        context: context,
-      //   constraints: BoxConstraints(
+        constraints: BoxConstraints(
-      //     maxHeight: PlatformInfos.isMobile ? 600 : 480,
+          maxHeight: PlatformInfos.isMobile ? 600 : 480,
-      //   ),
+        ),
-      //   builder: (_) => SubscriptionPaywall(
+        builder: (_) => SubscriptionPaywall(
-      //     pangeaController: _pangeaController,
+          pangeaController: _pangeaController,
-      //   ),
+        ),
-      // );
+      );
     } catch (e, s) {
       ErrorHandler.logError(e: e, s: s);
     }

lib/pangea/widgets/subscription/subscription_options.dart

@@ -1,12 +1,10 @@
 // Flutter imports:
 
-import 'package:flutter/material.dart';
-
-import 'package:flutter_gen/gen_l10n/l10n.dart';
-
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/controllers/subscription_controller.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 class SubscriptionOptions extends StatelessWidget {
   final PangeaController pangeaController;
@@ -17,19 +15,20 @@ class SubscriptionOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Expanded(
+    return const Expanded(
       child: Wrap(
         alignment: WrapAlignment.center,
         direction: Axis.horizontal,
-        children: pangeaController
+        children: [],
-            .subscriptionController.subscription!.availableSubscriptions
+        // pangeaController
-            .map(
+        //     .subscriptionController.subscription!.availableSubscriptions
-              (subscription) => SubscriptionCard(
+        //     .map(
-                subscription: subscription,
+        //       (subscription) => SubscriptionCard(
-                pangeaController: pangeaController,
+        //         subscription: subscription,
-              ),
+        //         pangeaController: pangeaController,
-            )
+        //       ),
-            .toList(),
+        //     )
+        //     .toList(),
       ),
     );
   }