Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CW-703: Better Seed UI/UX - Fix for Japanese PolySeeds #1875

Merged
merged 12 commits into from
Dec 13, 2024
Merged

CW-703: Better Seed UI/UX - Fix for Japanese PolySeeds #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1ad39b6
feat: Switch UI for seeds display
Blazebrain Dec 11, 2024
b9625bd
feat: Add localization for disclaimer text
Blazebrain Dec 11, 2024
dd657d8
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into …
Blazebrain Dec 11, 2024
2d53d82
fix: Modify color for warning on seeds screen
Blazebrain Dec 11, 2024
ff6e657
Fix: Adjust UI styling for seed page
Blazebrain Dec 11, 2024
1bf3d2b
chore: Revert podfile.lock
Blazebrain Dec 11, 2024
061e532
Fix column colors
tuxpizza Dec 11, 2024
688add3
Fix more colors
tuxpizza Dec 11, 2024
a883a3a
Fix more colors and update strings
tuxpizza Dec 11, 2024
484faf6
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into …
Blazebrain Dec 12, 2024
bce7612
Merge branch 'CW-703-Better-Seed-UI-UX' of https://github.com/cake-te…
Blazebrain Dec 12, 2024
97e91fe
fix: Error extracting seed words in Japanese because of spacing type …
Blazebrain Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions lib/src/screens/seed/wallet_seed_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
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/pin_code_theme.dart';
import 'package:cake_wallet/themes/theme_base.dart';
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/utils/clipboard_util.dart';
Expand Down Expand Up @@ -139,8 +138,8 @@ class WalletSeedPage extends BasePage {
fontSize: 12,
fontWeight: FontWeight.w800,
color: currentTheme.type == ThemeType.dark
? Colors.white.withOpacity(0.75)
: Colors.white.withOpacity(0.85),
? Colors.white.withOpacity(0.75)
: Colors.white.withOpacity(0.85),
),
),
),
Expand Down Expand Up @@ -188,19 +187,24 @@ class WalletSeedPage extends BasePage {
numberCount.toString(),
textAlign: TextAlign.right,
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w700,
color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor.withOpacity(0.5)
),
fontSize: 14,
fontWeight: FontWeight.w700,
color: Theme.of(context)
.extension<CakeTextTheme>()!
.buttonTextColor
.withOpacity(0.5)),
),
),
const SizedBox(width: 8),
Text(
'${item[0].toUpperCase()}${item.substring(1)}',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w700,
color: Theme.of(context).extension<CakeTextTheme>()!.buttonTextColor
Expanded(
child: Text(
'${item[0].toUpperCase()}${item.substring(1)}',
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w700,
color: Theme.of(context)
.extension<CakeTextTheme>()!
.buttonTextColor),
),
),
],
Expand Down
5 changes: 4 additions & 1 deletion lib/view_model/wallet_seed_view_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ abstract class WalletSeedViewModelBase with Store {
@observable
String seed;

List<String> get seedSplit => seed.split(' ');
/// The Regex split the words based on any whitespace character.
///
/// Either standard ASCII space (U+0020) or the full-width space character (U+3000) used by the Japanese.
List<String> get seedSplit => seed.split(RegExp(r'\s+'));

int get columnCount => seedSplit.length <= 16 ? 2 : 3;
}