mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-07-22 10:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix full screen mode for all devices (#2878)

Browse source 
* Fix full screen mode for all devices

* Hide system UI when we regain focus and a video is still full screen

* Revert theme changes

* Remove unneeded line break
This commit is contained in:
Daniel Shokouhi 2022-09-24 12:54:38 -07:00 committed by GitHub
parent 7ab914a8bb
commit 9fa983c6dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
View file

@ -49,6 +49,7 @@ import androidx.core.content.ContextCompat
import androidx.core.content.getSystemService
import androidx.core.content.res.ResourcesCompat
import androidx.core.graphics.ColorUtils
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat
import androidx.lifecycle.lifecycleScope
import androidx.webkit.WebViewCompat
@ -949,7 +950,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
moreInfoEntity = path.substringAfter("entityId:")
intent.removeExtra(EXTRA_PATH)
if (presenter.isFullScreen())
if (presenter.isFullScreen() || isVideoFullScreen)
hideSystemUI()
else
showSystemUI()
@ -957,46 +958,12 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
}
private fun hideSystemUI() {
if (isCutout())
decor.systemUiVisibility = decor.systemUiVisibility or
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
else {
decor.viewTreeObserver.addOnGlobalLayoutListener {
val r = Rect()
decor.getWindowVisibleDisplayFrame(r)
val height = r.bottom - decor.top
if ((decor.height - height) > (decor.height / 5))
decor.getChildAt(0).layoutParams.height = decor.height - (decor.height - height)
else
decor.getChildAt(0).layoutParams.height = decor.height
decor.requestLayout()
}
decor.systemUiVisibility = decor.systemUiVisibility or
View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
View.SYSTEM_UI_FLAG_FULLSCREEN or
View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
}
windowInsetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
windowInsetsController.hide(WindowInsetsCompat.Type.systemBars())
}
private fun showSystemUI() {
if (isCutout()) {
decor.systemUiVisibility = decor.systemUiVisibility and
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION.inv() and
View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY.inv()
} else {
decor.systemUiVisibility = decor.systemUiVisibility and View.SYSTEM_UI_FLAG_LAYOUT_STABLE.inv() and
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION.inv() and
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN.inv() and
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION.inv() and
View.SYSTEM_UI_FLAG_FULLSCREEN.inv() and
View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY.inv()
}
windowInsetsController.show(WindowInsetsCompat.Type.systemBars())
}
override fun onPictureInPictureModeChanged(
@ -1308,13 +1275,6 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
}
}
private fun isCutout(): Boolean {
var cutout = false
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && window.decorView.rootWindowInsets.displayCutout != null)
cutout = true
return cutout
}
private fun waitForConnection() {
Handler(Looper.getMainLooper()).postDelayed(
{