Fix DetailedChip colors, migrate it and Contact list item to ConstraintLayout

This commit is contained in:
Moez Bhatti
2018-08-13 01:37:50 +02:00
parent 7c15911ae5
commit a6dca03bc7
4 changed files with 135 additions and 120 deletions
@@ -25,6 +25,7 @@ import android.widget.RelativeLayout
import com.moez.QKSMS.R
import com.moez.QKSMS.common.util.Colors
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.injection.appComponent
import com.moez.QKSMS.model.Contact
import kotlinx.android.synthetic.main.contact_chip_detailed.view.*
@@ -46,13 +47,18 @@ class DetailedChipView(context: Context) : RelativeLayout(context) {
isFocusable = true
isFocusableInTouchMode = true
card.setBackgroundTint(colors.theme().theme)
colors.theme().let { theme ->
card.setBackgroundTint(theme.theme)
name.setTextColor(theme.textPrimary)
info.setTextColor(theme.textTertiary)
delete.setTint(theme.textPrimary)
}
}
fun setContact(contact: Contact) {
avatar.setContact(contact)
name.text = contact.name
info.text = contact.numbers.map { it.address }.toString()
info.text = contact.numbers.joinToString(", ") { it.address }
}
fun show() {
@@ -17,65 +17,72 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/card"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_margin="8dp"
android:background="@drawable/rounded_rectangle_2dp"
android:elevation="8dp"
android:gravity="center_vertical"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
tools:backgroundTint="@color/tools_theme">
<LinearLayout
android:id="@+id/card"
android:layout_width="match_parent"
<com.moez.QKSMS.common.widget.AvatarView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:background="@drawable/rounded_rectangle_2dp"
android:elevation="8dp"
android:gravity="center_vertical">
android:layout_marginStart="16dp"
android:ellipsize="end"
android:maxLines="1"
android:scrollHorizontally="true"
app:layout_constraintBottom_toTopOf="@id/info"
app:layout_constraintEnd_toStartOf="@id/delete"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:textSize="primary"
tools:text="Moez Bhatti"
tools:textColor="@color/textPrimaryDark" />
<com.moez.QKSMS.common.widget.AvatarView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_margin="16dp" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
android:scrollHorizontally="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/name"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/name"
app:textSize="secondary"
tools:text="(123) 456-7890"
tools:textColor="@color/textTertiaryDark" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:id="@+id/delete"
android:layout_width="56dp"
android:layout_height="56dp"
android:background="?attr/selectableItemBackground"
android:padding="16dp"
android:src="@drawable/ic_cancel_black_24dp"
app:layout_constraintEnd_toEndOf="parent"
tools:tint="@color/white" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/name"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:scrollHorizontally="true"
tools:text="Moez Bhatti" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/info"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
android:scrollHorizontally="true"
tools:text="(123) 456-7890" />
</LinearLayout>
<ImageView
android:id="@+id/delete"
android:layout_width="56dp"
android:layout_height="56dp"
android:background="?attr/selectableItemBackground"
android:padding="16dp"
android:src="@drawable/ic_cancel_black_24dp"
android:tint="@color/white" />
</LinearLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -17,78 +17,82 @@
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">
<LinearLayout
<com.moez.QKSMS.common.widget.AvatarView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/name"
style="@style/TextPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
app:layout_constraintBottom_toTopOf="@id/address"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/avatar"
app:layout_constraintVertical_chainStyle="packed"
tools:text="Moez Bhatti" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="2dp"
android:layout_weight="1"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:layout_constraintEnd_toStartOf="@id/type"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/name"
app:textColor="secondary"
app:textSize="secondary"
tools:text="(123) 456-7890"
tools:textColor="@color/textSecondary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/type"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:gravity="center_vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/address"
tools:text="Mobile"
tools:textColor="@color/textTertiary" />
<View
android:id="@+id/primary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:paddingBottom="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp">
<com.moez.QKSMS.common.widget.AvatarView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginEnd="16dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/name"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Moez Bhatti" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp">
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
app:textColor="secondary"
app:textSize="secondary"
tools:text="(123) 456-7890"
tools:textColor="@color/textSecondary" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/type"
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
tools:text="Mobile"
tools:textColor="@color/textTertiary" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
android:layout_height="56dp"
android:background="?attr/selectableItemBackground" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/addresses"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintEnd_toEndOf="@id/type"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/address"
tools:listitem="@layout/contact_number_list_item" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -28,7 +28,6 @@
android:id="@+id/address"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginStart="72dp"
android:layout_weight="1"
android:gravity="center_vertical"
app:textColor="secondary"
@@ -41,7 +40,6 @@
style="@style/TextSecondary"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginEnd="16dp"
android:gravity="center_vertical"
tools:text="Mobile"
tools:textColor="@color/textTertiary" />