nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: 12 Embedded subs in downloaded transcode

Browse source
This commit is contained in:
nomadics9 2024-07-18 06:52:52 +03:00
parent 09427e1de0
commit 2b2e6ce58b
7 changed files with 121 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yaml vendored
View file

@ -40,11 +40,11 @@ jobs:
- name: Build with Gradle
run: ./gradlew assemble
# Upload all build artifacts in separate steps. This can be shortened once https://github.com/actions/upload-artifact/pull/354 is merged.
- name: Upload artifact ananas-v0.14.2-libre-arm64-v8a.apk
- name: Upload artifact ananas-v0.10.2-0.14.2-libre-arm64-v8a.apk
uses: actions/upload-artifact@v4
with:
name: phone-libre-arm64-v8a.apk
path: ./app/phone/build/outputs/apk/libre/release/ananas-v0.14.2-libre-arm64-v8a.apk
path: ./app/phone/build/outputs/apk/libre/release/ananas-v0.10.2-0.14.2-libre-arm64-v8a.apk
# - name: Upload artifact phone-libre-armeabi-v7a-debug.apk
# uses: actions/upload-artifact@v4
# with:

87
app/phone/Ananas/release/output-metadata.json Normal file
View file

@ -0,0 +1,87 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.nomadics9.ananas",
"variantName": "AnanasRelease",
"elements": [
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "armeabi-v7a"
}
],
"attributes": [],
"versionCode": 12,
"versionName": "0.10.2-0.14.2",
"outputFile": "ananas-v0.10.2-0.14.2-Ananas-armeabi-v7a.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86"
}
],
"attributes": [],
"versionCode": 12,
"versionName": "0.10.2-0.14.2",
"outputFile": "ananas-v0.10.2-0.14.2-Ananas-x86.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 12,
"versionName": "0.10.2-0.14.2",
"outputFile": "ananas-v0.10.2-0.14.2-Ananas-arm64-v8a.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 12,
"versionName": "0.10.2-0.14.2",
"outputFile": "ananas-v0.10.2-0.14.2-Ananas-x86_64.apk"
}
],
"elementType": "File",
"baselineProfiles": [
{
"minApi": 28,
"maxApi": 30,
"baselineProfiles": [
"baselineProfiles/1/ananas-v0.10.2-0.14.2-Ananas-armeabi-v7a.dm",
"baselineProfiles/1/ananas-v0.10.2-0.14.2-Ananas-x86.dm",
"baselineProfiles/1/ananas-v0.10.2-0.14.2-Ananas-arm64-v8a.dm",
"baselineProfiles/1/ananas-v0.10.2-0.14.2-Ananas-x86_64.dm"
]
},
{
"minApi": 31,
"maxApi": 2147483647,
"baselineProfiles": [
"baselineProfiles/0/ananas-v0.10.2-0.14.2-Ananas-armeabi-v7a.dm",
"baselineProfiles/0/ananas-v0.10.2-0.14.2-Ananas-x86.dm",
"baselineProfiles/0/ananas-v0.10.2-0.14.2-Ananas-arm64-v8a.dm",
"baselineProfiles/0/ananas-v0.10.2-0.14.2-Ananas-x86_64.dm"
]
}
],
"minSdkVersionForDexing": 28
}

10
app/phone/build.gradle.kts
View file

@ -23,6 +23,8 @@ android {
versionName = Versions.appName
testInstrumentationRunner = "com.nomadics9.ananas.HiltTestRunner"
buildConfigField( "String", "DEFAULT_SERVER_ADDRESS", "\" \"")
buildConfigField( "String", "REQUEST_SERVER_ADDRESS", "\" \"")
}
applicationVariants.all {
@ -57,10 +59,16 @@ android {
flavorDimensions += "variant"
productFlavors {
register("libre") {
create("libre") {
dimension = "variant"
isDefault = true
}
create("Ananas") {
dimension = "variant"
isDefault = false
buildConfigField( "String", "DEFAULT_SERVER_ADDRESS", "\"https://askar.tv\"")
buildConfigField( "String", "REQUEST_SERVER_ADDRESS", "\"https://r.askar.tv\"")
}
}
splits {

29
app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt
View file

@ -14,6 +14,7 @@ import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.fragment.findNavController
import com.nomadics9.ananas.BuildConfig
import dagger.hilt.android.AndroidEntryPoint
import com.nomadics9.ananas.adapters.DiscoveredServerListAdapter
import com.nomadics9.ananas.databinding.FragmentAddServerBinding
@ -89,7 +90,12 @@ class AddServerFragment : Fragment() {
}
}
}
connectToServer(DEFAULT_SERVER_ADDRESS)
if (BuildConfig.FLAVOR == "Ananas") {
fun connectToServerDirectly(serverAddress: String = BuildConfig.DEFAULT_SERVER_ADDRESS) {
viewModel.checkServer(serverAddress.removeSuffix("/"))
}
connectToServerDirectly()
}
return binding.root
}
@ -129,18 +135,21 @@ class AddServerFragment : Fragment() {
}
}
// private fun connectToServer() {
// val serverAddress = (binding.editTextServerAddress as AppCompatEditText).text.toString()
// viewModel.checkServer(serverAddress.removeSuffix("/"))
// }
companion object {
private const val DEFAULT_SERVER_ADDRESS = "https://askar.tv"
}
private fun connectToServer(serverAddress: String = DEFAULT_SERVER_ADDRESS) {
private fun connectToServer() {
val serverAddress = (binding.editTextServerAddress as AppCompatEditText).text.toString()
viewModel.checkServer(serverAddress.removeSuffix("/"))
}
// private fun connectToServer() {
// val serverAddress = (binding.editTextServerAddress as AppCompatEditText).text.toString()
// if (serverAddress.isNotBlank()) {
// viewModel.checkServer(serverAddress.removeSuffix("/"))
// } else {
// viewModel.checkServer(BuildConfig.DEFAULT_SERVER_ADDRESS.removeSuffix("/"))
// }
// }
private fun navigateToLoginFragment() {
findNavController().navigate(AddServerFragmentDirections.actionAddServerFragmentToLoginFragment())
}

3
app/phone/src/main/java/com/nomadics9/ananas/fragments/RequestsWebViewFragment.kt
View file

@ -11,6 +11,7 @@ import android.webkit.WebViewClient
import android.widget.ProgressBar
import androidx.activity.OnBackPressedCallback
import androidx.fragment.app.Fragment
import com.nomadics9.ananas.BuildConfig
import com.nomadics9.ananas.R
import dagger.hilt.android.AndroidEntryPoint
@ -53,7 +54,7 @@ class RequestsWebViewFragment : Fragment() {
}
// Load your URL here
webView.loadUrl("https://r.askar.tv")
webView.loadUrl(BuildConfig.REQUEST_SERVER_ADDRESS)
requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {

4
buildSrc/src/main/kotlin/Versions.kt
View file

@ -1,8 +1,8 @@
import org.gradle.api.JavaVersion
object Versions {
const val appCode = 11
const val appName = "0.10.1-0.14.2"
const val appCode = 12
const val appName = "0.10.2-0.14.2"
const val compileSdk = 34
const val buildTools = "34.0.0"

1
core/build.gradle.kts
View file

@ -30,6 +30,7 @@ android {
flavorDimensions += "variant"
productFlavors {
register("libre")
create("Ananas")
}
compileOptions {