mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-22 19:49:22 +00:00
Cw 567 cant swipe through menus on desktop builds (#1563)
* MaterialApp scrollBehavior * accessibility improvements
This commit is contained in:
parent
9c29dbd6fd
commit
b412d45f0e
7 changed files with 75 additions and 37 deletions
9
lib/app_scroll_behavior.dart
Normal file
9
lib/app_scroll_behavior.dart
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
import 'dart:ui';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class AppScrollBehavior extends MaterialScrollBehavior {
|
||||||
|
@override
|
||||||
|
Set<PointerDeviceKind> get dragDevices =>
|
||||||
|
{PointerDeviceKind.touch, PointerDeviceKind.mouse, PointerDeviceKind.trackpad};
|
||||||
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
|
import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
|
||||||
|
import 'package:cake_wallet/app_scroll_behavior.dart';
|
||||||
import 'package:cake_wallet/buy/order.dart';
|
import 'package:cake_wallet/buy/order.dart';
|
||||||
import 'package:cake_wallet/core/auth_service.dart';
|
import 'package:cake_wallet/core/auth_service.dart';
|
||||||
import 'package:cake_wallet/di.dart';
|
import 'package:cake_wallet/di.dart';
|
||||||
|
@ -75,6 +76,7 @@ Future<void> main() async {
|
||||||
runApp(
|
runApp(
|
||||||
MaterialApp(
|
MaterialApp(
|
||||||
debugShowCheckedModeBanner: false,
|
debugShowCheckedModeBanner: false,
|
||||||
|
scrollBehavior: AppScrollBehavior(),
|
||||||
home: Scaffold(
|
home: Scaffold(
|
||||||
body: SingleChildScrollView(
|
body: SingleChildScrollView(
|
||||||
child: Container(
|
child: Container(
|
||||||
|
@ -297,6 +299,7 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
|
||||||
locale: Locale(settingsStore.languageCode),
|
locale: Locale(settingsStore.languageCode),
|
||||||
onGenerateRoute: (settings) => Router.createRoute(settings),
|
onGenerateRoute: (settings) => Router.createRoute(settings),
|
||||||
initialRoute: initialRoute,
|
initialRoute: initialRoute,
|
||||||
|
scrollBehavior: AppScrollBehavior(),
|
||||||
home: _Home(),
|
home: _Home(),
|
||||||
));
|
));
|
||||||
});
|
});
|
||||||
|
|
|
@ -237,7 +237,11 @@ class _DashboardPageView extends BasePage {
|
||||||
padding: EdgeInsets.only(bottom: 24, top: 10),
|
padding: EdgeInsets.only(bottom: 24, top: 10),
|
||||||
child: Observer(
|
child: Observer(
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return ExcludeSemantics(
|
return Semantics(
|
||||||
|
button: false,
|
||||||
|
label: 'Page Indicator',
|
||||||
|
hint: 'Swipe to change page',
|
||||||
|
excludeSemantics: true,
|
||||||
child: SmoothPageIndicator(
|
child: SmoothPageIndicator(
|
||||||
controller: controller,
|
controller: controller,
|
||||||
count: pages.length,
|
count: pages.length,
|
||||||
|
|
|
@ -23,6 +23,7 @@ import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
|
||||||
import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
|
import 'package:cake_wallet/view_model/dashboard/nft_view_model.dart';
|
||||||
import 'package:cw_core/crypto_currency.dart';
|
import 'package:cw_core/crypto_currency.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/widgets.dart';
|
||||||
import 'package:flutter_mobx/flutter_mobx.dart';
|
import 'package:flutter_mobx/flutter_mobx.dart';
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
|
@ -469,7 +470,10 @@ class BalanceRowWidget extends StatelessWidget {
|
||||||
children: [
|
children: [
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Text('${availableBalanceLabel}',
|
Semantics(
|
||||||
|
hint: 'Double tap to see more information',
|
||||||
|
container: true,
|
||||||
|
child: Text('${availableBalanceLabel}',
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontFamily: 'Lato',
|
fontFamily: 'Lato',
|
||||||
|
@ -478,6 +482,7 @@ class BalanceRowWidget extends StatelessWidget {
|
||||||
.extension<BalancePageTheme>()!
|
.extension<BalancePageTheme>()!
|
||||||
.labelTextColor,
|
.labelTextColor,
|
||||||
height: 1)),
|
height: 1)),
|
||||||
|
),
|
||||||
if (hasAdditionalBalance)
|
if (hasAdditionalBalance)
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 4),
|
padding: const EdgeInsets.symmetric(horizontal: 4),
|
||||||
|
|
|
@ -177,6 +177,11 @@ class WalletRestorePage extends BasePage {
|
||||||
if (_pages.length > 1)
|
if (_pages.length > 1)
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.only(top: 10),
|
padding: EdgeInsets.only(top: 10),
|
||||||
|
child: Semantics(
|
||||||
|
button: false,
|
||||||
|
label: 'Page Indicator',
|
||||||
|
hint: 'Swipe to change restore mode',
|
||||||
|
excludeSemantics: true,
|
||||||
child: SmoothPageIndicator(
|
child: SmoothPageIndicator(
|
||||||
controller: _controller,
|
controller: _controller,
|
||||||
count: _pages.length,
|
count: _pages.length,
|
||||||
|
@ -190,6 +195,7 @@ class WalletRestorePage extends BasePage {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.only(top: 20, bottom: 24, left: 24, right: 24),
|
padding: EdgeInsets.only(top: 20, bottom: 24, left: 24, right: 24),
|
||||||
child: Column(
|
child: Column(
|
||||||
|
|
|
@ -212,7 +212,12 @@ class SendPage extends BasePage {
|
||||||
final count = sendViewModel.outputs.length;
|
final count = sendViewModel.outputs.length;
|
||||||
|
|
||||||
return count > 1
|
return count > 1
|
||||||
? SmoothPageIndicator(
|
? Semantics (
|
||||||
|
label: 'Page Indicator',
|
||||||
|
hint: 'Swipe to change receiver',
|
||||||
|
excludeSemantics: true,
|
||||||
|
child:
|
||||||
|
SmoothPageIndicator(
|
||||||
controller: controller,
|
controller: controller,
|
||||||
count: count,
|
count: count,
|
||||||
effect: ScrollingDotsEffect(
|
effect: ScrollingDotsEffect(
|
||||||
|
@ -226,7 +231,7 @@ class SendPage extends BasePage {
|
||||||
activeDotColor: Theme.of(context)
|
activeDotColor: Theme.of(context)
|
||||||
.extension<SendPageTheme>()!
|
.extension<SendPageTheme>()!
|
||||||
.templateBackgroundColor),
|
.templateBackgroundColor),
|
||||||
)
|
))
|
||||||
: Offstage();
|
: Offstage();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
|
@ -94,7 +94,12 @@ class SendTemplatePage extends BasePage {
|
||||||
final count = sendTemplateViewModel.recipients.length;
|
final count = sendTemplateViewModel.recipients.length;
|
||||||
|
|
||||||
return count > 1
|
return count > 1
|
||||||
? SmoothPageIndicator(
|
? Semantics(
|
||||||
|
button: false,
|
||||||
|
label: 'Page Indicator',
|
||||||
|
hint: 'Swipe to change receiver',
|
||||||
|
excludeSemantics: true,
|
||||||
|
child: SmoothPageIndicator(
|
||||||
controller: controller,
|
controller: controller,
|
||||||
count: count,
|
count: count,
|
||||||
effect: ScrollingDotsEffect(
|
effect: ScrollingDotsEffect(
|
||||||
|
@ -108,7 +113,8 @@ class SendTemplatePage extends BasePage {
|
||||||
activeDotColor: Theme.of(context)
|
activeDotColor: Theme.of(context)
|
||||||
.extension<DashboardPageTheme>()!
|
.extension<DashboardPageTheme>()!
|
||||||
.indicatorDotTheme
|
.indicatorDotTheme
|
||||||
.activeIndicatorColor))
|
.activeIndicatorColor)),
|
||||||
|
)
|
||||||
: Offstage();
|
: Offstage();
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|
Loading…
Reference in a new issue