Skip to content

Commit 45b867f

Browse files
ethicnologyethicnology
authored
Merge pull request #2689 from SatoshiPortal/fix/numeric-input-single-line
fix: keep numeric input fields to a single line
2 parents f747d1e + 6f9d063 commit 45b867f

18 files changed

Lines changed: 118 additions & 220 deletions

File tree

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import 'package:bb_mobile/core/themes/app_theme.dart';
2-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
32
import 'package:bb_mobile/core/widgets/text/text.dart';
43
import 'package:flutter/material.dart';
5-
import 'package:bull_ui/bull_ui.dart' show Gap;
4+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
65

76
class LabeledTextInput extends StatelessWidget {
87
final String label;
@@ -47,7 +46,7 @@ class LabeledTextInput extends StatelessWidget {
4746
),
4847
],
4948
),
50-
child: BBInputText(
49+
child: BullInputText(
5150
value: value,
5251
onChanged: onChanged ?? (_) {},
5352
disabled: onChanged == null,

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

Lines changed: 0 additions & 168 deletions
This file was deleted.

‎lib/features/app_unlock/ui/pin_code_unlock_screen.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:bb_mobile/core/themes/app_theme.dart';
22
import 'package:bb_mobile/core/utils/build_context_x.dart';
33
import 'package:bb_mobile/core/widgets/buttons/button.dart';
44
import 'package:bb_mobile/core/widgets/dialpad/dial_pad.dart';
5-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
65
import 'package:bb_mobile/core/widgets/navbar/top_bar.dart';
76
import 'package:bb_mobile/core/widgets/snackbar_utils.dart';
87
import 'package:bb_mobile/features/app_unlock/presentation/app_unlock_failure_l10n.dart';
@@ -11,7 +10,7 @@ import 'package:bb_mobile/features/wallet/ui/wallet_router.dart';
1110
import 'package:bb_mobile/locator.dart';
1211
import 'package:flutter/material.dart';
1312
import 'package:flutter_bloc/flutter_bloc.dart';
14-
import 'package:bull_ui/bull_ui.dart' show Gap;
13+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
1514
import 'package:go_router/go_router.dart';
1615

1716
class PinCodeUnlockScreen extends StatelessWidget {
@@ -109,7 +108,7 @@ class PinCodeUnlockInputScreen extends StatelessWidget {
109108
(state.pinCode, state.obscurePinCode),
110109
builder: (context, data) {
111110
final (pinCode, obscurePinCode) = data;
112-
return BBInputText(
111+
return BullInputText(
113112
value: pinCode,
114113
obscure: obscurePinCode,
115114
onRightTap: () => context

‎lib/features/autoswap/ui/screens/autoswap_settings_screen.dart‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import 'package:bb_mobile/core/wallet/domain/entities/wallet.dart';
55
import 'package:bb_mobile/core/widgets/cards/info_card.dart';
66
import 'package:bb_mobile/core/widgets/dropdown/bb_dropdown.dart';
77
import 'package:bb_mobile/core/widgets/inputs/bb_keyboard_actions.dart';
8-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
98
import 'package:bb_mobile/core/widgets/switch/bb_switch.dart';
109
import 'package:bb_mobile/core/widgets/text/text.dart';
1110
import 'package:bb_mobile/features/autoswap/presentation/autoswap_failure_l10n.dart';
1211
import 'package:bb_mobile/features/autoswap/presentation/autoswap_settings_cubit.dart';
1312
import 'package:bb_mobile/locator.dart';
1413
import 'package:flutter/material.dart';
1514
import 'package:flutter_bloc/flutter_bloc.dart';
16-
import 'package:bull_ui/bull_ui.dart' show Gap;
15+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
1716

1817
class AutoSwapSettingsScreen extends StatefulWidget {
1918
const AutoSwapSettingsScreen({super.key});
@@ -168,7 +167,7 @@ class _AmountThresholdField extends StatelessWidget {
168167
Row(
169168
children: [
170169
Expanded(
171-
child: BBInputText(
170+
child: BullInputText(
172171
value: amountThresholdInput ?? '',
173172
focusNode: focusNode,
174173
onlyNumbers: true,
@@ -273,7 +272,7 @@ class _TriggerBalanceField extends StatelessWidget {
273272
Row(
274273
children: [
275274
Expanded(
276-
child: BBInputText(
275+
child: BullInputText(
277276
value: triggerBalanceSatsInput ?? '',
278277
focusNode: focusNode,
279278
onlyNumbers: true,
@@ -371,7 +370,7 @@ class _FeeThresholdField extends StatelessWidget {
371370
Row(
372371
children: [
373372
Expanded(
374-
child: BBInputText(
373+
child: BullInputText(
375374
value: feeThresholdInput ?? '',
376375
focusNode: focusNode,
377376
onlyNumbers: true,

‎lib/features/autoswap/ui/widgets/autoswap_settings.dart‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ import 'package:bb_mobile/core/widgets/buttons/button.dart';
77
import 'package:bb_mobile/core/widgets/cards/info_card.dart';
88
import 'package:bb_mobile/core/widgets/dropdown/bb_dropdown.dart';
99
import 'package:bb_mobile/core/widgets/inputs/bb_keyboard_actions.dart';
10-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
1110
import 'package:bb_mobile/core/widgets/switch/bb_switch.dart';
1211
import 'package:bb_mobile/core/widgets/text/text.dart';
1312
import 'package:bb_mobile/features/autoswap/presentation/autoswap_failure_l10n.dart';
1413
import 'package:bb_mobile/features/autoswap/presentation/autoswap_settings_cubit.dart';
1514
import 'package:bb_mobile/locator.dart';
1615
import 'package:flutter/material.dart';
1716
import 'package:flutter_bloc/flutter_bloc.dart';
18-
import 'package:bull_ui/bull_ui.dart' show Gap;
17+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
1918

2019
class AutoSwapSettingsBottomSheet extends StatelessWidget {
2120
const AutoSwapSettingsBottomSheet({super.key});
@@ -265,7 +264,7 @@ class _AmountThresholdField extends StatelessWidget {
265264
Row(
266265
children: [
267266
Expanded(
268-
child: BBInputText(
267+
child: BullInputText(
269268
value: amountThresholdInput ?? '',
270269
focusNode: focusNode,
271270
onlyNumbers: true,
@@ -349,7 +348,7 @@ class _TriggerBalanceField extends StatelessWidget {
349348
Row(
350349
children: [
351350
Expanded(
352-
child: BBInputText(
351+
child: BullInputText(
353352
value: triggerBalanceSatsInput ?? '',
354353
focusNode: focusNode,
355354
onlyNumbers: true,
@@ -430,7 +429,7 @@ class _FeeThresholdField extends StatelessWidget {
430429
Row(
431430
children: [
432431
Expanded(
433-
child: BBInputText(
432+
child: BullInputText(
434433
value: feeThresholdInput ?? '',
435434
focusNode: focusNode,
436435
onlyNumbers: true,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import 'package:bb_mobile/core/themes/app_theme.dart';
22
import 'package:bb_mobile/core/utils/build_context_x.dart';
33
import 'package:bb_mobile/core/widgets/buttons/button.dart';
4-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
54
import 'package:bb_mobile/core/widgets/text/text.dart';
65
import 'package:bb_mobile/features/exchange/ui/exchange_router.dart';
76
import 'package:bb_mobile/features/exchange_support_chat/public/exchange_support_chat_facade.dart';
87
import 'package:flutter/material.dart';
9-
import 'package:bull_ui/bull_ui.dart' show Gap;
8+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
109
import 'package:go_router/go_router.dart';
1110

1211
class ExchangeSupportLoginScreen extends StatelessWidget {
@@ -229,7 +228,7 @@ class _DisabledMessageInput extends StatelessWidget {
229228
const Gap(8),
230229
Expanded(
231230
child: IgnorePointer(
232-
child: BBInputText(
231+
child: BullInputText(
233232
value: '',
234233
hint: context.loc.exchangeSupportChatInputHint,
235234
maxLines: 1,

‎lib/features/exchange_support_chat/ui/screens/exchange_support_chat_screen.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:bb_mobile/core/exchange/domain/usecases/send_support_chat_messag
99
import 'package:bb_mobile/core/themes/app_theme.dart';
1010
import 'package:bb_mobile/core/utils/build_context_x.dart';
1111
import 'package:bb_mobile/core/widgets/buttons/button.dart';
12-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
1312
import 'package:bb_mobile/core/widgets/snackbar_utils.dart';
1413
import 'package:bb_mobile/core/widgets/text/text.dart';
1514
import 'package:bb_mobile/features/exchange/ui/exchange_router.dart';
@@ -20,7 +19,7 @@ import 'package:bb_mobile/locator.dart';
2019
import 'package:flutter/material.dart';
2120
import 'package:go_router/go_router.dart';
2221
import 'package:flutter_bloc/flutter_bloc.dart';
23-
import 'package:bull_ui/bull_ui.dart' show Gap;
22+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
2423
import 'package:intl/intl.dart';
2524

2625
class ExchangeSupportChatScreen extends StatelessWidget {
@@ -403,7 +402,7 @@ class _MessageInputState extends State<_MessageInput> {
403402
),
404403
const Gap(8),
405404
Expanded(
406-
child: BBInputText(
405+
child: BullInputText(
407406
value: state.newMessageText,
408407
hint:
409408
state.newMessageAttachments.isNotEmpty &&

‎lib/features/import_watch_only_wallet/presentation/watch_only_details_widget.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import 'package:bb_mobile/core/utils/build_context_x.dart';
44
import 'package:bb_mobile/core/widgets/buttons/button.dart';
55
import 'package:bb_mobile/core/widgets/cards/info_card.dart';
66
import 'package:bb_mobile/core/widgets/inputs/labeled_text_input.dart';
7-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
87
import 'package:bb_mobile/core/widgets/text/text.dart';
98
import 'package:bb_mobile/features/import_watch_only_wallet/presentation/cubit/import_watch_only_cubit.dart';
109
import 'package:bb_mobile/features/import_watch_only_wallet/watch_only_wallet_entity.dart';
1110
import 'package:flutter/material.dart';
1211
import 'package:flutter_bloc/flutter_bloc.dart';
13-
import 'package:bull_ui/bull_ui.dart' show Gap;
12+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
1413
import 'package:satoshifier/enums/derivation.dart' as satoshifier;
1514

1615
class WatchOnlyDetailsWidget extends StatelessWidget {
@@ -212,7 +211,7 @@ class _XpubDetailsWidget extends StatelessWidget {
212211
style: context.font.titleMedium,
213212
),
214213
const Gap(8),
215-
BBInputText(
214+
BullInputText(
216215
onChanged: cubit.updateLabel,
217216
value: entity.label,
218217
maxLines: 1,

‎lib/features/pay/ui/screens/pay_amount_screen.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ import 'package:bb_mobile/core/utils/build_context_x.dart';
33
import 'package:bb_mobile/core/widgets/buttons/button.dart';
44
import 'package:bb_mobile/core/widgets/cards/info_card.dart';
55
import 'package:bb_mobile/core/widgets/inputs/bb_keyboard_actions.dart';
6-
import 'package:bb_mobile/core/widgets/inputs/text_input.dart';
76
import 'package:bb_mobile/core/widgets/scrollable_column.dart';
87
import 'package:bb_mobile/features/exchange/ui/exchange_router.dart';
98
import 'package:bb_mobile/features/pay/presentation/pay_bloc.dart';
109
import 'package:bb_mobile/features/pay/ui/widgets/pay_amount_input_fields.dart';
1110
import 'package:flutter/material.dart';
1211
import 'package:flutter_bloc/flutter_bloc.dart';
13-
import 'package:bull_ui/bull_ui.dart' show Gap;
12+
import 'package:bull_ui/bull_ui.dart' show BullInputText, Gap;
1413
import 'package:go_router/go_router.dart';
1514

1615
class PayAmountScreen extends StatefulWidget {
@@ -94,7 +93,7 @@ class _PayAmountScreenState extends State<PayAmountScreen> {
9493
),
9594
),
9695
const Gap(8.0),
97-
BBInputText(
96+
BullInputText(
9897
controller: _descriptionController,
9998
value: _descriptionController.text,
10099
hint: context.loc.payDescriptionHint,

0 commit comments

Comments
 (0)