@24i/smartapps-bigscreen-rnv-build-engine 0.17.27-alpha.2786 → 0.17.27-alpha.2792

package/dist/src/sdks/sdk-androidtv/sdkAndroidtv.js

@@ -39,7 +39,6 @@ const sdk_webpack_2 = require("../sdk-webpack");
 const sdk_utils_1 = require("../sdk-utils");
 const services_1 = require("../sdk-utils/sdk-installer/services");
 const resolvers_1 = require("../../resolvers");
-const copyTheoPlayerLibs_1 = require("../../utils/copyTheoPlayerLibs");
 const copyEnvironmentFolder_1 = require("../../utils/copyEnvironmentFolder");
 const constants_1 = require("../../constants");
 const buildGradleFileName = 'build.gradle';
@@ -143,7 +142,7 @@ const configureProject = (c) => {
     const appId = rnv_1.Common.getConfigProp(c, c.platform, 'id', '');
     const minSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'minSdkVersion', 21);
     const targetSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'targetSdkVersion', 34);
-    const compileSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'compileSdkVersion', 34);
+    const compileSdkVersion = rnv_1.Common.getConfigProp(c, c.platform, 'compileSdkVersion', 36);
     let versionCode = rnv_1.Common.getConfigProp(c, c.platform, 'versionCode');
     if (typeof versionCode === 'undefined') {
         const major = `${semVerObj.major}`.padStart(2, '0');
@@ -196,8 +195,8 @@ const configureEntryUrl = (c) => {
     rnv_1.Logger.logTask('configureEntryUrl');
     const buildGradleFilePath = path.join(rnv_1.Common.getPlatformProjectDir(c), 'app', buildGradleFileName);
     const entryUrl = getHostedAppEntryUrl(c);
-    const theoLicense = process.env.THEO_LICENSE
-        || rnv_1.Common.getConfigProp(c, c.platform, 'theoLicense', '');
+    const bitmovinLicense = process.env.BITMOVIN_LICENSE
+        || rnv_1.Common.getConfigProp(c, c.platform, 'bitmovinLicense', '');
     const npawAccountCode = process.env.NPAW_ACCOUNT_CODE
         || rnv_1.Common.getConfigProp(c, c.platform, 'npawAccountCode', '');
     const enableImaSdk = !!rnv_1.Common.getConfigProp(c, c.platform, 'enableImaSdk', false);
@@ -205,8 +204,8 @@ const configureEntryUrl = (c) => {
             pattern: '{{APP_URL}}',
             override: entryUrl,
         }, {
-            pattern: '{{THEO_LICENSE}}',
-            override: theoLicense,
+            pattern: '{{BITMOVIN_LICENSE}}',
+            override: bitmovinLicense,
         }, {
             pattern: '{{NPAW_ACCOUNT_CODE}}',
             override: npawAccountCode,
@@ -246,7 +245,6 @@ const configureAndroidTVProject = async (c) => {
     fs.chmodSync(gradlew, '755');
     await rnv_1.ProjectManager.copyBuildsFolder(c, platform);
     (0, copyEnvironmentFolder_1.copyEnvFolderInPublicConfig)(c);
-    (0, copyTheoPlayerLibs_1.copyTheoPlayerLibs)(c);
 };
 exports.configureAndroidTVProject = configureAndroidTVProject;
 const getSdkInstallerUrl = () => {

package/dist/src/sdks/sdk-tizen/sdkTizen.js

@@ -33,7 +33,6 @@ const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
 const sdk_webpack_2 = require("../sdk-webpack");
 const sdk_utils_1 = require("../sdk-utils");
-const copyTheoPlayerLibs_1 = require("../../utils/copyTheoPlayerLibs");
 const copyEnvironmentFolder_1 = require("../../utils/copyEnvironmentFolder");
 const constants_1 = require("../../constants");
 const { createDevelopTizenCertificate, DEFAULT_CERTIFICATE_NAME, DEFAULT_SECURITY_PROFILE_NAME, } = rnv_1.SDKManager.Tizen;
@@ -94,7 +93,6 @@ const configureTizenProject = async (c) => {
     configureProject(c);
     await rnv_1.ProjectManager.copyBuildsFolder(c, platform);
     (0, copyEnvironmentFolder_1.copyEnvFolderInPublicConfig)(c);
-    (0, copyTheoPlayerLibs_1.copyTheoPlayerLibs)(c);
 };
 exports.configureTizenProject = configureTizenProject;
 const handleLinuxKeyring = () => {

package/dist/src/sdks/sdk-webos/sdkWebos.js

@@ -31,7 +31,6 @@ const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
 const sdk_webpack_2 = require("../sdk-webpack");
 const sdk_utils_1 = require("../sdk-utils");
-const copyTheoPlayerLibs_1 = require("../../utils/copyTheoPlayerLibs");
 const copyEnvironmentFolder_1 = require("../../utils/copyEnvironmentFolder");
 const constants_1 = require("../../constants");
 const buildWebOSProject = async (c) => {
@@ -67,7 +66,6 @@ const configureWebOSProject = async (c) => {
     configureProject(c);
     await rnv_1.ProjectManager.copyBuildsFolder(c, platform);
     (0, copyEnvironmentFolder_1.copyEnvFolderInPublicConfig)(c);
-    (0, copyTheoPlayerLibs_1.copyTheoPlayerLibs)(c);
 };
 exports.configureWebOSProject = configureWebOSProject;
 const sdkInstallerUUrl = 'https://s3.amazonaws.com/tools.nxg-bigscreen.24imedia.com/sdks/webos/ares_webos_builder_v1.10.4_multiplatform.zip';

package/dist/src/sdks/sdk-webpack/sdkWebpack.js

@@ -9,7 +9,6 @@ const ip_1 = __importDefault(require("ip"));
 const rnv_1 = require("rnv");
 const sdk_webpack_1 = require("@rnv/sdk-webpack");
 const resolvers_1 = require("../../resolvers");
-const copyTheoPlayerLibs_1 = require("../../utils/copyTheoPlayerLibs");
 const copyEnvironmentFolder_1 = require("../../utils/copyEnvironmentFolder");
 const configureWebProject = async (c) => {
     rnv_1.Logger.logTask('configureWebProject');
@@ -22,7 +21,6 @@ const configureWebProject = async (c) => {
     await (0, sdk_webpack_1.configureCoreWebProject)(c);
     await rnv_1.ProjectManager.copyBuildsFolder(c, platform);
     (0, copyEnvironmentFolder_1.copyEnvFolderInPublicConfig)(c);
-    (0, copyTheoPlayerLibs_1.copyTheoPlayerLibs)(c);
 };
 exports.configureWebProject = configureWebProject;
 const getWebpackPath = () => {

package/dist/templates/platforms/androidtv/project/amazoniap/build.gradle

@@ -1,14 +1,19 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 android {
     namespace = "com.twentyfouri.androidtv.amazoniap"
-    compileSdk = 34
+    compileSdk = 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 
     defaultConfig {
         minSdk = 21
@@ -30,9 +35,6 @@ android {
 }
 
 dependencies {
-    api fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.amazon.device:amazon-appstore-sdk:3.0.7'
     implementation project(':common')
-}
+}

package/dist/templates/platforms/androidtv/project/amazoniap/src/main/kotlin/com/twentyfouri/bridgetv/amazoniap/AmazonIapService.kt

@@ -0,0 +1,90 @@
+package com.twentyfouri.bridgetv.amazoniap
+
+import android.app.Activity
+import android.content.Context
+import com.amazon.device.iap.PurchasingListener
+import com.amazon.device.iap.PurchasingService
+import com.amazon.device.iap.model.FulfillmentResult
+import com.amazon.device.iap.model.ProductDataResponse
+import com.amazon.device.iap.model.PurchaseResponse
+import com.amazon.device.iap.model.PurchaseUpdatesResponse
+import com.amazon.device.iap.model.UserDataResponse
+import com.twentyfouri.tvbridge.common.IapCallback
+import com.twentyfouri.tvbridge.common.IapException
+import com.twentyfouri.tvbridge.common.IapProduct
+import com.twentyfouri.tvbridge.common.IapPurchase
+import com.twentyfouri.tvbridge.common.IapService
+
+class AmazonIapService(private val context: Context) : IapService, PurchasingListener {
+    private var callback: IapCallback? = null
+
+    override fun initialize() {
+        PurchasingService.registerListener(context, this)
+    }
+
+    override fun destroy() = Unit
+
+    override fun setCallback(callback: IapCallback?) {
+        this.callback = callback
+    }
+
+    override fun onUserDataResponse(result: UserDataResponse) = Unit
+
+    override fun checkNewPurchases() {
+        PurchasingService.getPurchaseUpdates(true)
+    }
+
+    override fun onPurchaseUpdatesResponse(result: PurchaseUpdatesResponse) {
+        if (result.requestStatus == PurchaseUpdatesResponse.RequestStatus.SUCCESSFUL) {
+            callback?.checkNewPurchasesFinished(
+                result.receipts.map { receipt ->
+                    IapPurchase(receipt.sku, result.userData.userId, receipt.receiptId)
+                }
+            )
+        } else {
+            callback?.checkNewPurchasesFinished(IapException(result.requestStatus.name))
+        }
+    }
+
+    override fun purchase(activity: Activity, sku: String) {
+        PurchasingService.purchase(sku)
+    }
+
+    override fun onPurchaseResponse(result: PurchaseResponse) {
+        if (result.requestStatus == PurchaseResponse.RequestStatus.SUCCESSFUL) {
+            callback?.purchaseFinished(
+                IapPurchase(result.receipt.sku, result.userData.userId, result.receipt.receiptId)
+            )
+        } else {
+            callback?.purchaseFinished(IapException(result.requestStatus.name))
+        }
+    }
+
+    override fun getProducts(skus: List<String>) {
+        PurchasingService.getProductData(skus.toSet())
+    }
+
+    override fun onProductDataResponse(result: ProductDataResponse) {
+        if (result.requestStatus == ProductDataResponse.RequestStatus.SUCCESSFUL) {
+            callback?.getProductsFinished(
+                result.productData.values.map {
+                    IapProduct(
+                        it.title.orEmpty(),
+                        it.description.orEmpty(),
+                        it.price.orEmpty(),
+                        it.smallIconUrl.orEmpty(),
+                        it.productType.name,
+                        it.sku
+                    )
+                },
+                result.unavailableSkus.toList()
+            )
+        } else {
+            callback?.getProductsFinished(IapException(result.requestStatus.name))
+        }
+    }
+
+    override fun acknowledgeReceipt(receipt: String) {
+        PurchasingService.notifyFulfillment(receipt, FulfillmentResult.FULFILLED)
+    }
+}

package/dist/templates/platforms/androidtv/project/amazoniap/src/main/kotlin/com/twentyfouri/bridgetv/amazoniap/AmazonIapServiceFactory.kt

@@ -0,0 +1,13 @@
+package com.twentyfouri.bridgetv.amazoniap
+
+import android.content.Context
+import android.os.Build
+import com.twentyfouri.tvbridge.common.IapServiceFactory
+import com.twentyfouri.tvbridge.common.installerPackageName
+
+object AmazonIapServiceFactory : IapServiceFactory {
+    override fun detectSupport(context: Context) =
+        context.installerPackageName == "com.amazon.venezia" || Build.MANUFACTURER == "Amazon"
+
+    override fun build(context: Context) = AmazonIapService(context)
+}

package/dist/templates/platforms/androidtv/project/app/build.gradle

@@ -1,13 +1,17 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+}
 
-def theoLicense = '{{THEO_LICENSE}}'
-def useTheoPlayer = theoLicense != ''
+def bitmovinLicense = '{{BITMOVIN_LICENSE}}'
+def useBitmovin = bitmovinLicense != ''
 def npawAccountCode = '{{NPAW_ACCOUNT_CODE}}'
 def useNpawPlugin = npawAccountCode != ''
 def useImaSdk = {{ENABLE_IMA_SDK}}
 
+def player_version = '0.8.0-alpha.19'
+
 android {
     namespace = 'com.twentyfouri.tvbridge'
     compileSdk = {{COMPILE_SDK_VERSION}}
@@ -17,7 +21,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-
     kotlinOptions {
         jvmTarget = '17'
         freeCompilerArgs = ['-Xjvm-default=all-compatibility']
@@ -40,7 +43,7 @@ android {
         multiDexEnabled true
 
         buildConfigField "String", "APP_URL", '"{{APP_URL}}"'
-        buildConfigField "String", "THEO_LICENSE", "\"$theoLicense\""
+        buildConfigField "String", "BITMOVIN_LICENSE", "\"$bitmovinLicense\""
         buildConfigField "String", "NPAW_ACCOUNT_CODE", "\"$npawAccountCode\""
         buildConfigField "Boolean", "startWithHighVideoQuality", "true"
     }
@@ -82,36 +85,35 @@ android {
             {{SIGNING_CONFIG_REF}}
         }
     }
+    lintOptions {
+        disable "Instantiatable"
+    }
 }
 
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
+    implementation project(':common')
+
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
 
     compileOnly "javax.annotation:jsr250-api:1.0"
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation "androidx.appcompat:appcompat:1.7.0"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
-    implementation "com.google.dagger:dagger:2.56.1"
-    kapt "com.google.dagger:dagger-compiler:2.56.1"
+    implementation "com.google.dagger:dagger:2.56.2"
+    kapt "com.google.dagger:dagger-compiler:2.56.2"
 
-    implementation "com.squareup.retrofit2:retrofit:2.9.0"
-    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
+    implementation "com.squareup.retrofit2:retrofit:2.11.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.11.0"
     implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
     implementation "com.squareup.okhttp3:okhttp:4.12.0"
-    if (useTheoPlayer) {
-        compileOnly "com.twentyfouri.player:exoplayer:0.8.0-alpha.18"
-        implementation "com.twentyfouri.player:theoplayer:0.8.0-alpha.18"
-        implementation "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
+    if (useBitmovin) {
+        compileOnly "com.twentyfouri.player:exoplayer:$player_version"
+        implementation "com.twentyfouri.player:bitmovin:$player_version"
     } else {
-        implementation "com.twentyfouri.player:exoplayer:0.8.0-alpha.18"
-        compileOnly "com.twentyfouri.player:theoplayer:0.8.0-alpha.18"
-        compileOnly "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
+        implementation "com.twentyfouri.player:exoplayer:$player_version"
+        compileOnly "com.twentyfouri.player:bitmovin:$player_version"
     }
 
     if (useNpawPlugin) {
@@ -128,7 +130,5 @@ dependencies {
         implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.36.0'
     }
 
-    implementation project(':common')
-
     implementation "com.google.android.gms:play-services-ads-identifier:18.2.0"
 }

package/dist/templates/platforms/androidtv/project/app/proguard-rules.pro

@@ -29,8 +29,8 @@
 -keep class com.amazon.** {*;}
 -keepattributes *Annotation*
 
--keep class com.theoplayer.android.** {*;}
--dontwarn com.theoplayer.android.**
+-keep class com.bitmovin.** {*;}
+-dontwarn com.bitmovin.**
 -keep public class com.google.android.gms.* { public *; }
 -dontwarn com.google.android.gms.**
 
@@ -44,4 +44,4 @@
 -keep class com.google.ads.interactivemedia.** { *; }
 -keep interface com.google.ads.interactivemedia.** { *; }
 
--optimizationpasses 1
+-optimizationpasses 1

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeFromJavaScript.kt

@@ -386,6 +386,12 @@ class BridgeFromJavaScript(
     @JavascriptInterface
     fun bridgeJavaScriptToAndroid_GetLimitAdTracking() = viewModel.limitAdTracking
 
+    /***
+     * Bridget JS 2 Android to get default OS language
+     */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetOsLanguage() = viewModel.language
+
     companion object {
         const val LOG_TAG = "JavaScriptBridge"
         val DISABLED_AUDIO_TRACK = JsonObject().apply {

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/configuration/BridgeConfig.kt

@@ -13,6 +13,6 @@ class BridgeConfig {
     var iapEventPrefix: String = ""
     var customizableUrl: Boolean = BuildConfig.DEBUG
     var startWithHighVideoQuality: Boolean = false
-    var theoLicense: String = BuildConfig.THEO_LICENSE
+    var bitmovinLicense: String = BuildConfig.BITMOVIN_LICENSE
     var npawAccount: String = BuildConfig.NPAW_ACCOUNT_CODE
-}
+}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/utils/PlayerFactoryBitmovinCustomized.kt

@@ -0,0 +1,7 @@
+package com.twentyfouri.tvbridge.global.utils
+
+import com.twentyfouri.player.bitmovin.PlayerFactoryBitmovin
+import com.twentyfouri.tvbridge.configuration.BridgeConfig
+
+class PlayerFactoryBitmovinCustomized(config: BridgeConfig) :
+    PlayerFactoryBitmovin(config.bitmovinLicense), PlayerFactoryVersion

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/utils/PlayerFactoryConfigured.kt

@@ -1,15 +1,13 @@
 package com.twentyfouri.tvbridge.global.utils
 
-import com.twentyfouri.player.base.*
-import com.twentyfouri.player.theoplayer.PlayerFactoryTheoPlayer
+import com.twentyfouri.player.base.PlayerFactoryBase
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 
 object PlayerFactoryConfigured {
-
     fun buildFactory(bridgeConfig: BridgeConfig): PlayerFactoryBase {
         var factory: PlayerFactoryBase? = null
-        if (bridgeConfig.theoLicense.isNotEmpty()) {
-            factory = factory ?: buildTheoFactory(bridgeConfig)
+        if (bridgeConfig.bitmovinLicense.isNotEmpty()) {
+            factory = factory ?: buildBitmovinFactory(bridgeConfig)
         }
         if (bridgeConfig.npawAccount.isNotEmpty()) {
             factory = factory ?: buildNpawFactory(bridgeConfig)
@@ -18,27 +16,21 @@ object PlayerFactoryConfigured {
         return factory ?: throw Exception("Cannot create player factory")
     }
 
-    private fun buildExoFactory(bridgeConfig: BridgeConfig): PlayerFactoryBase? {
-        try {
-            return PlayerFactoryExoPlayerCustomized(bridgeConfig)
-        } catch (e: NoClassDefFoundError) {
-            return null
-        }
+    private fun buildExoFactory(bridgeConfig: BridgeConfig) = try {
+        PlayerFactoryExoPlayerCustomized(bridgeConfig)
+    } catch (e: NoClassDefFoundError) {
+        null
     }
 
-    private fun buildNpawFactory(bridgeConfig: BridgeConfig): PlayerFactoryBase? {
-        try {
-            return PlayerFactoryExoPlayerNpaw(bridgeConfig)
-        } catch (e: NoClassDefFoundError) {
-            return null
-        }
+    private fun buildNpawFactory(bridgeConfig: BridgeConfig) = try {
+        PlayerFactoryExoPlayerNpaw(bridgeConfig)
+    } catch (e: NoClassDefFoundError) {
+        null
     }
 
-    private fun buildTheoFactory(bridgeConfig: BridgeConfig): PlayerFactoryBase? {
-        try {
-            return PlayerFactoryTheoPlayerCustomized(bridgeConfig)
-        } catch (e: NoClassDefFoundError) {
-            return null
-        }
+    private fun buildBitmovinFactory(bridgeConfig: BridgeConfig) = try {
+        PlayerFactoryBitmovinCustomized(bridgeConfig)
+    } catch (e: NoClassDefFoundError) {
+        null
     }
-}
+}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/utils/PlayerFactoryExoPlayerCustomized.kt

@@ -7,12 +7,14 @@ import com.google.android.exoplayer2.drm.DefaultDrmSessionManager
 import com.google.android.exoplayer2.drm.DrmSessionManager
 import com.google.android.exoplayer2.drm.FrameworkMediaDrm
 import com.google.android.exoplayer2.drm.MediaDrmCallback
+import com.google.android.exoplayer2.ext.ima.ImaAdsLoader
 import com.google.android.exoplayer2.upstream.HttpDataSource
 import com.google.android.exoplayer2.upstream.LoadErrorHandlingPolicy
 import com.twentyfouri.player.base.DrmPlayready
 import com.twentyfouri.player.base.DrmWidevine
 import com.twentyfouri.player.base.Source
 import com.twentyfouri.player.base.SourceDrm
+import com.twentyfouri.player.base.TimeProvider
 import com.twentyfouri.player.exoplayer.*
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 
@@ -44,7 +46,10 @@ class PlayerFactoryExoPlayerCustomized(
             DefaultMediaSourceFactoryProvider().also {
                 it.useLiveMediaTailorWorkaround = true
             }
-        }        
+        }
+
+        override val focusSkipButton: Boolean
+            get() = false
     }
 
     private inner class CustomizedPlayerComponents(shared: SharedComponents) : DefaultPlayerComponents(shared) {

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/view/WebViewActivity.kt

@@ -11,10 +11,6 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
-import android.view.ViewTreeObserver
-import android.webkit.WebView
-import com.twentyfouri.tvbridge.R
-import com.twentyfouri.tvbridge.webview.client.BridgeWebView
 import android.view.View.MeasureSpec
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
@@ -82,15 +78,6 @@ class WebViewActivity : AppCompatActivity(), Mainview {
 
         loadUrl(config.baseUrl)
 
-        val mainWebView = findViewById<WebView>(R.id.webview)
-
-        window.decorView.viewTreeObserver.addOnGlobalFocusChangeListener { oldFocus: View?, newFocus: View? ->
-            if (newFocus is WebView) {
-                Log.d("FocusDebug", "WebView získal focus, vracím zpět na hlavní view")
-                mainWebView.requestFocus()
-            }
-        }
-
         initialized = true
     }
 
@@ -243,7 +230,6 @@ class WebViewActivity : AppCompatActivity(), Mainview {
 
     override fun loadUrl(url: String?) {
         if (url.isNullOrEmpty()) return
-
         binding.webview.visibility = View.VISIBLE
         binding.webview.loadUrl(url)
         if (url.startsWith("http")) {
@@ -256,4 +242,4 @@ class WebViewActivity : AppCompatActivity(), Mainview {
             setCookiePolicy(CookiePolicy.ACCEPT_ALL)
         }
     }
-}
+}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/viewmodel/WebViewModel.kt

@@ -18,7 +18,6 @@ import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.*
-import com.twentyfouri.player.theoplayer.PlayerTheoPlayer
 import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.Flavor
 import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript
@@ -39,6 +38,7 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.net.NetworkInterface
+import java.util.Locale
 import javax.inject.Inject
 
 /**
@@ -597,10 +597,6 @@ class WebViewModel @Inject constructor(
                     mediaInfo.put("liveLatency", metrics.liveLatency)
                 }
             }
-            if (config.theoLicense.isNotEmpty()) {
-                detectMediaInfoTheo(mediaInfo, player)
-            }
-
         } catch (e: JSONException) {
             mediaInfo.put("errorType", e.javaClass.simpleName)
             mediaInfo.put("errorMessage", e.message)
@@ -608,27 +604,6 @@ class WebViewModel @Inject constructor(
         return mediaInfo
     }
 
-    private fun detectMediaInfoTheo(mediaInfo: JSONObject, player: PlayerBase) {
-        try {
-            val theoPlayer = (player as? PlayerTheoPlayer)?.theoPlayer ?: return
-            theoPlayer.player.buffered.also {
-                if (it.length() > 0) {
-                    mediaInfo.put("bufferLevel", it.getEnd(it.length() - 1))
-                }
-            }
-            theoPlayer.player.metrics?.also { theoMetrics ->
-                mediaInfo.put("bufferedSegments", theoMetrics.bufferedSegments.amountOfBufferedVideoSegments)
-                mediaInfo.put("droppedVideoFrames", theoMetrics.droppedVideoFrames)
-                mediaInfo.put("corruptedVideoFrames", theoMetrics.corruptedVideoFrames)
-                mediaInfo.put("estimatedBandwidth", theoMetrics.currentBandwidthEstimate)
-                mediaInfo.put("totalDataLoaded", theoMetrics.totalBytesLoaded)
-
-            }
-        } catch (e: NoClassDefFoundError) {
-            // ignore
-        }
-    }
-
     val adId get() = try {
         // Let's try Google first
         AdvertisingIdClient.getAdvertisingIdInfo(context).id
@@ -653,6 +628,8 @@ class WebViewModel @Inject constructor(
         }
     }
 
+    val language get() = Locale.getDefault().language
+
     private inner class InnerIapCallback : IapCallback {
         override fun checkNewPurchasesFinished(result: List<IapPurchase>) {
             // not actually used at the moment

package/dist/templates/platforms/androidtv/project/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.1'
+        classpath 'com.android.tools.build:gradle:8.9.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.4.2'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
@@ -34,12 +34,12 @@ allprojects {
                 password = "$mavenRepositoryPassword"
             }
         }
-        maven { url "https://maven.theoplayer.com/releases" }
         maven { url "https://jitpack.io" }
         maven { url "https://artifact.plugin.npaw.com/artifactory/plugins/android" }
+        maven { url "https://artifacts.bitmovin.com/artifactory/public-releases" }
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
+}

package/dist/templates/platforms/androidtv/project/common/build.gradle

@@ -1,14 +1,19 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
 
 android {
     namespace = "com.twentyfouri.tvbridge.common"
-    compileSdk = 34
+    compileSdk = 36
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 
     defaultConfig {
         minSdk = 21
@@ -30,8 +35,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    api 'androidx.core:core-ktx:1.16.0'
+    api 'androidx.appcompat:appcompat:1.7.0'
 }