various ui tweaks

Signed-off-by: androidacy-user <opensource@androidacy.com>

Author: androidacy-user

app/build.gradle.kts

@@ -557,11 +557,18 @@ android {
     }
     //noinspection GrDeprecatedAPIUsage
     buildToolsVersion = "34.0.0"
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     @Suppress("DEPRECATION") packagingOptions {
         jniLibs {
             useLegacyPackaging = true
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 java {

app/src/main/AndroidManifest.xml

@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (c) 2023 to present Androidacy and contributors. Names, logos, icons, and the Androidacy name are all trademarks of Androidacy and may not be used without license. See LICENSE for more information.
-  -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="QueryAllPackagesPermission"
@@ -15,16 +10,13 @@
         <intent>
             <action android:name="com.fox2code.mmm.utils.intent.action.OPEN_EXTERNAL" />
         </intent>
-    </queries>
-    <!-- Wifi is not the only way to get an internet connection -->
+    </queries> <!-- Wifi is not the only way to get an internet connection -->
     <uses-feature
         android:name="android.hardware.wifi"
-        android:required="false" />
-    <!-- uses webview -->
+        android:required="false" /> <!-- uses webview -->
     <uses-feature
         android:name="android.software.webview"
-        android:required="true" />
-    <!-- uses opengl 1.2 -->
+        android:required="true" /> <!-- uses opengl 1.2 -->
     <uses-feature
         android:name="android.hardware.opengles.aep"
         android:required="false" />
@@ -51,28 +43,35 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!-- wake lock -->
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <!-- request uninstall -->
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <!-- wifi -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
         android:name=".MainApplication"
         android:allowBackup="false"
-        android:hardwareAccelerated="true"
+        android:appCategory="productivity"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
+        android:forceDarkAllowed="false"
         android:fullBackupContent="@xml/full_backup_content"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name_v2"
+        android:memtagMode="async"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="@bool/lang_support_rtl"
         android:testOnly="false"
-        android:appCategory="productivity"
-        android:memtagMode="async"
         android:theme="@style/Theme.MagiskModuleManager"
         android:usesCleartextTraffic="false"
-        android:forceDarkAllowed="false"
         tools:ignore="ManifestResource"
         tools:replace="android:supportsRtl"
         tools:targetApi="tiramisu">
+        <activity
+            android:name=".ExpiredActivity"
+            android:exported="false" />
         <activity
             android:name=".UpdateActivity"
             android:exported="false"
@@ -105,19 +104,18 @@
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name_short_v2"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.MagiskModuleManager.NoActionBar" >
+            android:theme="@style/Theme.MagiskModuleManager.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".installer.InstallerActivity"
             android:exported="false"
@@ -131,13 +129,11 @@
                 <action android:name="${applicationId}.intent.action.INSTALL_MODULE_INTERNAL" />
             </intent-filter>
             -->
-        </activity>
-
-        <!-- We can handle zip files -->
+        </activity> <!-- We can handle zip files -->
         <activity
             android:name=".utils.ZipFileOpener"
             android:exported="true"
-            android:theme="@style/Theme.MagiskModuleManager.NoActionBar" >
+            android:theme="@style/Theme.MagiskModuleManager.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -148,26 +144,23 @@
                 <data android:scheme="content" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".markdown.MarkdownActivity"
             android:exported="false"
             android:parentActivityName=".MainActivity"
             android:theme="@style/Theme.MagiskModuleManager.NoActionBar" />
-
         <activity
             android:name=".androidacy.AndroidacyActivity"
             android:exported="false"
             android:parentActivityName=".MainActivity"
-            android:theme="@style/Theme.MagiskModuleManager.NoActionBar" >
+            android:theme="@style/Theme.MagiskModuleManager.NoActionBar">
 
             <!--
             <intent-filter>
                 <action android:name="${applicationId}.intent.action.OPEN_ANDROIDACY_INTERNAL" />
             </intent-filter>
             -->
         </activity>
-
         <activity
             android:name="com.mikepenz.aboutlibraries.ui.LibsActivity"
             tools:node="remove" />
@@ -184,7 +177,6 @@
                 android:name="androidx.work.WorkManagerInitializer"
                 tools:node="remove" />
         </provider>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.file-provider"
@@ -200,29 +192,25 @@
             android:value="false" />
         <meta-data
             android:name="io.sentry.dsn"
-            android:value="https://e199c2a54a1f49b1b5beb3244f2c2358@sentry.androidacy.com/77" />
-        <!-- enable view hierarchy for crashes -->
-        <meta-data android:name="io.sentry.attach-view-hierarchy" android:value="true" />
-        <!-- Sane value, but feel free to lower it -->
+            android:value="https://e199c2a54a1f49b1b5beb3244f2c2358@sentry.androidacy.com/77" /> <!-- enable view hierarchy for crashes -->
+        <meta-data
+            android:name="io.sentry.attach-view-hierarchy"
+            android:value="true" /> <!-- Sane value, but feel free to lower it -->
         <meta-data
             android:name="io.sentry.traces.sample-rate"
-            android:value="0.2" />
-        <!-- Doesn't actually monitor anything, just used to get the activities the user went through -->
+            android:value="0.2" /> <!-- Doesn't actually monitor anything, just used to get the activities the user went through -->
         <meta-data
             android:name="io.sentry.traces.user-interaction.enable"
-            android:value="true" />
-        <!-- Just a screenshot of ONLY the current activity at the time of the crash -->
+            android:value="true" /> <!-- Just a screenshot of ONLY the current activity at the time of the crash -->
         <meta-data
             android:name="io.sentry.attach-screenshot"
-            android:value="true" />
-        <!-- Just the current activity at the time of the crash -->
+            android:value="true" /> <!-- Just the current activity at the time of the crash -->
         <meta-data
             android:name="io.sentry.attach-stacktrace"
-            android:value="true" />
-        <!-- Performance profiling -->
+            android:value="true" /> <!-- Performance profiling -->
         <meta-data
             android:name="io.sentry.traces.profiling.sample-rate"
             android:value="0.2" />
     </application>
 
-</manifest>
+</manifest>

app/src/main/kotlin/com/fox2code/mmm/ExpiredActivity.kt

@@ -0,0 +1,35 @@
+package com.fox2code.mmm
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import com.fox2code.foxcompat.app.FoxActivity
+import com.google.android.material.button.MaterialButton
+
+class ExpiredActivity : FoxActivity() {
+    @SuppressLint("RestrictedApi")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_expired)
+        // download_button leads to the download page and uninstall_button leads to the uninstall dialog
+        val downloadBtn = findViewById<MaterialButton>(R.id.download_button)
+        val uninstallBtn = findViewById<MaterialButton>(R.id.uninstall_button)
+        downloadBtn.setOnClickListener {
+            // open https://www.androidacy.com/downloads/?view=FoxMMM
+            startActivity(
+                Intent(
+                    Intent.ACTION_VIEW,
+                    Uri.parse("https://www.androidacy.com/downloads/?view=FoxMMM")
+                )
+            )
+        }
+        uninstallBtn.setOnClickListener {
+            // open system uninstall dialog
+            val intent = Intent(Intent.ACTION_DELETE)
+            // discover our package name
+            intent.data = Uri.parse("package:$packageName")
+            startActivity(intent)
+        }
+    }
+}

app/src/main/kotlin/com/fox2code/mmm/MainActivity.kt

@@ -135,20 +135,28 @@ class MainActivity : FoxActivity(), OnRefreshListener, SearchView.OnQueryTextLis
             }
         }.start()
         val ts = Timestamp(System.currentTimeMillis() - 30L * 24 * 60 * 60 * 1000)
-        // check if this build has expired
         val buildTime = Timestamp(BuildConfig.BUILD_TIME)
-        // if the build time is more than 30 days ago, throw an exception
         if (BuildConfig.DEBUG) {
-            check(ts.time < buildTime.time) { getString(R.string.build_expired) }
+            if (ts.time > buildTime.time) {
+                val pm = packageManager
+                val intent = Intent(this, ExpiredActivity::class.java)
+                @Suppress("DEPRECATION") val resolveInfo = pm.queryIntentActivities(intent, 0)
+                if (resolveInfo.size > 0) {
+                    startActivity(intent)
+                    finish()
+                    return
+                } else {
+                    throw IllegalAccessError("This build has expired")
+                }
+            }
         } else {
-            // non-debug builds expire after 1 year but only show a toast
             val ts2 = Timestamp(System.currentTimeMillis() - 365L * 24 * 60 * 60 * 1000)
             if (ts2.time > buildTime.time) {
                 Toast.makeText(this, R.string.build_expired, Toast.LENGTH_LONG).show()
             }
         }
         setContentView(R.layout.activity_main)
-        this.setTitle(R.string.app_name)
+        this.setTitle(R.string.app_name_v2)
         // set window flags to ignore status bar
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             // ignore status bar space
@@ -342,6 +350,14 @@ class MainActivity : FoxActivity(), OnRefreshListener, SearchView.OnQueryTextLis
             }
             true
         }
+        // parse intent. if action is SHOW_ONLINE, show online modules
+        val action = intent.action
+        if (action == "android.intent.action.SHOW_ONLINE") {
+            // select online modules
+            bottomNavigationView.selectedItemId = R.id.online_menu_item
+        } else {
+            bottomNavigationView.selectedItemId = R.id.installed_menu_item
+        }
         // update the padding of blur_frame to match the new bottom nav height
         val blurFrame = findViewById<View>(R.id.blur_frame)
         blurFrame.post {

app/src/main/kotlin/com/fox2code/mmm/SetupActivity.kt

@@ -39,6 +39,7 @@ import org.apache.commons.io.FileUtils
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
+import java.sql.Timestamp
 import java.util.Objects
 
 class SetupActivity : FoxActivity(), LanguageActivity {
@@ -62,6 +63,27 @@ class SetupActivity : FoxActivity(), LanguageActivity {
         }
         val binding = ActivitySetupBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        val ts = Timestamp(System.currentTimeMillis() - 30L * 24 * 60 * 60 * 1000)
+        val buildTime = Timestamp(BuildConfig.BUILD_TIME)
+        if (BuildConfig.DEBUG) {
+            if (ts.time > buildTime.time) {
+                val pm = packageManager
+                val intent = Intent(this, ExpiredActivity::class.java)
+                @Suppress("DEPRECATION") val resolveInfo = pm.queryIntentActivities(intent, 0)
+                if (resolveInfo.size > 0) {
+                    startActivity(intent)
+                    finish()
+                    return
+                } else {
+                    throw IllegalAccessError("This build has expired")
+                }
+            }
+        } else {
+            val ts2 = Timestamp(System.currentTimeMillis() - 365L * 24 * 60 * 60 * 1000)
+            if (ts2.time > buildTime.time) {
+                Toast.makeText(this, R.string.build_expired, Toast.LENGTH_LONG).show()
+            }
+        }
         val view: View = binding.root
         (Objects.requireNonNull<Any>(view.findViewById(R.id.setup_background_update_check)) as MaterialSwitch).isChecked =
             BuildConfig.ENABLE_AUTO_UPDATER

app/src/main/kotlin/com/fox2code/mmm/UpdateActivity.kt

@@ -12,6 +12,7 @@ import android.view.View
 import android.webkit.CookieManager
 import android.webkit.WebSettings
 import android.webkit.WebView
+import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebViewFeature
@@ -28,6 +29,7 @@ import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
+import java.sql.Timestamp
 import java.util.Objects
 
 class UpdateActivity : FoxActivity() {
@@ -38,6 +40,27 @@ class UpdateActivity : FoxActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_update)
+        val ts = Timestamp(System.currentTimeMillis() - 30L * 24 * 60 * 60 * 1000)
+        val buildTime = Timestamp(BuildConfig.BUILD_TIME)
+        if (BuildConfig.DEBUG) {
+            if (ts.time > buildTime.time) {
+                val pm = packageManager
+                val intent = Intent(this, ExpiredActivity::class.java)
+                @Suppress("DEPRECATION") val resolveInfo = pm.queryIntentActivities(intent, 0)
+                if (resolveInfo.size > 0) {
+                    startActivity(intent)
+                    finish()
+                    return
+                } else {
+                    throw IllegalAccessError("This build has expired")
+                }
+            }
+        } else {
+            val ts2 = Timestamp(System.currentTimeMillis() - 365L * 24 * 60 * 60 * 1000)
+            if (ts2.time > buildTime.time) {
+                Toast.makeText(this, R.string.build_expired, Toast.LENGTH_LONG).show()
+            }
+        }
         chgWv = findViewById(R.id.changelog_webview)
         if (MainApplication.isMatomoAllowed()) {
             TrackHelper.track().screen(this).with(MainApplication.INSTANCE!!.tracker)