From 5c14d36ecfcf63b9d44b55e614f2a76c9221d90f Mon Sep 17 00:00:00 2001 From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com> Date: Tue, 26 Jan 2021 16:24:24 +0800 Subject: [PATCH] Clean up about activity --- .../manager/ui/activity/AboutActivity.java | 31 +- .../manager/ui/activity/MainActivity.java | 4 +- app/src/main/res/layout/activity_about.xml | 472 +----------------- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/values/strings.xml | 6 +- 5 files changed, 9 insertions(+), 508 deletions(-) diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java index 7413fa2f..58860ec2 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java @@ -1,14 +1,11 @@ package org.meowcat.edxposed.manager.ui.activity; -import android.content.SharedPreferences; import android.os.Bundle; import android.view.View; import androidx.appcompat.app.ActionBar; -import androidx.core.text.HtmlCompat; import com.bumptech.glide.Glide; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.meowcat.edxposed.manager.BuildConfig; import org.meowcat.edxposed.manager.R; @@ -32,38 +29,12 @@ public class AboutActivity extends BaseActivity { } setupWindowInsets(binding.snackbar, null); - String packageName = getPackageName(); - String translator = getResources().getString(R.string.translator); - - SharedPreferences prefs = getSharedPreferences(packageName + "_preferences", MODE_PRIVATE); - - final String changes = prefs.getString("changelog", null); - - if (changes == null) { - binding.changelogView.setVisibility(View.GONE); - } else { - binding.changelogView.setOnClickListener(v1 -> new MaterialAlertDialogBuilder(this) - .setTitle(R.string.changes) - .setMessage(HtmlCompat.fromHtml(changes, HtmlCompat.FROM_HTML_MODE_LEGACY)) - .setPositiveButton(android.R.string.ok, null).show()); - } binding.appVersion.setText(BuildConfig.VERSION_NAME); - binding.tabSupportModuleDescription.setText(getString(R.string.support_modules_description, - getString(R.string.module_support))); - - setupView(binding.installerSupportView, R.string.support_material_xda); - setupView(binding.faqView, R.string.support_faq_url); - setupView(binding.tgGroupView, R.string.group_telegram_link); - setupView(binding.qqGroupView, R.string.group_qq_link); - setupView(binding.donateView, R.string.support_donate_url); + setupView(binding.installerSupportView, R.string.group_telegram_channel_link); setupView(binding.sourceCodeView, R.string.about_source); setupView(binding.tgChannelView, R.string.group_telegram_channel_link); - if (translator.isEmpty()) { - binding.translatorsView.setVisibility(View.GONE); - } - Glide.with(binding.appIcon) .load(GlideHelper.wrapApplicationInfoForIconLoader(getApplicationInfo())) .into(binding.appIcon); diff --git a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java index d53e3864..0f4b1c76 100644 --- a/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java +++ b/app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java @@ -61,11 +61,11 @@ public class MainActivity extends BaseActivity implements ModuleUtil.ModuleListe intent.setClass(getApplicationContext(), LogsActivity.class); startActivity(intent); }); - /*binding.about.setOnClickListener(v -> { + binding.about.setOnClickListener(v -> { Intent intent = new Intent(); intent.setClass(getApplicationContext(), AboutActivity.class); startActivity(intent); - });*/ + }); TooltipCompat.setTooltipText(binding.menuMore, getString(androidx.appcompat.R.string.abc_action_menu_overflow_description)); binding.menuMore.setOnClickListener(v -> { PopupMenu appMenu = new PopupMenu(MainActivity.this, binding.menuMore); diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index d8aa315b..e6d5ee9b 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -87,107 +87,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6fe1dc4c..03ec3df8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -252,7 +252,7 @@ android:text="@string/Settings" android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> - + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc11fa1e..94cee631 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -252,10 +252,8 @@ After opening, you can set the list in \"Application\"\nBlack List mode: Selected app NOT to load LSPosed modules\nNote: using app list mode might break system-wide modules\' functions White List mode: Only selected app load LSPosed modules\nApp list mode is required to enable - http://edxp.meowcat.org/ - http://github.com/ElderDrivers/LSPosed/wiki - http://edxp.meowcat.org/donate - https://github.com/ElderDrivers/LSPosedManager/ + https://github.com/LSPosed/LSPosed/wiki + https://github.com/LSPosed/LSPosed/ givein2u MlgmXyysd