mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-03-12 09:32:33 +00:00
CWA-222 | decreased height of spaces in the dashboard page; renamed clear button to trail button; changed clear button to reset button on exchange page; changed font color on confirm sending alert; increased next button on seed page
This commit is contained in:
parent
5752b98c62
commit
4dfed515c7
8 changed files with 25 additions and 19 deletions
|
@ -64,11 +64,11 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
|
|||
),
|
||||
),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(left: 20, top: 20),
|
||||
padding: EdgeInsets.only(left: 20, top: 5),
|
||||
child: WalletCard(),
|
||||
),
|
||||
SizedBox(
|
||||
height: 28,
|
||||
height: 18,
|
||||
),
|
||||
Expanded(child: TradeHistoryPanel())
|
||||
],
|
||||
|
|
|
@ -244,7 +244,7 @@ class ButtonHeader extends SliverPersistentHeaderDelegate {
|
|||
}
|
||||
|
||||
@override
|
||||
double get maxExtent => 174;
|
||||
double get maxExtent => 154;
|
||||
|
||||
@override
|
||||
double get minExtent => 66;
|
||||
|
|
|
@ -75,7 +75,7 @@ class TradeHistoryPanelState extends State<TradeHistoryPanel> {
|
|||
: actionListStore.items;
|
||||
final itemsCount = items.length + 1;
|
||||
final symbol = settingsStore.fiatCurrency.toString();
|
||||
double freeSpaceHeight = MediaQuery.of(context).size.height - 496;
|
||||
double freeSpaceHeight = MediaQuery.of(context).size.height - 460;
|
||||
|
||||
return SliverList(
|
||||
key: _listKey,
|
||||
|
|
|
@ -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/screens/exchange/widgets/present_provider_picker.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 {
|
||||
@override
|
||||
|
@ -33,7 +33,8 @@ class ExchangePage extends BasePage {
|
|||
Widget trailing(BuildContext context) {
|
||||
final exchangeStore = Provider.of<ExchangeStore>(context);
|
||||
|
||||
return ClearButton(
|
||||
return TrailButton(
|
||||
caption: S.of(context).reset,
|
||||
onPressed: () => exchangeStore.reset()
|
||||
);
|
||||
}
|
||||
|
|
|
@ -35,9 +35,10 @@ class SeedPage extends BasePage {
|
|||
? GestureDetector(
|
||||
onTap: () => onClose(context),
|
||||
child: Container(
|
||||
width: 70,
|
||||
height: 32,
|
||||
width: 100,
|
||||
height: 42,
|
||||
alignment: Alignment.center,
|
||||
margin: EdgeInsets.only(left: 10),
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(16)),
|
||||
color: Theme.of(context).accentTextTheme.title.color
|
||||
|
@ -45,7 +46,7 @@ class SeedPage extends BasePage {
|
|||
child: Text(
|
||||
S.of(context).seed_language_next,
|
||||
style: TextStyle(
|
||||
fontSize: 10,
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.blue
|
||||
),
|
||||
|
|
|
@ -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/widgets/template_tile.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 {
|
||||
@override
|
||||
|
@ -48,7 +48,8 @@ class SendPage extends BasePage {
|
|||
Widget trailing(context) {
|
||||
final sendStore = Provider.of<SendStore>(context);
|
||||
|
||||
return ClearButton(
|
||||
return TrailButton(
|
||||
caption: S.of(context).clear,
|
||||
onPressed: () => sendStore.clear()
|
||||
);
|
||||
}
|
||||
|
|
|
@ -55,7 +55,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
|
|||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
color: Theme.of(context).primaryTextTheme.title.color,
|
||||
decoration: TextDecoration.none,
|
||||
),
|
||||
),
|
||||
|
@ -64,7 +64,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
|
|||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
color: Theme.of(context).primaryTextTheme.title.color,
|
||||
decoration: TextDecoration.none,
|
||||
),
|
||||
)
|
||||
|
@ -79,7 +79,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
|
|||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
color: Theme.of(context).primaryTextTheme.title.color,
|
||||
decoration: TextDecoration.none,
|
||||
),
|
||||
),
|
||||
|
@ -88,7 +88,7 @@ class ConfirmSendingAlert extends BaseAlertDialog {
|
|||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Colors.white,
|
||||
color: Theme.of(context).primaryTextTheme.title.color,
|
||||
decoration: TextDecoration.none,
|
||||
),
|
||||
)
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:cake_wallet/generated/i18n.dart';
|
||||
|
||||
class ClearButton extends StatelessWidget {
|
||||
ClearButton({@required this.onPressed});
|
||||
class TrailButton extends StatelessWidget {
|
||||
TrailButton({
|
||||
@required this.caption,
|
||||
@required this.onPressed
|
||||
});
|
||||
|
||||
final String caption;
|
||||
final VoidCallback onPressed;
|
||||
|
||||
@override
|
||||
|
@ -16,7 +19,7 @@ class ClearButton extends StatelessWidget {
|
|||
child: FlatButton(
|
||||
padding: EdgeInsets.all(0),
|
||||
child: Text(
|
||||
S.of(context).clear,
|
||||
caption,
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).primaryTextTheme.caption.color,
|
||||
fontWeight: FontWeight.w500,
|
Loading…
Reference in a new issue