fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renaming some stuff

This commit is contained in:
tibbi 2022-10-14 23:47:52 +02:00
parent f240f4f695
commit 7f24e4d2a8
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@ -55,7 +55,7 @@ import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.adapters.AutoCompleteTextViewAdapter
import com.simplemobiletools.smsmessenger.adapters.ThreadAdapter
import com.simplemobiletools.smsmessenger.dialogs.ScheduleSendDialog
import com.simplemobiletools.smsmessenger.dialogs.ScheduleMessageDialog
import com.simplemobiletools.smsmessenger.extensions.*
import com.simplemobiletools.smsmessenger.helpers.*
import com.simplemobiletools.smsmessenger.models.*
@ -1260,7 +1260,7 @@ class ThreadActivity : SimpleActivity() {
thread_type_message.setText(message.body)
extractAttachments(message)
scheduledDateTime = DateTime(message.millis())
showScheduleSendUi()
showScheduleMessageDialog()
}
private fun cancelScheduledMessageAndRefresh(messageId: Long) {
@ -1271,11 +1271,12 @@ class ThreadActivity : SimpleActivity() {
}
}
private fun launchScheduleSendDialog(originalDt: DateTime? = null) {
ScheduleSendDialog(this, originalDt) { newDt ->
if (newDt != null) {
scheduledDateTime = newDt
showScheduleSendUi()
private fun launchScheduleSendDialog(originalDateTime: DateTime? = null) {
ScheduleMessageDialog(this, originalDateTime) { newDateTime ->
mydebug("new $newDateTime")
if (newDateTime != null) {
scheduledDateTime = newDateTime
showScheduleMessageDialog()
}
}
}
@ -1304,14 +1305,14 @@ class ThreadActivity : SimpleActivity() {
}
}
private fun showScheduleSendUi() {
private fun showScheduleMessageDialog() {
isScheduledMessage = true
updateSendButtonDrawable()
scheduled_message_holder.beVisible()
val dt = scheduledDateTime
val millis = dt.millis
scheduled_message_button.text = if (dt.yearOfCentury().get() > DateTime.now().yearOfCentury().get()) {
val dateTime = scheduledDateTime
val millis = dateTime.millis
scheduled_message_button.text = if (dateTime.yearOfCentury().get() > DateTime.now().yearOfCentury().get()) {
millis.formatDate(this)
} else {
val flags = FORMAT_SHOW_TIME or FORMAT_SHOW_DATE or FORMAT_NO_YEAR

2
app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ScheduleSendDialog.kt → app/src/main/kotlin/com/simplemobiletools/smsmessenger/dialogs/ScheduleMessageDialog.kt
View File

@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.schedule_message_dialog.view.*
import org.joda.time.DateTime
import java.util.*
class ScheduleSendDialog(
class ScheduleMessageDialog(
private val activity: BaseSimpleActivity,
private var dateTime: DateTime? = null,
private val callback: (dateTime: DateTime?) -> Unit