[feature] js 源

Author: heyanLE

app/src/main/assets/loading_himemiya.gif

@@ -53,7 +53,7 @@ class JsExtensionProvider(
     }
 
     override fun coverExtensionLoaderList(loaderList: List<ExtensionLoader>): List<ExtensionLoader> {
-        if (false) {
+        if (BuildConfig.DEBUG) {
             val file = APP.assets.open("extension_test.js").use {
                 File(cacheFolder).mkdirs()
                 val file = File(cacheFolder, "test.js")

app/src/main/assets/loading_komari.gif

@@ -56,7 +56,7 @@ class PushFromRepo(
 
         // 2. 解析 jsonl
         val taskList = repoJsonlFile.bufferedReader().use {
-            it.lineSequence().map {
+            it.readLines().map {
                 JSONObject(it)
             }.map {
                 val url = it.optString("url")

app/src/main/assets/loading_yanami.gif

@@ -777,7 +777,6 @@ fun FullScreenVideoTopBar(
 
             val br = rememberBatteryReceiver()
 
-
             val ic = if (br.isCharge.value) {
                 Icons.Filled.BatteryChargingFull
             } else {

app/src/main/java/com/heyanle/easybangumi4/plugin/extension/provider/JsExtensionProvider.kt

@@ -158,7 +158,7 @@ fun LoadingImage(
                 else GifDecoder.Factory()
             )
             .crossfade(true)
-            .data(Uri.parse("file:///android_asset/loading_himemiya.gif")).build(),
+            .data(Uri.parse("file:///android_asset/loading_ryo.gif")).build(),
         contentDescription = stringResource(id = com.heyanle.easy_i18n.R.string.loading),
         modifier = Modifier
             .then(modifier)

app/src/main/java/com/heyanle/easybangumi4/plugin/extension/push/PushFromRepo.kt

@@ -64,7 +64,7 @@ fun LoadingPage(
     msgColor: Color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.6f),
     other: @Composable () -> Unit = {},
 ) {
-    WhitePage(modifier, Uri.parse("file:///android_asset/loading_himemiya.gif"), loadingMsg, other = other, msgColor = msgColor)
+    WhitePage(modifier, Uri.parse("file:///android_asset/loading_ryo.gif"), loadingMsg, other = other, msgColor = msgColor)
 }
 
 @Composable

app/src/main/java/com/heyanle/easybangumi4/ui/cartoon_play/VideoComponent.kt

@@ -1,6 +1,7 @@
 package com.heyanle.easybangumi4.ui.extension_push
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
@@ -16,9 +17,11 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExtendedFloatingActionButton
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
@@ -35,6 +38,7 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -202,6 +206,25 @@ fun ExtensionPush() {
 
             }
         }
+
+        Box(contentAlignment = Alignment.BottomEnd, modifier = Modifier.fillMaxSize()) {
+            ExtendedFloatingActionButton(
+                modifier = Modifier
+                    .padding(16.dp, 40.dp),
+                text = {
+                    Text(text = stringResource(id = com.heyanle.easy_i18n.R.string.js_extension_push))
+                },
+                icon = {
+                    Icon(
+                        Icons.Filled.Check,
+                        contentDescription = stringResource(id = com.heyanle.easy_i18n.R.string.js_extension_push)
+                    )
+                },
+                onClick = {
+                    vm.push()
+                }
+            )
+        }
     }
 
     when(sta.dialog) {

app/src/main/java/com/heyanle/easybangumi4/ui/common/OkImage.kt

@@ -639,5 +639,7 @@
 
     <string name="encrypt_completely">加密完成</string>
 
+    <string name="js_extension_push">添加拓展</string>
+
 
 </resources>