Skip to content

fix: multiple patches of the theme and the layout to fit translations #1718

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 7 commits into from
Dec 30, 2025
Merged

fix: multiple patches of the theme and the layout to fit translations #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
04f7148
fix: theme in recoverbull
ethicnology Dec 30, 2025
68a1117
fix: theme in exchange buy
ethicnology Dec 30, 2025
cf64759
refactor: deposit the arrow goes towards the app, while withdrawal goes
ethicnology Dec 30, 2025
87b79c9
fix: theme for backup warning
ethicnology Dec 30, 2025
a7ea8b8
fix: view vault key theme
ethicnology Dec 30, 2025
2d22e3f
fix: button shouldn't be red
ethicnology Dec 30, 2025
7ed5348
fix: various theme and translations overflow issues
ethicnology Dec 30, 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
25 changes: 12 additions & 13 deletions lib/core/widgets/inputs/paste_input.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,22 @@ class PasteInput extends StatelessWidget {
children: [
const Gap(15),
Expanded(
child:
text.isEmpty
? BBText(
hint,
style: context.font.labelSmall,
color: context.appColors.textMuted,
)
: BBText(
text.trim(),
style: context.font.bodyLarge,
color: context.appColors.text,
),
child: text.isEmpty
? BBText(
hint,
style: context.font.labelSmall,
color: context.appColors.onSurface,
)
: BBText(
text.trim(),
style: context.font.bodyLarge,
color: context.appColors.onSurface,
),
),
IconButton(
visualDensity: VisualDensity.compact,
iconSize: 20,
icon: Icon(Icons.paste_sharp, color: context.appColors.text),
icon: Icon(Icons.paste_sharp, color: context.appColors.onSurface),
onPressed: () {
Clipboard.getData(Clipboard.kTextPlain).then((value) {
if (value != null) {
Expand Down
7 changes: 1 addition & 6 deletions lib/features/address_view/ui/screens/addresses_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,7 @@ class _AddressesScreenState extends State<AddressesScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(context.loc.addressViewAddressesTitle),
scrolledUnderElevation: 0,
backgroundColor: context.appColors.transparent,
elevation: 0,
),
appBar: AppBar(title: Text(context.loc.addressViewAddressesTitle)),
body: SafeArea(
child: Column(
children: [
Expand Down
165 changes: 78 additions & 87 deletions lib/features/backup_settings/ui/widgets/view_vault_key_warning_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,100 +19,91 @@ class ViewVaultKeyWarningBottomSheet extends StatelessWidget {

@override
Widget build(BuildContext context) {
return Container(
constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height * 0.8,
),
decoration: BoxDecoration(
color: context.appColors.onPrimary,
borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
),
child: Column(
mainAxisSize: .min,
crossAxisAlignment: .start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
child: Column(
children: [
const Gap(20),
Row(
mainAxisAlignment: .spaceBetween,
children: [
const Gap(24),
BBText(
context.loc.backupSettingsSecurityWarning,
style: context.font.headlineMedium,
),
GestureDetector(
onTap: () => Navigator.of(context).pop(false),
child: const Icon(Icons.close),
),
],
),
],
),
return Column(
mainAxisSize: .min,
crossAxisAlignment: .start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
child: Column(
children: [
const Gap(20),
Row(
mainAxisAlignment: .spaceBetween,
children: [
const Gap(24),
BBText(
context.loc.backupSettingsSecurityWarning,
style: context.font.headlineMedium,
),
GestureDetector(
onTap: () => Navigator.of(context).pop(false),
child: const Icon(Icons.close),
),
],
),
],
),
Flexible(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
crossAxisAlignment: .start,
children: [
BBText(
context.loc.backupSettingsKeyWarningBold,
style: context.font.bodyMedium?.copyWith(
color: context.appColors.secondary,
fontWeight: .bold,
),
maxLines: 4,
),
Flexible(
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Column(
crossAxisAlignment: .start,
children: [
BBText(
context.loc.backupSettingsKeyWarningBold,
style: context.font.bodyMedium?.copyWith(
color: context.appColors.secondary,
fontWeight: .bold,
),
const Gap(24),
BBText(
context.loc.backupSettingsKeyWarningMessage,
maxLines: 4,
style: context.font.bodyMedium,
),
const Gap(16),
BBText(
context.loc.backupSettingsKeyWarningExample,
maxLines: 3,
style: context.font.bodyMedium,
),
const Gap(32),
Row(
children: [
Expanded(
child: BBButton.big(
label: context.loc.cancelButton,
onPressed: () => Navigator.of(context).pop(false),
bgColor: context.appColors.transparent,
outlined: true,
textStyle: context.font.headlineLarge,
textColor: context.appColors.secondary,
),
maxLines: 4,
),
const Gap(24),
BBText(
context.loc.backupSettingsKeyWarningMessage,
maxLines: 4,
style: context.font.bodyMedium,
),
const Gap(16),
BBText(
context.loc.backupSettingsKeyWarningExample,
maxLines: 3,
style: context.font.bodyMedium,
),
const Gap(32),
Row(
children: [
Expanded(
child: BBButton.big(
label: context.loc.cancelButton,
onPressed: () => Navigator.of(context).pop(false),
bgColor: context.appColors.transparent,
outlined: true,
textStyle: context.font.headlineLarge,
textColor: context.appColors.secondary,
),
const Gap(16),
Expanded(
child: BBButton.big(
label: context.loc.sendContinue,
onPressed: () => context.pop(true),
bgColor: context.appColors.secondary,
textStyle: context.font.headlineLarge,
textColor: context.appColors.onPrimary,
),
),
const Gap(16),
Expanded(
child: BBButton.big(
label: context.loc.sendContinue,
onPressed: () => context.pop(true),
bgColor: context.appColors.secondary,
textStyle: context.font.headlineLarge,
textColor: context.appColors.onSecondary,
),
],
),
const Gap(30),
],
),
),
],
),
const Gap(30),
],
),
),
),
],
),
),
],
);
}
}
13 changes: 6 additions & 7 deletions lib/features/bip329_labels/page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ class Bip329LabelsPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BlocProvider(
create:
(context) => Bip329LabelsCubit(
exportLabelsUsecase: locator<ExportLabelsUsecase>(),
importLabelsUsecase: locator<ImportLabelsUsecase>(),
),
create: (context) => Bip329LabelsCubit(
exportLabelsUsecase: locator<ExportLabelsUsecase>(),
importLabelsUsecase: locator<ImportLabelsUsecase>(),
),
child: Scaffold(
appBar: AppBar(
forceMaterialTransparency: true,
Expand Down Expand Up @@ -87,8 +86,8 @@ class Bip329LabelsPage extends StatelessWidget {
BBButton.big(
label: context.loc.bip329LabelsImportButton,
onPressed: isLoading ? () {} : () => cubit.importLabels(),
bgColor: context.appColors.primary,
textColor: context.appColors.onPrimary,
bgColor: context.appColors.secondary,
textColor: context.appColors.onSecondary,
iconData: Icons.file_upload,
iconFirst: true,
disabled: isLoading,
Expand Down
6 changes: 3 additions & 3 deletions lib/features/buy/ui/widgets/buy_destination_input_fields.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class _BuyDestinationInputFieldsState extends State<BuyDestinationInputFields> {
height: 56,
child: Material(
elevation: 4,
color: context.appColors.onPrimary,
color: context.appColors.surface,
borderRadius: BorderRadius.circular(4.0),
child: Center(
child: DropdownButtonFormField<String>(
Expand All @@ -71,7 +71,7 @@ class _BuyDestinationInputFieldsState extends State<BuyDestinationInputFields> {
),
icon: Icon(
Icons.keyboard_arrow_down,
color: context.appColors.secondary,
color: context.appColors.onSurface,
),
initialValue: selectedWallet?.id,
items: [
Expand Down Expand Up @@ -117,7 +117,7 @@ class _BuyDestinationInputFieldsState extends State<BuyDestinationInputFields> {
height: 56,
child: Material(
elevation: 2,
color: context.appColors.onPrimary,
color: context.appColors.secondary,
borderRadius: BorderRadius.circular(2.0),
child: Center(
child: TextFormField(
Expand Down
22 changes: 12 additions & 10 deletions lib/features/exchange/ui/screens/exchange_home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ class ExchangeHomeScreen extends StatelessWidget {
builder: (context, priceChartState) {
final showChart = priceChartState.showChart;
final hasApiKey = context.select(
(ExchangeCubit cubit) => cubit.state.apiKeyException == null,
(ExchangeCubit cubit) =>
cubit.state.apiKeyException == null,
);

return SliverAppBar(
Expand Down Expand Up @@ -144,7 +145,8 @@ class ExchangeHomeScreen extends StatelessWidget {
onPressed: () {
context.pushNamed(
ExchangeSupportChatRoute
.supportChat.name,
.supportChat
.name,
);
},
),
Expand Down Expand Up @@ -202,11 +204,11 @@ class ExchangeHomeScreen extends StatelessWidget {
Expanded(
child: BBButton.big(
iconData: Icons.arrow_downward,
label: context.loc.exchangeHomeDepositButton,
label: context.loc.exchangeHomeWithdrawButton,
iconFirst: true,
onPressed: () => context.pushNamed(
FundExchangeRoute.fundExchangeAccount.name,
),
disabled: false,
onPressed: () =>
context.pushNamed(WithdrawRoute.withdraw.name),
bgColor: context.appColors.secondaryFixed,
textColor: context.appColors.onSecondaryFixed,
outlined: true,
Expand All @@ -217,11 +219,11 @@ class ExchangeHomeScreen extends StatelessWidget {
Expanded(
child: BBButton.big(
iconData: Icons.arrow_upward,
label: context.loc.exchangeHomeWithdrawButton,
label: context.loc.exchangeHomeDepositButton,
iconFirst: true,
disabled: false,
onPressed: () =>
context.pushNamed(WithdrawRoute.withdraw.name),
onPressed: () => context.pushNamed(
FundExchangeRoute.fundExchangeAccount.name,
),
bgColor: context.appColors.secondaryFixed,
textColor: context.appColors.onSecondaryFixed,
outlined: true,
Expand Down
38 changes: 17 additions & 21 deletions lib/features/import_watch_only_wallet/presentation/import_method_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ class ImportMethodWidget extends StatelessWidget {
mainAxisAlignment: .spaceEvenly,
children: [
const Gap(12),
BBButton.small(
BBButton.big(
label: context.loc.importWatchOnlyScanQR,
onPressed:
() => context.replaceNamed(
ImportWatchOnlyWalletRoutes.scan.name,
),
onPressed: () =>
context.replaceNamed(ImportWatchOnlyWalletRoutes.scan.name),
iconData: Icons.qr_code_scanner,
bgColor: context.appColors.surface,
textColor: context.appColors.text,
bgColor: context.appColors.secondary,
textColor: context.appColors.onSecondary,
outlined: true,
),

Expand All @@ -39,27 +37,25 @@ class ImportMethodWidget extends StatelessWidget {
child: Column(
mainAxisAlignment: .spaceEvenly,
children: [
BBButton.small(
BBButton.big(
label: context.loc.importWatchOnlyBuyDevice,
onPressed:
() => launchUrl(
Uri.parse('https://store.coinkite.com/promo/BULLBITCOIN'),
),
onPressed: () => launchUrl(
Uri.parse('https://store.coinkite.com/promo/BULLBITCOIN'),
),
iconData: Icons.shopping_cart,
bgColor: context.appColors.surface,
textColor: context.appColors.text,
bgColor: context.appColors.secondary,
textColor: context.appColors.onSecondary,
outlined: true,
),
const Gap(12),
BBButton.small(

BBButton.big(
label: context.loc.importWatchOnlyWalletGuides,
onPressed:
() => launchUrl(
Uri.parse('https://docs.bull.ethicnology.com'),
),
onPressed: () =>
launchUrl(Uri.parse('https://docs.bull.ethicnology.com')),
iconData: Icons.lightbulb_outline,
bgColor: context.appColors.surface,
textColor: context.appColors.text,
bgColor: context.appColors.secondary,
textColor: context.appColors.onSecondary,
outlined: true,
),
],
Expand Down
Loading