Skip to content

Commit b45e699

Browse files
committed
Revert view id refactor
1 parent f8bcc74 commit b45e699

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ class MainActivity : SimpleActivity() {
111111
search_holder.setBackgroundColor(getProperBackgroundColor())
112112

113113
val properPrimaryColor = getProperPrimaryColor()
114-
start_conversation_placeholder.setTextColor(properPrimaryColor)
115-
start_conversation_placeholder.underlineText()
114+
no_conversations_placeholder_2.setTextColor(properPrimaryColor)
115+
no_conversations_placeholder_2.underlineText()
116116
conversations_fastscroller.updateColors(properPrimaryColor)
117117
conversations_progress_bar.setIndicatorColor(properPrimaryColor)
118118
conversations_progress_bar.trackColor = properPrimaryColor.adjustAlpha(LOWER_ALPHA)
@@ -239,7 +239,7 @@ class MainActivity : SimpleActivity() {
239239
storeStateVariables()
240240
getCachedConversations()
241241

242-
start_conversation_placeholder.setOnClickListener {
242+
no_conversations_placeholder_2.setOnClickListener {
243243
launchNewConversation()
244244
}
245245

@@ -378,19 +378,19 @@ class MainActivity : SimpleActivity() {
378378
private fun showOrHideProgress(show: Boolean) {
379379
if (show) {
380380
conversations_progress_bar.show()
381-
conversations_placeholder.beVisible()
382-
conversations_placeholder.text = getString(R.string.loading_messages)
381+
no_conversations_placeholder.beVisible()
382+
no_conversations_placeholder.text = getString(R.string.loading_messages)
383383
} else {
384384
conversations_progress_bar.hide()
385-
conversations_placeholder.beGone()
385+
no_conversations_placeholder.beGone()
386386
}
387387
}
388388

389389
private fun showOrHidePlaceholder(show: Boolean) {
390390
conversations_fastscroller.beGoneIf(show)
391-
conversations_placeholder.beVisibleIf(show)
392-
conversations_placeholder.text = getString(R.string.no_conversations_found)
393-
start_conversation_placeholder.beVisibleIf(show)
391+
no_conversations_placeholder.beVisibleIf(show)
392+
no_conversations_placeholder.text = getString(R.string.no_conversations_found)
393+
no_conversations_placeholder_2.beVisibleIf(show)
394394
}
395395

396396
private fun fadeOutSearch() {

app/src/main/res/layout/activity_main.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
tools:visibility="visible" />
4343

4444
<com.simplemobiletools.commons.views.MyTextView
45-
android:id="@+id/conversations_placeholder"
45+
android:id="@+id/no_conversations_placeholder"
4646
android:layout_width="match_parent"
4747
android:layout_height="wrap_content"
4848
android:layout_centerHorizontal="true"
@@ -57,10 +57,10 @@
5757
android:visibility="gone" />
5858

5959
<com.simplemobiletools.commons.views.MyTextView
60-
android:id="@+id/start_conversation_placeholder"
60+
android:id="@+id/no_conversations_placeholder_2"
6161
android:layout_width="wrap_content"
6262
android:layout_height="wrap_content"
63-
android:layout_below="@+id/conversations_placeholder"
63+
android:layout_below="@+id/no_conversations_placeholder"
6464
android:layout_centerHorizontal="true"
6565
android:background="@drawable/ripple_all_corners"
6666
android:gravity="center"

0 commit comments

Comments
 (0)