Merge pull request #118 from nin0-dev/main

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.nin0dev.vendroid"
         minSdk 25
         targetSdk 34
-        versionCode 11
-        versionName "1.8"
+        versionCode 12
+        versionName "1.9"
     }
 
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -111,6 +111,22 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
+        <activity-alias
+            android:name=".TS12MainActivity"
+            android:exported="true"
+            android:roundIcon="@mipmap/ic_launcher_ts12_round"
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_launcher_ts12"
+            android:enabled="false"
+            android:targetActivity=".MainActivity">
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
     </application>
 
 </manifest>

app/src/main/java/com/nin0dev/vendroid/RecoveryActivity.kt

@@ -5,16 +5,8 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
 import android.view.WindowManager
-import android.webkit.CookieManager
-import android.webkit.CookieSyncManager
-import android.webkit.WebView
-import android.widget.Button
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.google.android.material.card.MaterialCardView
-import com.google.android.material.snackbar.Snackbar
 
 class RecoveryActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -39,6 +31,14 @@ class RecoveryActivity : AppCompatActivity() {
             finish()
             startActivity(Intent(this, MainActivity::class.java))
         }
+        findViewById<MaterialCardView>(R.id.force_update).setOnClickListener {
+            val sPrefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
+            val e = sPrefs.edit()
+            e.putInt("lastMajorUpdateThatUserHasUpdatedVencord", 0)
+            e.apply()
+            finish()
+            startActivity(Intent(this, MainActivity::class.java))
+        }
 
     }
     override fun onNewIntent(intent: Intent) {

app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt

@@ -76,7 +76,7 @@ class VencordNative(private val activity: MainActivity, private val wv: WebView)
 
     @JavascriptInterface
     fun changeAppIcon(id: String) {
-        val icons = arrayOf("Main", "Jolly", "Discord", "Retro")
+        val icons = arrayOf("Main", "Jolly", "Discord", "Retro", "TS12")
         for (icon in icons) {
             activity.packageManager.setComponentEnabledSetting(
                 ComponentName(activity.applicationContext,

app/src/main/res/layout/activity_recovery.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -78,6 +77,35 @@
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
 
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/force_update"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:clickable="true">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/force_update"
+                        android:textAppearance="?attr/textAppearanceTitleMedium" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:text="@string/force_update_desc"
+                        android:textAppearance="?attr/textAppearanceBodyMedium"
+                        android:textColor="?android:attr/textColorSecondary" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+
 
         </LinearLayout>
 

app/src/main/res/mipmap-anydpi-v26/ic_launcher_ts12.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_ts12_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_ts12_foreground" />
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_ts12_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_ts12_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_ts12_foreground" />
+</adaptive-icon>

app/src/main/res/values/strings.xml

@@ -38,4 +38,6 @@
     <string name="app_icons_desc">Change your VendroidEnhanced app icon! Occasionally, seasonal icons may appear.</string>
     <string name="quickcss">QuickCSS</string>
     <string name="save_exit"><![CDATA[Save & exit]]></string>
+    <string name="force_update">Force update Vencord</string>
+    <string name="force_update_desc">Start VendroidEnhanced, but force a Vencord update. Useful if you are crashing or similar and cannot access the Updater tab.</string>
 </resources>