From 402b94a299145f4b38f2954202dec57ae1f23d78 Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Mon, 2 Mar 2020 21:09:56 +0200
Subject: [PATCH 1/3] CWA-177 | fixed UI bug in the settings text list row
---
.../widgets/settings_text_list_row.dart | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/lib/src/screens/settings/widgets/settings_text_list_row.dart b/lib/src/screens/settings/widgets/settings_text_list_row.dart
index ad68471db..23102bd40 100644
--- a/lib/src/screens/settings/widgets/settings_text_list_row.dart
+++ b/lib/src/screens/settings/widgets/settings_text_list_row.dart
@@ -18,14 +18,23 @@ class SettingsTextListRow extends StatelessWidget {
color: Theme.of(context).accentTextTheme.headline.backgroundColor,
child: ListTile(
contentPadding: EdgeInsets.only(left: 20.0, right: 20.0),
- title: Observer(
- builder: (_) => Text(
+ title: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: <Widget>[
+ Flexible(
+ child: Observer(
+ builder: (_) => Text(
settingsStore.itemHeaders[title],
style: TextStyle(
- fontSize: 16.0,
- color: Theme.of(context).primaryTextTheme.title.color),
- )),
- trailing: widget,
+ fontSize: 16.0,
+ color: Theme.of(context).primaryTextTheme.title.color),
+ )),
+ ),
+ Flexible(
+ child: widget
+ )
+ ],
+ ),
onTap: onTaped,
),
);
From d3b3f079c67801b0645717de98d9cbea1e24777e Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Mon, 2 Mar 2020 22:02:42 +0200
Subject: [PATCH 2/3] CWA-177 | added text alignment to the current node list
tile in the settings page
---
lib/src/screens/settings/settings.dart | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/src/screens/settings/settings.dart b/lib/src/screens/settings/settings.dart
index f893b0d6f..f297a462f 100644
--- a/lib/src/screens/settings/settings.dart
+++ b/lib/src/screens/settings/settings.dart
@@ -79,6 +79,7 @@ class SettingsFormState extends State<SettingsForm> {
widget: Observer(
builder: (_) => Text(
settingsStore.node == null ? '' : settingsStore.node.uri,
+ textAlign: TextAlign.right,
style: TextStyle(
fontSize: 16.0,
color:
From f0d55fed94ad4ab30367619b306afd2c1d7c0c2a Mon Sep 17 00:00:00 2001
From: Oleksandr Sobol <dr.alexander.sobol@gmail.com>
Date: Tue, 3 Mar 2020 16:26:12 +0200
Subject: [PATCH 3/3] CWA-177 | added text alignment to balance display mode,
fiat currency and transaction priority in the settings page, changed padding
for buttons in the dashboard page
---
lib/src/screens/dashboard/dashboard_page.dart | 2 +-
lib/src/screens/settings/settings.dart | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 2d01a8351..80cb4bad0 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -321,7 +321,7 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
),
Padding(
padding: const EdgeInsets.only(
- left: 35, right: 35, bottom: 30),
+ left: 20, right: 20, bottom: 30),
child: Container(
child: Row(
mainAxisAlignment:
diff --git a/lib/src/screens/settings/settings.dart b/lib/src/screens/settings/settings.dart
index f297a462f..93cbdf638 100644
--- a/lib/src/screens/settings/settings.dart
+++ b/lib/src/screens/settings/settings.dart
@@ -93,6 +93,7 @@ class SettingsFormState extends State<SettingsForm> {
widget: Observer(
builder: (_) => Text(
settingsStore.balanceDisplayMode.toString(),
+ textAlign: TextAlign.right,
style: TextStyle(
fontSize: 16.0,
color:
@@ -105,6 +106,7 @@ class SettingsFormState extends State<SettingsForm> {
widget: Observer(
builder: (_) => Text(
settingsStore.fiatCurrency.toString(),
+ textAlign: TextAlign.right,
style: TextStyle(
fontSize: 16.0,
color:
@@ -117,6 +119,7 @@ class SettingsFormState extends State<SettingsForm> {
widget: Observer(
builder: (_) => Text(
settingsStore.transactionPriority.toString(),
+ textAlign: TextAlign.right,
style: TextStyle(
fontSize: 16.0,
color: