From 28f022cd18578ce621c366236c92664b59790392 Mon Sep 17 00:00:00 2001 From: tehcneko <7764726+tehcneko@users.noreply.github.com> Date: Fri, 29 Jan 2021 20:56:53 +0800 Subject: [PATCH] Update about activity --- .../manager/ui/activity/AboutActivity.java | 12 +- .../manager/ui/activity/BaseActivity.java | 7 +- app/src/main/res/drawable/ic_github.xml | 1 - .../res/drawable/ic_telegram_2019_logo.xml | 12 + app/src/main/res/drawable/ph_drawable.xml | 5 + app/src/main/res/layout/activity_about.xml | 384 ++++++------------ 6 files changed, 144 insertions(+), 277 deletions(-) create mode 100644 app/src/main/res/drawable/ic_telegram_2019_logo.xml create mode 100644 app/src/main/res/drawable/ph_drawable.xml 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 index d50ad9de..8b1d8555 100644 --- 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 @@ -4,13 +4,11 @@ import android.os.Bundle; import android.view.View; import androidx.appcompat.app.ActionBar; - -import com.bumptech.glide.Glide; +import androidx.appcompat.app.AppCompatDelegate; import io.github.lsposed.manager.BuildConfig; import io.github.lsposed.manager.R; import io.github.lsposed.manager.databinding.ActivityAboutBinding; -import io.github.lsposed.manager.util.GlideHelper; import io.github.lsposed.manager.util.NavUtil; public class AboutActivity extends BaseActivity { @@ -18,6 +16,7 @@ public class AboutActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { + getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES); super.onCreate(savedInstanceState); binding = ActivityAboutBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); @@ -28,15 +27,8 @@ public class AboutActivity extends BaseActivity { bar.setDisplayHomeAsUpEnabled(true); } - binding.appVersion.setText(BuildConfig.VERSION_NAME); - - 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); - - Glide.with(binding.appIcon) - .load(GlideHelper.wrapApplicationInfoForIconLoader(getApplicationInfo())) - .into(binding.appIcon); } void setupView(View v, final int url) { diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java index 7fb4097b..6001d2e5 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java @@ -42,7 +42,7 @@ public class BaseActivity extends AppCompatActivity { return preferences.getBoolean("black_dark_theme", false) || preferences.getBoolean("md2", true); } - public static String getTheme(Context context) { + public String getTheme(Context context) { if (isBlackNightTheme() && isNightMode(context.getResources().getConfiguration())) return THEME_BLACK; @@ -56,6 +56,9 @@ public class BaseActivity extends AppCompatActivity { @StyleRes public int getThemeStyleRes(Context context) { + if (this instanceof AboutActivity) { + return R.style.ThemeOverlay_Black; + } switch (getTheme(context)) { case THEME_BLACK: return R.style.ThemeOverlay_Black; @@ -111,6 +114,8 @@ public class BaseActivity extends AppCompatActivity { } else { getWindow().setStatusBarColor(getThemedColor(R.attr.colorPrimaryDark)); } + } else { + getWindow().setStatusBarColor(getThemedColor(android.R.attr.colorBackground)); } if (!Objects.equals(theme, getTheme(this) + getCustomTheme() + preferences.getBoolean("md2", true))) { recreate(); diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml index bc9c4e97..028f43f9 100644 --- a/app/src/main/res/drawable/ic_github.xml +++ b/app/src/main/res/drawable/ic_github.xml @@ -2,7 +2,6 @@ + + + diff --git a/app/src/main/res/drawable/ph_drawable.xml b/app/src/main/res/drawable/ph_drawable.xml new file mode 100644 index 00000000..3913278c --- /dev/null +++ b/app/src/main/res/drawable/ph_drawable.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index ba5da6ff..0b1591bc 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -6,271 +6,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file