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

Jump to bottom

chore(app): Increase shade on disabled fields #2183

Merged
merged 3 commits into from
Mar 7, 2024
Merged

chore(app): Increase shade on disabled fields #2183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea462bc
chore(app): Improve text component alignments on channel config modal
holzeis Mar 7, 2024
06412ec
chore(app): Align text input field heights
holzeis Mar 7, 2024
804898c
chore(app): Increase shade on disabled fields
holzeis Mar 7, 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
25 changes: 13 additions & 12 deletions mobile/lib/common/amount_text_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:get_10101/common/color.dart';
import 'package:get_10101/common/domain/model.dart';

class AmountTextField extends StatefulWidget {
Expand All @@ -21,18 +22,18 @@ class _AmountTextState extends State<AmountTextField> {

return InputDecorator(
decoration: InputDecoration(
border: const OutlineInputBorder(),
labelText: widget.label,
labelStyle: const TextStyle(color: Colors.black87),
errorStyle: TextStyle(
color: Colors.red[900],
),
errorText: widget.error,
filled: true,
suffixIcon: widget.suffixIcon,
fillColor: Colors.grey[50],
),
child: Text(value, style: const TextStyle(fontSize: 15)),
contentPadding: const EdgeInsets.fromLTRB(12, 24, 12, 17),
border: const OutlineInputBorder(),
labelText: widget.label,
labelStyle: const TextStyle(color: Colors.black87),
errorStyle: TextStyle(
color: Colors.red[900],
),
errorText: widget.error,
filled: true,
suffixIcon: widget.suffixIcon,
fillColor: tenTenOnePurple.shade50.withOpacity(0.3)),
child: Text(value, style: const TextStyle(fontSize: 16)),
);
}
}
2 changes: 1 addition & 1 deletion mobile/lib/common/amount_text_input_form_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class AmountInputField extends StatelessWidget {
@override
Widget build(BuildContext context) {
return TextFormField(
style: style ?? const TextStyle(color: Colors.black87),
style: style ?? const TextStyle(color: Colors.black87, fontSize: 16),
enabled: enabled,
controller: controller,
initialValue: controller != null ? null : value.formatted(),
Expand Down
31 changes: 12 additions & 19 deletions mobile/lib/features/trade/channel_configuration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,25 +141,21 @@ class _ChannelConfiguration extends State<ChannelConfiguration> {
return Form(
key: _formKey,
child: Container(
padding: const EdgeInsets.only(top: 5, left: 20, right: 20),
padding: const EdgeInsets.only(top: 20, left: 20, right: 20),
child: Column(children: [
const Text("DLC Channel Configuration",
style: TextStyle(fontWeight: FontWeight.bold, fontSize: 17)),
const SizedBox(
height: 20,
),
RichText(
text: TextSpan(
text:
"This is your first trade. 10101 will open a DLC channel with you, creating your position in the process.\n\nPlease specify your preferred channel size, impacting how much you will be able to win up to.",
style: DefaultTextStyle.of(context).style,
)),
const SizedBox(
height: 10,
),
const SizedBox(height: 20),
Text(
"This is your first trade. 10101 will open a DLC channel with you, creating your position in the process.",
style: DefaultTextStyle.of(context).style),
const SizedBox(height: 10),
Text(
"Please specify your preferred channel size, impacting how much you will be able to win up to.",
style: DefaultTextStyle.of(context).style),
Center(
child: Container(
padding: const EdgeInsets.only(top: 10),
padding: const EdgeInsets.only(top: 20),
child: Column(
children: [
Wrap(
Expand Down Expand Up @@ -203,9 +199,7 @@ class _ChannelConfiguration extends State<ChannelConfiguration> {
infoText:
"Your total collateral in the dlc channel.\n\nChoose a bigger amount here if you plan to make bigger trades in the future and don't want to open a new channel.",
)),
const SizedBox(
width: 10,
),
const SizedBox(width: 10),
Flexible(
child: AmountTextField(
value: counterpartyCollateral,
Expand All @@ -214,7 +208,6 @@ class _ChannelConfiguration extends State<ChannelConfiguration> {
],
),
),
const SizedBox(height: 10),
ValueDataRow(
type: ValueType.amount,
value: ownTotalCollateral,
Expand Down Expand Up @@ -244,7 +237,7 @@ class _ChannelConfiguration extends State<ChannelConfiguration> {
.add(fundingTxFee)
.add(channelFeeReserve),
label: "Total"),
const SizedBox(height: 17),
const SizedBox(height: 10),
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.end,
Expand Down
Loading