Update based on Review

cake-tech · Jun 14, 2022 · 379c2ea · 379c2ea
1 parent d7b69b8
commit 379c2ea
Show file tree

Hide file tree

Showing 17 changed files with 274 additions and 177 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -98,9 +98,6 @@ PODS:
   - Flutter (1.0.0)
   - flutter_secure_storage (3.3.1):
     - Flutter
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
   - local_auth (0.0.1):
     - Flutter
   - MTBBarcodeScanner (5.0.11)
@@ -118,9 +115,6 @@ PODS:
     - Flutter
   - shared_preferences (0.0.1):
     - Flutter
-  - sqflite (0.0.2):
-    - Flutter
-    - FMDB (>= 2.7.5)
   - SwiftProtobuf (1.12.0)
   - SwiftyGif (5.3.0)
   - uni_links (0.0.1):
@@ -151,7 +145,6 @@ DEPENDENCIES:
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - share (from `.symlinks/plugins/share/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - UnstoppableDomainsResolution (~> 4.0.0)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
@@ -163,7 +156,6 @@ SPEC REPOS:
     - CryptoSwift
     - DKImagePickerController
     - DKPhotoGallery
-    - FMDB
     - MTBBarcodeScanner
     - Reachability
     - SDWebImage
@@ -204,8 +196,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
   uni_links:
     :path: ".symlinks/plugins/uni_links/ios"
   url_launcher:
@@ -228,7 +218,6 @@ SPEC CHECKSUMS:
   file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
@@ -238,7 +227,6 @@ SPEC CHECKSUMS:
   SDWebImage: a990c053fff71e388a10f3357edb0be17929c9c5
   share: 0b2c3e82132f5888bccca3351c504d0003b3b410
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   SwiftProtobuf: 4ef85479c18ca85b5482b343df9c319c62bda699
   SwiftyGif: e466e86c660d343357ab944a819a101c4127cb40
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
@@ -248,4 +236,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: ae71bdf0eb731a1ffc399c122f6aa4dea0cb5f6f
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.11.2
diff --git a/lib/src/screens/ionia/auth/ionia_create_account_page.dart b/lib/src/screens/ionia/auth/ionia_create_account_page.dart
@@ -14,8 +14,6 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 
 class IoniaCreateAccountPage extends BasePage {
-  final IoniaViewModel _ioniaViewModel;
-
   IoniaCreateAccountPage(this._ioniaViewModel)
       : _emailFocus = FocusNode(),
         _emailController = TextEditingController(),
@@ -24,6 +22,8 @@ class IoniaCreateAccountPage extends BasePage {
     _emailController.addListener(() => _ioniaViewModel.email = _emailController.text);
   }
 
+  final IoniaViewModel _ioniaViewModel;
+
   final GlobalKey<FormState> _formKey;
 
   final FocusNode _emailFocus;
@@ -36,6 +36,7 @@ class IoniaCreateAccountPage extends BasePage {
       style: TextStyle(
         fontSize: 22,
         fontFamily: 'Lato',
+        color: Theme.of(context).accentTextTheme.display4.backgroundColor,
         fontWeight: FontWeight.w900,
       ),
     );
@@ -111,7 +112,7 @@ class IoniaCreateAccountPage extends BasePage {
                         fontWeight: FontWeight.w700,
                       ),
                     ),
-                    TextSpan(text: ' by CakePay'),
+                    TextSpan(text: ' ${S.of(context).by_cake_pay}'),
                   ],
                 ),
               ),

diff --git a/lib/src/screens/ionia/auth/ionia_login_page.dart b/lib/src/screens/ionia/auth/ionia_login_page.dart
@@ -1,6 +1,5 @@
 import 'package:cake_wallet/core/email_validator.dart';
 import 'package:cake_wallet/ionia/ionia_create_state.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
@@ -15,20 +14,20 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 
 class IoniaLoginPage extends BasePage {
-  final IoniaViewModel _ioniaViewModel;
   IoniaLoginPage(this._ioniaViewModel)
       : _formKey = GlobalKey<FormState>(),
-        _emailFocus = FocusNode(),
         _emailController = TextEditingController() {
     _emailController.text = _ioniaViewModel.email;
     _emailController.addListener(() => _ioniaViewModel.email = _emailController.text);
   }
 
   final GlobalKey<FormState> _formKey;
+
+  final IoniaViewModel _ioniaViewModel;
+
   @override
   Color get titleColor => Colors.black;
 
-  final FocusNode _emailFocus;
   final TextEditingController _emailController;
 
   @override

diff --git a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
@@ -15,9 +15,7 @@ import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
 
 class IoniaVerifyIoniaOtp extends BasePage {
-  final IoniaViewModel _ioniaViewModel;
-  final String _email;
-
+
   IoniaVerifyIoniaOtp(this._ioniaViewModel, this._email)
       : _codeController = TextEditingController(),
         _codeFocus = FocusNode() {
@@ -32,13 +30,18 @@ class IoniaVerifyIoniaOtp extends BasePage {
     });
   }
 
+  final IoniaViewModel _ioniaViewModel;
+
+  final String _email;
+
   @override
   Widget middle(BuildContext context) {
     return Text(
       S.current.verification,
       style: TextStyle(
         fontSize: 22,
         fontFamily: 'Lato',
+        color: Theme.of(context).accentTextTheme.display4.backgroundColor,
         fontWeight: FontWeight.w900,
       ),
     );

diff --git a/lib/src/screens/ionia/auth/ionia_welcome_page.dart b/lib/src/screens/ionia/auth/ionia_welcome_page.dart
@@ -9,25 +9,23 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:mobx/mobx.dart';
 
 class IoniaWelcomePage extends BasePage {
-  final IoniaViewModel _ioniaViewModel;
-
   IoniaWelcomePage(this._ioniaViewModel);
 
-  @override
-  Color get titleColor => Colors.black;
-
   @override
   Widget middle(BuildContext context) {
     return Text(
       S.current.welcome_to_cakepay,
       style: TextStyle(
         fontSize: 22,
         fontFamily: 'Lato',
+        color: Theme.of(context).accentTextTheme.display4.backgroundColor,
         fontWeight: FontWeight.w900,
       ),
     );
   }
 
+  final IoniaViewModel _ioniaViewModel;
+
   @override
   Widget body(BuildContext context) {
     reaction((_) => _ioniaViewModel.isLoggedIn, (bool state) {

diff --git a/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart b/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart
@@ -12,16 +12,18 @@ import 'package:cake_wallet/generated/i18n.dart';
 import 'package:mobx/mobx.dart';
 
 class IoniaActivateDebitCardPage extends BasePage {
-  final IoniaViewModel _ioniaViewModel;
 
   IoniaActivateDebitCardPage(this._ioniaViewModel);
 
+  final IoniaViewModel _ioniaViewModel;
+
   @override
   Widget middle(BuildContext context) {
     return Text(
       S.current.debit_card,
       style: TextStyle(
         fontSize: 22,
+        color: Theme.of(context).accentTextTheme.display4.backgroundColor,
         fontFamily: 'Lato',
         fontWeight: FontWeight.w900,
       ),

diff --git a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
@@ -1,6 +1,6 @@
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/palette.dart';
-import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/screens/ionia/widgets/confirm_modal.dart';
 import 'package:cake_wallet/src/screens/ionia/widgets/text_icon_button.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/discount_badge.dart';
@@ -11,7 +11,6 @@ import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/src/widgets/framework.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 
 class IoniaBuyGiftCardDetailPage extends StatelessWidget {
@@ -95,7 +94,7 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
               child: Column(
                 children: [
                   Text(
-                    'Gift Card Amount',
+                    S.of(context).gift_card_amount,
                     style: textSmall(),
                   ),
                   SizedBox(height: 4),
@@ -113,7 +112,7 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             Text(
-                              'Bill Amount',
+                              S.of(context).bill_amount,
                               style: textSmall(),
                             ),
                             SizedBox(height: 4),
@@ -127,7 +126,7 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
                           crossAxisAlignment: CrossAxisAlignment.end,
                           children: [
                             Text(
-                              'Tip',
+                              S.of(context).tip,
                               style: textSmall(),
                             ),
                             SizedBox(height: 4),
@@ -144,7 +143,7 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
                   Divider(),
                   SizedBox(height: 16),
                   Text(
-                    'You Pay',
+                    S.of(context).you_pay,
                     style: textSmall(),
                   ),
                   SizedBox(height: 4),
@@ -161,7 +160,7 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
-                    'Tip:',
+                    S.of(context).tip,
                     style: TextStyle(
                       color: Theme.of(context).primaryTextTheme.title.color,
                       fontWeight: FontWeight.w700,
@@ -205,25 +204,27 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
       ),
     );
   }
-}
 
-void purchaseCard(BuildContext context) {
-  showPopUp<void>(
-      context: context,
-      builder: (dialogContext) {
-        return AlertWithTwoActions(
-            alertTitle: S.of(context).save_backup_password_alert,
-            alertContent: S.of(context).change_backup_password_alert,
-            rightButtonText: S.of(context).ok,
-            leftButtonText: S.of(context).cancel,
-            leftActionColor: Color(0xffFF6600),
-            isDividerExist: true,
-            rightActionColor: Theme.of(context).accentTextTheme.body2.color,
-            actionRightButton: () async {
-              Navigator.of(dialogContext)..pop()..pop();
-            },
-            actionLeftButton: () => Navigator.of(dialogContext).pop());
-      });
+  void purchaseCard(BuildContext context) {
+    showPopUp<void>(
+        context: context,
+        builder: (_) {
+          return IoniaConfirmModal(
+              alertTitle: S.of(context).confirm_sending,
+              alertContent: SizedBox(
+                //Todo:: substitute this widget with modal content
+                height: 200,
+              ),
+              rightButtonText: S.of(context).ok,
+              leftButtonText: S.of(context).cancel,
+              leftActionColor: Color(0xffFF6600),
+              rightActionColor: Theme.of(context).accentTextTheme.body2.color,
+              actionRightButton: () async {
+                Navigator.of(context).pop();
+              },
+              actionLeftButton: () => Navigator.of(context).pop());
+        });
+  }
 }
 
 class TipButtonGroup extends StatefulWidget {
@@ -264,7 +265,7 @@ class _TipButtonGroupState extends State<TipButtonGroup> {
         SizedBox(width: 4),
         TipButton(
           isSelected: _isSelected('299'),
-          caption: 'Custom',
+          caption: S.of(context).custom,
         ),
       ],
     );

diff --git a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
@@ -1,8 +1,8 @@
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/src/screens/ionia/widgets/card_item.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
-import 'package:cake_wallet/src/widgets/market_place_item.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
@@ -126,12 +126,10 @@ class IoniaBuyGiftCardPage extends BasePage {
               ),
               Padding(
                 padding: const EdgeInsets.all(24.0),
-                child: MarketPlaceItem(
+                child: CardItem(
                   onTap: () {},
                   title: 'Applebee’s',
                   hasDiscount: true,
-                  isWhiteBackground: true,
-                  padding: EdgeInsets.all(12),
                   subTitle: 'subTitle',
                   logoUrl: '',
                 ),