From dfd9bd89f9b510938b30a91f8eaefc44f05a5645 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 2 Jun 2021 13:03:22 +1000 Subject: [PATCH] Fix colors --- .../conversation/v2/ConversationActivityV2.kt | 4 +++- .../v2/messages/VisibleMessageContentView.kt | 17 +++++++++++++---- .../res/layout/activity_create_closed_group.xml | 4 ++-- app/src/main/res/values-notnight-v21/colors.xml | 5 ----- app/src/main/res/values-notnight-v21/themes.xml | 2 +- app/src/main/res/values/colors.xml | 6 ------ app/src/main/res/values/conversation_colors.xml | 2 -- app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/material_colors.xml | 1 - app/src/main/res/values/themes.xml | 16 ++++------------ libsession/src/main/res/values/colors.xml | 6 ------ libsession/src/main/res/values/dimens.xml | 2 +- .../src/main/res/values/material_colors.xml | 1 - 13 files changed, 25 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 5633627037..1e9bc2e781 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -38,7 +38,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() { val adapter = ConversationAdapter(this, cursor) adapter.setHasStableIds(true) conversationRecyclerView.adapter = adapter - conversationRecyclerView.layoutManager = LinearLayoutManager(this) + val layoutManager = LinearLayoutManager(this) + layoutManager.reverseLayout = true + conversationRecyclerView.layoutManager = layoutManager } private fun setUpToolbar() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt index 6dcb0c97e5..73b96b13d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt @@ -16,6 +16,9 @@ import network.loki.messenger.R import org.session.libsession.utilities.ThemeUtil import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MmsMessageRecord +import org.thoughtcrime.securesms.loki.utilities.UiMode +import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities +import org.thoughtcrime.securesms.loki.utilities.getColorWithID import java.lang.IllegalStateException class VisibleMessageContentView : LinearLayout { @@ -64,19 +67,25 @@ class VisibleMessageContentView : LinearLayout { } else if (message is MmsMessageRecord && message.slideDeck.asAttachments().isNotEmpty()) { throw IllegalStateException("Not yet implemented; we may want to use Signal's album view here.") } else { - val bodyTextView = getBodyTextView(message.body) + val bodyTextView = getBodyTextView(message) mainContainer.addView(bodyTextView) } } // endregion // region Convenience - private fun getBodyTextView(body: String): TextView { + private fun getBodyTextView(message: MessageRecord): TextView { val result = TextView(context) result.setPadding(resources.getDimension(R.dimen.small_spacing).toInt()) - result.text = body + result.text = message.body result.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.medium_font_size)) - // TODO: Further styling + val uiMode = UiModeUtilities.getUserSelectedUiMode(context) + val colorID = if (message.isOutgoing) { + if (uiMode == UiMode.NIGHT) R.color.black else R.color.white + } else { + if (uiMode == UiMode.NIGHT) R.color.white else R.color.black + } + result.setTextColor(resources.getColorWithID(colorID, context.theme)) return result } // endregion diff --git a/app/src/main/res/layout/activity_create_closed_group.xml b/app/src/main/res/layout/activity_create_closed_group.xml index fb875e77a9..09bfd38b34 100644 --- a/app/src/main/res/layout/activity_create_closed_group.xml +++ b/app/src/main/res/layout/activity_create_closed_group.xml @@ -16,10 +16,10 @@ android:orientation="vertical"> - - #00E97B #8000E97B #000000 @@ -22,14 +20,11 @@ #FCFCFC #0D000000 - #ffffff #fcfcfd #fcfcfd - #333132 #0A000000 #8000E97B - \ No newline at end of file diff --git a/app/src/main/res/values-notnight-v21/themes.xml b/app/src/main/res/values-notnight-v21/themes.xml index 274f2dbbd8..a8540be632 100644 --- a/app/src/main/res/values-notnight-v21/themes.xml +++ b/app/src/main/res/values-notnight-v21/themes.xml @@ -9,7 +9,7 @@ #FFFFFFFF #F5F5F5 - ?colorAccent + #00E076 @android:color/black diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c22e705630..f619f42c42 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,5 @@ - - #00F782 #8000F782 #FFFFFF @@ -35,11 +33,8 @@ #f3c615 #fcac5a - - #0a0a0a - @color/accent @color/accent @@ -85,5 +80,4 @@ #121212 #171717 - diff --git a/app/src/main/res/values/conversation_colors.xml b/app/src/main/res/values/conversation_colors.xml index 157f8dde45..8fbbab4cec 100644 --- a/app/src/main/res/values/conversation_colors.xml +++ b/app/src/main/res/values/conversation_colors.xml @@ -1,6 +1,4 @@ - #336ba3 - \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d77fbf56aa..3d44675888 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -72,7 +72,7 @@ 104dp 69dp - 10dp + 18dp 4dp 2dp 1.5dp diff --git a/app/src/main/res/values/material_colors.xml b/app/src/main/res/values/material_colors.xml index 8f9fbbac36..660f6c1718 100644 --- a/app/src/main/res/values/material_colors.xml +++ b/app/src/main/res/values/material_colors.xml @@ -29,5 +29,4 @@ #212121 #44BDBDBD - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ca86db3153..202f171816 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,10 +1,7 @@ - - - + - - - - -