diff --git a/assets/images/2.0x/backup.png b/assets/images/2.0x/backup.png new file mode 100644 index 000000000..044e494a9 Binary files /dev/null and b/assets/images/2.0x/backup.png differ diff --git a/assets/images/2.0x/restore_keys.png b/assets/images/2.0x/restore_keys.png new file mode 100644 index 000000000..db52a8a2f Binary files /dev/null and b/assets/images/2.0x/restore_keys.png differ diff --git a/assets/images/2.0x/restore_seed.png b/assets/images/2.0x/restore_seed.png new file mode 100644 index 000000000..ae32393cc Binary files /dev/null and b/assets/images/2.0x/restore_seed.png differ diff --git a/assets/images/2.0x/restore_wallet_image.png b/assets/images/2.0x/restore_wallet_image.png new file mode 100644 index 000000000..85c913533 Binary files /dev/null and b/assets/images/2.0x/restore_wallet_image.png differ diff --git a/assets/images/3.0x/backup.png b/assets/images/3.0x/backup.png new file mode 100644 index 000000000..48737c9b2 Binary files /dev/null and b/assets/images/3.0x/backup.png differ diff --git a/assets/images/3.0x/restore_keys.png b/assets/images/3.0x/restore_keys.png new file mode 100644 index 000000000..05cf12ed7 Binary files /dev/null and b/assets/images/3.0x/restore_keys.png differ diff --git a/assets/images/3.0x/restore_seed.png b/assets/images/3.0x/restore_seed.png new file mode 100644 index 000000000..addaf2cd0 Binary files /dev/null and b/assets/images/3.0x/restore_seed.png differ diff --git a/assets/images/3.0x/restore_wallet_image.png b/assets/images/3.0x/restore_wallet_image.png new file mode 100644 index 000000000..e96af8782 Binary files /dev/null and b/assets/images/3.0x/restore_wallet_image.png differ diff --git a/assets/images/backup.png b/assets/images/backup.png new file mode 100644 index 000000000..e7948fba8 Binary files /dev/null and b/assets/images/backup.png differ diff --git a/assets/images/restore_keys.png b/assets/images/restore_keys.png new file mode 100644 index 000000000..cc1d80691 Binary files /dev/null and b/assets/images/restore_keys.png differ diff --git a/assets/images/restore_seed.png b/assets/images/restore_seed.png new file mode 100644 index 000000000..6a3ca415e Binary files /dev/null and b/assets/images/restore_seed.png differ diff --git a/assets/images/restore_wallet_image.png b/assets/images/restore_wallet_image.png new file mode 100644 index 000000000..4bd343eb3 Binary files /dev/null and b/assets/images/restore_wallet_image.png differ diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart index 8e1789efa..db3e0d746 100644 --- a/lib/src/screens/base_page.dart +++ b/lib/src/screens/base_page.dart @@ -63,7 +63,7 @@ abstract class BasePage extends StatelessWidget { : Text( title, style: TextStyle( - fontSize: 22.0, + fontSize: 18.0, fontWeight: FontWeight.bold, color: Colors.white), //color: Theme.of(context).primaryTextTheme.title.color), diff --git a/lib/src/screens/restore/restore_options_page.dart b/lib/src/screens/restore/restore_options_page.dart index 6a0dec278..604a8a6b2 100644 --- a/lib/src/screens/restore/restore_options_page.dart +++ b/lib/src/screens/restore/restore_options_page.dart @@ -3,57 +3,47 @@ import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/routes.dart'; import 'package:flutter/cupertino.dart'; import 'package:cake_wallet/src/screens/restore/widgets/restore_button.dart'; -import 'package:cake_wallet/src/screens/restore/widgets/image_widget.dart'; -import 'package:cake_wallet/src/screens/restore/widgets/base_restore_widget.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/generated/i18n.dart'; class RestoreOptionsPage extends BasePage { - static const _aspectRatioImage = 2.086; @override String get title => S.current.restore_restore_wallet; @override - Color get backgroundColor => Palette.creamyGrey; + Color get backgroundColor => PaletteDark.historyPanel; - final _imageSeedKeys = Image.asset('assets/images/seedKeys.png'); - final _imageRestoreSeed = Image.asset('assets/images/restoreSeed.png'); + final imageSeedKeys = Image.asset('assets/images/restore_wallet_image.png'); + final imageBackup = Image.asset('assets/images/backup.png'); @override Widget body(BuildContext context) { - final isLargeScreen = MediaQuery.of(context).size.height > largeHeight; - - return BaseRestoreWidget( - firstRestoreButton: RestoreButton( - onPressed: () => - Navigator.pushNamed( - context, Routes.restoreWalletOptionsFromWelcome), - imageWidget: ImageWidget( - image: _imageSeedKeys, - aspectRatioImage: _aspectRatioImage, - isLargeScreen: isLargeScreen, + return Container( + padding: EdgeInsets.all(24), + child: SingleChildScrollView( + child: Column( + children: [ + RestoreButton( + onPressed: () => + Navigator.pushNamed( + context, Routes.restoreWalletOptionsFromWelcome), + image: imageSeedKeys, + title: S.of(context).restore_title_from_seed_keys, + description: S.of(context).restore_description_from_seed_keys + ), + Padding( + padding: EdgeInsets.only(top: 24), + child: RestoreButton( + onPressed: () {}, + image: imageBackup, + title: S.of(context).restore_title_from_backup, + description: S.of(context).restore_description_from_backup + ), + ) + ], ), - titleColor: Palette.lightViolet, - color: Palette.lightViolet, - title: S.of(context).restore_title_from_seed_keys, - description: S.of(context).restore_description_from_seed_keys, - textButton: S.of(context).restore_next, - ), - secondRestoreButton: RestoreButton( - onPressed: () {}, - imageWidget: ImageWidget( - image: _imageRestoreSeed, - aspectRatioImage: _aspectRatioImage, - isLargeScreen: isLargeScreen, - ), - titleColor: Palette.cakeGreen, - color: Palette.cakeGreen, - title: S.of(context).restore_title_from_backup, - description: S.of(context).restore_description_from_backup, - textButton: S.of(context).restore_next, - ), - isLargeScreen: isLargeScreen, + ) ); } } diff --git a/lib/src/screens/restore/restore_wallet_options_page.dart b/lib/src/screens/restore/restore_wallet_options_page.dart index 39ac97a4d..82cdc0165 100644 --- a/lib/src/screens/restore/restore_wallet_options_page.dart +++ b/lib/src/screens/restore/restore_wallet_options_page.dart @@ -3,31 +3,59 @@ import 'package:flutter/cupertino.dart'; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/src/screens/restore/widgets/restore_button.dart'; -import 'package:cake_wallet/src/screens/restore/widgets/image_widget.dart'; -import 'package:cake_wallet/src/screens/restore/widgets/base_restore_widget.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart'; import 'package:provider/provider.dart'; class RestoreWalletOptionsPage extends BasePage { - static const _aspectRatioImage = 2.086; @override String get title => S.current.restore_seed_keys_restore; @override - Color get backgroundColor => Palette.creamyGrey; + Color get backgroundColor => PaletteDark.historyPanel; - final _imageSeed = Image.asset('assets/images/seedIco.png'); - final _imageKeys = Image.asset('assets/images/keysIco.png'); + final imageSeed = Image.asset('assets/images/restore_seed.png'); + final imageKeys = Image.asset('assets/images/restore_keys.png'); @override Widget body(BuildContext context) { final seedLanguageStore = Provider.of(context); - final isLargeScreen = MediaQuery.of(context).size.height > largeHeight; - return BaseRestoreWidget( + return Container( + padding: EdgeInsets.all(24), + child: SingleChildScrollView( + child: Column( + children: [ + RestoreButton( + onPressed: () { + seedLanguageStore.setCurrentRoute(Routes.restoreWalletFromSeed); + Navigator.pushNamed(context, Routes.seedLanguage); + }, + image: imageSeed, + title: S.of(context).restore_title_from_seed, + description: S.of(context).restore_description_from_seed + ), + Padding( + padding: EdgeInsets.only(top: 24), + child: RestoreButton( + onPressed: () { + seedLanguageStore.setCurrentRoute(Routes.restoreWalletFromKeys); + Navigator.pushNamed(context, Routes.seedLanguage); + }, + image: imageKeys, + title: S.of(context).restore_title_from_keys, + description: S.of(context).restore_description_from_keys + ), + ) + ], + ), + ) + ); + + + /*BaseRestoreWidget( firstRestoreButton: RestoreButton( onPressed: () { seedLanguageStore.setCurrentRoute(Routes.restoreWalletFromSeed); @@ -59,6 +87,6 @@ class RestoreWalletOptionsPage extends BasePage { textButton: S.of(context).restore_next, ), isLargeScreen: isLargeScreen, - ); + );*/ } } diff --git a/lib/src/screens/restore/widgets/base_restore_widget.dart b/lib/src/screens/restore/widgets/base_restore_widget.dart deleted file mode 100644 index 8e0b2f0dc..000000000 --- a/lib/src/screens/restore/widgets/base_restore_widget.dart +++ /dev/null @@ -1,44 +0,0 @@ -import 'package:flutter/material.dart'; - -const largeHeight = 700; - -class BaseRestoreWidget extends StatelessWidget { - BaseRestoreWidget({ - @required this.firstRestoreButton, - @required this.secondRestoreButton, - this.isLargeScreen = false - }); - - final Widget firstRestoreButton; - final Widget secondRestoreButton; - final bool isLargeScreen; - - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.only( - left: 20.0, - right: 20.0, - ), - child: isLargeScreen - ? Column( - children: [ - Flexible( - child: firstRestoreButton - ), - Flexible( - child: secondRestoreButton - ) - ], - ) - : SingleChildScrollView( - child: Column( - children: [ - firstRestoreButton, - secondRestoreButton - ], - ), - ) - ); - } -} \ No newline at end of file diff --git a/lib/src/screens/restore/widgets/image_widget.dart b/lib/src/screens/restore/widgets/image_widget.dart deleted file mode 100644 index 016bd9ce8..000000000 --- a/lib/src/screens/restore/widgets/image_widget.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:flutter/material.dart'; - -class ImageWidget extends StatelessWidget { - ImageWidget({ - @required this.image, - @required this.aspectRatioImage, - this.isLargeScreen = false}); - - final Image image; - final double aspectRatioImage; - final bool isLargeScreen; - - @override - Widget build(BuildContext context) { - return isLargeScreen - ? Flexible( - child: Container( - child: AspectRatio( - aspectRatio: aspectRatioImage, - child: FittedBox( - fit: BoxFit.contain, - child: image, - ), - ), - ), - ) - : image; - } -} \ No newline at end of file diff --git a/lib/src/screens/restore/widgets/restore_button.dart b/lib/src/screens/restore/widgets/restore_button.dart index ffa73a2fb..0db7cab5f 100644 --- a/lib/src/screens/restore/widgets/restore_button.dart +++ b/lib/src/screens/restore/widgets/restore_button.dart @@ -1,101 +1,71 @@ +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:cake_wallet/palette.dart'; -import 'package:auto_size_text/auto_size_text.dart'; class RestoreButton extends StatelessWidget { - const RestoreButton( - {@required this.onPressed, - @required this.imageWidget, - @required this.color, - @required this.titleColor, - this.title = '', - this.description = '', - this.textButton = ''}); + const RestoreButton({ + @required this.onPressed, + @required this.image, + @required this.title, + @required this.description}); final VoidCallback onPressed; - final Widget imageWidget; - final Color color; - final Color titleColor; + final Image image; final String title; final String description; - final String textButton; @override Widget build(BuildContext context) { - return Container( - margin: EdgeInsets.only(top: 20.0, bottom: 20.0), - decoration: BoxDecoration( - color: Theme.of(context).accentTextTheme.headline.backgroundColor, - borderRadius: BorderRadius.all(Radius.circular(20.0)), - boxShadow: [ - BoxShadow( - color: Palette.buttonShadow, - blurRadius: 10, - offset: Offset( - 0, - 12, + return GestureDetector( + onTap: onPressed, + child: Container( + width: double.infinity, + height: 140, + padding: EdgeInsets.all(24), + alignment: Alignment.topLeft, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(12)), + color: PaletteDark.menuList + ), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + image, + Expanded( + child: Padding( + padding: EdgeInsets.only(left: 16), + child: Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + title, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + color: Colors.white + ), + ), + Padding( + padding: EdgeInsets.only(top: 5), + child: Text( + title, + style: TextStyle( + fontSize: 14, + color: PaletteDark.walletCardText + ), + ), + ) + ], + ), ), ) - ]), - child: InkWell( - onTap: onPressed, - borderRadius: BorderRadius.all(Radius.circular(20.0)), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - imageWidget, - Column( - children: [ - Padding( - padding: EdgeInsets.only(left: 20, right: 20), - child: AutoSizeText( - title, - textAlign: TextAlign.center, - style: TextStyle( - color: titleColor, - fontWeight: FontWeight.bold), - maxLines: 2, - ), - ), - Padding( - padding: EdgeInsets.only(left: 20, right: 20, top: 10), - child: AutoSizeText( - description, - textAlign: TextAlign.center, - style: TextStyle( - color: Theme.of(context).accentTextTheme.subhead.color, - ), - maxLines: 2, - ) - ) - ], - ), - SizedBox( - height: 20, - ), - Container( - height: 56.0, - decoration: BoxDecoration( - border: Border( - top: BorderSide( - color: Theme.of(context) - .accentTextTheme - .headline - .decorationColor, - width: 1.15)), - color: Colors.transparent, - ), - child: Center( - child: Text( - textButton, - style: TextStyle( - color: color, - fontSize: 16.0, - fontWeight: FontWeight.bold), - ), - )) - ], - )), + ], + ), + ), ); } }