Android IAP

lib/ui/app/upgrade_dialog.dart

@@ -126,7 +126,9 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
     final List<Widget> stack = <Widget>[];
     if (_queryProductError == null) {
       stack.add(
-        Scrollbar(
+        Container(
+          width: double.maxFinite,
+          child: Scrollbar(
             thumbVisibility: true,
             controller: _scrollController,
             child: ListView(
@@ -144,6 +146,7 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
               ],
             ),
           ),
+        ),
       );
     } else {
       stack.add(Center(
@@ -292,7 +295,7 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
     final data = {
       'inapp_transaction_id': purchaseDetails.purchaseID,
       'key': state.account.key,
-      'plan': purchaseDetails.productID,
+      'plan': purchaseDetails.productID.replaceAll('-', '_'),
       'plan_paid': (int.parse(purchaseDetails.transactionDate) / 1000).floor(),
     };
 

lib/utils/platforms.dart

@@ -37,7 +37,7 @@ bool supportsInAppPurchase() {
     return false;
   }
 
-  return isIOS();
+  return isIOS() || isAndroid();
 }
 
 bool isDesktopOS() => isMacOS() || isWindows() || isLinux();