Skip to content

refactor: re-arrange settings and icons #1697

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

Merged
ethicnology merged 3 commits into from
Dec 23, 2025
Merged

refactor: re-arrange settings and icons #1697

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fafe8b5
refactor: move currency, theme and pin into app settings + improve icons
ethicnology Dec 23, 2025
c58d4bc
refactor: Update icons for settings and backup screens
ethicnology Dec 23, 2025
3aa15c5
refactor: make start backup red and first button in the page
ethicnology Dec 23, 2025
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
6 changes: 3 additions & 3 deletions lib/features/backup_settings/ui/screens/backup_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class _StartBackupButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return SettingsEntryItem(
icon: Icons.backup,
icon: Icons.save_as,
title: context.loc.backupSettingsStartBackup,
onTap: () => context.pushNamed(
BackupSettingsSubroute.backupOptions.name,
Expand Down Expand Up @@ -243,7 +243,7 @@ class _Bip329LabelsButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return SettingsEntryItem(
icon: Icons.label,
icon: Icons.sell,
title: context.loc.backupSettingsLabelsButton,
onTap: () => context.push(Bip329LabelsRouter.route.path),
);
Expand All @@ -256,7 +256,7 @@ class _RecoverBullSettingsButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return SettingsEntryItem(
icon: Icons.settings,
icon: Icons.cloud_circle,
iconColor: context.appColors.secondary,
textColor: context.appColors.secondary,
title: context.loc.backupSettingsRecoverBullSettings,
Expand Down
27 changes: 3 additions & 24 deletions lib/features/settings/ui/screens/all_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class _AllSettingsScreenState extends State<AllSettingsScreen> {
child: Column(
children: [
SettingsEntryItem(
icon: Icons.account_balance_wallet,
icon: Icons.currency_exchange,
title: context.loc.settingsExchangeSettingsTitle,
onTap: () {
if (Platform.isIOS) {
Expand Down Expand Up @@ -93,7 +93,7 @@ class _AllSettingsScreenState extends State<AllSettingsScreen> {
},
),
SettingsEntryItem(
icon: Icons.save_alt,
icon: Icons.save,
title: context.loc.settingsWalletBackupTitle,
onTap: () {
context.pushNamed(SettingsRoute.backupSettings.name);
Expand All @@ -107,28 +107,7 @@ class _AllSettingsScreenState extends State<AllSettingsScreen> {
},
),
SettingsEntryItem(
icon: Icons.security,
title: context.loc.settingsSecurityPinTitle,
onTap: () {
context.pushNamed(SettingsRoute.pinCode.name);
},
),
SettingsEntryItem(
icon: Icons.attach_money,
title: context.loc.settingsCurrencyTitle,
onTap: () {
context.pushNamed(SettingsRoute.currency.name);
},
),
SettingsEntryItem(
icon: Icons.palette,
title: 'Theme',
onTap: () {
context.pushNamed(SettingsRoute.theme.name);
},
),
SettingsEntryItem(
icon: Icons.settings,
icon: Icons.app_settings_alt,
title: context.loc.settingsAppSettingsTitle,
onTap: () {
context.pushNamed(SettingsRoute.appSettings.name);
Expand Down
51 changes: 36 additions & 15 deletions lib/features/settings/ui/screens/app_settings/app_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,6 @@ class AppSettingsScreen extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
children: [
SettingsEntryItem(
icon: Icons.article,
title: context.loc.logSettingsLogsTitle,
onTap: () {
context.pushNamed(SettingsRoute.logs.name);
},
),
SettingsEntryItem(
icon: Icons.security,
title: context.loc.settingsTorSettingsTitle,
onTap: () {
context.pushNamed(TorSettingsRoute.torSettings.name);
},
),
SettingsEntryItem(
icon: Icons.language,
title: context.loc.settingsLanguageTitle,
Expand All @@ -67,9 +53,44 @@ class AppSettingsScreen extends StatelessWidget {
},
),
),
SettingsEntryItem(
icon: Icons.palette,
title: context.loc.settingsThemeTitle,
onTap: () {
context.pushNamed(SettingsRoute.theme.name);
},
),
SettingsEntryItem(
icon: Icons.attach_money,
title: context.loc.settingsCurrencyTitle,
onTap: () {
context.pushNamed(SettingsRoute.currency.name);
},
),
SettingsEntryItem(
icon: Icons.fiber_pin,
title: context.loc.settingsSecurityPinTitle,
onTap: () {
context.pushNamed(SettingsRoute.pinCode.name);
},
),
SettingsEntryItem(
icon: Icons.vpn_lock,
title: context.loc.settingsTorSettingsTitle,
onTap: () {
context.pushNamed(TorSettingsRoute.torSettings.name);
},
),
SettingsEntryItem(
icon: Icons.article,
title: context.loc.logSettingsLogsTitle,
onTap: () {
context.pushNamed(SettingsRoute.logs.name);
},
),
if (isSuperuser)
SettingsEntryItem(
icon: Icons.developer_mode,
icon: Icons.logo_dev,
title: context.loc.appSettingsDevModeTitle,
trailing: const DevModeSwitch(),
),
Expand Down
46 changes: 23 additions & 23 deletions lib/features/settings/ui/screens/bitcoin/bitcoin_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,28 @@ class BitcoinSettingsScreen extends StatelessWidget {
},
),
SettingsEntryItem(
icon: Icons.settings_input_component,
icon: Icons.sim_card_download,
title: context.loc.bitcoinSettingsImportWalletTitle,
onTap: () => context.pushNamed(
ImportWalletRoute.importWalletHome.name,
),
),
SettingsEntryItem(
icon: Icons.swap_horiz,
title: context.loc.bitcoinSettingsAutoTransferTitle,
onTap: () {
context.pushNamed(SettingsRoute.autoswapSettings.name);
},
),
SettingsEntryItem(
icon: Icons.satellite_alt,
title: context.loc.bitcoinSettingsBroadcastTransactionTitle,
onTap: () => context.pushNamed(
BroadcastSignedTxRoute.broadcastHome.name,
),
),
SettingsEntryItem(
icon: Icons.hub,
title: context.loc.bitcoinSettingsElectrumServerTitle,
onTap: () {
context.pushNamed(
Expand All @@ -56,19 +77,12 @@ class BitcoinSettingsScreen extends StatelessWidget {
},
),
SettingsEntryItem(
icon: Icons.analytics,
icon: Icons.memory,
title: context.loc.bitcoinSettingsMempoolServerTitle,
onTap: () {
context.pushNamed(MempoolSettingsRoute.name);
},
),
SettingsEntryItem(
icon: Icons.swap_horiz,
title: context.loc.bitcoinSettingsAutoTransferTitle,
onTap: () {
context.pushNamed(SettingsRoute.autoswapSettings.name);
},
),
if (hasLegacySeeds)
SettingsEntryItem(
icon: Icons.vpn_key,
Expand All @@ -77,20 +91,6 @@ class BitcoinSettingsScreen extends StatelessWidget {
context.pushNamed(SettingsRoute.legacySeeds.name);
},
),
SettingsEntryItem(
icon: Icons.download,
title: context.loc.bitcoinSettingsImportWalletTitle,
onTap: () => context.pushNamed(
ImportWalletRoute.importWalletHome.name,
),
),
SettingsEntryItem(
icon: Icons.satellite_alt,
title: context.loc.bitcoinSettingsBroadcastTransactionTitle,
onTap: () => context.pushNamed(
BroadcastSignedTxRoute.broadcastHome.name,
),
),
if (isSuperuser)
SettingsEntryItem(
icon: Icons.science,
Expand Down
6 changes: 5 additions & 1 deletion localization/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@
"@settingsLanguageTitle": {
"description": "Title for the language selection in app settings"
},
"settingsThemeTitle": "Theme",
"@settingsThemeTitle": {
"description": "Title for the theme selection in app settings"
},
"settingsArkTitle": "Ark",
"@settingsArkTitle": {
"description": "Title for the Ark protocol section in Bitcoin settings"
Expand Down Expand Up @@ -12175,4 +12179,4 @@
}
}
}
}
}
4 changes: 4 additions & 0 deletions localization/app_es.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@
"@settingsLanguageTitle": {
"description": "Title for the language selection in app settings"
},
"settingsThemeTitle": "Tema",
"@settingsThemeTitle": {
"description": "Title for the theme selection in app settings"
},
"settingsArkTitle": "Ark",
"@settingsArkTitle": {
"description": "Title for the Ark protocol section in Bitcoin settings"
Expand Down
4 changes: 4 additions & 0 deletions localization/app_fi.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@
"@settingsLanguageTitle": {
"description": "Title for the language selection in app settings"
},
"settingsThemeTitle": "Teema",
"@settingsThemeTitle": {
"description": "Title for the theme selection in app settings"
},
"settingsArkTitle": "Ark",
"@settingsArkTitle": {
"description": "Title for the Ark protocol section in Bitcoin settings"
Expand Down
4 changes: 4 additions & 0 deletions localization/app_fr.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@
"@settingsLanguageTitle": {
"description": "Title for the language selection in app settings"
},
"settingsThemeTitle": "Thème",
"@settingsThemeTitle": {
"description": "Title for the theme selection in app settings"
},
"settingsArkTitle": "Ark",
"@settingsArkTitle": {
"description": "Title for the Ark protocol section in Bitcoin settings"
Expand Down