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

Commit 7ab6af2a authored by Dayona Joseph's avatar Dayona Joseph
Browse files

UI update

parent de837dc6
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,6 @@
        android:viewportWidth="24.0"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
        android:viewportHeight="24.0">
    <path
    <path
        android:fillColor="#FF000000"
        android:fillColor="#FF0087EC"
        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
</vector>
</vector>
+1 −1
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ class Preferences @Inject constructor(context: Context, private val rxPrefs: RxS
    }
    }


    fun theme(threadId: Long = 0): Preference<Int> {
    fun theme(threadId: Long = 0): Preference<Int> {
        val default = rxPrefs.getInteger("theme", 0xFF0097A7.toInt())
        val default = rxPrefs.getInteger("theme", 0xFF0087EC.toInt())


        return when (threadId) {
        return when (threadId) {
            0L -> default
            0L -> default
+1 −1
Original line number Original line Diff line number Diff line
@@ -226,7 +226,7 @@ class NotificationManagerImpl @Inject constructor(
                        Preferences.NOTIFICATION_ACTION_READ -> {
                        Preferences.NOTIFICATION_ACTION_READ -> {
                            val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
                            val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
                            val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, intent, PendingIntent.FLAG_UPDATE_CURRENT)
                            val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, intent, PendingIntent.FLAG_UPDATE_CURRENT)
                            NotificationCompat.Action.Builder(R.drawable.ic_check_white_24dp, actionLabels[action], pi)
                            NotificationCompat.Action.Builder(R.drawable.ic_check_blue_24dp, actionLabels[action], pi)
                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build()
                                    .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ).build()
                        }
                        }


+0 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ class PreferenceView @JvmOverloads constructor(
        orientation = HORIZONTAL
        orientation = HORIZONTAL
        gravity = Gravity.CENTER_VERTICAL
        gravity = Gravity.CENTER_VERTICAL


        icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary)


        context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run {
        context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run {
            title = getString(R.styleable.PreferenceView_title)
            title = getString(R.styleable.PreferenceView_title)
+1 −1
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ class ConversationItemTouchCallback @Inject constructor(
            Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_black_24dp
            Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_black_24dp
            Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
            Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
            Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
            Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
            Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp
            Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_blue_24dp
            Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
            Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
            else -> null
            else -> null
        }
        }
Loading