n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update version

Browse Source
This commit is contained in:
PeratX 2022-05-23 14:36:30 +08:00
parent 60a9834e9e
commit d0dc3ada22
6 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/FUNDING.yml vendored
View File

@ -1 +0,0 @@
custom: https://qr.alipay.com/a6x07022gffiehykicipv1a

4
README.md
View File

@ -1,8 +1,6 @@
# iTXTech Daedalus
[![Donate](https://img.shields.io/badge/alipay-donate-yellow.svg)](https://qr.alipay.com/FKX04751EZDP0SQ0BOT137)
[![Build Status](https://travis-ci.org/iTXTech/Daedalus.svg?branch=master)](https://travis-ci.org/iTXTech/Daedalus)
[![Jenkins](https://img.shields.io/jenkins/s/http/dev.itxtech.org:10298/job/Daedalus.svg)](http://dev.itxtech.org:10298/job/Daedalus/)
__No root required Android DNS modifier and Hosts/DNSMasq resolver.__
@ -76,7 +74,7 @@ __Users must comply with local laws and regulations.__<br>
## License
Copyright (C) 2017-2019 iTX Technologies <admin@itxtech.org>
Copyright (C) 2017-2022 iTX Technologies <admin@itxtech.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

4
app/build.gradle
View File

@ -10,8 +10,8 @@ android {
applicationId "org.itxtech.daedalus"
minSdkVersion 21
targetSdkVersion 31
versionCode 20
versionName "1.14.1"
versionCode 21
versionName "1.15.0"
buildConfigField "String", "BUILD_TIME", "\"${System.currentTimeMillis()}\""
buildConfigField "String", "GIT_COMMIT", "\"${gitCommit}\""

2
app/src/main/assets/about_html/index.html
View File

@ -40,7 +40,7 @@
<br>
<div style="font-size: 12px; color: gray;">Users must comply with local laws and regulations.</div>
<br>
<div style="font-size: 12px; color: gray;">Copyright (C) 2017-2019 iTX Technologies <a
<div style="font-size: 12px; color: gray;">Copyright (C) 2017-2022 iTX Technologies <a
href="mailto:admin@itxtech.org">admin@itxtech.org</a>
</div>
<br>

2
app/src/main/assets/about_html/index_zh.html
View File

@ -41,7 +41,7 @@
<br>
<div style="font-size: 12px; color: gray;">使用者必须遵守当地法律法规。</div>
<br>
<div style="font-size: 12px; color: gray;">Copyright (C) 2017-2019 iTX Technologies <a
<div style="font-size: 12px; color: gray;">Copyright (C) 2017-2022 iTX Technologies <a
href="mailto:admin@itxtech.org">admin@itxtech.org</a>
</div>
<br>

31
app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
View File

@ -12,7 +12,6 @@ import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.view.GravityCompat;
@ -145,21 +144,21 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
activateCounter++;
Daedalus.configurations.setActivateCounter(activateCounter);
if (activateCounter % 10 == 0) {
new AlertDialog.Builder(this)
.setTitle("觉得还不错？")
.setMessage("您的支持是我动力来源！\n请考虑为我买杯咖啡醒醒脑，甚至其他…… ;)")
.setPositiveButton("为我买杯咖啡", (dialog, which) -> {
Daedalus.donate();
new AlertDialog.Builder(MainActivity.this)
.setMessage("感谢您的支持！;)\n我会再接再厉！")
.setPositiveButton("确认", null)
.show();
})
.setNeutralButton("不再显示", (dialog, which) -> Daedalus.configurations.setActivateCounter(-1))
.setNegativeButton("取消", null)
.show();
}
// if (activateCounter % 10 == 0) {
// new AlertDialog.Builder(this)
// .setTitle("觉得还不错？")
// .setMessage("您的支持是我动力来源！\n请考虑为我买杯咖啡醒醒脑，甚至其他…… ;)")
// .setPositiveButton("为我买杯咖啡", (dialog, which) -> {
// Daedalus.donate();
// new AlertDialog.Builder(MainActivity.this)
// .setMessage("感谢您的支持！;)\n我会再接再厉！")
// .setPositiveButton("确认", null)
// .show();
// })
// .setNeutralButton("不再显示", (dialog, which) -> Daedalus.configurations.setActivateCounter(-1))
// .setNegativeButton("取消", null)
// .show();
// }
}
public void onActivityResult(int request, int result, Intent data) {