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

Fix desktop background color and address book view issues

Browse source
This commit is contained in:
Godwin Asuquo 2023-02-17 18:19:26 +02:00
parent 1b89228893
commit 52468e1331
4 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/src/screens/dashboard/desktop_dashboard_page.dart
View file

@ -32,29 +32,32 @@ class DesktopDashboardPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
_setEffects(context); _setEffects(context);
return Row( return Container(
crossAxisAlignment: CrossAxisAlignment.start, color: Theme.of(context).backgroundColor,
children: [ child: Row(
Container( crossAxisAlignment: CrossAxisAlignment.start,
width: 400, children: [
child: balancePage, Container(
), width: 400,
Flexible( child: balancePage,
child: ConstrainedBox( ),
constraints: BoxConstraints(maxWidth: 500), Flexible(
child: Navigator( child: ConstrainedBox(
key: desktopKey, constraints: BoxConstraints(maxWidth: 500),
initialRoute: Routes.desktop_actions, child: Navigator(
onGenerateRoute: (settings) => Router.createRoute(settings), key: desktopKey,
onGenerateInitialRoutes: (NavigatorState navigator, String initialRouteName) { initialRoute: Routes.desktop_actions,
return [ onGenerateRoute: (settings) => Router.createRoute(settings),
navigator.widget.onGenerateRoute!(RouteSettings(name: initialRouteName))! onGenerateInitialRoutes: (NavigatorState navigator, String initialRouteName) {
]; return [
}, navigator.widget.onGenerateRoute!(RouteSettings(name: initialRouteName))!
];
},
),
), ),
), ),
), ],
], ),
); );
} }

1
lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
View file

@ -160,6 +160,7 @@ class DesktopSidebarWrapper extends BasePage {
children: [ children: [
child, child,
Container( Container(
color: Theme.of(context).backgroundColor,
padding: EdgeInsets.all(20), padding: EdgeInsets.all(20),
child: Navigator( child: Navigator(
initialRoute: Routes.support, initialRoute: Routes.support,

10
lib/src/screens/exchange/widgets/exchange_card.dart
View file

@ -1,6 +1,8 @@
import 'package:cake_wallet/entities/contact_base.dart'; import 'package:cake_wallet/entities/contact_base.dart';
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart'; import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:cake_wallet/utils/show_bar.dart'; import 'package:cake_wallet/utils/show_bar.dart';
import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:cake_wallet/utils/payment_request.dart'; import 'package:cake_wallet/utils/payment_request.dart';
@ -430,10 +432,10 @@ class ExchangeCardState extends State<ExchangeCard> {
padding: EdgeInsets.only(top: 0), padding: EdgeInsets.only(top: 0),
child: InkWell( child: InkWell(
onTap: () async { onTap: () async {
final contact = final navigatorState = ResponsiveLayoutUtil.instance.isMobile(context)
await Navigator.of(context, ? Navigator.of(context, rootNavigator: true)
rootNavigator: true) : DesktopDashboardPage.desktopKey.currentState!;
.pushNamed(Routes final contact = await navigatorState.pushNamed(Routes
.pickerAddressBook); .pickerAddressBook);
if (contact is ContactBase && if (contact is ContactBase &&

8
lib/src/widgets/address_text_field.dart
View file

@ -1,3 +1,5 @@
import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';
@ -209,8 +211,10 @@ class AddressTextField extends StatelessWidget {
} }
Future<void> _presetAddressBookPicker(BuildContext context) async { Future<void> _presetAddressBookPicker(BuildContext context) async {
final contact = await Navigator.of(context, rootNavigator: true) final navigatorState = ResponsiveLayoutUtil.instance.isMobile(context) ? Navigator.of(context, rootNavigator: true)
.pushNamed(Routes.pickerAddressBook,arguments: selectedCurrency); : DesktopDashboardPage.desktopKey.currentState!;
final contact = await navigatorState.pushNamed(Routes.pickerAddressBook,arguments: selectedCurrency);
if (contact is ContactBase && contact.address != null) { if (contact is ContactBase && contact.address != null) {
controller?.text = contact.address; controller?.text = contact.address;