Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-04-02 20:49:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cw 1018 minor UI enhancements ()

Browse source 
* 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:
Serhii 2025-03-28 00:18:50 +02:00 committed by GitHub
parent 3ec7d01c30
commit be81042a06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 60 additions and 50 deletions

60
lib/src/screens/new_wallet/wallet_group_description_page.dart
View file

@ -29,37 +29,41 @@ class WalletGroupDescriptionPage extends BasePage {
Image.asset(currentTheme.type.walletGroupImage, height: 200),
SizedBox(height: 32),
Expanded(
child: Text.rich(
TextSpan(
children: [
TextSpan(text: '${S.of(context).wallet_group_description_one} '),
child: Scrollbar(
child: SingleChildScrollView(
child: Text.rich(
TextSpan(
text: '${S.of(context).wallet_group.toLowerCase()} ',
style: TextStyle(fontWeight: FontWeight.w700),
children: [
TextSpan(text: '${S.of(context).wallet_group_description_one} '),
TextSpan(
text: '${S.of(context).wallet_group.toLowerCase()} ',
style: TextStyle(fontWeight: FontWeight.w700),
),
TextSpan(
text: '${S.of(context).wallet_group_description_two} ',
),
TextSpan(
text: '${S.of(context).choose_wallet_group} ',
style: TextStyle(fontWeight: FontWeight.w700),
),
TextSpan(
text: '${S.of(context).wallet_group_description_three} ',
),
TextSpan(
text: '${S.of(context).create_new_seed} ',
style: TextStyle(fontWeight: FontWeight.w700),
),
TextSpan(text: S.of(context).wallet_group_description_four),
],
),
TextSpan(
text: '${S.of(context).wallet_group_description_two} ',
textAlign: TextAlign.center,
style: TextStyle(
height: 1.5,
fontSize: 16,
fontWeight: FontWeight.w400,
color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
),
TextSpan(
text: '${S.of(context).choose_wallet_group} ',
style: TextStyle(fontWeight: FontWeight.w700),
),
TextSpan(
text: '${S.of(context).wallet_group_description_three} ',
),
TextSpan(
text: '${S.of(context).create_new_seed} ',
style: TextStyle(fontWeight: FontWeight.w700),
),
TextSpan(text: S.of(context).wallet_group_description_four),
],
),
textAlign: TextAlign.center,
style: TextStyle(
height: 1.5,
fontSize: 16,
fontWeight: FontWeight.w400,
color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
),
),
),
),

42
lib/src/screens/new_wallet/wallet_group_existing_seed_description_page.dart
View file

@ -32,28 +32,30 @@ class WalletGroupExistingSeedDescriptionPage extends BasePage {
Image.asset(currentTheme.type.walletGroupImage, height: 200),
SizedBox(height: 32),
Expanded(
child: RichText(
text: TextSpan(
children: [
TextSpan(
text: S.current.wallet_group_description_existing_seed + '\n\n',
style: textStyle),
TextSpan(
text: S.current.wallet_group_description_open_wallet + '\n\n',
style: textStyle),
TextSpan(
text: S.current.wallet_group_description_view_seed + '\n', style: textStyle),
TextSpan(
text: S.current.seed_display_path,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w800,
color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
child: SingleChildScrollView(
child: RichText(
text: TextSpan(
children: [
TextSpan(
text: S.current.wallet_group_description_existing_seed + '\n\n',
style: textStyle),
TextSpan(
text: S.current.wallet_group_description_open_wallet + '\n\n',
style: textStyle),
TextSpan(
text: S.current.wallet_group_description_view_seed + '\n', style: textStyle),
TextSpan(
text: S.current.seed_display_path,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w800,
color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
),
),
),
],
],
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
),
Column(

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

@ -397,7 +397,10 @@ class SendPage extends BasePage {
return LoadingPrimaryButton(
key: ValueKey('send_page_send_button_key'),
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 (_formKey.currentState != null &&
!_formKey.currentState!.validate()) {

3
lib/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart
View file

@ -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/themes/extensions/cake_text_theme.dart';
import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
@ -85,7 +86,7 @@ class InfoBottomSheet extends BaseBottomSheet {
const Spacer(flex: 2),
Expanded(
flex: 6,
child: Text(
child: AutoSizeText(
content!,
textAlign: TextAlign.center,
style: TextStyle(