CWA-214 | applied new design to show keys page; moved standard list row to widgets directory
Oleksandr Sobol committed
May 19, 2020 at 17:50 UTC
ba9b19214cf88f67e0eb06b8b214718ec483d425
4 files changed
+37
-31
lib/src/screens/show_keys/show_keys_page.dart
+35
-29
@@ -7,10 +7,11 @@ import 'package:cake_wallet/palette.dart';
7
import 'package:cake_wallet/generated/i18n.dart';
8
import 'package:cake_wallet/src/stores/wallet/wallet_keys_store.dart';
9
import 'package:cake_wallet/src/screens/base_page.dart';
10
+import 'package:cake_wallet/src/widgets/standart_list_row.dart';
11
12
class ShowKeysPage extends BasePage {
13
@override
13
- bool get isModalBackButton => true;
14
+ Color get backgroundColor => PaletteDark.historyPanel;
15
16
@override
17
String get title => S.current.wallet_keys;
@@ -20,7 +21,8 @@ class ShowKeysPage extends BasePage {
21
final walletKeysStore = Provider.of<WalletKeysStore>(context);
22
23
return Container(
23
- padding: EdgeInsets.only(top: 20.0, bottom: 20.0, left: 20, right: 20),
24
+ color: PaletteDark.historyPanel,
25
+ padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
26
child: Observer(
27
builder: (_) {
28
final keysMap = {
@@ -31,39 +33,43 @@ class ShowKeysPage extends BasePage {
33
};
34
35
return ListView.separated(
34
- separatorBuilder: (_, __) => Container(
35
- padding: EdgeInsets.only(left: 30.0, right: 20.0),
36
- child: Divider(
37
- color: Theme.of(context).dividerTheme.color,
38
- height: 1.0)),
36
+ separatorBuilder: (context, index) => Container(
37
+ height: 1,
38
+ padding: EdgeInsets.only(left: 24),
39
+ color: PaletteDark.menuList,
40
+ child: Container(
41
+ height: 1,
42
+ color: PaletteDark.walletCardTopEndSync,
43
+ ),
44
+ ),
45
itemCount: keysMap.length,
46
itemBuilder: (BuildContext context, int index) {
47
final key = keysMap.keys.elementAt(index);
48
final value = keysMap.values.elementAt(index);
49
44
- return ListTile(
45
- contentPadding: EdgeInsets.only(
46
- top: 10, bottom: 10, left: 30, right: 20),
47
- onTap: () {
48
- Clipboard.setData(ClipboardData(
49
- text: keysMap.values.elementAt(index)));
50
- Scaffold.of(context).showSnackBar(SnackBar(
51
- content: Text(
52
- S.of(context).copied_key_to_clipboard(key),
53
- textAlign: TextAlign.center,
54
- style: TextStyle(color: Colors.white),
55
- ),
56
- backgroundColor: Colors.green,
57
- duration: Duration(seconds: 1),
58
- ));
59
- },
60
- title: Text(key + ':', style: TextStyle(fontSize: 16.0)),
61
- subtitle: Container(
62
- padding: EdgeInsets.only(top: 5.0),
63
- child: Text(value,
64
- style: TextStyle(
65
- fontSize: 16.0, color: Palette.wildDarkBlue)),
50
+ final isDrawTop = index == 0 ? true : false;
51
+ final isDrawBottom = index == keysMap.length - 1 ? true : false;
52
+
53
+ return GestureDetector(
54
+ onTap: () {
55
+ Clipboard.setData(ClipboardData(text: value));
56
+ Scaffold.of(context).showSnackBar(SnackBar(
57
+ content: Text(
58
+ S.of(context).copied_key_to_clipboard(key),
59
+ textAlign: TextAlign.center,
60
+ style: TextStyle(color: Colors.white),
61
+ ),
62
+ backgroundColor: Colors.green,
63
+ duration: Duration(seconds: 1),
64
));
65
+ },
66
+ child: StandartListRow(
67
+ title: key + ':',
68
+ value: value,
69
+ isDrawTop: isDrawTop,
70
+ isDrawBottom: isDrawBottom,
71
+ ),
72
+ );
73
});
74
},
75
));
lib/src/screens/trade_details/trade_details_page.dart
+1
-1
@@ -8,7 +8,7 @@ import 'package:cake_wallet/src/stores/exchange_trade/exchange_trade_store.dart'
8
import 'package:cake_wallet/src/stores/settings/settings_store.dart';
9
import 'package:cake_wallet/src/screens/base_page.dart';
10
import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
11
-import 'package:cake_wallet/src/screens/transaction_details/standart_list_row.dart';
11
+import 'package:cake_wallet/src/widgets/standart_list_row.dart';
12
import 'package:cake_wallet/palette.dart';
13
14
class TradeDetailsPage extends BasePage {
lib/src/screens/transaction_details/transaction_details_page.dart
+1
-1
@@ -6,7 +6,7 @@ import 'package:cake_wallet/generated/i18n.dart';
6
import 'package:cake_wallet/src/domain/common/transaction_info.dart';
7
import 'package:cake_wallet/src/stores/settings/settings_store.dart';
8
import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
9
-import 'package:cake_wallet/src/screens/transaction_details/standart_list_row.dart';
9
+import 'package:cake_wallet/src/widgets/standart_list_row.dart';
10
import 'package:cake_wallet/src/screens/base_page.dart';
11
import 'package:cake_wallet/palette.dart';
12