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 b27eb6c5..c562cb40 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -8,9 +8,7 @@ import android.os.Bundle
import android.provider.Telephony
import android.view.Menu
import android.view.MenuItem
-import com.simplemobiletools.commons.extensions.appLaunched
-import com.simplemobiletools.commons.extensions.checkAppSideloading
-import com.simplemobiletools.commons.extensions.updateTextColors
+import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.FAQItem
import com.simplemobiletools.smsmessenger.BuildConfig
@@ -60,12 +58,6 @@ class MainActivity : SimpleActivity() {
startActivityForResult(intent, MAKE_DEFAULT_APP_REQUEST)
}
}
-
- conversations_fab.setOnClickListener {
- Intent(this, NewMessageActivity::class.java).apply {
- startActivity(this)
- }
- }
}
override fun onResume() {
@@ -75,6 +67,8 @@ class MainActivity : SimpleActivity() {
}
updateTextColors(main_coordinator)
+ no_conversations_placeholder_2.setTextColor(getAdjustedPrimaryColor())
+ no_conversations_placeholder_2.underlineText()
}
override fun onPause() {
@@ -142,6 +136,10 @@ class MainActivity : SimpleActivity() {
ensureBackgroundThread {
val conversations = getConversations()
runOnUiThread {
+ conversations_list.beVisibleIf(conversations.isNotEmpty())
+ no_conversations_placeholder.beVisibleIf(conversations.isEmpty())
+ no_conversations_placeholder_2.beVisibleIf(conversations.isEmpty())
+
ConversationsAdapter(this, conversations, conversations_list, conversations_fastscroller) {
Intent(this, ThreadActivity::class.java).apply {
putExtra(THREAD_ID, (it as Conversation).id)
@@ -153,6 +151,21 @@ class MainActivity : SimpleActivity() {
}
}
}
+
+
+ no_conversations_placeholder_2.setOnClickListener {
+ launchNewConversation()
+ }
+
+ conversations_fab.setOnClickListener {
+ launchNewConversation()
+ }
+ }
+
+ private fun launchNewConversation() {
+ Intent(this, NewMessageActivity::class.java).apply {
+ startActivity(this)
+ }
}
private fun launchSettings() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
index 24846683..ceec0b63 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ConversationsAdapter.kt
@@ -105,6 +105,9 @@ class ConversationsAdapter(
finishActMode()
} else {
removeSelectedItems(positions)
+ if (conversations.isEmpty()) {
+ refreshMessages()
+ }
}
}
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6b3c8d12..aaa99efc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,6 +10,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
+
+