diff --git a/cyberwow/lib/config.dart b/cyberwow/lib/config.dart
index e523ffa..412d506 100644
--- a/cyberwow/lib/config.dart
+++ b/cyberwow/lib/config.dart
@@ -19,14 +19,10 @@ along with CyberWOW. If not, see .
*/
-import 'package:logging/logging.dart';
-
import 'config/prototype.dart';
import 'config/cyberwow.dart' as cryptoConfig;
-final Logger log = new Logger('Default');
-
-const config = cryptoConfig.config;
+const c = cryptoConfig.config;
const arch = 'arm64';
// const arch = 'x86_64';
diff --git a/cyberwow/lib/controller/daemon.dart b/cyberwow/lib/controller/daemon.dart
index 8dec29f..810b4e5 100644
--- a/cyberwow/lib/controller/daemon.dart
+++ b/cyberwow/lib/controller/daemon.dart
@@ -23,7 +23,8 @@ import 'dart:async';
import 'dart:convert';
import 'rpc/rpc.dart' as rpc;
-import '../config.dart';
+import '../config.dart' as config;
+import '../logging.dart';
Future isConnected() async {
final _outPeers = await rpc.outgoingConnectionsCount();
@@ -37,7 +38,7 @@ Future isConnected() async {
Future isSynced() async {
final _targetHeight = await rpc.targetHeight();
final _height = await rpc.height();
- return _targetHeight >= 0 && _targetHeight <= _height && _height > minimumHeight;
+ return _targetHeight >= 0 && _targetHeight <= _height && _height > config.minimumHeight;
}
Future isNotSynced() async {
diff --git a/cyberwow/lib/controller/refresh.dart b/cyberwow/lib/controller/refresh.dart
index 67b25d6..967ebba 100644
--- a/cyberwow/lib/controller/refresh.dart
+++ b/cyberwow/lib/controller/refresh.dart
@@ -26,6 +26,7 @@ import 'dart:async';
import 'rpc/rpc.dart' as rpc;
import '../config.dart';
+import '../logging.dart';
typedef GetNotificationFunc = AppLifecycleState Function();
diff --git a/cyberwow/lib/controller/rpc/rpc.dart b/cyberwow/lib/controller/rpc/rpc.dart
index 14d9d88..40f41d1 100644
--- a/cyberwow/lib/controller/rpc/rpc.dart
+++ b/cyberwow/lib/controller/rpc/rpc.dart
@@ -25,13 +25,14 @@ import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:flutter/foundation.dart';
-import '../../config.dart';
+import '../../config.dart' as config;
import '../../helper.dart';
+import '../../logging.dart';
int rpcID = 0;
Future rpcHTTP(String method) async {
- final url = 'http://${host}:${config.port}/json_rpc';
+ final url = 'http://${config.host}:${config.c.port}/json_rpc';
rpcID += 1;
diff --git a/cyberwow/lib/controller/rpc/rpc2.dart b/cyberwow/lib/controller/rpc/rpc2.dart
index 7fae535..d1c7c3a 100644
--- a/cyberwow/lib/controller/rpc/rpc2.dart
+++ b/cyberwow/lib/controller/rpc/rpc2.dart
@@ -25,11 +25,12 @@ import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:flutter/foundation.dart';
-import '../../config.dart';
+import '../../config.dart' as config;
import '../../helper.dart';
+import '../../logging.dart';
Future rpc2(String method) async {
- final url = 'http://${host}:${config.port}/${method}';
+ final url = 'http://${config.host}:${config.c.port}/${method}';
var response;
try {
diff --git a/cyberwow/lib/controller/syncing.dart b/cyberwow/lib/controller/syncing.dart
index b91dc53..893fda1 100644
--- a/cyberwow/lib/controller/syncing.dart
+++ b/cyberwow/lib/controller/syncing.dart
@@ -27,14 +27,15 @@ import 'dart:async';
import 'dart:convert';
import 'helper.dart';
-import '../config.dart';
+import '../config.dart' as config;
+import '../logging.dart';
Stream runBinary (String name) async* {
final newPath = await getBinaryPath(name);
final appDocDir = await getApplicationDocumentsDirectory();
final appDocPath = appDocDir.path;
- final binDir = new Directory(appDocDir.path + "/" + config.appPath);
+ final binDir = new Directory(appDocDir.path + "/" + config.c.appPath);
await binDir.create();
@@ -54,7 +55,7 @@ Stream runBinary (String name) async* {
"--data-dir",
binDir.path,
"--non-interactive",
- ] + extraArgs + config.extraArgs;
+ ] + extraArgs + config.c.extraArgs;
log.info('args: ' + args.toString());
@@ -63,7 +64,7 @@ Stream runBinary (String name) async* {
yield line;
}
- if (isEmu) return;
+ if (config.isEmu) return;
// the app should never reach here
log.severe('Daemon is gone!');
diff --git a/cyberwow/lib/logging.dart b/cyberwow/lib/logging.dart
new file mode 100644
index 0000000..12a481f
--- /dev/null
+++ b/cyberwow/lib/logging.dart
@@ -0,0 +1,3 @@
+import 'package:logging/logging.dart';
+
+final Logger log = new Logger('Default');
diff --git a/cyberwow/lib/main.dart b/cyberwow/lib/main.dart
index 5d8b1f5..499d09f 100644
--- a/cyberwow/lib/main.dart
+++ b/cyberwow/lib/main.dart
@@ -28,7 +28,8 @@ import 'dart:io';
import 'dart:async';
import 'state.dart';
-import 'config.dart';
+import 'config.dart' as config;
+import 'logging.dart';
import 'controller/loading.dart';
import 'controller/syncing.dart';
import 'widget/loading.dart';
@@ -112,11 +113,11 @@ class _CyberWOW_PageState extends State with WidgetsBindingObserv
}
Future buildStateMachine(BlankState _blankState) async {
- final loadingText = config.splash;
+ final loadingText = config.c.splash;
LoadingState _loadingState = await _blankState.next(loadingText);
- final binName = config.outputBin;
- final resourcePath = 'native/output/' + arch + '/' + binName;
+ final binName = config.c.outputBin;
+ final resourcePath = 'native/output/' + config.arch + '/' + binName;
final bundle = DefaultAssetBundle.of(context);
final loading = deployBinary(bundle, resourcePath, binName);
diff --git a/cyberwow/lib/state.dart b/cyberwow/lib/state.dart
index 7660fa6..ff1a9b6 100644
--- a/cyberwow/lib/state.dart
+++ b/cyberwow/lib/state.dart
@@ -33,7 +33,8 @@ import 'controller/rpc/rpc.dart' as rpc;
import 'controller/rpc/rpc2.dart' as rpc;
import 'controller/daemon.dart' as daemon;
import 'controller/refresh.dart' as refresh;
-import 'config.dart';
+import 'config.dart' as config;
+import 'logging.dart';
abstract class AppState {
T use
@@ -113,7 +114,7 @@ class LoadingState extends HookedState {
for (String char in chars) {
append(char);
- await Future.delayed(Duration(milliseconds: config.splashDelay), () => "1");
+ await Future.delayed(Duration(milliseconds: config.c.splashDelay), () => "1");
}
await Future.delayed(const Duration(seconds: 2), () => "1");
@@ -127,7 +128,7 @@ class LoadingState extends HookedState {
}
}
- final outputBinExists = await binaryExists(config.outputBin);
+ final outputBinExists = await binaryExists(config.c.outputBin);
if (outputBinExists) {
await load();
}
diff --git a/cyberwow/lib/widget/blank.dart b/cyberwow/lib/widget/blank.dart
index 54c0a9d..1214f2a 100644
--- a/cyberwow/lib/widget/blank.dart
+++ b/cyberwow/lib/widget/blank.dart
@@ -22,13 +22,13 @@ along with CyberWOW. If not, see .
import 'package:flutter/material.dart';
import '../state.dart';
-import '../config.dart';
+import '../config.dart' as config;
Widget buildBlank(BuildContext context, BlankState state) {
return Scaffold(
body: Container
(
- color: config.backgroundColor,
+ color: config.c.backgroundColor,
),
);
}
diff --git a/cyberwow/lib/widget/loading.dart b/cyberwow/lib/widget/loading.dart
index 5cdf29c..a25dba9 100644
--- a/cyberwow/lib/widget/loading.dart
+++ b/cyberwow/lib/widget/loading.dart
@@ -22,7 +22,7 @@ along with CyberWOW. If not, see .
import 'package:flutter/material.dart';
import '../state.dart';
-import '../config.dart';
+import '../config.dart' as config;
Widget buildLoading(BuildContext context, LoadingState state) {
return Scaffold(
@@ -33,7 +33,7 @@ Widget buildLoading(BuildContext context, LoadingState state) {
body: Container
(
padding: const EdgeInsets.all(10.0),
- color: config.backgroundColor,
+ color: config.c.backgroundColor,
child: Align
(
alignment: Alignment.topLeft,
@@ -55,7 +55,7 @@ Widget buildLoading(BuildContext context, LoadingState state) {
fontFamily: 'RobotoMono',
fontSize: 17,
fontWeight: FontWeight.bold,
- color: config.textColor,
+ color: config.c.textColor,
),
)
)
diff --git a/cyberwow/lib/widget/resyncing.dart b/cyberwow/lib/widget/resyncing.dart
index fd36557..5d4a57f 100644
--- a/cyberwow/lib/widget/resyncing.dart
+++ b/cyberwow/lib/widget/resyncing.dart
@@ -22,7 +22,7 @@ along with CyberWOW. If not, see .
import 'package:flutter/material.dart';
import '../state.dart';
-import '../config.dart';
+import '../config.dart' as config;
Widget buildReSyncing(BuildContext context, ReSyncingState state) {
return Scaffold
@@ -35,7 +35,7 @@ Widget buildReSyncing(BuildContext context, ReSyncingState state) {
body: Container
(
// padding: const EdgeInsets.all(10.0),
- color: config.backgroundColor,
+ color: config.c.backgroundColor,
child: Align
(
alignment: Alignment.topLeft,
@@ -58,7 +58,7 @@ Widget buildReSyncing(BuildContext context, ReSyncingState state) {
(
fontFamily: 'RobotoMono',
fontSize: 11,
- color: config.textColor,
+ color: config.c.textColor,
),
)
)
diff --git a/cyberwow/lib/widget/synced.dart b/cyberwow/lib/widget/synced.dart
index 64e815c..c324c49 100644
--- a/cyberwow/lib/widget/synced.dart
+++ b/cyberwow/lib/widget/synced.dart
@@ -22,14 +22,14 @@ along with CyberWOW. If not, see .
import 'package:flutter/material.dart';
import '../state.dart';
-import '../config.dart';
+import '../config.dart' as config;
import '../helper.dart';
Widget summary(SyncedState state) {
return Container
(
padding: EdgeInsets.only(bottom: 10.0),
- color: config.backgroundColor,
+ color: config.c.backgroundColor,
child: Align
(
alignment: Alignment.center,
@@ -64,7 +64,7 @@ Widget summary(SyncedState state) {
fontFamily: 'RobotoMono',
fontSize: 35,
fontWeight: FontWeight.bold,
- color: config.textColor,
+ color: config.c.textColor,
),
key: ValueKey(state.height),
)
@@ -95,7 +95,7 @@ Widget rpcView(String title, String body) {
return Container
(
padding: const EdgeInsets.all(10.0),
- color: config.backgroundColor,
+ color: config.c.backgroundColor,
child: Align
(
alignment: Alignment.topLeft,
@@ -127,12 +127,12 @@ Widget rpcView(String title, String body) {
fontFamily: 'RobotoMono',
fontSize: 35,
fontWeight: FontWeight.bold,
- color: config.textColor,
+ color: config.c.textColor,
),
),
Container(
height: 1,
- color: config.textColor,
+ color: config.c.textColor,
margin: const EdgeInsets.only(bottom: 20, top: 20),
),
Text
@@ -142,7 +142,7 @@ Widget rpcView(String title, String body) {
(
fontFamily: 'RobotoMono',
fontSize: 11,
- color: config.textColor,
+ color: config.c.textColor,
),
)
],
diff --git a/cyberwow/lib/widget/syncing.dart b/cyberwow/lib/widget/syncing.dart
index 04b511f..723027a 100644
--- a/cyberwow/lib/widget/syncing.dart
+++ b/cyberwow/lib/widget/syncing.dart
@@ -22,7 +22,7 @@ along with CyberWOW. If not, see .
import 'package:flutter/material.dart';
import '../state.dart';
-import '../config.dart';
+import '../config.dart' as config;
Widget buildSyncing(BuildContext context, SyncingState state) {
return Scaffold
@@ -35,7 +35,7 @@ Widget buildSyncing(BuildContext context, SyncingState state) {
body: Container
(
// padding: const EdgeInsets.all(10.0),
- color: config.backgroundColor,
+ color: config.c.backgroundColor,
child: Align
(
alignment: Alignment.topLeft,
@@ -58,7 +58,7 @@ Widget buildSyncing(BuildContext context, SyncingState state) {
(
fontFamily: 'RobotoMono',
fontSize: 11,
- color: config.textColor,
+ color: config.c.textColor,
),
)
)