From 492cb3104fabe1b54f360d2a0ea57de60674f404 Mon Sep 17 00:00:00 2001
From: RaindropsSys <raindrops@equestria.dev>
Date: Wed, 8 Nov 2023 22:02:10 +0100
Subject: Updated 7 files, added android/app/release/app-release.apk.zip and
 renamed android/app/release/app-release.apka (automated)

---
 android/.idea/deploymentTargetDropDown.xml           |  15 ++++++++++++++-
 android/app/build.gradle.kts                         |   4 ++--
 android/app/release/app-release.apk                  | Bin 0 -> 23035043 bytes
 android/app/release/app-release.apk.zip              | Bin 0 -> 8354599 bytes
 android/app/release/app-release.apka                 | Bin 23034331 -> 0 bytes
 android/app/release/output-metadata.json             |   4 ++--
 .../java/dev/equestria/mist/JavaScriptExtensions.kt  |   5 +++++
 .../src/main/java/dev/equestria/mist/MainActivity.kt |   5 +++++
 8 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 android/app/release/app-release.apk
 create mode 100644 android/app/release/app-release.apk.zip
 delete mode 100644 android/app/release/app-release.apka

(limited to 'android')

diff --git a/android/.idea/deploymentTargetDropDown.xml b/android/.idea/deploymentTargetDropDown.xml
index 0c0c338..ef1f9a9 100644
--- a/android/.idea/deploymentTargetDropDown.xml
+++ b/android/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <targetSelectedWithDropDown>
+            <Target>
+              <type value="QUICK_BOOT_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="VIRTUAL_DEVICE_PATH" />
+                  <value value="$USER_HOME$/.android/avd/Pixel_4a_API_31.avd" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </targetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2023-11-08T20:38:44.325223Z" />
+        </State>
       </entry>
     </value>
   </component>
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 8975408..b711e97 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "dev.equestria.mist"
         minSdk = 30
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/android/app/release/app-release.apk b/android/app/release/app-release.apk
new file mode 100644
index 0000000..aa449ce
Binary files /dev/null and b/android/app/release/app-release.apk differ
diff --git a/android/app/release/app-release.apk.zip b/android/app/release/app-release.apk.zip
new file mode 100644
index 0000000..f8b3169
Binary files /dev/null and b/android/app/release/app-release.apk.zip differ
diff --git a/android/app/release/app-release.apka b/android/app/release/app-release.apka
deleted file mode 100644
index 0b3aa69..0000000
Binary files a/android/app/release/app-release.apka and /dev/null differ
diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json
index 0debc4d..5b3e7dd 100644
--- a/android/app/release/output-metadata.json
+++ b/android/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 2,
+      "versionName": "1.1",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/android/app/src/main/java/dev/equestria/mist/JavaScriptExtensions.kt b/android/app/src/main/java/dev/equestria/mist/JavaScriptExtensions.kt
index 294e80f..dad4a7b 100644
--- a/android/app/src/main/java/dev/equestria/mist/JavaScriptExtensions.kt
+++ b/android/app/src/main/java/dev/equestria/mist/JavaScriptExtensions.kt
@@ -89,6 +89,11 @@ class JavaScriptExtensions(originalActivity: MainActivity, private val window: W
         }
     }
 
+    @JavascriptInterface
+    fun quitApp() {
+        activity.finish()
+    }
+
     @JavascriptInterface
     fun setNotificationData(title: String, artist: String, album: String, position: Long, duration: Long, playing: Boolean, buffering: Boolean) {
         val playbackStateBuilder = PlaybackStateCompat.Builder()
diff --git a/android/app/src/main/java/dev/equestria/mist/MainActivity.kt b/android/app/src/main/java/dev/equestria/mist/MainActivity.kt
index 78807c2..acfe7df 100644
--- a/android/app/src/main/java/dev/equestria/mist/MainActivity.kt
+++ b/android/app/src/main/java/dev/equestria/mist/MainActivity.kt
@@ -18,6 +18,7 @@ import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.activity.ComponentActivity
+import androidx.activity.addCallback
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -90,6 +91,10 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
+        val callback = onBackPressedDispatcher.addCallback(this) {
+            webview.evaluateJavascript("window.back();", null)
+        }
+
         if (ActivityCompat.checkSelfPermission(
                 applicationContext,
                 Manifest.permission.POST_NOTIFICATIONS
-- 
cgit