zecfoundation
/
zwallet
mirror of https://github.com/ZcashFoundation/zwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UI glitches

This commit is contained in:
Hanh 2021-08-24 10:04:45 +08:00
parent c3cfd703a6
commit 6a6cb8041e
8 changed files with 92 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/release.yaml vendored
View File

@ -18,9 +18,12 @@ jobs:
id: extract
with:
image: '${{ secrets.DOCKER_HUB_USERNAME }}/zwallet:latest'
path: '/root/app-release.aab'
path: '/root/.'
- name: Release
uses: softprops/action-gh-release@v1
with:
files: ${{ steps.extract.outputs.destination }}/app-release.aab
files: |
${{ steps.extract.outputs.destination }}/app-arm64-v8a-release.apk
${{ steps.extract.outputs.destination }}/app-armeabi-v7a-release.apk
${{ steps.extract.outputs.destination }}/app-x86_64-release.apk

2
build.sh
View File

@ -1,4 +1,4 @@
export FEATURE=$1
cargo make --env COIN=$FEATURE --profile release
flutter build appbundle
flutter build apk --split-per-abi

2
docker/Dockerfile
View File

@ -11,4 +11,4 @@ RUN --mount=type=secret,id=pwd cd /zwallet && ./configure.sh zcash && ./build.sh
FROM alpine:latest
WORKDIR /root
COPY --from=builder /zwallet/build/app/outputs/bundle/release/app-release.aab ./
COPY --from=builder /zwallet/build/app/outputs/flutter-apk/* ./

96
lib/account.dart
View File

@ -109,15 +109,22 @@ class _AccountPageState extends State<AccountPage>
accountManager.canPay;
return PopupMenuButton<String>(
itemBuilder: (context) => [
PopupMenuItem(child: Text(S.of(context).accounts), value: "Accounts"),
PopupMenuItem(child: Text(S.of(context).backup), value: "Backup"),
PopupMenuItem(child: Text(S.of(context).rescan), value: "Rescan"),
PopupMenuItem(
child: Text(S.of(context).accounts), value: "Accounts"),
PopupMenuItem(
child: Text(S.of(context).backup), value: "Backup"),
PopupMenuItem(
child: Text(S.of(context).rescan), value: "Rescan"),
if (accountManager.canPay)
PopupMenuItem(child: Text(S.of(context).coldStorage), value: "Cold"),
PopupMenuItem(
child: Text(S.of(context).coldStorage), value: "Cold"),
if (accountManager.canPay)
PopupMenuItem(child: Text(S.of(context).multipay), value: "MultiPay"),
PopupMenuItem(child: Text(S.of(context).broadcast), value: "Broadcast"),
PopupMenuItem(child: Text(S.of(context).settings), value: "Settings"),
PopupMenuItem(
child: Text(S.of(context).multipay), value: "MultiPay"),
PopupMenuItem(
child: Text(S.of(context).broadcast), value: "Broadcast"),
PopupMenuItem(
child: Text(S.of(context).settings), value: "Settings"),
PopupMenuItem(child: Text(S.of(context).about), value: "About"),
],
onSelected: _onMenu,
@ -271,7 +278,8 @@ class _AccountPageState extends State<AccountPage>
_onAddressCopy() {
Clipboard.setData(ClipboardData(text: _address()));
final snackBar = SnackBar(content: Text(S.of(context).addressCopiedToClipboard));
final snackBar =
SnackBar(content: Text(S.of(context).addressCopiedToClipboard));
rootScaffoldMessengerKey.currentState.showSnackBar(snackBar);
}
@ -286,8 +294,7 @@ class _AccountPageState extends State<AccountPage>
actions: confirmButtons(context, () async {
final s = S.of(context);
Navigator.of(this.context).pop();
final snackBar1 =
SnackBar(content: Text(s.shieldingInProgress));
final snackBar1 = SnackBar(content: Text(s.shieldingInProgress));
rootScaffoldMessengerKey.currentState.showSnackBar(snackBar1);
final txid = await WarpApi.shieldTAddr(accountManager.active.id);
final snackBar2 = SnackBar(content: Text("${s.txId}: $txid"));
@ -426,21 +433,20 @@ class _AccountPageState extends State<AccountPage>
_rescan() {
showDialog(
context: this.context,
barrierDismissible: false,
builder: (context) => AlertDialog(
title: Text(S.of(context).rescan),
content: Text(S.of(context).rescanWalletFromTheFirstBlock),
actions:
confirmButtons(context, () {
Navigator.of(this.context).pop();
final snackBar = SnackBar(content: Text(S.of(context).rescanRequested));
rootScaffoldMessengerKey.currentState.showSnackBar(snackBar);
syncStatus.setSyncHeight(0);
WarpApi.rewindToHeight(0);
_sync();
}))
);
context: this.context,
barrierDismissible: false,
builder: (context) => AlertDialog(
title: Text(S.of(context).rescan),
content: Text(S.of(context).rescanWalletFromTheFirstBlock),
actions: confirmButtons(context, () {
Navigator.of(this.context).pop();
final snackBar =
SnackBar(content: Text(S.of(context).rescanRequested));
rootScaffoldMessengerKey.currentState.showSnackBar(snackBar);
syncStatus.setSyncHeight(0);
WarpApi.rewindToHeight(0);
_sync();
})));
}
_cold() {
@ -448,12 +454,11 @@ class _AccountPageState extends State<AccountPage>
context: context,
barrierDismissible: false,
builder: (context) => AlertDialog(
title: Text(S.of(context).coldStorage),
content: Text(
S.of(context).doYouWantToDeleteTheSecretKeyAndConvert),
actions:
confirmButtons(context, _convertToWatchOnly, okLabel: S.of(context).delete)
));
title: Text(S.of(context).coldStorage),
content:
Text(S.of(context).doYouWantToDeleteTheSecretKeyAndConvert),
actions: confirmButtons(context, _convertToWatchOnly,
okLabel: S.of(context).delete)));
}
_multiPay() {
@ -567,7 +572,9 @@ class NotesDataSource extends DataTableSource {
? syncStatus.latestHeight - note.height + 1
: note.height;
var style = _confirmed(note.height) ? theme.textTheme.bodyText2 : theme.textTheme.overline;
var style = _confirmed(note.height)
? theme.textTheme.bodyText2
: theme.textTheme.overline;
if (note.spent)
style = style.merge(TextStyle(decoration: TextDecoration.lineThrough));
@ -579,8 +586,7 @@ class NotesDataSource extends DataTableSource {
? theme.primaryColor.withOpacity(0.5)
: theme.backgroundColor),
cells: [
DataCell(Text("$confsOrHeight",
style: style)),
DataCell(Text("$confsOrHeight", style: style)),
DataCell(Text("${note.timestamp}", style: style)),
DataCell(Text("${note.value.toStringAsFixed(8)}", style: style)),
],
@ -775,7 +781,8 @@ class PnLState extends State<PnLWidget> with AutomaticKeepAliveClientMixin {
});
},
options: [
FormBuilderFieldOption(child: Text(S.of(context).realized), value: 0),
FormBuilderFieldOption(
child: Text(S.of(context).realized), value: 0),
FormBuilderFieldOption(child: Text(S.of(context).mm), value: 1),
FormBuilderFieldOption(child: Text(S.of(context).total), value: 2),
FormBuilderFieldOption(child: Text(S.of(context).price), value: 3),
@ -783,7 +790,7 @@ class PnLState extends State<PnLWidget> with AutomaticKeepAliveClientMixin {
FormBuilderFieldOption(child: Text(S.of(context).table), value: 5),
]),
Observer(builder: (context) {
final _ = accountManager.pnls;
final _ = accountManager.pnlSorted;
return Expanded(
child: accountManager.pnlSeriesIndex != 5
? PnLChart(accountManager.pnls, accountManager.pnlSeriesIndex)
@ -822,19 +829,26 @@ class PnLChart extends StatelessWidget {
static List<TimeSeriesPoint<double>> _createSeries(
List<PnL> data, int index, BuildContext context) {
return data.map((pnl) =>
TimeSeriesPoint(pnl.timestamp.millisecondsSinceEpoch ~/ DAY_MS,
_seriesData(pnl, index))).toList();
return data
.map((pnl) => TimeSeriesPoint(
pnl.timestamp.millisecondsSinceEpoch ~/ DAY_MS,
_seriesData(pnl, index)))
.toList();
}
}
class PnLTable extends StatelessWidget {
@override
Widget build(BuildContext context) {
final sortSymbol = accountManager.pnlDesc ? ' \u2193' : ' \u2191';
return SingleChildScrollView(
child: PaginatedDataTable(
columns: [
DataColumn(label: Text(S.of(context).datetime)),
DataColumn(
label: Text(S.of(context).datetime + sortSymbol),
onSort: (_, __) {
accountManager.togglePnlDesc();
}),
DataColumn(label: Text(S.of(context).qty), numeric: true),
DataColumn(label: Text(S.of(context).price), numeric: true),
DataColumn(label: Text(S.of(context).realized), numeric: true),
@ -861,7 +875,7 @@ class PnLDataSource extends DataTableSource {
@override
DataRow getRow(int index) {
final pnl = accountManager.pnls[index];
final pnl = accountManager.pnlSorted[index];
final ts = dateFormat.format(pnl.timestamp);
return DataRow(cells: [
DataCell(Text("$ts")),

14
lib/settings.dart
View File

@ -18,6 +18,7 @@ class SettingsState extends State<SettingsPage> {
MaskedTextController(mask: "00", text: "${settings.anchorOffset}");
var _thresholdController = MoneyMaskedTextController(
decimalSeparator: '.', thousandSeparator: ',', precision: 3);
var _currency = settings.currency;
@override
void initState() {
@ -98,13 +99,18 @@ class SettingsState extends State<SettingsPage> {
child: DropdownButtonFormField<String>(
decoration: InputDecoration(
labelText: S.of(context).currency),
value: settings.currency,
value: _currency,
items: settings.currencies
.map((c) => DropdownMenuItem(
child: Text(c), value: c))
.toList(),
onChanged: (v) {
settings.setCurrency(v);
setState(() {
_currency = v;
});
},
onSaved: (_) {
settings.setCurrency(_currency);
})),
]),
FormBuilderTextField(
@ -122,7 +128,7 @@ class SettingsState extends State<SettingsPage> {
decoration: InputDecoration(
labelText: S.of(context).tradingChartRange),
initialValue: settings.chartRange,
onChanged: _onChartRange,
onSaved: _onChartRange,
options: [
FormBuilderFieldOption(
child: Text(S.of(context).M1), value: '1M'),
@ -161,7 +167,7 @@ class SettingsState extends State<SettingsPage> {
final vss = vs.replaceAll(',', '');
final v = double.tryParse(vss);
if (v == null) return S.of(context).amountMustBeANumber;
if (v <= 0.0) return S.of(context).amountMustBePositive;
if (v < 0.0) return S.of(context).amountMustBePositive;
return null;
}

19
lib/store.dart
View File

@ -299,6 +299,9 @@ abstract class _AccountManager with Store {
@observable
int pnlSeriesIndex = 0;
@observable
bool pnlDesc = false;
@observable
List<Contact> contacts = [];
@ -675,6 +678,20 @@ abstract class _AccountManager with Store {
pnls = _pnls;
}
@action
void togglePnlDesc() {
pnlDesc = !pnlDesc;
}
@computed
List<PnL> get pnlSorted {
if (pnlDesc) {
var _pnls = [...pnls.reversed];
return _pnls;
}
return pnls;
}
@action
Future<void> convertToWatchOnly() async {
await db.rawUpdate(
@ -694,7 +711,7 @@ abstract class _AccountManager with Store {
if (active == null) return;
int balance = WarpApi.getTBalance(active.id);
if (balance != tbalance) tbalance = balance;
if (tbalance / ZECUNIT >= settings.autoShieldThreshold) {
if (settings.autoShieldThreshold != 0.0 && tbalance / ZECUNIT >= settings.autoShieldThreshold) {
WarpApi.shieldTAddr(active.id);
}
}

2
pubspec.yaml
View File

@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.9+91
version: 1.0.9+94
environment:
sdk: ">=2.9.0 <3.0.0"

2
pubspec.yaml.tpl
View File

@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.9+91
version: 1.0.9+94
environment:
sdk: ">=2.9.0 <3.0.0"