Revert view id refactor

This commit is contained in:
Naveen
2023-01-17 02:27:21 +05:30
parent f8bcc74155
commit b45e6990d7
2 changed files with 12 additions and 12 deletions

View File

@ -111,8 +111,8 @@ class MainActivity : SimpleActivity() {
search_holder.setBackgroundColor(getProperBackgroundColor()) search_holder.setBackgroundColor(getProperBackgroundColor())
val properPrimaryColor = getProperPrimaryColor() val properPrimaryColor = getProperPrimaryColor()
start_conversation_placeholder.setTextColor(properPrimaryColor) no_conversations_placeholder_2.setTextColor(properPrimaryColor)
start_conversation_placeholder.underlineText() no_conversations_placeholder_2.underlineText()
conversations_fastscroller.updateColors(properPrimaryColor) conversations_fastscroller.updateColors(properPrimaryColor)
conversations_progress_bar.setIndicatorColor(properPrimaryColor) conversations_progress_bar.setIndicatorColor(properPrimaryColor)
conversations_progress_bar.trackColor = properPrimaryColor.adjustAlpha(LOWER_ALPHA) conversations_progress_bar.trackColor = properPrimaryColor.adjustAlpha(LOWER_ALPHA)
@ -239,7 +239,7 @@ class MainActivity : SimpleActivity() {
storeStateVariables() storeStateVariables()
getCachedConversations() getCachedConversations()
start_conversation_placeholder.setOnClickListener { no_conversations_placeholder_2.setOnClickListener {
launchNewConversation() launchNewConversation()
} }
@ -378,19 +378,19 @@ class MainActivity : SimpleActivity() {
private fun showOrHideProgress(show: Boolean) { private fun showOrHideProgress(show: Boolean) {
if (show) { if (show) {
conversations_progress_bar.show() conversations_progress_bar.show()
conversations_placeholder.beVisible() no_conversations_placeholder.beVisible()
conversations_placeholder.text = getString(R.string.loading_messages) no_conversations_placeholder.text = getString(R.string.loading_messages)
} else { } else {
conversations_progress_bar.hide() conversations_progress_bar.hide()
conversations_placeholder.beGone() no_conversations_placeholder.beGone()
} }
} }
private fun showOrHidePlaceholder(show: Boolean) { private fun showOrHidePlaceholder(show: Boolean) {
conversations_fastscroller.beGoneIf(show) conversations_fastscroller.beGoneIf(show)
conversations_placeholder.beVisibleIf(show) no_conversations_placeholder.beVisibleIf(show)
conversations_placeholder.text = getString(R.string.no_conversations_found) no_conversations_placeholder.text = getString(R.string.no_conversations_found)
start_conversation_placeholder.beVisibleIf(show) no_conversations_placeholder_2.beVisibleIf(show)
} }
private fun fadeOutSearch() { private fun fadeOutSearch() {

View File

@ -42,7 +42,7 @@
tools:visibility="visible" /> tools:visibility="visible" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/conversations_placeholder" android:id="@+id/no_conversations_placeholder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@ -57,10 +57,10 @@
android:visibility="gone" /> android:visibility="gone" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/start_conversation_placeholder" android:id="@+id/no_conversations_placeholder_2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/conversations_placeholder" android:layout_below="@+id/no_conversations_placeholder"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@drawable/ripple_all_corners" android:background="@drawable/ripple_all_corners"
android:gravity="center" android:gravity="center"