From 8c29a55f86978d23b4a04f3731fa89fcd5989565 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 4 Apr 2020 15:53:35 +0200 Subject: [PATCH] splitting ThreadActivity into some functions --- .../smsmessenger/activities/ThreadActivity.kt | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt index 5e232913..4a3444b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt @@ -25,6 +25,31 @@ class ThreadActivity : SimpleActivity() { val threadID = intent.getIntExtra(THREAD_ID, 0) val targetNumber = intent.getStringExtra(THREAD_NUMBER) + val items = getThreadItems(threadID) + + val adapter = ThreadAdapter(this, items, thread_messages_list, thread_messages_fastscroller) {} + thread_messages_list.adapter = adapter + setupButtons() + } + + private fun setupButtons() { + thread_type_message.setColors(config.textColor, config.primaryColor, config.backgroundColor) + thread_send_message.applyColorFilter(config.textColor) + + thread_send_message.setOnClickListener { + val msg = thread_type_message.value + if (msg.isEmpty()) { + return@setOnClickListener + } + } + + thread_send_message.isClickable = false + thread_type_message.onTextChangeListener { + thread_send_message.isClickable = it.isNotEmpty() + } + } + + private fun getThreadItems(threadID: Int): ArrayList { val messages = getMessages(threadID) messages.sortBy { it.id } @@ -39,21 +64,6 @@ class ThreadActivity : SimpleActivity() { items.add(it) } - val adapter = ThreadAdapter(this, items, thread_messages_list, thread_messages_fastscroller) {} - thread_messages_list.adapter = adapter - - thread_type_message.setColors(config.textColor, config.primaryColor, config.backgroundColor) - thread_send_message.applyColorFilter(config.textColor) - - thread_type_message.onTextChangeListener { - thread_send_message.isClickable = it.isNotEmpty() - } - - thread_send_message.setOnClickListener { - val msg = thread_type_message.value - if (msg.isEmpty()) { - return@setOnClickListener - } - } + return items } }