Skip to content

Commit 3e43c57

Browse files
ethicnologyethicnology
authored
Merge branch 'develop' into weblate-translations
2 parents ae8ab2b + d98b0c9 commit 3e43c57

44 files changed

Lines changed: 12467 additions & 242 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/core/settings/domain/settings_entity.dart‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ enum Language {
4343
unitedStatesEnglish('en', 'US', 'English'),
4444
franceFrench('fr', 'FR', 'Français'),
4545
spanish('es', 'ES', 'Español'),
46-
finnish('fi', 'FI', 'Suomi');
46+
finnish('fi', 'FI', 'Suomi'),
47+
ukrainian('uk', 'UA', 'Українська'),
48+
russian('ru', 'RU', 'Русский'),
49+
german('de', 'DE', 'Deutsch'),
50+
italian('it', 'IT', 'Italiano'),
51+
portuguese('pt', 'PT', 'Português');
4752

4853
final String languageCode;
4954
final String? countryCode;

‎lib/core/widgets/inputs/paste_input.dart‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,22 @@ class PasteInput extends StatelessWidget {
2929
children: [
3030
const Gap(15),
3131
Expanded(
32-
child:
33-
text.isEmpty
34-
? BBText(
35-
hint,
36-
style: context.font.labelSmall,
37-
color: context.appColors.textMuted,
38-
)
39-
: BBText(
40-
text.trim(),
41-
style: context.font.bodyLarge,
42-
color: context.appColors.text,
43-
),
32+
child: text.isEmpty
33+
? BBText(
34+
hint,
35+
style: context.font.labelSmall,
36+
color: context.appColors.onSurface,
37+
)
38+
: BBText(
39+
text.trim(),
40+
style: context.font.bodyLarge,
41+
color: context.appColors.onSurface,
42+
),
4443
),
4544
IconButton(
4645
visualDensity: VisualDensity.compact,
4746
iconSize: 20,
48-
icon: Icon(Icons.paste_sharp, color: context.appColors.text),
47+
icon: Icon(Icons.paste_sharp, color: context.appColors.onSurface),
4948
onPressed: () {
5049
Clipboard.getData(Clipboard.kTextPlain).then((value) {
5150
if (value != null) {

‎lib/features/address_view/ui/screens/addresses_screen.dart‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,7 @@ class _AddressesScreenState extends State<AddressesScreen> {
6464
@override
6565
Widget build(BuildContext context) {
6666
return Scaffold(
67-
appBar: AppBar(
68-
title: Text(context.loc.addressViewAddressesTitle),
69-
scrolledUnderElevation: 0,
70-
backgroundColor: context.appColors.transparent,
71-
elevation: 0,
72-
),
67+
appBar: AppBar(title: Text(context.loc.addressViewAddressesTitle)),
7368
body: SafeArea(
7469
child: Column(
7570
children: [

‎lib/features/backup_settings/ui/widgets/view_vault_key_warning_bottom_sheet.dart‎

Lines changed: 78 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -19,100 +19,91 @@ class ViewVaultKeyWarningBottomSheet extends StatelessWidget {
1919

2020
@override
2121
Widget build(BuildContext context) {
22-
return Container(
23-
constraints: BoxConstraints(
24-
maxHeight: MediaQuery.of(context).size.height * 0.8,
25-
),
26-
decoration: BoxDecoration(
27-
color: context.appColors.onPrimary,
28-
borderRadius: const BorderRadius.vertical(top: Radius.circular(32)),
29-
),
30-
child: Column(
31-
mainAxisSize: .min,
32-
crossAxisAlignment: .start,
33-
children: [
34-
Padding(
35-
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
36-
child: Column(
37-
children: [
38-
const Gap(20),
39-
Row(
40-
mainAxisAlignment: .spaceBetween,
41-
children: [
42-
const Gap(24),
43-
BBText(
44-
context.loc.backupSettingsSecurityWarning,
45-
style: context.font.headlineMedium,
46-
),
47-
GestureDetector(
48-
onTap: () => Navigator.of(context).pop(false),
49-
child: const Icon(Icons.close),
50-
),
51-
],
52-
),
53-
],
54-
),
22+
return Column(
23+
mainAxisSize: .min,
24+
crossAxisAlignment: .start,
25+
children: [
26+
Padding(
27+
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
28+
child: Column(
29+
children: [
30+
const Gap(20),
31+
Row(
32+
mainAxisAlignment: .spaceBetween,
33+
children: [
34+
const Gap(24),
35+
BBText(
36+
context.loc.backupSettingsSecurityWarning,
37+
style: context.font.headlineMedium,
38+
),
39+
GestureDetector(
40+
onTap: () => Navigator.of(context).pop(false),
41+
child: const Icon(Icons.close),
42+
),
43+
],
44+
),
45+
],
5546
),
56-
Flexible(
57-
child: SingleChildScrollView(
58-
child: Padding(
59-
padding: const EdgeInsets.all(24.0),
60-
child: Column(
61-
crossAxisAlignment: .start,
62-
children: [
63-
BBText(
64-
context.loc.backupSettingsKeyWarningBold,
65-
style: context.font.bodyMedium?.copyWith(
66-
color: context.appColors.secondary,
67-
fontWeight: .bold,
68-
),
69-
maxLines: 4,
47+
),
48+
Flexible(
49+
child: SingleChildScrollView(
50+
child: Padding(
51+
padding: const EdgeInsets.all(24.0),
52+
child: Column(
53+
crossAxisAlignment: .start,
54+
children: [
55+
BBText(
56+
context.loc.backupSettingsKeyWarningBold,
57+
style: context.font.bodyMedium?.copyWith(
58+
color: context.appColors.secondary,
59+
fontWeight: .bold,
7060
),
71-
const Gap(24),
72-
BBText(
73-
context.loc.backupSettingsKeyWarningMessage,
74-
maxLines: 4,
75-
style: context.font.bodyMedium,
76-
),
77-
const Gap(16),
78-
BBText(
79-
context.loc.backupSettingsKeyWarningExample,
80-
maxLines: 3,
81-
style: context.font.bodyMedium,
82-
),
83-
const Gap(32),
84-
Row(
85-
children: [
86-
Expanded(
87-
child: BBButton.big(
88-
label: context.loc.cancelButton,
89-
onPressed: () => Navigator.of(context).pop(false),
90-
bgColor: context.appColors.transparent,
91-
outlined: true,
92-
textStyle: context.font.headlineLarge,
93-
textColor: context.appColors.secondary,
94-
),
61+
maxLines: 4,
62+
),
63+
const Gap(24),
64+
BBText(
65+
context.loc.backupSettingsKeyWarningMessage,
66+
maxLines: 4,
67+
style: context.font.bodyMedium,
68+
),
69+
const Gap(16),
70+
BBText(
71+
context.loc.backupSettingsKeyWarningExample,
72+
maxLines: 3,
73+
style: context.font.bodyMedium,
74+
),
75+
const Gap(32),
76+
Row(
77+
children: [
78+
Expanded(
79+
child: BBButton.big(
80+
label: context.loc.cancelButton,
81+
onPressed: () => Navigator.of(context).pop(false),
82+
bgColor: context.appColors.transparent,
83+
outlined: true,
84+
textStyle: context.font.headlineLarge,
85+
textColor: context.appColors.secondary,
9586
),
96-
const Gap(16),
97-
Expanded(
98-
child: BBButton.big(
99-
label: context.loc.sendContinue,
100-
onPressed: () => context.pop(true),
101-
bgColor: context.appColors.secondary,
102-
textStyle: context.font.headlineLarge,
103-
textColor: context.appColors.onPrimary,
104-
),
87+
),
88+
const Gap(16),
89+
Expanded(
90+
child: BBButton.big(
91+
label: context.loc.sendContinue,
92+
onPressed: () => context.pop(true),
93+
bgColor: context.appColors.secondary,
94+
textStyle: context.font.headlineLarge,
95+
textColor: context.appColors.onSecondary,
10596
),
106-
],
107-
),
108-
const Gap(30),
109-
],
110-
),
97+
),
98+
],
99+
),
100+
const Gap(30),
101+
],
111102
),
112103
),
113104
),
114-
],
115-
),
105+
),
106+
],
116107
);
117108
}
118109
}

‎lib/features/bip329_labels/page.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ class Bip329LabelsPage extends StatelessWidget {
2121
@override
2222
Widget build(BuildContext context) {
2323
return BlocProvider(
24-
create:
25-
(context) => Bip329LabelsCubit(
26-
exportLabelsUsecase: locator<ExportLabelsUsecase>(),
27-
importLabelsUsecase: locator<ImportLabelsUsecase>(),
28-
),
24+
create: (context) => Bip329LabelsCubit(
25+
exportLabelsUsecase: locator<ExportLabelsUsecase>(),
26+
importLabelsUsecase: locator<ImportLabelsUsecase>(),
27+
),
2928
child: Scaffold(
3029
appBar: AppBar(
3130
forceMaterialTransparency: true,
@@ -87,8 +86,8 @@ class Bip329LabelsPage extends StatelessWidget {
8786
BBButton.big(
8887
label: context.loc.bip329LabelsImportButton,
8988
onPressed: isLoading ? () {} : () => cubit.importLabels(),
90-
bgColor: context.appColors.primary,
91-
textColor: context.appColors.onPrimary,
89+
bgColor: context.appColors.secondary,
90+
textColor: context.appColors.onSecondary,
9291
iconData: Icons.file_upload,
9392
iconFirst: true,
9493
disabled: isLoading,

‎lib/features/buy/ui/widgets/buy_destination_input_fields.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class _BuyDestinationInputFieldsState extends State<BuyDestinationInputFields> {
6060
height: 56,
6161
child: Material(
6262
elevation: 4,
63-
color: context.appColors.onPrimary,
63+
color: context.appColors.surface,
6464
borderRadius: BorderRadius.circular(4.0),
6565
child: Center(
6666
child: DropdownButtonFormField<String>(
@@ -71,7 +71,7 @@ class _BuyDestinationInputFieldsState extends State<BuyDestinationInputFields> {
7171
),
7272
icon: Icon(
7373
Icons.keyboard_arrow_down,
74-
color: context.appColors.secondary,
74+
color: context.appColors.onSurface,
7575
),
7676
initialValue: selectedWallet?.id,
7777
items: [
@@ -117,7 +117,7 @@ class _BuyDestinationInputFieldsState extends State<BuyDestinationInputFields> {
117117
height: 56,
118118
child: Material(
119119
elevation: 2,
120-
color: context.appColors.onPrimary,
120+
color: context.appColors.secondary,
121121
borderRadius: BorderRadius.circular(2.0),
122122
child: Center(
123123
child: TextFormField(

‎lib/features/exchange/ui/screens/exchange_home_screen.dart‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ class ExchangeHomeScreen extends StatelessWidget {
8888
builder: (context, priceChartState) {
8989
final showChart = priceChartState.showChart;
9090
final hasApiKey = context.select(
91-
(ExchangeCubit cubit) => cubit.state.apiKeyException == null,
91+
(ExchangeCubit cubit) =>
92+
cubit.state.apiKeyException == null,
9293
);
9394

9495
return SliverAppBar(
@@ -144,7 +145,8 @@ class ExchangeHomeScreen extends StatelessWidget {
144145
onPressed: () {
145146
context.pushNamed(
146147
ExchangeSupportChatRoute
147-
.supportChat.name,
148+
.supportChat
149+
.name,
148150
);
149151
},
150152
),
@@ -202,26 +204,30 @@ class ExchangeHomeScreen extends StatelessWidget {
202204
Expanded(
203205
child: BBButton.big(
204206
iconData: Icons.arrow_downward,
205-
label: context.loc.exchangeHomeDepositButton,
207+
label: context.loc.exchangeHomeWithdrawButton,
206208
iconFirst: true,
207-
onPressed: () => context.pushNamed(
208-
FundExchangeRoute.fundExchangeAccount.name,
209-
),
210-
bgColor: context.appColors.secondary,
211-
textColor: context.appColors.onSecondary,
209+
disabled: false,
210+
onPressed: () =>
211+
context.pushNamed(WithdrawRoute.withdraw.name),
212+
bgColor: context.appColors.secondaryFixed,
213+
textColor: context.appColors.onSecondaryFixed,
214+
outlined: true,
215+
borderColor: context.appColors.onSecondaryFixed,
212216
),
213217
),
214218
const Gap(4),
215219
Expanded(
216220
child: BBButton.big(
217221
iconData: Icons.arrow_upward,
218-
label: context.loc.exchangeHomeWithdrawButton,
222+
label: context.loc.exchangeHomeDepositButton,
219223
iconFirst: true,
220-
disabled: false,
221-
onPressed: () =>
222-
context.pushNamed(WithdrawRoute.withdraw.name),
223-
bgColor: context.appColors.secondary,
224-
textColor: context.appColors.onSecondary,
224+
onPressed: () => context.pushNamed(
225+
FundExchangeRoute.fundExchangeAccount.name,
226+
),
227+
bgColor: context.appColors.secondaryFixed,
228+
textColor: context.appColors.onSecondaryFixed,
229+
outlined: true,
230+
borderColor: context.appColors.onSecondaryFixed,
225231
),
226232
),
227233
],

0 commit comments

Comments
 (0)