mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 03:29:28 +01:00
simplify initSystemBars
.. by not executing duplicated checks and not using the common lib for now (needs to be aligned if possible) Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
dbc274bf63
commit
b014ebc3da
@ -17,6 +17,7 @@ import android.text.TextUtils
|
|||||||
import android.util.Log
|
import android.util.Log
|
||||||
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.view.inputmethod.EditorInfo
|
import android.view.inputmethod.EditorInfo
|
||||||
import android.webkit.SslErrorHandler
|
import android.webkit.SslErrorHandler
|
||||||
@ -26,7 +27,6 @@ import androidx.appcompat.app.AppCompatActivity
|
|||||||
import androidx.core.content.res.ResourcesCompat
|
import androidx.core.content.res.ResourcesCompat
|
||||||
import autodagger.AutoInjector
|
import autodagger.AutoInjector
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import com.nextcloud.android.common.ui.util.extensions.initStatusBar
|
|
||||||
import com.nextcloud.talk.R
|
import com.nextcloud.talk.R
|
||||||
import com.nextcloud.talk.account.AccountVerificationActivity
|
import com.nextcloud.talk.account.AccountVerificationActivity
|
||||||
import com.nextcloud.talk.account.ServerSelectionActivity
|
import com.nextcloud.talk.account.ServerSelectionActivity
|
||||||
@ -115,12 +115,21 @@ open class BaseActivity : AppCompatActivity() {
|
|||||||
eventBus.unregister(this)
|
eventBus.unregister(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* May be aligned with android-common lib in the future: .../ui/util/extensions/AppCompatActivityExtensions.kt
|
||||||
|
*/
|
||||||
fun initSystemBars() {
|
fun initSystemBars() {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
|
window.decorView.setOnApplyWindowInsetsListener { view, insets ->
|
||||||
initStatusBar(ResourcesCompat.getColor(resources, R.color.bg_default, context.theme))
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
|
||||||
} else {
|
val statusBarHeight = insets.getInsets(WindowInsets.Type.statusBars()).top
|
||||||
colorizeStatusBar()
|
view.setPadding(0, statusBarHeight, 0, 0)
|
||||||
colorizeNavigationBar()
|
val color = ResourcesCompat.getColor(resources, R.color.bg_default, context.theme)
|
||||||
|
view.setBackgroundColor(color)
|
||||||
|
} else {
|
||||||
|
colorizeStatusBar()
|
||||||
|
colorizeNavigationBar()
|
||||||
|
}
|
||||||
|
insets
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user