From 8d9a54e8eae2346aaa953c4522a428d9b7088e55 Mon Sep 17 00:00:00 2001 From: Vignesh Kumar Date: Tue, 13 Oct 2020 22:00:06 +0530 Subject: [PATCH] Change characters left color to red when negative (#1952) * Change characters left color to red when negative * Use val for the integers, optimize variable assignment * Added tusky_red color * remove extra line typo * make characters left bold * change red hue * fix typo --- .../tusky/components/compose/ComposeActivity.kt | 10 +++++++++- app/src/main/res/layout/activity_compose.xml | 1 + app/src/main/res/values/colors.xml | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index c1d42868..ec3ba841 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -929,7 +929,15 @@ class ComposeActivity : BaseActivity(), } private fun updateVisibleCharactersLeft() { - composeCharactersLeftView.text = String.format(Locale.getDefault(), "%d", maximumTootCharacters - calculateTextLength()) + val remainingLength = maximumTootCharacters - calculateTextLength(); + composeCharactersLeftView.text = String.format(Locale.getDefault(), "%d", remainingLength) + + val textColor = if (remainingLength < 0) { + ContextCompat.getColor(this, R.color.tusky_red) + } else { + ThemeUtils.getColor(this, android.R.attr.textColorTertiary) + } + composeCharactersLeftView.setTextColor(textColor) } private fun onContentWarningChanged() { diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml index 97559db7..78389bac 100644 --- a/app/src/main/res/layout/activity_compose.xml +++ b/app/src/main/res/layout/activity_compose.xml @@ -451,6 +451,7 @@ android:textSize="?attr/status_text_medium" android:layout_toLeftOf="@+id/composePreviewButton" android:layout_centerVertical="true" + android:textStyle="bold" tools:text="500" /> #fab207 #19a341 #25d069 + #DF1553 #f00 #fff