Skip to content

Commit ed6b21f

Browse files
canewsincanewsin
committed
v 0.8.2 - beta 7
 - Updated to Latest ZeroNet Version.
1 parent 00886c0 commit ed6b21f

21 files changed

+257
-109
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ZeroNet Mobile
22
[![Codemagic build status](https://api.codemagic.io/apps/5f755f0647fecf7a4f25751a/5f75609747fecf958ea171b0/status_badge.svg)](https://codemagic.io/apps/5f755f0647fecf7a4f25751a/5f75609747fecf958ea171b0/latest_build)
33

4-
ZeroNet Mobile is an Android Client for [ZeroNet](https://zeronet.io), a platform for decentralized websites using Bitcoin crypto and the BitTorrent network. you can learn more about ZeroNet at https://zeronet.io/.
4+
ZeroNet Mobile is an Android Client for [ZeroNet](https://zeronet.dev), a platform for decentralized websites using Bitcoin crypto and the BitTorrent network. you can learn more about ZeroNet at https://zeronet.dev/.
55

66
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
77
alt="Download from Google Play"
@@ -56,7 +56,7 @@ flutter run
5656
## Donate
5757
BTC(Preferred) :
5858

59-
`1eVStCWqLM7hFB1enaoGzAt7T3tsAB41z`
59+
`1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX`
6060

6161
ETH :
6262

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ flutter {
103103
}
104104

105105
dependencies {
106-
def billing_version = '4.0.0'
107-
implementation "com.android.billingclient:billing:$billing_version"
106+
// def billing_version = '4.0.0'
107+
// implementation "com.android.billingclient:billing:$billing_version"
108108

109109
def work_version = "2.7.0"
110110
// Force WorkManager 2.6.0 for transitive dependency

‎android/common/src/main/assets/zeronet_py3.zip

316 Bytes
Binary file not shown.

‎lib/controllers/stringcontroller.dart

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ final strController = Get.put(StrController());
44

55
class StrController extends GetxController {
66
var statusStr = 'Status'.obs;
7+
var userStatusStr = 'User Id'.obs;
8+
var userNameNotCreatedStr = 'Not Created'.obs;
79
var statusNotRunningStr = 'Not Running'.obs;
810
var statusInitializingStr = 'Initializing..'.obs;
911
var statusStartingStr = 'Starting'.obs;
@@ -226,8 +228,18 @@ class StrController extends GetxController {
226228
var enableTorLogStr = 'Enable Tor Log'.obs;
227229
var enableTorLogDesStr =
228230
'This will Enable Tor Log in ZeroNet Console helpful for debugging.'.obs;
231+
var createUserIdFirstStr =
232+
'Please create User Id or Import your ZeroNet users.json File, to continue your donation. '
233+
'You can create your User ID at App Home Page. '
234+
'This will helps to restore your purchase in future.'
235+
.obs;
229236

230237
void updatestatusStr(String str) => statusStr.value = str;
238+
void updateUserStatusStr(String str) => userStatusStr.value = str;
239+
void updateUserNameNotCreatedStr(String str) =>
240+
userNameNotCreatedStr.value = str;
241+
void updateCreateUserIdFirstStr(String str) =>
242+
createUserIdFirstStr.value = str;
231243
void updatestatusNotRunningStr(String str) => statusNotRunningStr.value = str;
232244
void updatestatusInitializingStr(String str) =>
233245
statusInitializingStr.value = str;
@@ -406,6 +418,9 @@ class StrController extends GetxController {
406418
}
407419
Map map = json.decode(readAsStringSync);
408420
updatestatusStr(map['statusStr']);
421+
updateUserStatusStr(map['userStatusStr']);
422+
updateUserNameNotCreatedStr(map['userNameNotCreatedStr']);
423+
updateCreateUserIdFirstStr(map['createUserIdFirstStr']);
409424
updatestatusNotRunningStr(map['statusNotRunningStr']);
410425
updatestatusInitializingStr(map['statusInitializingStr']);
411426
updatestatusStartingStr(map['statusStartingStr']);

‎lib/controllers/uicontroller.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,16 @@ class UiController extends GetxController {
5353
void setZeroNetStatus(ZeroNetStatus status) {
5454
zeroNetStatus.value = status;
5555
}
56+
57+
var zeroNetUserStatus = ZeroNetUserStatus.NOT_REGISTERED.obs;
58+
59+
void setZeroNetUserStatus(ZeroNetUserStatus status) {
60+
zeroNetUserStatus.value = status;
61+
}
62+
63+
var zeroNetUserId = ''.obs;
64+
65+
void setZeroNetUserId(String id) {
66+
zeroNetUserId.value = id;
67+
}
5668
}

‎lib/controllers/varcontroller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class VarController extends GetxController {
1313
RxString loadingStatus = strController.loadingStr;
1414
var loadingPercent = 0.obs;
1515

16-
updateSetting(Setting setting) {
16+
void updateSetting(Setting setting) {
1717
settings[setting.name] = setting;
1818
}
1919

‎lib/core/content/content_db.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ class ContentDb {
1515
}
1616
}
1717

18-
Map content_db = {};
18+
Map contentDb = {};
1919

2020
getContentDb({String path}) {
2121
if (path == null) {
2222
path = "../content.db";
2323
}
2424

25-
var result = content_db.keys.where((element) => path == element).toList();
25+
var result = contentDb.keys.where((element) => path == element).toList();
2626

2727
if (result.isEmpty) {
28-
content_db[path] = ContentDb(path);
29-
content_db[path].init();
30-
return content_db[path];
28+
contentDb[path] = ContentDb(path);
29+
contentDb[path].init();
30+
return contentDb[path];
3131
}
3232
}

‎lib/imports.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ export 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
2222
export 'package:get/get.dart' hide HeaderValue, MultipartFile, Response;
2323
export 'package:google_fonts/google_fonts.dart';
2424
export 'package:http/http.dart';
25-
export 'package:in_app_purchase/in_app_purchase.dart';
26-
export 'package:in_app_purchase_android/in_app_purchase_android.dart';
2725
export 'package:in_app_review/in_app_review.dart';
2826
export 'package:in_app_update/in_app_update.dart';
2927
export 'package:outline_material_icons/outline_material_icons.dart';

‎lib/main.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ import 'imports.dart';
44
Future main() async {
55
WidgetsFlutterBinding.ensureInitialized();
66
await init();
7-
if (kEnableInAppPurchases) {
8-
InAppPurchaseAndroidPlatformAddition.enablePendingPurchases();
9-
final Stream purchaseUpdates = InAppPurchase.instance.purchaseStream;
10-
purchaseUpdates.listen((purchases) => listenToPurchaseUpdated(purchases));
11-
}
127
launchUrl = await launchZiteUrl();
138
runApp(MyApp());
149
}
@@ -29,7 +24,13 @@ class MyApp extends StatelessWidget {
2924
setSystemUiTheme();
3025
if (varStore.zeroNetInstalled.value) {
3126
if (firstTime) {
32-
SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values);
27+
SystemChrome.setEnabledSystemUIMode(
28+
SystemUiMode.manual,
29+
overlays: [
30+
SystemUiOverlay.top,
31+
SystemUiOverlay.bottom,
32+
],
33+
);
3334
activateFilters();
3435
uiStore.updateCurrentAppRoute(AppRoute.Settings);
3536
if (!isExecPermitted)

‎lib/models/enums.dart

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,72 @@ extension ZeroNetStatusExt on ZeroNetStatus {
123123
}
124124
}
125125

126+
enum ZeroNetUserStatus {
127+
NOT_REGISTERED,
128+
REGISTERED,
129+
}
130+
131+
extension ZeroNetUserStatusExt on ZeroNetUserStatus {
132+
get message {
133+
switch (this) {
134+
case ZeroNetUserStatus.NOT_REGISTERED:
135+
return strController.userNameNotCreatedStr.value;
136+
break;
137+
case ZeroNetUserStatus.REGISTERED:
138+
return uiStore.zeroNetUserId.value;
139+
break;
140+
default:
141+
}
142+
}
143+
144+
get actionText {
145+
switch (this) {
146+
case ZeroNetUserStatus.NOT_REGISTERED:
147+
return strController.createStr.value;
148+
break;
149+
case ZeroNetUserStatus.REGISTERED:
150+
return strController.switchStr.value;
151+
break;
152+
default:
153+
}
154+
}
155+
156+
void onAction() {
157+
switch (this) {
158+
case ZeroNetUserStatus.NOT_REGISTERED:
159+
var url = zeroNetUrl;
160+
browserUrl = url + Utils.urlZeroId;
161+
uiStore.updateCurrentAppRoute(AppRoute.ZeroBrowser);
162+
break;
163+
case ZeroNetUserStatus.REGISTERED:
164+
MapOptions.CREATE_PROFILE.onClick(Get.context);
165+
break;
166+
default:
167+
return null;
168+
}
169+
}
170+
171+
get actionBtnColor {
172+
switch (this) {
173+
case ZeroNetUserStatus.NOT_REGISTERED:
174+
case ZeroNetUserStatus.REGISTERED:
175+
return Color(0xFF52F7C5);
176+
break;
177+
default:
178+
}
179+
}
180+
181+
get statusChipColor {
182+
switch (this) {
183+
case ZeroNetUserStatus.NOT_REGISTERED:
184+
case ZeroNetUserStatus.REGISTERED:
185+
return Color(0xFF5A53FF);
186+
break;
187+
default:
188+
}
189+
}
190+
}
191+
126192
enum AppUpdate {
127193
NOT_AVAILABLE,
128194
AVAILABLE,

‎lib/others/common.dart

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ FlutterBackgroundService service;
5151
String downloadLink(String item) =>
5252
releases + 'Android_Module_Binaries/$item.zip';
5353

54-
String trackerRepo = 'https://cdn.jsdelivr.net/gh/ngosang/trackerslist/';
54+
String trackerRepo = 'https://newtrackon.com/api/';
5555
String downloadTrackerLink(String item) => trackerRepo + item;
5656

5757
bool isUsrBinExists() => Directory(dataDir + '/usr').existsSync();
@@ -74,14 +74,7 @@ List<String> files(String arch) => [
7474
];
7575

7676
List<String> trackerFileNames = [
77-
'trackers_best.txt',
78-
'trackers_all.txt',
79-
'trackers_all_udp.txt',
80-
'trackers_all_http.txt',
81-
'trackers_all_https.txt',
82-
'trackers_all_ws.txt',
83-
'trackers_best_ip.txt',
84-
'trackers_all_ip.txt',
77+
'stable',
8578
];
8679

8780
void setSystemUiTheme() => SystemChrome.setSystemUIOverlayStyle(
@@ -116,13 +109,24 @@ init() async {
116109
var setting = varStore.settings[languageSwitcher] as MapSetting;
117110
var language = setting.map['selected'];
118111
var code = translations[language] ?? 'en';
119-
strController.loadTranslationsFromFile(
120-
getZeroNetDataDir().path +
121-
'/' +
122-
Utils.urlZeroNetMob +
123-
'/translations/' +
124-
'strings-$code.json',
125-
);
112+
if (code != 'en')
113+
strController.loadTranslationsFromFile(
114+
getZeroNetDataDir().path +
115+
'/' +
116+
Utils.urlZeroNetMob +
117+
'/translations/' +
118+
'strings-$code.json',
119+
);
120+
}
121+
loadUsersFromFileSystem();
122+
if (varStore.settings.keys.contains(themeSwitcher)) {
123+
var setting = varStore.settings[themeSwitcher] as MapSetting;
124+
var theme = setting.map['selected'];
125+
if (theme == 'Dark') {
126+
uiStore.setTheme(AppTheme.Dark);
127+
} else {
128+
uiStore.setTheme(AppTheme.Light);
129+
}
126130
}
127131
kisProUser = await isProUser();
128132
}

‎lib/others/constants.dart

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ const String autoStartZeroNetonBoot = 'AutoStart ZeroNet on Boot';
9898
const String enableTorLog = 'Enable Tor Log';
9999

100100
class Utils {
101-
static const String urlHello = '1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D';
101+
static const String urlHello = '1HELLoE3sFD9569CLCbHEAVqvqV7U2Ri9d';
102+
static const String urlZeroId = '1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz';
102103
static const String urlZeroNetMob = '15UYrA7aXr2Nto1Gg4yWXpY3EAJwafMTNk';
103104
static const String urlTalk = 'Talk.ZeroNetwork.bit';
104105
static const String btcUrlTalk = '1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT';
@@ -113,37 +114,37 @@ class Utils {
113114

114115
static var initialSites = {
115116
'ZeroHello': {
116-
'description': (strController.zerohelloSiteDesStr as RxString).value,
117+
'description': strController.zerohelloSiteDesStr.value,
117118
'url': urlHello,
118119
'btcAddress': urlHello,
119120
},
120121
'ZeroNetMobile': {
121-
'description': (strController.zeronetMobileSiteDesStr as RxString).value,
122+
'description': strController.zeronetMobileSiteDesStr.value,
122123
'url': urlZeroNetMob,
123124
'btcAddress': urlZeroNetMob,
124125
},
125126
'ZeroTalk': {
126-
'description': (strController.zeroTalkSiteDesStr as RxString).value,
127+
'description': strController.zeroTalkSiteDesStr.value,
127128
'url': urlTalk,
128129
'btcAddress': btcUrlTalk,
129130
},
130131
'ZeroBlog': {
131-
'description': (strController.zeroblogSiteDesStr as RxString).value,
132+
'description': strController.zeroblogSiteDesStr.value,
132133
'url': urlBlog,
133134
'btcAddress': btcUrlBlog,
134135
},
135136
'ZeroMail': {
136-
'description': (strController.zeromailSiteDesStr as RxString).value,
137+
'description': strController.zeromailSiteDesStr.value,
137138
'url': urlMail,
138139
'btcAddress': btcUrlMail,
139140
},
140141
'ZeroMe': {
141-
'description': (strController.zeromeSiteDesStr as RxString).value,
142+
'description': strController.zeromeSiteDesStr.value,
142143
'url': urlMe,
143144
'btcAddress': btcUrlMe,
144145
},
145146
'ZeroSites': {
146-
'description': (strController.zeroSitesSiteDesStr as RxString).value,
147+
'description': strController.zeroSitesSiteDesStr.value,
147148
'url': urlSites,
148149
'btcAddress': btcUrlSites,
149150
},
@@ -328,6 +329,7 @@ extension MapOptionExt on MapOptions {
328329
uiStore.updateCurrentAppRoute(AppRoute.Settings);
329330
var value2 = uiStore.reload.value;
330331
uiStore.updateReload(value2 + 1);
332+
loadUsersFromFileSystem();
331333
} else {
332334
validUsername = false;
333335
// _reload();

0 commit comments

Comments
 (0)