mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-17 12:30:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

Migrate to ViewBindings (#1072) - WIP

Browse source
This commit is contained in:
Benoit Marty 2020-12-16 02:59:03 +01:00
parent c1222737d6
commit 409d7e50bb
3 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vector/src/main/java/im/vector/app/core/ui/bottomsheet/BottomSheetGeneric.kt
View file

@ -51,13 +51,13 @@ abstract class BottomSheetGeneric<STATE : BottomSheetGenericState, ACTION : Bott
@CallSuper
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
views.views.bottomSheetRecyclerView.configureWith(getController(), viewPool = sharedViewPool, hasFixedSize = false, disableItemAnimation = true)
views.bottomSheetRecyclerView.configureWith(getController(), viewPool = sharedViewPool, hasFixedSize = false, disableItemAnimation = true)
getController().listener = this
}
@CallSuper
override fun onDestroyView() {
views.views.bottomSheetRecyclerView.cleanup()
views.bottomSheetRecyclerView.cleanup()
getController().listener = null
super.onDestroyView()
}

7
vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt
View file

@ -22,7 +22,7 @@ import android.view.View
import android.widget.RelativeLayout
import androidx.core.content.ContextCompat
import im.vector.app.R
import im.vector.app.databinding.ViewJumpToReadMarkerBinding
class JumpToReadMarkerView @JvmOverloads constructor(
context: Context,
@ -43,11 +43,12 @@ class JumpToReadMarkerView @JvmOverloads constructor(
private fun setupView() {
inflate(context, R.layout.view_jump_to_read_marker, this)
val views = ViewJumpToReadMarkerBinding.bind(this)
setBackgroundColor(ContextCompat.getColor(context, R.color.notification_accent_color))
jumpToReadMarkerLabelView.setOnClickListener {
views.jumpToReadMarkerLabelView.setOnClickListener {
callback?.onJumpToReadMarkerClicked()
}
closeJumpToReadMarkerView.setOnClickListener {
views.closeJumpToReadMarkerView.setOnClickListener {
visibility = View.INVISIBLE
callback?.onClearReadMarkerClicked()
}

48
vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt
View file

@ -24,6 +24,7 @@ import androidx.core.content.edit
import androidx.core.view.isVisible
import im.vector.app.R
import im.vector.app.core.di.DefaultSharedPreferences
import im.vector.app.databinding.ViewKeysBackupBannerBinding
import timber.log.Timber
@ -40,6 +41,8 @@ class KeysBackupBanner @JvmOverloads constructor(
var delegate: Delegate? = null
private var state: State = State.Initial
private lateinit var views: ViewKeysBackupBannerBinding
init {
setupView()
DefaultSharedPreferences.getInstance(context).edit {
@ -119,9 +122,10 @@ class KeysBackupBanner @JvmOverloads constructor(
inflate(context, R.layout.view_keys_backup_banner, this)
setOnClickListener(this)
view_keys_backup_banner_text_1.setOnClickListener(this)
view_keys_backup_banner_text_2.setOnClickListener(this)
view_keys_backup_banner_close.setOnClickListener { onCloseClicked() }
views = ViewKeysBackupBannerBinding.bind(this)
views.viewKeysBackupBannerText1.setOnClickListener(this)
views.viewKeysBackupBannerText2.setOnClickListener(this)
views.viewKeysBackupBannerClose.setOnClickListener { onCloseClicked() }
}
private fun renderInitial() {
@ -140,10 +144,10 @@ class KeysBackupBanner @JvmOverloads constructor(
} else {
isVisible = true
view_keys_backup_banner_text_1.setText(R.string.secure_backup_banner_setup_line1)
view_keys_backup_banner_text_2.isVisible = true
view_keys_backup_banner_text_2.setText(R.string.secure_backup_banner_setup_line2)
view_keys_backup_banner_close_group.isVisible = true
views.viewKeysBackupBannerText1.setText(R.string.secure_backup_banner_setup_line1)
views.viewKeysBackupBannerText2.isVisible = true
views.viewKeysBackupBannerText2.setText(R.string.secure_backup_banner_setup_line2)
views.viewKeysBackupBannerCloseGroup.isVisible = true
}
}
@ -153,10 +157,10 @@ class KeysBackupBanner @JvmOverloads constructor(
} else {
isVisible = true
view_keys_backup_banner_text_1.setText(R.string.keys_backup_banner_recover_line1)
view_keys_backup_banner_text_2.isVisible = true
view_keys_backup_banner_text_2.setText(R.string.keys_backup_banner_recover_line2)
view_keys_backup_banner_close_group.isVisible = true
views.viewKeysBackupBannerText1.setText(R.string.keys_backup_banner_recover_line1)
views.viewKeysBackupBannerText2.isVisible = true
views.viewKeysBackupBannerText2.setText(R.string.keys_backup_banner_recover_line2)
views.viewKeysBackupBannerCloseGroup.isVisible = true
}
}
@ -166,28 +170,28 @@ class KeysBackupBanner @JvmOverloads constructor(
} else {
isVisible = true
view_keys_backup_banner_text_1.setText(R.string.keys_backup_banner_update_line1)
view_keys_backup_banner_text_2.isVisible = true
view_keys_backup_banner_text_2.setText(R.string.keys_backup_banner_update_line2)
view_keys_backup_banner_close_group.isVisible = true
views.viewKeysBackupBannerText1.setText(R.string.keys_backup_banner_update_line1)
views.viewKeysBackupBannerText2.isVisible = true
views.viewKeysBackupBannerText2.setText(R.string.keys_backup_banner_update_line2)
views.viewKeysBackupBannerCloseGroup.isVisible = true
}
}
private fun renderBackingUp() {
isVisible = true
view_keys_backup_banner_text_1.setText(R.string.secure_backup_banner_setup_line1)
view_keys_backup_banner_text_2.isVisible = true
view_keys_backup_banner_text_2.setText(R.string.keys_backup_banner_in_progress)
view_keys_backup_banner_loading.isVisible = true
views.viewKeysBackupBannerText1.setText(R.string.secure_backup_banner_setup_line1)
views.viewKeysBackupBannerText2.isVisible = true
views.viewKeysBackupBannerText2.setText(R.string.keys_backup_banner_in_progress)
views.viewKeysBackupBannerLoading.isVisible = true
}
/**
* Hide all views that are not visible in all state
*/
private fun hideAll() {
view_keys_backup_banner_text_2.isVisible = false
view_keys_backup_banner_close_group.isVisible = false
view_keys_backup_banner_loading.isVisible = false
views.viewKeysBackupBannerText2.isVisible = false
views.viewKeysBackupBannerCloseGroup.isVisible = false
views.viewKeysBackupBannerLoading.isVisible = false
}
/**