This commit is contained in:
Hillel Coren 2019-09-03 08:45:05 +03:00
parent f8c60041d9
commit e630e43138
2 changed files with 23 additions and 6 deletions

View File

@ -162,13 +162,12 @@ class AppDrawer extends StatelessWidget {
: ListView( : ListView(
shrinkWrap: true, shrinkWrap: true,
children: <Widget>[ children: <Widget>[
/* if (isHosted(context) && !isPaidAccount(context))
if (isHosted(context) && !isProAccount(context))
Material( Material(
color: Colors.green, color: Colors.green,
child: ListTile( child: ListTile(
leading: Icon(FontAwesomeIcons.superpowers), leading: Icon(FontAwesomeIcons.superpowers, color: Colors.white,),
title: Text(localization.upgrade), title: Text(localization.upgrade, style: TextStyle(color: Colors.white)),
onTap: () => showDialog<UpgradeDialog>( onTap: () => showDialog<UpgradeDialog>(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
@ -176,7 +175,6 @@ class AppDrawer extends StatelessWidget {
}), }),
), ),
), ),
*/
DrawerTile( DrawerTile(
company: company, company: company,
icon: FontAwesomeIcons.tachometerAlt, icon: FontAwesomeIcons.tachometerAlt,
@ -482,6 +480,7 @@ class SidebarFooter extends StatelessWidget {
icon: Icon(Icons.info_outline), icon: Icon(Icons.info_outline),
onPressed: () => showAbout(), onPressed: () => showAbout(),
), ),
/*
if (isHosted(context) && !isPaidAccount(context)) ...[ if (isHosted(context) && !isPaidAccount(context)) ...[
Spacer(), Spacer(),
FlatButton( FlatButton(
@ -495,6 +494,7 @@ class SidebarFooter extends StatelessWidget {
), ),
SizedBox(width: 14) SizedBox(width: 14)
], ],
*/
], ],
), ),
); );

View File

@ -172,7 +172,24 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
parseDouble(product1.price) > parseDouble(product2.price) ? 1 : -1); parseDouble(product1.price) > parseDouble(product2.price) ? 1 : -1);
return SimpleDialog( return SimpleDialog(
title: Text(localization.annualSubscription), title: Column(
children: <Widget>[
Text(localization.annualSubscription),
if (Platform.isIOS)
Text('Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user\'s Account Settings after purchase.'),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
FlatButton(
child: Text(localization.termsOfService),
),
FlatButton(
child: Text(localization.privacyPolicy),
),
],
)
],
),
contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 15), contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 15),
children: [ children: [
if (_showPastPurchases) if (_showPastPurchases)