android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 12:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cw 1018 minor UI enhancements (#2118)

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
Download patch file Download diff file Expand all files Collapse all files

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), Image.asset(currentTheme.type.walletGroupImage, height: 200),
SizedBox(height: 32), SizedBox(height: 32),
Expanded( Expanded(
child: Text.rich( child: Scrollbar(
TextSpan( child: SingleChildScrollView(
children: [ child: Text.rich(
TextSpan(text: '${S.of(context).wallet_group_description_one} '),
TextSpan( TextSpan(
text: '${S.of(context).wallet_group.toLowerCase()} ', children: [
style: TextStyle(fontWeight: FontWeight.w700), 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( textAlign: TextAlign.center,
text: '${S.of(context).wallet_group_description_two} ', 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), Image.asset(currentTheme.type.walletGroupImage, height: 200),
SizedBox(height: 32), SizedBox(height: 32),
Expanded( Expanded(
child: RichText( child: SingleChildScrollView(
text: TextSpan( child: RichText(
children: [ text: TextSpan(
TextSpan( children: [
text: S.current.wallet_group_description_existing_seed + '\n\n', TextSpan(
style: textStyle), text: S.current.wallet_group_description_existing_seed + '\n\n',
TextSpan( style: textStyle),
text: S.current.wallet_group_description_open_wallet + '\n\n', TextSpan(
style: textStyle), text: S.current.wallet_group_description_open_wallet + '\n\n',
TextSpan( style: textStyle),
text: S.current.wallet_group_description_view_seed + '\n', style: textStyle), TextSpan(
TextSpan( text: S.current.wallet_group_description_view_seed + '\n', style: textStyle),
text: S.current.seed_display_path, TextSpan(
style: TextStyle( text: S.current.seed_display_path,
fontSize: 16, style: TextStyle(
fontWeight: FontWeight.w800, fontSize: 16,
color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor, fontWeight: FontWeight.w800,
color: Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor,
),
), ),
), ],
], ),
textAlign: TextAlign.center,
), ),
textAlign: TextAlign.center,
), ),
), ),
Column( Column(

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

@ -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()) {

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/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(