mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-06-28 20:39:51 +00:00
Cw 1018 minor UI enhancements (#2118)
* fix ui for monero batch sending
* minor ui fixes
* Revert "fix ui for monero batch sending"
This reverts commit 4827b17bfe
.
* fix: focus node issue
This commit is contained in:
parent
3ec7d01c30
commit
be81042a06
4 changed files with 60 additions and 50 deletions
|
@ -29,6 +29,8 @@ class WalletGroupDescriptionPage extends BasePage {
|
||||||
Image.asset(currentTheme.type.walletGroupImage, height: 200),
|
Image.asset(currentTheme.type.walletGroupImage, height: 200),
|
||||||
SizedBox(height: 32),
|
SizedBox(height: 32),
|
||||||
Expanded(
|
Expanded(
|
||||||
|
child: Scrollbar(
|
||||||
|
child: SingleChildScrollView(
|
||||||
child: Text.rich(
|
child: Text.rich(
|
||||||
TextSpan(
|
TextSpan(
|
||||||
children: [
|
children: [
|
||||||
|
@ -63,6 +65,8 @@ class WalletGroupDescriptionPage extends BasePage {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
PrimaryButton(
|
PrimaryButton(
|
||||||
key: ValueKey('wallet_group_description_page_create_new_seed_button_key'),
|
key: ValueKey('wallet_group_description_page_create_new_seed_button_key'),
|
||||||
onPressed: () => Navigator.of(context).pushNamed(
|
onPressed: () => Navigator.of(context).pushNamed(
|
||||||
|
|
|
@ -32,6 +32,7 @@ class WalletGroupExistingSeedDescriptionPage extends BasePage {
|
||||||
Image.asset(currentTheme.type.walletGroupImage, height: 200),
|
Image.asset(currentTheme.type.walletGroupImage, height: 200),
|
||||||
SizedBox(height: 32),
|
SizedBox(height: 32),
|
||||||
Expanded(
|
Expanded(
|
||||||
|
child: SingleChildScrollView(
|
||||||
child: RichText(
|
child: RichText(
|
||||||
text: TextSpan(
|
text: TextSpan(
|
||||||
children: [
|
children: [
|
||||||
|
@ -56,6 +57,7 @@ class WalletGroupExistingSeedDescriptionPage extends BasePage {
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
Column(
|
Column(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Row(
|
Row(
|
||||||
|
|
|
@ -397,7 +397,10 @@ class SendPage extends BasePage {
|
||||||
return LoadingPrimaryButton(
|
return LoadingPrimaryButton(
|
||||||
key: ValueKey('send_page_send_button_key'),
|
key: ValueKey('send_page_send_button_key'),
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
FocusManager.instance.primaryFocus?.unfocus();
|
|
||||||
|
//Request dummy node to get the focus out of the text fields
|
||||||
|
FocusScope.of(context).requestFocus(FocusNode());
|
||||||
|
|
||||||
if (sendViewModel.state is IsExecutingState) return;
|
if (sendViewModel.state is IsExecutingState) return;
|
||||||
if (_formKey.currentState != null &&
|
if (_formKey.currentState != null &&
|
||||||
!_formKey.currentState!.validate()) {
|
!_formKey.currentState!.validate()) {
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import 'package:auto_size_text/auto_size_text.dart';
|
||||||
import 'package:cake_wallet/src/widgets/primary_button.dart';
|
import 'package:cake_wallet/src/widgets/primary_button.dart';
|
||||||
import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
|
import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
|
||||||
import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
|
import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
|
||||||
|
@ -85,7 +86,7 @@ class InfoBottomSheet extends BaseBottomSheet {
|
||||||
const Spacer(flex: 2),
|
const Spacer(flex: 2),
|
||||||
Expanded(
|
Expanded(
|
||||||
flex: 6,
|
flex: 6,
|
||||||
child: Text(
|
child: AutoSizeText(
|
||||||
content!,
|
content!,
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue