Revert view id refactor
This commit is contained in:
parent
f8bcc74155
commit
b45e6990d7
2 changed files with 12 additions and 12 deletions
|
|
@ -111,8 +111,8 @@ class MainActivity : SimpleActivity() {
|
|||
search_holder.setBackgroundColor(getProperBackgroundColor())
|
||||
|
||||
val properPrimaryColor = getProperPrimaryColor()
|
||||
start_conversation_placeholder.setTextColor(properPrimaryColor)
|
||||
start_conversation_placeholder.underlineText()
|
||||
no_conversations_placeholder_2.setTextColor(properPrimaryColor)
|
||||
no_conversations_placeholder_2.underlineText()
|
||||
conversations_fastscroller.updateColors(properPrimaryColor)
|
||||
conversations_progress_bar.setIndicatorColor(properPrimaryColor)
|
||||
conversations_progress_bar.trackColor = properPrimaryColor.adjustAlpha(LOWER_ALPHA)
|
||||
|
|
@ -239,7 +239,7 @@ class MainActivity : SimpleActivity() {
|
|||
storeStateVariables()
|
||||
getCachedConversations()
|
||||
|
||||
start_conversation_placeholder.setOnClickListener {
|
||||
no_conversations_placeholder_2.setOnClickListener {
|
||||
launchNewConversation()
|
||||
}
|
||||
|
||||
|
|
@ -378,19 +378,19 @@ class MainActivity : SimpleActivity() {
|
|||
private fun showOrHideProgress(show: Boolean) {
|
||||
if (show) {
|
||||
conversations_progress_bar.show()
|
||||
conversations_placeholder.beVisible()
|
||||
conversations_placeholder.text = getString(R.string.loading_messages)
|
||||
no_conversations_placeholder.beVisible()
|
||||
no_conversations_placeholder.text = getString(R.string.loading_messages)
|
||||
} else {
|
||||
conversations_progress_bar.hide()
|
||||
conversations_placeholder.beGone()
|
||||
no_conversations_placeholder.beGone()
|
||||
}
|
||||
}
|
||||
|
||||
private fun showOrHidePlaceholder(show: Boolean) {
|
||||
conversations_fastscroller.beGoneIf(show)
|
||||
conversations_placeholder.beVisibleIf(show)
|
||||
conversations_placeholder.text = getString(R.string.no_conversations_found)
|
||||
start_conversation_placeholder.beVisibleIf(show)
|
||||
no_conversations_placeholder.beVisibleIf(show)
|
||||
no_conversations_placeholder.text = getString(R.string.no_conversations_found)
|
||||
no_conversations_placeholder_2.beVisibleIf(show)
|
||||
}
|
||||
|
||||
private fun fadeOutSearch() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue