diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index 0a5634e8..d0a9aed2 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt @@ -219,6 +219,9 @@ class ComposeActivity : QkThemedActivity(), ComposeView { if (title != state.title) title = state.title + counter.text = state.remaining + counter.setVisible(counter.text.isNotBlank()) + send.isEnabled = state.canSend sendIcon.isEnabled = state.canSend } diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeState.kt b/qksms/src/main/java/presentation/feature/compose/ComposeState.kt index 7ab52234..ebb254c0 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeState.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeState.kt @@ -34,5 +34,6 @@ data class ComposeState( val archived: Boolean = false, val messages: Pair>? = null, val attachments: List = ArrayList(), + val remaining: String = "", val canSend: Boolean = false ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index cee4f02d..bce9fff7 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -22,6 +22,7 @@ import android.content.Context import android.content.Intent import android.net.Uri import android.telephony.PhoneNumberUtils +import android.telephony.SmsMessage import android.view.KeyEvent import android.view.inputmethod.EditorInfo import com.mlsdev.rximagepicker.RxImagePicker @@ -339,6 +340,24 @@ class ComposeViewModel(intent: Intent) : QkViewModel( .autoDisposable(view.scope()) .subscribe { canSend -> newState { it.copy(canSend = canSend) } } + // Show the remaining character counter when necessary + view.textChangedIntent + .observeOn(Schedulers.computation()) + .map { draft -> SmsMessage.calculateLength(draft, false) } + .map { array -> + val messages = array[0] + val remaining = array[2] + + when { + messages <= 1 && remaining > 10 -> "" + messages <= 1 && remaining <= 10 -> "$remaining" + else -> "$remaining / $messages" + } + } + .distinctUntilChanged() + .autoDisposable(view.scope()) + .subscribe { remaining -> newState { it.copy(remaining = remaining) } } + // Update the draft whenever the text is changed view.textChangedIntent .debounce(100, TimeUnit.MILLISECONDS) diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index edb2007f..b53264bd 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -66,7 +66,8 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:background="@drawable/compose_bar_background" - android:gravity="center_vertical"> + android:gravity="bottom" + tools:backgroundTint="@color/backgroundLight"> - + android:orientation="vertical"> - + - + + + + + + +