mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-22 13:48:52 +01:00
Fix gravity for vCard items
This commit is contained in:
@@ -20,7 +20,9 @@ package com.moez.QKSMS.feature.compose.part
|
|||||||
|
|
||||||
import android.content.ContentUris
|
import android.content.ContentUris
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.view.Gravity
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import android.widget.FrameLayout
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.common.Navigator
|
import com.moez.QKSMS.common.Navigator
|
||||||
import com.moez.QKSMS.common.util.Colors
|
import com.moez.QKSMS.common.util.Colors
|
||||||
@@ -49,11 +51,18 @@ class VCardBinder(
|
|||||||
|
|
||||||
override fun canBindPart(part: MmsPart) = part.isVCard()
|
override fun canBindPart(part: MmsPart) = part.isVCard()
|
||||||
|
|
||||||
override fun bindPart(view: View, part: MmsPart, message: Message, canGroupWithPrevious: Boolean, canGroupWithNext: Boolean) {
|
override fun bindPart(
|
||||||
|
view: View,
|
||||||
|
part: MmsPart,
|
||||||
|
message: Message,
|
||||||
|
canGroupWithPrevious: Boolean,
|
||||||
|
canGroupWithNext: Boolean
|
||||||
|
) {
|
||||||
val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id)
|
val uri = ContentUris.withAppendedId(CursorToPartImpl.CONTENT_URI, part.id)
|
||||||
|
val bubble = BubbleUtils.getBubble(canGroupWithPrevious, canGroupWithNext, message.isMe())
|
||||||
|
|
||||||
view.setOnClickListener { navigator.saveVcard(uri) }
|
view.setOnClickListener { navigator.saveVcard(uri) }
|
||||||
view.vCardBackground.setBackgroundResource(BubbleUtils.getBubble(canGroupWithPrevious, canGroupWithNext, message.isMe()))
|
view.vCardBackground.setBackgroundResource(bubble)
|
||||||
|
|
||||||
Observable.just(uri)
|
Observable.just(uri)
|
||||||
.map(context.contentResolver::openInputStream)
|
.map(context.contentResolver::openInputStream)
|
||||||
@@ -62,12 +71,15 @@ class VCardBinder(
|
|||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
.subscribe { vcard -> view.name?.text = vcard.formattedName.value }
|
.subscribe { vcard -> view.name?.text = vcard.formattedName.value }
|
||||||
|
|
||||||
|
val params = view.vCardBackground.layoutParams as FrameLayout.LayoutParams
|
||||||
if (!message.isMe()) {
|
if (!message.isMe()) {
|
||||||
|
view.vCardBackground.layoutParams = params.apply { gravity = Gravity.START }
|
||||||
view.vCardBackground.setBackgroundTint(theme.theme)
|
view.vCardBackground.setBackgroundTint(theme.theme)
|
||||||
view.vCardAvatar.setTint(theme.textPrimary)
|
view.vCardAvatar.setTint(theme.textPrimary)
|
||||||
view.name.setTextColor(theme.textPrimary)
|
view.name.setTextColor(theme.textPrimary)
|
||||||
view.label.setTextColor(theme.textTertiary)
|
view.label.setTextColor(theme.textTertiary)
|
||||||
} else {
|
} else {
|
||||||
|
view.vCardBackground.layoutParams = params.apply { gravity = Gravity.END }
|
||||||
view.vCardBackground.setBackgroundTint(view.context.resolveThemeColor(R.attr.bubbleColor))
|
view.vCardBackground.setBackgroundTint(view.context.resolveThemeColor(R.attr.bubbleColor))
|
||||||
view.vCardAvatar.setTint(view.context.resolveThemeColor(android.R.attr.textColorSecondary))
|
view.vCardAvatar.setTint(view.context.resolveThemeColor(android.R.attr.textColorSecondary))
|
||||||
view.name.setTextColor(view.context.resolveThemeColor(android.R.attr.textColorPrimary))
|
view.name.setTextColor(view.context.resolveThemeColor(android.R.attr.textColorPrimary))
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
<!--
|
|
||||||
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||||
~
|
~
|
||||||
~ This file is part of QKSMS.
|
~ This file is part of QKSMS.
|
||||||
@@ -17,56 +16,54 @@
|
|||||||
~ You should have received a copy of the GNU General Public License
|
~ You should have received a copy of the GNU General Public License
|
||||||
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="2dp">
|
android:layout_marginTop="2dp">
|
||||||
|
|
||||||
<View
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/vCardBackground"
|
android:id="@+id/vCardBackground"
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/label"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="@id/name" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/vCardAvatar"
|
|
||||||
android:layout_width="24dp"
|
|
||||||
android:layout_height="24dp"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:src="@drawable/ic_person_black_24dp"
|
|
||||||
android:tint="?android:attr/textColorSecondary"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/vCardBackground"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="@id/vCardBackground" />
|
|
||||||
|
|
||||||
<com.moez.QKSMS.common.widget.QkTextView
|
|
||||||
android:id="@+id/name"
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content">
|
||||||
android:paddingEnd="12dp"
|
|
||||||
android:paddingStart="12dp"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
android:textColor="?android:attr/textColorPrimary"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/vCardAvatar"
|
|
||||||
app:textSize="primary"
|
|
||||||
tools:text="@tools:sample/full_names" />
|
|
||||||
|
|
||||||
<com.moez.QKSMS.common.widget.QkTextView
|
<ImageView
|
||||||
android:id="@+id/label"
|
android:id="@+id/vCardAvatar"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="24dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="24dp"
|
||||||
android:paddingBottom="8dp"
|
android:layout_marginStart="12dp"
|
||||||
android:paddingEnd="12dp"
|
android:src="@drawable/ic_person_black_24dp"
|
||||||
android:paddingStart="12dp"
|
android:tint="?android:attr/textColorSecondary"
|
||||||
android:text="@string/compose_vcard_label"
|
app:layout_constraintBottom_toBottomOf="@id/vCardBackground"
|
||||||
android:textColor="?android:attr/textColorTertiary"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="@id/name"
|
app:layout_constraintTop_toTopOf="@id/vCardBackground" />
|
||||||
app:layout_constraintTop_toBottomOf="@id/name"
|
|
||||||
app:textSize="secondary" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
<com.moez.QKSMS.common.widget.QkTextView
|
||||||
|
android:id="@+id/name"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingStart="12dp"
|
||||||
|
android:paddingTop="8dp"
|
||||||
|
android:paddingEnd="12dp"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/vCardAvatar"
|
||||||
|
app:textSize="primary"
|
||||||
|
tools:text="@tools:sample/full_names" />
|
||||||
|
|
||||||
|
<com.moez.QKSMS.common.widget.QkTextView
|
||||||
|
android:id="@+id/label"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingStart="12dp"
|
||||||
|
android:paddingEnd="12dp"
|
||||||
|
android:paddingBottom="8dp"
|
||||||
|
android:text="@string/compose_vcard_label"
|
||||||
|
android:textColor="?android:attr/textColorTertiary"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/name"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/name"
|
||||||
|
app:textSize="secondary" />
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
Reference in New Issue
Block a user