Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96bd39fe authored by moezbhatti's avatar moezbhatti
Browse files

#286 - Remove bubbles and enlarge emoji

parent 0be789cb

presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt

+10 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ class TextViewStyler @Inject constructor( 
        const val SIZE_TERTIARY = 2

        const val SIZE_TOOLBAR = 3

        const val SIZE_DIALOG = 4

        const val SIZE_EMOJI = 5



        fun applyEditModeAttributes(textView: TextView, attrs: AttributeSet?) {

            textView.run {
@@ -84,6 +85,7 @@ class TextViewStyler @Inject constructor( 
                    SIZE_TERTIARY -> 12f

                    SIZE_TOOLBAR -> 20f

                    SIZE_DIALOG -> 18f

                    SIZE_EMOJI -> 32f

                    else -> textSize / paint.density

                }

            }
@@ -177,6 +179,14 @@ class TextViewStyler @Inject constructor( 
                Preferences.TEXT_SIZE_LARGER -> 24f

                else -> 18f

            }



            SIZE_EMOJI -> textView.textSize = when (textSizePref) {

                Preferences.TEXT_SIZE_SMALL -> 28f

                Preferences.TEXT_SIZE_NORMAL -> 32f

                Preferences.TEXT_SIZE_LARGE -> 36f

                Preferences.TEXT_SIZE_LARGER -> 40f

                else -> 32f

            }

        }

    }

presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt

+2 −1
Original line number Diff line number Diff line
@@ -32,8 +32,9 @@ object BubbleUtils { 
        return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD

    }



    fun getBubble(canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int {

    fun getBubble(emojiOnly: Boolean, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean, isMe: Boolean): Int {

        return when {

            emojiOnly -> R.drawable.message_emoji

            !canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_first else R.drawable.message_in_first

            canGroupWithPrevious && canGroupWithNext -> if (isMe) R.drawable.message_out_middle else R.drawable.message_in_middle

            canGroupWithPrevious && !canGroupWithNext -> if (isMe) R.drawable.message_out_last else R.drawable.message_in_last

presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt

+19 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.moez.QKSMS.common.base.QkRealmAdapter 
import com.moez.QKSMS.common.base.QkViewHolder

import com.moez.QKSMS.common.util.Colors

import com.moez.QKSMS.common.util.DateFormatter

import com.moez.QKSMS.common.util.TextViewStyler

import com.moez.QKSMS.common.util.extensions.dpToPx

import com.moez.QKSMS.common.util.extensions.forwardTouches

import com.moez.QKSMS.common.util.extensions.setBackgroundTint
@@ -71,12 +72,19 @@ class MessagesAdapter @Inject constructor( 
    private val colors: Colors,

    private val dateFormatter: DateFormatter,

    private val navigator: Navigator,

    private val prefs: Preferences

    private val prefs: Preferences,

    private val textViewStyler: TextViewStyler

) : QkRealmAdapter<Message>() {



    companion object {

        private const val VIEW_TYPE_MESSAGE_IN = 0

        private const val VIEW_TYPE_MESSAGE_OUT = 1



        // Thanks to Cory Kilger for this regex

        // https://gist.github.com/cmkilger/b8f7dba3e76244a84e7e

        private val EMOJI_REGEX = Regex(

                "^[\\s\n\r]*(?:(?:[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9-\u21aa\u231a-\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u24c2\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614-\u2615\u2618\u261d\u2620\u2622-\u2623\u2626\u262a\u262e-\u262f\u2638-\u263a\u2648-\u2653\u2660\u2663\u2665-\u2666\u2668\u267b\u267f\u2692-\u2694\u2696-\u2697\u2699\u269b-\u269c\u26a0-\u26a1\u26aa-\u26ab\u26b0-\u26b1\u26bd-\u26be\u26c4-\u26c5\u26c8\u26ce-\u26cf\u26d1\u26d3-\u26d4\u26e9-\u26ea\u26f0-\u26f5\u26f7-\u26fa\u26fd\u2702\u2705\u2708-\u270d\u270f\u2712\u2714\u2716\u271d\u2721\u2728\u2733-\u2734\u2744\u2747\u274c\u274e\u2753-\u2755\u2757\u2763-\u2764\u2795-\u2797\u27a1\u27b0\u27bf\u2934-\u2935\u2b05-\u2b07\u2b1b-\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299\ud83c\udc04\ud83c\udccf\ud83c\udd70-\ud83c\udd71\ud83c\udd7e-\ud83c\udd7f\ud83c\udd8e\ud83c\udd91-\ud83c\udd9a\ud83c\ude01-\ud83c\ude02\ud83c\ude1a\ud83c\ude2f\ud83c\ude32-\ud83c\ude3a\ud83c\ude50-\ud83c\ude51\u200d\ud83c\udf00-\ud83d\uddff\ud83d\ude00-\ud83d\ude4f\ud83d\ude80-\ud83d\udeff\ud83e\udd00-\ud83e\uddff\udb40\udc20-\udb40\udc7f]|\u200d[\u2640\u2642]|[\ud83c\udde6-\ud83c\uddff]{2}|.[\u20e0\u20e3\ufe0f]+)+[\\s\n\r]*)+$")



    }



    val clicks: Subject<Message> = PublishSubject.create()
@@ -228,7 +236,7 @@ class MessagesAdapter @Inject constructor( 
        }



        // Bind the body text

        view.body.text = when (message.isSms()) {

        val messageText = when (message.isSms()) {

            true -> message.body

            false -> {

                val subject = message.getCleansedSubject()
@@ -249,8 +257,16 @@ class MessagesAdapter @Inject constructor( 
                }

            }

        }

        view.body.setVisible(message.isSms() || view.body.text.isNotBlank())

        val emojiOnly = messageText.isNotBlank() && messageText.matches(EMOJI_REGEX)

        textViewStyler.setTextSize(view.body, when (emojiOnly) {

            true -> TextViewStyler.SIZE_EMOJI

            false -> TextViewStyler.SIZE_PRIMARY

        })



        view.body.text = messageText

        view.body.setVisible(message.isSms() || messageText.isNotBlank())

        view.body.setBackgroundResource(getBubble(

                emojiOnly = emojiOnly,

                canGroupWithPrevious = canGroup(message, previous) || media.isNotEmpty(),

                canGroupWithNext = canGroup(message, next),

                isMe = message.isMe()))

presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class VCardBinder( 
        canGroupWithNext: Boolean

    ) {

        val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id)

        val bubble = BubbleUtils.getBubble(canGroupWithPrevious, canGroupWithNext, message.isMe())

        val bubble = BubbleUtils.getBubble(false, canGroupWithPrevious, canGroupWithNext, message.isMe())



        view.setOnClickListener { navigator.saveVcard(uri) }

        view.vCardBackground.setBackgroundResource(bubble)

presentation/src/main/res/drawable/message_emoji.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>

  ~

  ~ This file is part of QKSMS.

  ~

  ~ QKSMS is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ QKSMS is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">



    <solid android:color="@android:color/transparent" />

    <padding

        android:bottom="8dp"

        android:top="8dp" />



</shape>