null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed all warnings in MainActivity

Browse source
This commit is contained in:
Jays2Kings 2021-10-07 00:00:00 -04:00
parent 6ead02b761
commit 2b014931c4
1 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

58
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -11,7 +11,6 @@ import android.graphics.Rect
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler
import android.provider.Settings import android.provider.Settings
import android.view.GestureDetector import android.view.GestureDetector
import android.view.Gravity import android.view.Gravity
@ -20,7 +19,6 @@ import android.view.MenuItem
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.WindowInsets
import android.view.WindowManager import android.view.WindowManager
import android.webkit.WebView import android.webkit.WebView
import androidx.annotation.IdRes import androidx.annotation.IdRes
@ -29,6 +27,9 @@ import androidx.core.graphics.ColorUtils
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.core.view.GestureDetectorCompat import androidx.core.view.GestureDetectorCompat
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsCompat.Type.systemBars
import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.WindowInsetsControllerCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams import androidx.core.view.updateLayoutParams
@ -82,10 +83,11 @@ import eu.kanade.tachiyomi.util.system.isBottomTappable
import eu.kanade.tachiyomi.util.system.isInNightMode import eu.kanade.tachiyomi.util.system.isInNightMode
import eu.kanade.tachiyomi.util.system.launchUI import eu.kanade.tachiyomi.util.system.launchUI
import eu.kanade.tachiyomi.util.system.prepareSideNavContext import eu.kanade.tachiyomi.util.system.prepareSideNavContext
import eu.kanade.tachiyomi.util.system.rootWindowInsetsCompat
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import eu.kanade.tachiyomi.util.view.backgroundColor import eu.kanade.tachiyomi.util.view.backgroundColor
import eu.kanade.tachiyomi.util.view.blurBehindWindow import eu.kanade.tachiyomi.util.view.blurBehindWindow
import eu.kanade.tachiyomi.util.view.doOnApplyWindowInsets import eu.kanade.tachiyomi.util.view.doOnApplyWindowInsetsCompat
import eu.kanade.tachiyomi.util.view.getItemView import eu.kanade.tachiyomi.util.view.getItemView
import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.util.view.snack
import eu.kanade.tachiyomi.util.view.withFadeTransaction import eu.kanade.tachiyomi.util.view.withFadeTransaction
@ -124,8 +126,8 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
private val updateChecker by lazy { UpdateChecker.getUpdateChecker() } private val updateChecker by lazy { UpdateChecker.getUpdateChecker() }
private val isUpdaterEnabled = BuildConfig.INCLUDE_UPDATER private val isUpdaterEnabled = BuildConfig.INCLUDE_UPDATER
var tabAnimation: ValueAnimator? = null private var tabAnimation: ValueAnimator? = null
var overflowDialog: Dialog? = null private var overflowDialog: Dialog? = null
var currentToolbar: Toolbar? = null var currentToolbar: Toolbar? = null
var ogWidth: Int = Int.MAX_VALUE var ogWidth: Int = Int.MAX_VALUE
@ -190,7 +192,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
anchorView = binding.bottomNav anchorView = binding.bottomNav
setAction(R.string.cancel) { setAction(R.string.cancel) {
LibraryUpdateService.stop(context) LibraryUpdateService.stop(context)
Handler().post { lifecycleScope.launchUI {
NotificationReceiver.dismissNotification( NotificationReceiver.dismissNotification(
context, context,
Notifications.ID_LIBRARY_PROGRESS Notifications.ID_LIBRARY_PROGRESS
@ -217,41 +219,37 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
val content: ViewGroup = binding.mainContent val content: ViewGroup = binding.mainContent
DownloadService.addListener(this) DownloadService.addListener(this)
content.systemUiVisibility = WindowCompat.setDecorFitsSystemWindows(window, false)
View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
container.systemUiVisibility =
View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
supportActionBar?.setDisplayShowCustomEnabled(true) supportActionBar?.setDisplayShowCustomEnabled(true)
setNavBarColor(content.rootWindowInsets) setNavBarColor(content.rootWindowInsetsCompat)
nav.isVisible = false nav.isVisible = false
content.doOnApplyWindowInsets { v, insets, _ -> content.doOnApplyWindowInsetsCompat { v, insets, _ ->
setNavBarColor(insets) setNavBarColor(insets)
val contextView = window?.decorView?.findViewById<View>(R.id.action_mode_bar) val contextView = window?.decorView?.findViewById<View>(R.id.action_mode_bar)
contextView?.updateLayoutParams<ViewGroup.MarginLayoutParams> { contextView?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
leftMargin = insets.systemWindowInsetLeft leftMargin = insets.getInsetsIgnoringVisibility(systemBars()).left
rightMargin = insets.systemWindowInsetRight rightMargin = insets.getInsetsIgnoringVisibility(systemBars()).right
} }
// Consume any horizontal insets and pad all content in. There's not much we can do // Consume any horizontal insets and pad all content in. There's not much we can do
// with horizontal insets // with horizontal insets
v.updatePadding( v.updatePadding(
left = insets.systemWindowInsetLeft, left = insets.getInsetsIgnoringVisibility(systemBars()).left,
right = insets.systemWindowInsetRight right = insets.getInsetsIgnoringVisibility(systemBars()).right
) )
binding.appBar.updatePadding( binding.appBar.updatePadding(
top = insets.systemWindowInsetTop top = insets.getInsetsIgnoringVisibility(systemBars()).top
) )
binding.bottomNav?.updatePadding(bottom = insets.systemWindowInsetBottom) binding.bottomNav?.updatePadding(bottom = insets.getInsetsIgnoringVisibility(systemBars()).bottom)
binding.sideNav?.updatePadding( binding.sideNav?.updatePadding(
left = 0, left = 0,
right = 0, right = 0,
bottom = insets.systemWindowInsetBottom, bottom = insets.getInsetsIgnoringVisibility(systemBars()).bottom,
top = insets.systemWindowInsetTop top = insets.getInsetsIgnoringVisibility(systemBars()).top
) )
binding.bottomView?.isVisible = insets.systemWindowInsetBottom > 0 binding.bottomView?.isVisible = insets.getInsetsIgnoringVisibility(systemBars()).bottom > 0
binding.bottomView?.updateLayoutParams<ViewGroup.LayoutParams> { binding.bottomView?.updateLayoutParams<ViewGroup.LayoutParams> {
height = insets.systemWindowInsetBottom height = insets.getInsetsIgnoringVisibility(systemBars()).bottom
} }
} }
// Set this as nav view will try to set its own insets and they're hilariously bad // Set this as nav view will try to set its own insets and they're hilariously bad
@ -364,6 +362,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
} }
} else { } else {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
@Suppress("DEPRECATION")
window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
} }
} }
@ -444,7 +443,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
binding.toolbar.navigationIcon = if (enabled) dismissDrawable else searchDrawable binding.toolbar.navigationIcon = if (enabled) dismissDrawable else searchDrawable
} }
private fun setNavBarColor(insets: WindowInsets?) { private fun setNavBarColor(insets: WindowInsetsCompat?) {
if (insets == null) return if (insets == null) return
window.navigationBarColor = when { window.navigationBarColor = when {
Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1 -> { Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1 -> {
@ -885,14 +884,14 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
binding.tabsFrameLayout.alpha = 0f binding.tabsFrameLayout.alpha = 0f
binding.tabsFrameLayout.isVisible = true binding.tabsFrameLayout.isVisible = true
} }
tabAnimation = ValueAnimator.ofFloat( val tA = ValueAnimator.ofFloat(
binding.tabsFrameLayout.alpha, binding.tabsFrameLayout.alpha,
if (show) 1f else 0f if (show) 1f else 0f
) )
tabAnimation?.addUpdateListener { valueAnimator -> tA.addUpdateListener { valueAnimator ->
binding.tabsFrameLayout.alpha = valueAnimator.animatedValue as Float binding.tabsFrameLayout.alpha = valueAnimator.animatedValue as Float
} }
tabAnimation?.addListener( tA.addListener(
EndAnimatorListener { EndAnimatorListener {
binding.tabsFrameLayout.isVisible = show binding.tabsFrameLayout.isVisible = show
if (!show) { if (!show) {
@ -901,8 +900,9 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
} }
} }
) )
tabAnimation?.duration = 200 tA.duration = 200
tabAnimation?.start() tabAnimation = tA
tA.start()
} else { } else {
binding.tabsFrameLayout.isVisible = show binding.tabsFrameLayout.isVisible = show
} }