From 03792c613855aca4d7d36046ea6eed6a899f43e8 Mon Sep 17 00:00:00 2001 From: tehcneko <7764726+tehcneko@users.noreply.github.com> Date: Sat, 13 Feb 2021 17:13:50 +0800 Subject: [PATCH] [app] Replace about activity with dialog --- app/src/main/AndroidManifest.xml | 3 - .../manager/ui/activity/AboutActivity.java | 55 ------ .../manager/ui/activity/MainActivity.java | 18 +- app/src/main/res/drawable/ic_github.xml | 31 ---- .../res/drawable/ic_telegram_2019_logo.xml | 30 ---- app/src/main/res/layout/activity_about.xml | 166 ------------------ app/src/main/res/layout/dialog_about.xml | 96 ++++++++++ app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 4 +- app/src/main/res/xml/keep.xml | 22 --- 14 files changed, 113 insertions(+), 318 deletions(-) delete mode 100644 app/src/main/java/io/github/lsposed/manager/ui/activity/AboutActivity.java delete mode 100644 app/src/main/res/drawable/ic_github.xml delete mode 100644 app/src/main/res/drawable/ic_telegram_2019_logo.xml delete mode 100644 app/src/main/res/layout/activity_about.xml create mode 100644 app/src/main/res/layout/dialog_about.xml delete mode 100644 app/src/main/res/xml/keep.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 012596ac..693cda9c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -40,9 +40,6 @@ - diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/AboutActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/AboutActivity.java deleted file mode 100644 index d99efdca..00000000 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/AboutActivity.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of LSPosed. - * - * LSPosed is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LSPosed is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LSPosed. If not, see . - * - * Copyright (C) 2020 EdXposed Contributors - * Copyright (C) 2021 LSPosed Contributors - */ - -package io.github.lsposed.manager.ui.activity; - -import android.os.Bundle; -import android.view.View; - -import androidx.appcompat.app.ActionBar; - -import io.github.lsposed.manager.R; -import io.github.lsposed.manager.databinding.ActivityAboutBinding; -import io.github.lsposed.manager.ui.activity.base.BaseActivity; -import io.github.lsposed.manager.util.NavUtil; - -public class AboutActivity extends BaseActivity { - ActivityAboutBinding binding; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - binding = ActivityAboutBinding.inflate(getLayoutInflater()); - setContentView(binding.getRoot()); - setSupportActionBar(binding.toolbar); - binding.toolbar.setNavigationOnClickListener(view -> finish()); - ActionBar bar = getSupportActionBar(); - if (bar != null) { - bar.setDisplayHomeAsUpEnabled(true); - } - - setupView(binding.sourceCodeView, R.string.about_source); - setupView(binding.tgChannelView, R.string.group_telegram_channel_link); - } - - void setupView(View v, final int url) { - v.setOnClickListener(v1 -> NavUtil.startURL(this, getString(url))); - } -} diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java index 03deb576..697ca30b 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java @@ -24,9 +24,12 @@ import android.annotation.SuppressLint; import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.text.method.LinkMovementMethod; +import android.view.LayoutInflater; import android.view.View; -import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.core.text.HtmlCompat; import com.bumptech.glide.Glide; import com.google.android.material.snackbar.Snackbar; @@ -36,6 +39,7 @@ import java.util.Locale; import io.github.lsposed.manager.Constants; import io.github.lsposed.manager.R; import io.github.lsposed.manager.databinding.ActivityMainBinding; +import io.github.lsposed.manager.databinding.DialogAboutBinding; import io.github.lsposed.manager.ui.activity.base.BaseActivity; import io.github.lsposed.manager.ui.fragment.StatusDialogBuilder; import io.github.lsposed.manager.util.GlideHelper; @@ -69,7 +73,17 @@ public class MainActivity extends BaseActivity { binding.download.setOnClickListener(new StartActivityListener(RepoActivity.class, false)); binding.logs.setOnClickListener(new StartActivityListener(LogsActivity.class, true)); binding.settings.setOnClickListener(new StartActivityListener(SettingsActivity.class, false)); - binding.about.setOnClickListener(new StartActivityListener(AboutActivity.class, false)); + binding.about.setOnClickListener(v -> { + DialogAboutBinding binding = DialogAboutBinding.inflate(LayoutInflater.from(this), null, false); + binding.sourceCode.setMovementMethod(LinkMovementMethod.getInstance()); + binding.sourceCode.setText(HtmlCompat.fromHtml(getString( + R.string.about_view_source_code, + "GitHub", + "Telegram"), HtmlCompat.FROM_HTML_MODE_LEGACY)); + new AlertDialog.Builder(this) + .setView(binding.getRoot()) + .show(); + }); Glide.with(binding.appIcon) .load(GlideHelper.wrapApplicationInfoForIconLoader(getApplicationInfo())) .into(binding.appIcon); diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml deleted file mode 100644 index af2ec008..00000000 --- a/app/src/main/res/drawable/ic_github.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_telegram_2019_logo.xml b/app/src/main/res/drawable/ic_telegram_2019_logo.xml deleted file mode 100644 index b332371d..00000000 --- a/app/src/main/res/drawable/ic_telegram_2019_logo.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml deleted file mode 100644 index 40e28c9c..00000000 --- a/app/src/main/res/layout/activity_about.xml +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml new file mode 100644 index 00000000..7ee6eb00 --- /dev/null +++ b/app/src/main/res/layout/dialog_about.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d5e14409..9bc451c7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -30,7 +30,6 @@ %d модулей включено Настройки https://github.com/LSPosed/LSPosed/ - Исходный код Цвет акцента System Framework Android %2$s (%1$s, API %3$d) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5953cd9f..c0df7db5 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -28,7 +28,6 @@ %d модулі(в) увімкнено Налаштування https://github.com/LSPosed/LSPosed/ - Вихідний код Колір акценту System Framework Android %2$s (%1$s, API %3$d) @@ -43,7 +42,6 @@ Увімкнути модуль Не вдалося зберегти список областей Слідувати системі - http://t.me/LSPosed Інформація Обережно! Завантаження… diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fac4b25d..5c604503 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -78,7 +78,6 @@ 日志为空 - 源代码 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 2e39cfe6..71b5dd24 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -76,7 +76,6 @@ 日誌為空 - 源代碼 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ff6f2544..d2997d46 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -60,7 +60,6 @@ 日誌為空 - 原始碼 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6fe3a856..d383db84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -81,7 +81,6 @@ Log is empty. - Source code @@ -106,8 +105,6 @@ https://github.com/LSPosed/LSPosed/ - http://t.me/LSPosed - Disable verbose logs Cannot read log: \n Launch it @@ -177,4 +174,5 @@ Network DNS over HTTPS Workaround DNS poisoning in some nations + Join our %s channel]]> diff --git a/app/src/main/res/xml/keep.xml b/app/src/main/res/xml/keep.xml deleted file mode 100644 index d8b04f90..00000000 --- a/app/src/main/res/xml/keep.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - \ No newline at end of file