Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-23 03:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #69 from cake-tech/CWA-222-bug-fix-4

Browse source 
Cwa 222 bug fix 4
This commit is contained in:
Oleksandr Sobol 2020-06-12 20:09:15 +03:00 committed by GitHub
commit 733e8a90ea
8 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/screens/dashboard/dashboard_page.dart
View file

@ -64,7 +64,7 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only(left: 20, top: 20), padding: EdgeInsets.only(left: 20, top: 5),
child: WalletCard(), child: WalletCard(),
), ),
SizedBox( SizedBox(

2
lib/src/screens/dashboard/widgets/button_header.dart
View file

@ -244,7 +244,7 @@ class ButtonHeader extends SliverPersistentHeaderDelegate {
} }
@override @override
double get maxExtent => 174; double get maxExtent => 164;
@override @override
double get minExtent => 66; double get minExtent => 66;

2
lib/src/screens/dashboard/widgets/trade_history_panel.dart
View file

@ -75,7 +75,7 @@ class TradeHistoryPanelState extends State<TradeHistoryPanel> {
: actionListStore.items; : actionListStore.items;
final itemsCount = items.length + 1; final itemsCount = items.length + 1;
final symbol = settingsStore.fiatCurrency.toString(); final symbol = settingsStore.fiatCurrency.toString();
double freeSpaceHeight = MediaQuery.of(context).size.height - 496; double freeSpaceHeight = MediaQuery.of(context).size.height - 480;
return SliverList( return SliverList(
key: _listKey, key: _listKey,

5
lib/src/screens/exchange/exchange_page.dart
View file

@ -10,7 +10,7 @@ import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart'; import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart';
import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart'; import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker.dart';
import 'package:cake_wallet/src/screens/exchange/widgets/base_exchange_widget.dart'; import 'package:cake_wallet/src/screens/exchange/widgets/base_exchange_widget.dart';
import 'package:cake_wallet/src/widgets/clear_button.dart'; import 'package:cake_wallet/src/widgets/trail_button.dart';
class ExchangePage extends BasePage { class ExchangePage extends BasePage {
@override @override
@ -33,7 +33,8 @@ class ExchangePage extends BasePage {
Widget trailing(BuildContext context) { Widget trailing(BuildContext context) {
final exchangeStore = Provider.of<ExchangeStore>(context); final exchangeStore = Provider.of<ExchangeStore>(context);
return ClearButton( return TrailButton(
caption: S.of(context).reset,
onPressed: () => exchangeStore.reset() onPressed: () => exchangeStore.reset()
); );
} }

7
lib/src/screens/seed/seed_page.dart
View file

@ -37,9 +37,10 @@ class SeedPage extends BasePage {
? GestureDetector( ? GestureDetector(
onTap: () => onClose(context), onTap: () => onClose(context),
child: Container( child: Container(
width: 70, width: 100,
height: 32, height: 42,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(left: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(16)), borderRadius: BorderRadius.all(Radius.circular(16)),
color: Theme.of(context).accentTextTheme.title.color color: Theme.of(context).accentTextTheme.title.color
@ -47,7 +48,7 @@ class SeedPage extends BasePage {
child: Text( child: Text(
S.of(context).seed_language_next, S.of(context).seed_language_next,
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 14,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.blue color: Colors.blue
), ),

5
lib/src/screens/send/send_page.dart
View file

@ -29,7 +29,7 @@ import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart'
import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart'; import 'package:cake_wallet/src/screens/send/widgets/sending_alert.dart';
import 'package:cake_wallet/src/widgets/template_tile.dart'; import 'package:cake_wallet/src/widgets/template_tile.dart';
import 'package:cake_wallet/src/stores/send_template/send_template_store.dart'; import 'package:cake_wallet/src/stores/send_template/send_template_store.dart';
import 'package:cake_wallet/src/widgets/clear_button.dart'; import 'package:cake_wallet/src/widgets/trail_button.dart';
class SendPage extends BasePage { class SendPage extends BasePage {
@override @override
@ -48,7 +48,8 @@ class SendPage extends BasePage {
Widget trailing(context) { Widget trailing(context) {
final sendStore = Provider.of<SendStore>(context); final sendStore = Provider.of<SendStore>(context);
return ClearButton( return TrailButton(
caption: S.of(context).clear,
onPressed: () => sendStore.clear() onPressed: () => sendStore.clear()
); );
} }

8
lib/src/screens/send/widgets/confirm_sending_alert.dart
View file

@ -55,7 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.white, color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none, decoration: TextDecoration.none,
), ),
), ),
@ -64,7 +64,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.white, color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none, decoration: TextDecoration.none,
), ),
) )
@ -79,7 +79,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.white, color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none, decoration: TextDecoration.none,
), ),
), ),
@ -88,7 +88,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Colors.white, color: Theme.of(context).primaryTextTheme.title.color,
decoration: TextDecoration.none, decoration: TextDecoration.none,
), ),
) )

11
lib/src/widgets/clear_button.dart → lib/src/widgets/trail_button.dart
View file

@ -1,9 +1,12 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cake_wallet/generated/i18n.dart';
class ClearButton extends StatelessWidget { class TrailButton extends StatelessWidget {
ClearButton({@required this.onPressed}); TrailButton({
@required this.caption,
@required this.onPressed
});
final String caption;
final VoidCallback onPressed; final VoidCallback onPressed;
@override @override
@ -16,7 +19,7 @@ class ClearButton extends StatelessWidget {
child: FlatButton( child: FlatButton(
padding: EdgeInsets.all(0), padding: EdgeInsets.all(0),
child: Text( child: Text(
S.of(context).clear, caption,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryTextTheme.caption.color, color: Theme.of(context).primaryTextTheme.caption.color,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,