From d0dc3ada22abea0042e36f3a478ccadae3ec85d1 Mon Sep 17 00:00:00 2001 From: PeratX Date: Mon, 23 May 2022 14:36:30 +0800 Subject: [PATCH] update version --- .github/FUNDING.yml | 1 - README.md | 4 +-- app/build.gradle | 4 +-- app/src/main/assets/about_html/index.html | 2 +- app/src/main/assets/about_html/index_zh.html | 2 +- .../daedalus/activity/MainActivity.java | 31 +++++++++---------- 6 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 9acaff4..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: https://qr.alipay.com/a6x07022gffiehykicipv1a diff --git a/README.md b/README.md index eccde37..af83fce 100644 --- a/README.md +++ b/README.md @@ -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.__
## License - Copyright (C) 2017-2019 iTX Technologies + Copyright (C) 2017-2022 iTX Technologies 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 diff --git a/app/build.gradle b/app/build.gradle index 7757456..a18fcfa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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}\"" diff --git a/app/src/main/assets/about_html/index.html b/app/src/main/assets/about_html/index.html index 2965f77..18a1a01 100644 --- a/app/src/main/assets/about_html/index.html +++ b/app/src/main/assets/about_html/index.html @@ -40,7 +40,7 @@
Users must comply with local laws and regulations.

-
Copyright (C) 2017-2019 iTX Technologies Copyright (C) 2017-2022 iTX Technologies admin@itxtech.org

diff --git a/app/src/main/assets/about_html/index_zh.html b/app/src/main/assets/about_html/index_zh.html index 82b6ea6..76b0db1 100644 --- a/app/src/main/assets/about_html/index_zh.html +++ b/app/src/main/assets/about_html/index_zh.html @@ -41,7 +41,7 @@
使用者必须遵守当地法律法规。

-
Copyright (C) 2017-2019 iTX Technologies Copyright (C) 2017-2022 iTX Technologies admin@itxtech.org

diff --git a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java index eeff855..c6b2f47 100644 --- a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java @@ -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) {