From 2b2e6ce58b02bbbf3eafa128e7fb9b6ef45832ae Mon Sep 17 00:00:00 2001 From: nomadics9 Date: Thu, 18 Jul 2024 06:52:52 +0300 Subject: [PATCH] build: 12 Embedded subs in downloaded transcode --- .github/workflows/build.yaml | 4 +- app/phone/Ananas/release/output-metadata.json | 87 +++++++++++++++++++ app/phone/build.gradle.kts | 10 ++- .../ananas/fragments/AddServerFragment.kt | 27 ++++-- .../fragments/RequestsWebViewFragment.kt | 3 +- buildSrc/src/main/kotlin/Versions.kt | 4 +- core/build.gradle.kts | 1 + 7 files changed, 121 insertions(+), 15 deletions(-) create mode 100644 app/phone/Ananas/release/output-metadata.json diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a2e668f1..aa2c9c88 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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: diff --git a/app/phone/Ananas/release/output-metadata.json b/app/phone/Ananas/release/output-metadata.json new file mode 100644 index 00000000..43eac451 --- /dev/null +++ b/app/phone/Ananas/release/output-metadata.json @@ -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 +} \ No newline at end of file diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts index 12f8231f..89a88d5c 100644 --- a/app/phone/build.gradle.kts +++ b/app/phone/build.gradle.kts @@ -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 { diff --git a/app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt index 3fae1e38..b739125f 100644 --- a/app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/AddServerFragment.kt @@ -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("/")) + } + + // private fun connectToServer() { // val serverAddress = (binding.editTextServerAddress as AppCompatEditText).text.toString() -// viewModel.checkServer(serverAddress.removeSuffix("/")) +// if (serverAddress.isNotBlank()) { +// viewModel.checkServer(serverAddress.removeSuffix("/")) +// } else { +// viewModel.checkServer(BuildConfig.DEFAULT_SERVER_ADDRESS.removeSuffix("/")) +// } // } - companion object { - private const val DEFAULT_SERVER_ADDRESS = "https://askar.tv" - } - private fun connectToServer(serverAddress: String = DEFAULT_SERVER_ADDRESS) { - viewModel.checkServer(serverAddress.removeSuffix("/")) -} - private fun navigateToLoginFragment() { findNavController().navigate(AddServerFragmentDirections.actionAddServerFragmentToLoginFragment()) } diff --git a/app/phone/src/main/java/com/nomadics9/ananas/fragments/RequestsWebViewFragment.kt b/app/phone/src/main/java/com/nomadics9/ananas/fragments/RequestsWebViewFragment.kt index 61af3021..266f01c4 100644 --- a/app/phone/src/main/java/com/nomadics9/ananas/fragments/RequestsWebViewFragment.kt +++ b/app/phone/src/main/java/com/nomadics9/ananas/fragments/RequestsWebViewFragment.kt @@ -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() { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index b6fe7839..d6efe051 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -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" diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 2f929813..f42e59fe 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -30,6 +30,7 @@ android { flavorDimensions += "variant" productFlavors { register("libre") + create("Ananas") } compileOptions {