aiden
/
MagiskModuleManager
mirror of https://github.com/Androidacy/MagiskModuleManager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various refactoring

Browse Source 
fixes #7

- tweak proguard-rules.pro to try to fix a bug
- modernize update activity

Signed-off-by: androidacy-user <opensource@androidacy.com>
pull/27/head
androidacy-user 2 years ago
parent fbb6ecd40c
commit a0c0d86f78
6 changed files with 121 additions and 106 deletions
Show Stats Download Patch File Download Diff File

8
app/proguard-rules.pro vendored
Unescape Escape View File

@ -14,12 +14,12 @@
# Uncomment this to preserve the line number information for
# debugging stack traces.
-keepattributes SourceFile,LineNumberTable,Signature
# -keepattributes SourceFile,LineNumberTable,Signature
-printmapping mapping.txt
# Optimisations
-repackageclasses ""
-overloadaggressively
# -overloadaggressively
-allowaccessmodification
@ -188,13 +188,13 @@
}
# Keep all of Cronet API and google's internal classes
-keep class com.google.common.util.concurrent.** { *; }
# -keep class com.google.common.util.concurrent.** { *; }
-keepclassmembers class kotlin.SafePublicationLazyImpl {
java.lang.Object _value;
}
# fix bug with androidx work and future
-keep class androidx.work.impl.utils.futures.* { *; }
# -keep class androidx.work.impl.utils.futures.* { *; }
# Silence some warnings
-dontwarn android.os.SystemProperties

3
app/src/main/java/com/fox2code/mmm/NotificationType.java
Unescape Escape View File

@ -25,9 +25,6 @@ import java.util.zip.ZipFile;
import timber.log.Timber;
interface NotificationTypeCst {
}
public enum NotificationType implements NotificationTypeCst {
DEBUG(R.string.debug_build, R.drawable.ic_baseline_bug_report_24, com.google.android.material.R.attr.colorSecondary, com.google.android.material.R.attr.colorOnSecondary) {
@Override

3
app/src/main/java/com/fox2code/mmm/NotificationTypeCst.kt
Unescape Escape View File

@ -0,0 +1,3 @@
package com.fox2code.mmm
internal interface NotificationTypeCst

16
app/src/main/java/com/fox2code/mmm/utils/RuntimeUtils.kt
Unescape Escape View File

@ -53,7 +53,7 @@ class RuntimeUtils {
activity.layoutInflater.inflate(R.layout.dialog_checkbox, null)
val checkBox = view.findViewById<CheckBox>(R.id.checkbox)
checkBox.setText(R.string.dont_ask_again)
checkBox.setOnCheckedChangeListener { buttonView: CompoundButton?, isChecked: Boolean ->
checkBox.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean ->
PreferenceManager.getDefaultSharedPreferences(
context
).edit().putBoolean(
@ -61,14 +61,14 @@ class RuntimeUtils {
).apply()
}
builder.setView(view)
builder.setPositiveButton(R.string.permission_notification_grant) { dialog, which ->
builder.setPositiveButton(R.string.permission_notification_grant) { _, _ ->
// Request the permission
activity.requestPermissions(
arrayOf(Manifest.permission.POST_NOTIFICATIONS), 0
)
MainActivity.doSetupNowRunning = false
}
builder.setNegativeButton(R.string.cancel) { dialog, which ->
builder.setNegativeButton(R.string.cancel) { dialog, _ ->
// Set pref_background_update_check to false and dismiss dialog
val prefs = PreferenceManager.getDefaultSharedPreferences(context)
prefs.edit().putBoolean("pref_background_update_check", false).apply()
@ -104,7 +104,7 @@ class RuntimeUtils {
val view: View = activity.layoutInflater.inflate(R.layout.dialog_checkbox, null)
val checkBox = view.findViewById<CheckBox>(R.id.checkbox)
checkBox.setText(R.string.dont_ask_again)
checkBox.setOnCheckedChangeListener { buttonView: CompoundButton?, isChecked: Boolean ->
checkBox.setOnCheckedChangeListener { _: CompoundButton?, isChecked: Boolean ->
PreferenceManager.getDefaultSharedPreferences(
context
).edit()
@ -112,7 +112,7 @@ class RuntimeUtils {
.apply()
}
builder.setView(view)
builder.setPositiveButton(R.string.permission_notification_grant) { dialog, which ->
builder.setPositiveButton(R.string.permission_notification_grant) { _, _ ->
// Open notification settings
val intent = Intent()
intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
@ -121,7 +121,7 @@ class RuntimeUtils {
activity.startActivity(intent)
MainActivity.doSetupNowRunning = false
}
builder.setNegativeButton(R.string.cancel) { dialog, which ->
builder.setNegativeButton(R.string.cancel) { dialog, _ ->
// Set pref_background_update_check to false and dismiss dialog
val prefs = MainApplication.getSharedPreferences("mmm")
prefs.edit().putBoolean("pref_background_update_check", false).apply()
@ -207,11 +207,11 @@ class RuntimeUtils {
val prefs = MainApplication.getSharedPreferences("mmm")
if (prefs.getInt("weblate_snackbar_shown", 0) == BuildConfig.VERSION_CODE) return
val snackbar: Snackbar = Snackbar.make(
activity.findViewById<View>(R.id.root_container),
activity.findViewById(R.id.root_container),
activity.getString(R.string.language_not_available, languageName),
Snackbar.LENGTH_LONG
)
snackbar.setAction(R.string.ok) { v ->
snackbar.setAction(R.string.ok) {
val intent = Intent(Intent.ACTION_VIEW)
intent.data = Uri.parse("https://translate.nift4.org/engage/foxmmm/?language=$language")
activity.startActivity(intent)

179
app/src/main/res/layout/activity_update.xml
Unescape Escape View File

@ -1,122 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".UpdateActivity">
<!-- Activity used to download and install app updates -->
<!-- first, upgrade icon -->
<ImageView
android:id="@+id/update_icon"
android:layout_width="101dp"
android:layout_height="93dp"
android:layout_gravity="center"
android:layout_margin="8dp"
android:contentDescription="@string/crash_icon"
android:src="@drawable/baseline_system_update_24" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:text="@string/update_title"
android:textAppearance="?attr/textAppearanceHeadline6" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
android:text="@string/update_message"
android:textAppearance="?attr/textAppearanceBody2" />
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/update_progress"
style="@style/Widget.Material3.LinearProgressIndicator"
<LinearLayout
android:id="@+id/update_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_progress_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
android:textAppearance="?attr/textAppearanceBody2" />
android:layout_height="0dp"
android:gravity="center"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/bottom_navigation"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="4dp"
android:orientation="horizontal">
<!-- Activity used to download and install app updates -->
<!-- first, upgrade icon -->
<ImageView
android:id="@+id/update_icon"
android:layout_width="101dp"
android:layout_height="93dp"
android:layout_gravity="center"
android:layout_margin="8dp"
android:contentDescription="@string/update"
android:src="@drawable/baseline_system_update_24" />
<com.google.android.material.button.MaterialButton
android:id="@+id/update_button"
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:text="@string/update_button"
android:visibility="invisible" />
android:text="@string/update_title"
android:textAppearance="?attr/textAppearanceHeadline6" />
<com.google.android.material.button.MaterialButton
android:id="@+id/update_cancel_button"
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:text="@string/update_cancel_button"
android:visibility="visible" />
</LinearLayout>
<!-- Invisible warning for debug builds -->
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_debug_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:text="@string/update_debug_warning"
android:textAppearance="?attr/textAppearanceBody2"
android:visibility="gone" />
android:layout_marginTop="8dp"
android:text="@string/update_message"
android:textAppearance="?attr/textAppearanceBody2" />
<!-- Changelog view -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/update_progress"
style="@style/Widget.Material3.LinearProgressIndicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/changelog_title"
android:layout_width="match_parent"
android:id="@+id/update_progress_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:text="@string/changelog"
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall" />
android:layout_marginTop="8dp"
android:textAppearance="?attr/textAppearanceBody2" />
<!-- Invisible warning for debug builds -->
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_changelog"
android:layout_width="match_parent"
android:id="@+id/update_debug_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:scrollbars="vertical"
android:text="@string/changelog_none"
android:textAppearance="?attr/textAppearanceBody2" />
android:text="@string/update_debug_warning"
android:textAppearance="?attr/textAppearanceBody2"
android:visibility="gone" />
<!-- Changelog view -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/changelog_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:text="@string/changelog"
android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/update_changelog"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:scrollbars="vertical"
android:text="@string/changelog_none"
android:textAppearance="?attr/textAppearanceBody2" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- bottom nav for cancel and finish -->
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="0dp"
android:visibility="visible"
app:compatShadowEnabled="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/update_container"
app:menu="@menu/update_nav" />
</androidx.constraintlayout.widget.ConstraintLayout >

18
app/src/main/res/menu/update_nav.xml
Unescape Escape View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/update_cancel_button"
android:icon="@drawable/baseline_close_24"
android:title="@string/cancel"
android:visible="true"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_update"
android:icon="@drawable/ic_baseline_refresh_24"
android:title="@string/update_button"
android:visible="true"
android:enabled="false"
app:showAsAction="ifRoom" />
</menu>
Write Preview
Loading…
Cancel
Save