From c2c76a2fd01a5249711cf0924d2088537624d5e4 Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Mon, 11 Oct 2021 09:20:37 +0200 Subject: [PATCH 1/2] Fixed constant loading messages text (#225) --- .../simplemobiletools/smsmessenger/activities/MainActivity.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt index 2a66fa41..82c62d0e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -278,6 +278,10 @@ class MainActivity : SimpleActivity() { } else { try { (currAdapter as ConversationsAdapter).updateConversations(sortedConversations) + if (currAdapter.conversations.isEmpty()) { + no_conversations_placeholder.text = getString(R.string.no_conversations_found) + no_conversations_placeholder_2.beVisible() + } } catch (ignored: Exception) { } } From 2385dcd14b2c05f2fbb4b531e842cd2306534f46 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Tue, 19 Oct 2021 13:28:17 +0200 Subject: [PATCH 2/2] fixing some visibility and clickability things --- .../smsmessenger/activities/MainActivity.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt index 82c62d0e..0042a7f9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt @@ -92,6 +92,7 @@ class MainActivity : SimpleActivity() { (conversations_list.adapter as? ConversationsAdapter)?.updateFontSize() } + (conversations_list.adapter as? ConversationsAdapter)?.updateDrafts() updateTextColors(main_coordinator) no_conversations_placeholder_2.setTextColor(getAdjustedPrimaryColor()) no_conversations_placeholder_2.underlineText() @@ -250,8 +251,8 @@ class MainActivity : SimpleActivity() { .thenByDescending { it.date } ).toMutableList() as ArrayList conversations_list.beVisibleIf(hasConversations) - no_conversations_placeholder.beVisibleIf(!hasConversations) - no_conversations_placeholder_2.beVisibleIf(!hasConversations) + no_conversations_placeholder.beGoneIf(hasConversations) + no_conversations_placeholder_2.beGoneIf(hasConversations) if (!hasConversations && config.appRunCount == 1) { no_conversations_placeholder.text = getString(R.string.loading_messages) @@ -279,7 +280,9 @@ class MainActivity : SimpleActivity() { try { (currAdapter as ConversationsAdapter).updateConversations(sortedConversations) if (currAdapter.conversations.isEmpty()) { + conversations_list.beGone() no_conversations_placeholder.text = getString(R.string.no_conversations_found) + no_conversations_placeholder.beVisible() no_conversations_placeholder_2.beVisible() } } catch (ignored: Exception) {