@24i/smartapps-bigscreen-rnv-build-engine 0.17.6-alpha.19 → 0.17.6-alpha.2

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

@@ -2,6 +2,9 @@ package com.twentyfouri.tvbridge.webview.view
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.graphics.Point
 import android.media.AudioManager
 import android.media.AudioManager.OnAudioFocusChangeListener
@@ -11,9 +14,10 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
-import android.view.View.MeasureSpec
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
+import android.webkit.WebChromeClient
+import android.webkit.WebView
 import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -21,6 +25,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.media.AudioAttributesCompat
 import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat
+import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.R
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.databinding.ActivityWebViewBinding
@@ -71,14 +76,36 @@ class WebViewActivity : AppCompatActivity(), Mainview {
             CookieHandler.setDefault(defaultCookieManager)
         }
 
-        binding = ActivityWebViewBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        binding.playerView.playerFactory = viewModel.playerFactory
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_web_view)
+        binding.viewModel = viewModel
+        binding.exoplayerView.playerFactory = viewModel.playerFactory
         viewModel.attachView(this)
         viewModel.configureWebView(binding.webview)
-        viewModel.player = binding.playerView.player
+        viewModel.player = binding.exoplayerView.player
 
-        loadUrl(config.baseUrl)
+        binding.url.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                viewModel.appUrl = s.toString()
+            }
+
+            override fun afterTextChanged(s: Editable) {}
+        })
+
+        val appUrl = config.baseUrl
+        if (config.customizableUrl) {
+            viewModel.urlSetterVisible = true
+            viewModel.appUrl = appUrl
+            setUrlToView(appUrl)
+        } else {
+            viewModel.urlSetterVisible = false
+            loadUrl(appUrl)
+        }
+
+        binding.root.viewTreeObserver.addOnGlobalFocusChangeListener { oldFocus: View, newFocus: View ->
+            Log.v("FOCUS", "global focus changed old = $oldFocus")
+            Log.v("FOCUS", "global focus changed new = $newFocus")
+        }
 
         initialized = true
     }
@@ -143,12 +170,13 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     public override fun onDestroy() {
         if (initialized) {
             viewModel.releasePlayer()
+            binding.unbind()
         }
         super.onDestroy()
     }
 
     override fun goFullscreen() {
-        val layoutParams = binding.playerView.layoutParams as RelativeLayout.LayoutParams
+        val layoutParams = binding.exoplayerView.layoutParams as RelativeLayout.LayoutParams
         layoutParams.width = -1
         layoutParams.height = -1
         layoutParams.leftMargin = 0
@@ -159,12 +187,8 @@ class WebViewActivity : AppCompatActivity(), Mainview {
         display.getSize(size)
         val width = size.x
         val height = size.y
-        binding.playerView.layoutParams = layoutParams
-        binding.playerView.measure(
-            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-        )
-        binding.playerView.layout(width, height, 0, 0)
+        binding.exoplayerView.layoutParams = layoutParams
+        binding.exoplayerView.layout(width, height, 0, 0)
     }
 
     override fun launchIapPurchase(sku: String) {
@@ -172,22 +196,37 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     }
 
     override fun exitFullscreen(width: Int, height: Int, left: Int, top: Int) {
-        val layoutParams = binding.playerView.layoutParams as RelativeLayout.LayoutParams
+        val layoutParams = binding.exoplayerView.layoutParams as RelativeLayout.LayoutParams
         layoutParams.width = width
         layoutParams.height = height
         layoutParams.leftMargin = left
         layoutParams.topMargin = top
 
         //set the layout inner and outer sizes
-        binding.playerView.layoutParams = layoutParams
-        binding.playerView.layout(width, height, left, top)
+        binding.exoplayerView.layoutParams = layoutParams
+        binding.exoplayerView.layout(width, height, left, top)
+    }
+
+    override fun setUrlToView(urlString: String?) {
+        binding.url.requestFocus()
+        binding.url.setText(urlString)
+        binding.url.setSelection(urlString?.length ?: 0)
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         when (event.keyCode) {
+            KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_DPAD_LEFT -> changeFocus()
             KeyEvent.KEYCODE_DPAD_CENTER -> goToUrl()
+            KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_MENU, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_MEDIA_PAUSE, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
+                if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
+                    // Send these key presses to the WebView, through a JavaScript bridge.
+                    viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
+                }
+            }
             else -> {
-                viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
+                if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
+                    viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
+                }
             }
         }
         return super.onKeyDown(keyCode, event)
@@ -215,19 +254,35 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     }
 
     private fun goToUrl() {
-        viewModel.onClickGo()
+        if (binding.buttonGo.hasFocus()) {
+            viewModel.onClickGo()
+        }
+    }
+
+    private fun changeFocus() {
+        if (binding.url.hasFocus()) {
+            binding.buttonGo.requestFocus()
+        } else if (binding.buttonGo.hasFocus()) {
+            binding.url.requestFocus()
+        }
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
-        // Send these key presses to the WebView, through a JavaScript bridge.
-        viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_UP)
-        return true
+        if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
+            // Send these key presses to the WebView, through a JavaScript bridge.
+            viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_UP)
+            return true
+        }
+        return super.onKeyUp(keyCode, event)
     }
 
     override fun onKeyLongPress(keyCode: Int, event: KeyEvent): Boolean {
-        // Send these key presses to the WebView, through a JavaScript bridge.
-        viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_PRESS)
-        return true
+        if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
+            // Send these key presses to the WebView, through a JavaScript bridge.
+            viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_PRESS)
+            return true
+        }
+        return super.onKeyLongPress(keyCode, event)
     }
 
     override fun loadUrl(url: String?) {
@@ -239,6 +294,10 @@ class WebViewActivity : AppCompatActivity(), Mainview {
         }
     }
 
+    override fun onBackPressed() {
+        super.onBackPressed()
+    }
+
     companion object {
         private val defaultCookieManager: CookieManager = CookieManager().apply {
             setCookiePolicy(CookiePolicy.ACCEPT_ALL)

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
+import android.net.Uri
 import android.os.Build
 import android.util.Log
 import android.view.KeyEvent
@@ -12,9 +13,15 @@ import android.view.View
 import android.webkit.CookieManager
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import androidx.databinding.BaseObservable
+import androidx.databinding.Bindable
+import com.google.android.exoplayer2.C
+import com.google.android.exoplayer2.SeekParameters
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.*
+import com.twentyfouri.player.exoplayer.PlayerExoPlayer
+import com.twentyfouri.tvbridge.BR
 import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.Flavor
 import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript
@@ -22,12 +29,14 @@ import com.twentyfouri.tvbridge.bridge.BridgeToJavaScript
 import com.twentyfouri.tvbridge.common.*
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
-import com.twentyfouri.tvbridge.global.utils.PlayerFactoryVersion
 import com.twentyfouri.tvbridge.global.utils.SourceDrmOverridden
+import com.twentyfouri.tvbridge.jump.JumpAnalytics
 import com.twentyfouri.tvbridge.webview.client.BridgeWebView
 import com.twentyfouri.tvbridge.webview.client.BridgeWebViewClient
 import com.twentyfouri.tvbridge.webview.client.BridgeWebViewClient.BridgeWebViewClientCallback
 import com.twentyfouri.tvbridge.webview.model.AnalyticsPlaybackInfo
+import com.twentyfouri.tvbridge.webview.model.ContentModel
+import com.twentyfouri.tvbridge.webview.model.DrmModel
 import com.twentyfouri.tvbridge.webview.model.MediaEventType
 import com.twentyfouri.tvbridge.webview.view.Mainview
 import com.twentyfouri.tvbridge.webview.view.PlayerCache
@@ -35,6 +44,7 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.net.NetworkInterface
+import java.net.URI
 import javax.inject.Inject
 
 /**
@@ -46,7 +56,7 @@ class WebViewModel @Inject constructor(
         private val config: BridgeConfig,
         private val iapService: IapService,
         val playerFactory: PlayerFactoryBase
-) : EventListener {
+) : BaseObservable(), EventListener {
     var player: PlayerBase? = null
     private var view: Mainview? = null
     private val jsBridge = BridgeToJavaScript(config) { s: String? ->
@@ -54,9 +64,12 @@ class WebViewModel @Inject constructor(
     }
     private val iapCallback = InnerIapCallback()
     private val playerCache = PlayerCache()
+    private val jumpAnalytics = JumpAnalytics()
 
-    private var source: Source? = null
+    private var contentModel: ContentModel? = null
 
+    val videoTrack: VideoTrack?
+        get() = player?.selectedVideoTrack
     val audioTrack: AudioTrack?
         get() = player?.selectedAudioTrack
     val subtitleTrack: TextTrack?
@@ -64,6 +77,17 @@ class WebViewModel @Inject constructor(
 
     var appUrl: String? = null
 
+    var urlSetterVisible: Boolean = false
+        set(value) {
+            if (field == value) return
+            field = value
+            notifyPropertyChanged(BR.urlSetterVisibility)
+        }
+
+    @get:Bindable
+    val urlSetterVisibility: Int
+        get() = if (urlSetterVisible) View.VISIBLE else View.GONE
+
     fun attachView(view: Mainview?) {
         this.view = view
         if (view != null) {
@@ -118,42 +142,52 @@ class WebViewModel @Inject constructor(
 
     fun onClickGo() {
         view?.loadUrl(appUrl)
+        urlSetterVisible = false
         if (BuildConfig.DEBUG) {
             view?.hideKeyboard()
         }
     }
 
-    fun setVideo(source: Source) {
-        var adaptedSource = source
-        if (config.drm.shouldOverrideDrmCallback()) {
-            adaptedSource = SourceDrmOverridden.replaceSource(adaptedSource)
+    fun setVideo(contentModel: ContentModel) {
+        logContentModel(contentModel)
+        playDirectly(contentModel)
+    }
+
+    private fun logContentModel(contentModel: ContentModel) {
+        Log.i("BridgeVideo", "Url: " + contentModel.streamUrl)
+        val drmModel = contentModel.drmModel
+        if (drmModel != null) {
+            Log.i("BridgeVideo", "DRM: " + drmModel.drmSchemeUuid)
+            Log.i("BridgeVideo", "LicenseUrl: " + drmModel.drmLicenseUrl)
         }
-        logSource(adaptedSource)
-        playDirectly(adaptedSource)
     }
 
-    private fun logSource(source: Source) {
-        Log.i("BridgeVideo", "Url: ${source.url}")
-        when (val drmModel = source.drm.firstOrNull()) {
-            is SourceDrmWidevine -> {
-                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
-                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
-            }
-            is SourceDrmPlayready -> {
-                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
-                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
-            }
-            is SourceDrmOverridden -> {
-                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
-                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
-            }
+    private fun playInExoPlayerDemoApp(contentModel: ContentModel) {
+        val intent = Intent("com.google.android.exoplayer.demo.action.VIEW", Uri.parse(contentModel.streamUrl))
+        val drmModel = contentModel.drmModel
+        if (drmModel != null) {
+            intent.putExtra("drm_scheme", drmModel.drmSchemeUuid)
+            intent.putExtra("drm_license_url", drmModel.drmLicenseUrl)
+        }
+        try {
+            context.startActivity(intent)
+        } catch (e: Exception) {
+            Log.w("WebViewModel", "Failed to start ExoPlayer demo app", e)
         }
     }
 
-    private fun playDirectly(source: Source) {
-        this.source = source
+    private fun playDirectly(contentModel: ContentModel) {
+        this.contentModel = contentModel
+        (player as? PlayerExoPlayer)?.exoPlayer?.also { exoPlayer ->
+            jumpAnalytics.setVideoPlayer(exoPlayer)
+            exoPlayer.setSeekParameters(SeekParameters.CLOSEST_SYNC)
+        }
         player?.also { player ->
-            player.source = source
+            player.source = Source {
+                url = contentModel.streamUrl?.let { URI(it) }
+                mimeType = detectMimeType(contentModel)
+                contentModel.drmModel?.let { buildDrm(it) }?.also { drm.add(it) }
+            }
 
             if (isLowEndDevice) {
                 player.trackRestrictions = player.trackRestrictions.buildUpon {
@@ -173,6 +207,43 @@ class WebViewModel @Inject constructor(
         }
     }
 
+    private fun detectMimeType(contentModel: ContentModel) =
+            when (contentModel.streamType) {
+                null, "" -> null
+                ".mpd", "mpd", "dash" -> ManifestDash.mimeType
+                ".ism", "ism", "ss" -> ManifestSmoothStreaming.mimeType
+                ".m3u8", "m3u8", "hls" -> ManifestHls.mimeType
+                else -> null
+            }
+
+    private fun buildDrm(drmModel: DrmModel): SourceDrm? {
+        val drmScheme = drmModel.drmSchemeUuid
+        val useOverride = drmModel.overrideDrmCallback ?: config.drm.shouldOverrideDrmCallback()
+        val useWidevine = drmScheme == "widevine" || drmScheme == C.WIDEVINE_UUID.toString()
+        val usePlayReady = drmScheme == "playready" || drmScheme == C.PLAYREADY_UUID.toString()
+        return when {
+            drmScheme == null -> null
+            useOverride -> SourceDrmOverridden {
+                packageName = when {
+                    useWidevine -> DrmWidevine.packageName
+                    usePlayReady -> DrmPlayready.packageName
+                    else -> ""
+                }
+                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
+                forceLicenseServer = true
+            }
+            useWidevine -> SourceDrmWidevine {
+                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
+                forceLicenseServer = true
+            }
+            usePlayReady -> SourceDrmWidevine {
+                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
+                forceLicenseServer = true
+            }
+            else -> SourceDrmUnrecognized(drmScheme)
+        }
+    }
+
     private val isLowEndDevice: Boolean
         get() = when (Build.MODEL) {
             "AFTB" -> true
@@ -185,9 +256,9 @@ class WebViewModel @Inject constructor(
     }
 
     fun resumePlayer() {
-        val savedSource = playerCache.savedSource
-        if (playerCache.loadFromCache && savedSource != null && playerCache.savedPlayerState !== PlayerCache.PlayerState.PAUSED) {
-            setVideo(savedSource)
+        val savedContentModel = playerCache.savedContentModel
+        if (playerCache.loadFromCache && savedContentModel != null && playerCache.savedPlayerState !== PlayerCache.PlayerState.PAUSED) {
+            setVideo(savedContentModel)
             var position = playerCache.savedPlayerPosition
             val player = this.player ?: return
             if (player.live) {
@@ -212,24 +283,26 @@ class WebViewModel @Inject constructor(
 
     fun stopPlayer() {
         view?.setBlackCurtainVisibility(View.VISIBLE)
-        source = null
+        contentModel = null
 
         player?.also { player ->
             player.removeEventListener(Event.ALL, this)
             player.unload()
+            jumpAnalytics.setVideoPlayer(null)
         }
     }
 
     fun releasePlayer() {
         val player = this.player ?: return
-        if (source != null) {
+        if (contentModel != null) {
             playerCache.loadFromCache = true
-            playerCache.savedSource = source
+            playerCache.savedContentModel = contentModel
             playerCache.savedPlayerDuration = player.duration
             playerCache.savedPlayerPosition = player.currentTime
             playerCache.savedPlayerState = if (player.playing) PlayerCache.PlayerState.PLAYING else PlayerCache.PlayerState.PAUSED
         }
         player.unload()
+        jumpAnalytics.setVideoPlayer(null)
     }
 
     val currentPosition: Double
@@ -244,7 +317,7 @@ class WebViewModel @Inject constructor(
     val isPlayerPlaying: Boolean
         get() = player?.playing == true
     val isInPlayer: Boolean
-        get() = player != null && source != null
+        get() = player != null && contentModel != null
 
     fun loadUrl(url: String?) {
         view?.loadUrl(url)
@@ -286,7 +359,6 @@ class WebViewModel @Inject constructor(
             }
             is LoadedMetadataEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.LOADEDMETADATA)
-                jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
             }
             is CanPlayEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.CANPLAY)
@@ -317,21 +389,13 @@ class WebViewModel @Inject constructor(
                     jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.PAUSE)
                 }
             }
+            is LoadedMetadataEvent,
             is AddAudioTrackEvent, is AddTextTrackEvent,
             is RemoveAudioTrackEvent, is RemoveTextTrackEvent,
             is ChangeAudioTrackEvent, is ChangeTextTrackEvent -> {
                 Log.d("WebViewModel", "onTracksChanged: audio=$audioTrack subtitle=$subtitleTrack")
                 jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
             }
-            is AdBreakStartedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_START)
-            }
-            is AdBreakEndedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_END)
-            }
-            is AdBreaksRescheduledEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdBreaksEvent(MediaEventType.AD_BREAKS_RESCHEDULED, player.timeline)
-            }
         }
     }
 
@@ -360,7 +424,9 @@ class WebViewModel @Inject constructor(
     }
 
     fun setPlaybackInfo(playbackInfo: AnalyticsPlaybackInfo) {
-        // previously used for Jump analytics, not supported with THEO
+        if ("JUMP" == playbackInfo.name) {
+            jumpAnalytics.setPlaybackInfo(playbackInfo)
+        }
     }
 
     fun showMessage(message: String?) {
@@ -458,14 +524,11 @@ class WebViewModel @Inject constructor(
     fun detectDeviceInfo(): JSONObject {
         val deviceInfo = JSONObject()
         try {
-            val engineVersion = PlayerFactoryVersion.from(playerFactory)
             deviceInfo.put("deviceBrand", Build.MANUFACTURER)
             deviceInfo.put("deviceModel", Build.MODEL)
             deviceInfo.put("osVersion", Build.VERSION.RELEASE)
             deviceInfo.put("appFlavor", BuildConfig.FLAVOR)
             deviceInfo.put("appVersion", BuildConfig.VERSION_NAME)
-            deviceInfo.put("engineName", engineVersion.engineName)
-            deviceInfo.put("engineVersion", engineVersion.engineVersion)
 
             val drmKeySystems = mutableSetOf<String>()
             playerFactory.getSupportedFormats(context).manifest.forEach { manifest ->

package/dist/templates/platforms/androidtv/project/app/src/main/res/layout/activity_web_view.xml

@@ -1,28 +1,76 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/black">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <com.twentyfouri.player.base.PlayerView
-        android:id="@+id/player_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    <data>
 
-    <View
-        android:id="@+id/black_curtain"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/black" />
+        <variable
+            name="viewModel"
+            type="com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel" />
+    </data>
 
-    <com.twentyfouri.tvbridge.webview.client.BridgeWebView
-        android:id="@+id/webview"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:background="@android:color/transparent"
-        android:visibility="gone" />
-
-</RelativeLayout>
+        android:background="@android:color/black"
+        tools:context=".webview.ui.view.WebViewActivity">
+
+        <com.twentyfouri.player.base.PlayerView
+            android:id="@+id/exoplayer_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <View
+            android:id="@+id/black_curtain"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black" />
+
+        <LinearLayout
+            android:id="@+id/url_setter"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_margin="80dp"
+            android:orientation="vertical"
+            app:visibility="@{viewModel.urlSetterVisibility}">
+
+            <EditText
+                android:id="@+id/url"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nextFocusUp="@+id/url"
+                android:nextFocusLeft="@+id/url"
+                android:nextFocusRight="@+id/url"
+                android:textColor="@android:color/white"/>
+
+            <Button
+                android:id="@+id/button_go"
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/button_focus"
+                android:textColor="@android:color/black"
+                android:nextFocusDown="@+id/button_go"
+                android:nextFocusLeft="@+id/button_go"
+                android:nextFocusRight="@+id/button_go"
+                android:onClick="@{() -> viewModel.onClickGo()}"
+                android:text="GO" />
+
+        </LinearLayout>
+
+        <com.twentyfouri.tvbridge.webview.client.BridgeWebView
+            android:id="@+id/webview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:background="@android:color/transparent"
+            android:visibility="gone"/>
+
+    </RelativeLayout>
+
+</layout>
+
+

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

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 30
 
         versionCode 1
         versionName "1.0"

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

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 30
 
         versionCode 1
         versionName "1.0"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.17.6-alpha.19",
+	"version": "0.17.6-alpha.2",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {
@@ -35,11 +35,9 @@
 		}
 	],
 	"dependencies": {
-		"fs-extra": "11.1.1",
 		"xml2js": "^0.4.23"
 	},
 	"devDependencies": {
-		"@types/fs-extra": "11.0.1",
 		"@types/inquirer": "8.2.1",
 		"@types/ip": "1.1.0",
 		"@types/mini-css-extract-plugin": "1.4.3",