fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-06-05 21:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide progress bar after loading from telephony

Browse Source
This commit is contained in:
Naveen
2023-01-17 00:18:32 +05:30
parent 9ac2b71172
commit f8bcc74155
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,8 +111,8 @@ class MainActivity : SimpleActivity() {
search_holder.setBackgroundColor(getProperBackgroundColor())
val properPrimaryColor = getProperPrimaryColor()
no_conversations_placeholder_2.setTextColor(properPrimaryColor)
no_conversations_placeholder_2.underlineText()
start_conversation_placeholder.setTextColor(properPrimaryColor)
start_conversation_placeholder.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()
no_conversations_placeholder_2.setOnClickListener {
start_conversation_placeholder.setOnClickListener {
launchNewConversation()
}
@ -258,7 +258,7 @@ class MainActivity : SimpleActivity() {
updateUnreadCountBadge(conversations)
runOnUiThread {
setupConversations(conversations)
setupConversations(conversations, cached = true)
getNewConversations(conversations)
}
conversations.forEach {
@ -349,33 +349,25 @@ class MainActivity : SimpleActivity() {
return currAdapter as ConversationsAdapter
}
private fun setupConversations(conversations: ArrayList<Conversation>) {
val hasConversations = conversations.isNotEmpty()
private fun setupConversations(conversations: ArrayList<Conversation>, cached: Boolean = false) {
val sortedConversations = conversations.sortedWith(
compareByDescending<Conversation> { config.pinnedConversations.contains(it.threadId.toString()) }
.thenByDescending { it.date }
).toMutableList() as ArrayList<Conversation>
conversations_fastscroller.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)
no_conversations_placeholder_2.beGone()
conversations_progress_bar.beVisible()
if (cached && config.appRunCount == 1) {
// there are no cached conversations on the first run so we show the loading placeholder and progress until we are done loading from telephony
showOrHideProgress(show = conversations.isEmpty())
} else {
conversations_progress_bar.beGone()
showOrHideProgress(show = false)
showOrHidePlaceholder(show = conversations.isEmpty())
}
try {
getOrCreateConversationsAdapter().apply {
updateConversations(sortedConversations) {
if (currentList.isEmpty()) {
conversations_fastscroller.beGone()
no_conversations_placeholder.text = getString(R.string.no_conversations_found)
no_conversations_placeholder.beVisible()
no_conversations_placeholder_2.beVisible()
if (!cached) {
showOrHidePlaceholder(show = currentList.isEmpty())
}
}
}
@ -383,6 +375,24 @@ 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)
} else {
conversations_progress_bar.hide()
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)
}
private fun fadeOutSearch() {
search_holder.animate().alpha(0f).setDuration(SHORT_ANIMATION_DURATION).withEndAction {
search_holder.beGone()

6
app/src/main/res/layout/activity_main.xml
View File

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