TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-14 06:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix colors

Browse Source
This commit is contained in:
nielsandriesse
2021-06-02 13:03:22 +10:00
parent 43fbc3de55
commit dfd9bd89f9
13 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@@ -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() {

17
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt
View File

@@ -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