From 521587ccfae118388b2572524ec5dd67020ae677 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Wed, 24 Feb 2021 08:34:39 +0100
Subject: [PATCH] Setup DubpRust in home, no main any more; Improve home view
elements sizes
---
Makefile.toml | 2 +-
lib/main.dart | 13 -------------
lib/screens/home.dart | 18 ++++++++++--------
pubspec.yaml | 2 +-
4 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/Makefile.toml b/Makefile.toml
index c468104e..df6d1a7a 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -1,7 +1,7 @@
[env]
CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
CARGO_MAKE_WORKSPACE_INCLUDE_MEMBERS = ["native/dubp_rs"]
-ANDROID_PLATFORM_VERSION = "22"
+ANDROID_PLATFORM_VERSION = "21"
TARGET_OS = "unknown"
RELEASE = true
DEV = false
diff --git a/lib/main.dart b/lib/main.dart
index f84ff3b6..0b3fdc6c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,4 @@
import 'dart:async';
-
-import 'package:dubp/dubp.dart';
import 'package:gecko/globals.dart';
import 'package:gecko/models/cesiumPlus.dart';
import 'package:gecko/models/changePin.dart';
@@ -87,17 +85,6 @@ class Gecko extends StatelessWidget {
link: _httpLink,
),
);
- try {
- DubpRust.setup();
- } catch (e, stack) {
- print(e);
- if (kReleaseMode) {
- Sentry.captureException(
- e,
- stackTrace: stack,
- );
- }
- }
// HistoryProvider _historyProvider = Provider.of<HistoryProvider>(context);
// HistoryProvider('').snackNode(context);
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index e0c7f14e..54afc886 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -1,3 +1,4 @@
+import 'package:dubp/dubp.dart';
import 'package:gecko/globals.dart';
import 'package:gecko/models/history.dart';
import 'package:gecko/models/home.dart';
@@ -111,6 +112,7 @@ class HomeScreen extends StatelessWidget {
builder: (ctx) => StatefulWrapper(
onInit: () {
WidgetsBinding.instance.addPostFrameCallback((_) {
+ DubpRust.setup();
_historyStatic.snackNode(ctx);
});
},
@@ -124,10 +126,10 @@ class HomeScreen extends StatelessWidget {
Image(
image:
AssetImage('assets/icon/gecko_final.png'),
- height: 180),
+ height: 160),
])),
Padding(
- padding: EdgeInsets.only(top: 15),
+ padding: EdgeInsets.only(top: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
@@ -139,7 +141,7 @@ class HomeScreen extends StatelessWidget {
)
])),
Padding(
- padding: EdgeInsets.only(top: 60),
+ padding: EdgeInsets.only(top: 40),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
@@ -156,7 +158,7 @@ class HomeScreen extends StatelessWidget {
child: Image(
image: AssetImage(
'assets/qrcode-scan.png'),
- height: 58)),
+ height: 50)),
onTap: () async {
await _historyProvider
.scan(context);
@@ -185,7 +187,7 @@ class HomeScreen extends StatelessWidget {
])
])),
Padding(
- padding: EdgeInsets.only(top: 60),
+ padding: EdgeInsets.only(top: 40),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
@@ -203,7 +205,7 @@ class HomeScreen extends StatelessWidget {
child: Image(
image: AssetImage(
'assets/blockchain.png'),
- height: 65)),
+ height: 55)),
onTap: () {}),
),
),
@@ -227,7 +229,7 @@ class HomeScreen extends StatelessWidget {
color: Colors.black, fontSize: 13),
)
]),
- SizedBox(width: 140),
+ SizedBox(width: 100),
Column(children: <Widget>[
Container(
child: ClipOval(
@@ -241,7 +243,7 @@ class HomeScreen extends StatelessWidget {
child: Image(
image: AssetImage(
'assets/lock.png'),
- height: 50)),
+ height: 45)),
onTap: () {
Navigator.push(
context,
diff --git a/pubspec.yaml b/pubspec.yaml
index ecc162ea..cd6a70fa 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ description: A new Flutter project.
# pub.dev using `pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 0.0.1+14
+version: 0.0.1+16
environment:
sdk: ">=2.7.0 <3.0.0"
--
GitLab