WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up about activity

This commit is contained in:
NekoInverter 2021-01-26 16:24:24 +08:00
parent ffc7980ac6
commit 5c14d36ecf
No known key found for this signature in database
GPG Key ID: 280D6CCCF95715F9
5 changed files with 9 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/org/meowcat/edxposed/manager/ui/activity/AboutActivity.java
View File

@ -1,14 +1,11 @@
package org.meowcat.edxposed.manager.ui.activity; package org.meowcat.edxposed.manager.ui.activity;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.ActionBar;
import androidx.core.text.HtmlCompat;
import com.bumptech.glide.Glide; import com.bumptech.glide.Glide;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.meowcat.edxposed.manager.BuildConfig; import org.meowcat.edxposed.manager.BuildConfig;
import org.meowcat.edxposed.manager.R; import org.meowcat.edxposed.manager.R;
@ -32,38 +29,12 @@ public class AboutActivity extends BaseActivity {
} }
setupWindowInsets(binding.snackbar, null); 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.appVersion.setText(BuildConfig.VERSION_NAME);
binding.tabSupportModuleDescription.setText(getString(R.string.support_modules_description, setupView(binding.installerSupportView, R.string.group_telegram_channel_link);
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.sourceCodeView, R.string.about_source); setupView(binding.sourceCodeView, R.string.about_source);
setupView(binding.tgChannelView, R.string.group_telegram_channel_link); setupView(binding.tgChannelView, R.string.group_telegram_channel_link);
if (translator.isEmpty()) {
binding.translatorsView.setVisibility(View.GONE);
}
Glide.with(binding.appIcon) Glide.with(binding.appIcon)
.load(GlideHelper.wrapApplicationInfoForIconLoader(getApplicationInfo())) .load(GlideHelper.wrapApplicationInfoForIconLoader(getApplicationInfo()))
.into(binding.appIcon); .into(binding.appIcon);

4
app/src/main/java/org/meowcat/edxposed/manager/ui/activity/MainActivity.java
View File

@ -61,11 +61,11 @@ public class MainActivity extends BaseActivity implements ModuleUtil.ModuleListe
intent.setClass(getApplicationContext(), LogsActivity.class); intent.setClass(getApplicationContext(), LogsActivity.class);
startActivity(intent); startActivity(intent);
}); });
/*binding.about.setOnClickListener(v -> { binding.about.setOnClickListener(v -> {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClass(getApplicationContext(), AboutActivity.class); intent.setClass(getApplicationContext(), AboutActivity.class);
startActivity(intent); startActivity(intent);
});*/ });
TooltipCompat.setTooltipText(binding.menuMore, getString(androidx.appcompat.R.string.abc_action_menu_overflow_description)); TooltipCompat.setTooltipText(binding.menuMore, getString(androidx.appcompat.R.string.abc_action_menu_overflow_description));
binding.menuMore.setOnClickListener(v -> { binding.menuMore.setOnClickListener(v -> {
PopupMenu appMenu = new PopupMenu(MainActivity.this, binding.menuMore); PopupMenu appMenu = new PopupMenu(MainActivity.this, binding.menuMore);

472
app/src/main/res/layout/activity_about.xml
View File

@ -87,107 +87,6 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/changelogView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_history" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/changelog"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
tools:ignore="RtlHardcoded" />
</LinearLayout>
<LinearLayout
android:id="@+id/licensesView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_description" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/about_libraries_label"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
tools:ignore="RtlHardcoded" />
</LinearLayout>
<LinearLayout
android:id="@+id/translatorsView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_language" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
tools:ignore="RtlHardcoded">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_translator_label"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/translator"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/tgChannelView" android:id="@+id/tgChannelView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -225,81 +124,6 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/qqGroupView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_help" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
tools:ignore="RtlHardcoded">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/support_group_qq"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/tgGroupView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_help" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
tools:ignore="RtlHardcoded">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/support_group_telegram"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/sourceCodeView" android:id="@+id/sourceCodeView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -337,129 +161,6 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/donateView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_donate" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
tools:ignore="RtlHardcoded">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/support_donate_label"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/support_donate_description"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/faqView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_bug" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
tools:ignore="RtlHardcoded">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/support_faq_label"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?roundBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingHorizontal="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
app:srcCompat="@drawable/ic_info" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginLeft="32dp"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
tools:ignore="RtlHardcoded">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/support_modules_label"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:id="@+id/tab_support_module_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/support_modules_description"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/installerSupportView" android:id="@+id/installerSupportView"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -509,68 +210,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body2" android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="?android:textColorSecondary" /> android:textColor="?android:textColorSecondary" />
<LinearLayout <!-- TODO:
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mlgmxyysd"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mlgmxyysd_summary"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="16dp"
android:paddingVertical="8dp">
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openLink"
android:tag="@string/mlgmxyysd_xda"
android:text="@string/xda"
android:textColor="#F57C00" />
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openLink"
android:tag="@string/mlgmxyysd_github"
android:text="@string/github"
android:textColor="#4183c4" />
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openLink"
android:tag="@string/mlgmxyysd_coolapk"
android:text="@string/coolapk"
android:textColor="#0F9D58" />
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -632,115 +272,7 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/meowcat"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/meowcat_summary"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="16dp"
android:paddingVertical="8dp">
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openLink"
android:tag="@string/meowcat_website"
android:text="@string/website"
android:textColor="#F57C00" />
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openLink"
android:tag="@string/meowcat_github"
android:text="@string/github"
android:textColor="#4183c4" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/elderdrivers"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/elderdrivers_summary"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="16dp"
android:paddingVertical="8dp">
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openLink"
android:tag="@string/elderdrivers_website"
android:text="@string/website"
android:textColor="#F57C00" />
<com.google.android.material.button.MaterialButton
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="openLink"
android:tag="@string/elderdrivers_github"
android:text="@string/github"
android:textColor="#4183c4" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

4
app/src/main/res/layout/activity_main.xml
View File

@ -252,7 +252,7 @@
android:text="@string/Settings" android:text="@string/Settings"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
</LinearLayout> </LinearLayout>
<!--
<LinearLayout <LinearLayout
android:id="@+id/about" android:id="@+id/about"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -279,7 +279,7 @@
android:text="@string/About" android:text="@string/About"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
</LinearLayout> </LinearLayout>
-->
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

6
app/src/main/res/values/strings.xml
View File

@ -252,10 +252,8 @@
<string name="pref_black_white_list_summary">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</string> <string name="pref_black_white_list_summary">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</string>
<string name="white_list_mode_summary">White List mode: Only selected app load LSPosed modules\nApp list mode is required to enable</string> <string name="white_list_mode_summary">White List mode: Only selected app load LSPosed modules\nApp list mode is required to enable</string>
<string name="support_material_xda" translatable="false">http://edxp.meowcat.org/</string> <string name="support_faq_url" translatable="false">https://github.com/LSPosed/LSPosed/wiki</string>
<string name="support_faq_url" translatable="false">http://github.com/ElderDrivers/LSPosed/wiki</string> <string name="about_source" translatable="false">https://github.com/LSPosed/LSPosed/</string>
<string name="support_donate_url" translatable="false">http://edxp.meowcat.org/donate</string>
<string name="about_source" translatable="false">https://github.com/ElderDrivers/LSPosedManager/</string>
<string name="solohsu" translatable="false">givein2u</string> <string name="solohsu" translatable="false">givein2u</string>
<string name="mlgmxyysd" translatable="false">MlgmXyysd</string> <string name="mlgmxyysd" translatable="false">MlgmXyysd</string>