Skip to content

Commit

Permalink
Rewrite ContactSelectionListItem to utilize ConstraintLayout.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-signal
alex-signal committed Aug 5, 2021
1 parent b9c6c6b commit f25e8d6
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 79 deletions.
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;

import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
Expand All @@ -25,7 +26,7 @@
import org.thoughtcrime.securesms.util.ViewUtil;
import org.whispersystems.libsignal.util.guava.Optional;

public class ContactSelectionListItem extends LinearLayout implements RecipientForeverObserver {
public class ContactSelectionListItem extends ConstraintLayout implements RecipientForeverObserver {

@SuppressWarnings("unused")
private static final String TAG = Log.tag(ContactSelectionListItem.class);
Expand Down
150 changes: 72 additions & 78 deletions app/src/main/res/layout/contact_selection_list_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,102 +6,96 @@
android:layout_height="wrap_content"
android:background="@drawable/conversation_item_background"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="@dimen/contact_selection_item_height"
android:orientation="horizontal"
android:paddingStart="@dimen/dsl_settings_gutter"
android:paddingEnd="@dimen/dsl_settings_gutter">

<FrameLayout
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginTop="2dp">
<org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/contact_photo_image"
android:layout_width="40dp"
android:layout_height="40dp"
android:contentDescription="@string/SingleContactSelectionActivity_contact_photo"
android:cropToPadding="true"
android:foreground="@drawable/contact_photo_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UnusedAttribute"
tools:src="@color/blue_600" />

<org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/contact_photo_image"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:contentDescription="@string/SingleContactSelectionActivity_contact_photo"
android:cropToPadding="true"
android:foreground="@drawable/contact_photo_background"
tools:ignore="UnusedAttribute"
tools:src="@color/blue_600" />
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/check_box"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:alpha="0"
android:background="@drawable/contact_selection_checkbox"
android:button="@null"
android:clickable="false"
android:focusable="false"
app:layout_constraintStart_toStartOf="@id/contact_photo_image"
app:layout_constraintTop_toTopOf="@id/contact_photo_image" />

<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/check_box"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_gravity="bottom|end"
android:background="@drawable/contact_selection_checkbox"
android:button="@null"
android:alpha="0"
android:clickable="false"
android:focusable="false" />

</FrameLayout>

<LinearLayout
<org.thoughtcrime.securesms.components.FromTextView
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:orientation="vertical">

<org.thoughtcrime.securesms.components.FromTextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Signal.Body1"
android:textColor="@color/signal_text_primary"
tools:text="@sample/contacts.json/data/name" />

<LinearLayout
android:id="@+id/number_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Signal.Body1"
android:textColor="@color/signal_text_primary"
app:layout_constraintBottom_toTopOf="@id/number"
app:layout_constraintEnd_toStartOf="@id/sms_tag"
app:layout_constraintStart_toEndOf="@id/contact_photo_image"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="@sample/contacts.json/data/name" />

<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
android:textDirection="ltr"
app:emoji_forceCustom="true"
tools:text="@sample/contacts.json/data/number" />

<TextView
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingStart="4dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
tools:ignore="RtlSymmetry"
tools:text="· Mobile" />

</LinearLayout>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
android:textDirection="ltr"
app:emoji_forceCustom="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/contact_photo_image"
app:layout_constraintTop_toBottomOf="@id/name"
tools:text="@sample/contacts.json/data/number" />

</LinearLayout>
<TextView
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingStart="4dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
app:layout_constraintStart_toEndOf="@id/number"
app:layout_constraintTop_toTopOf="@id/number"
tools:ignore="RtlSymmetry"
tools:text="· Mobile" />

<TextView
android:id="@+id/sms_tag"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/ContactSelectionListItem__sms"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
android:visibility="gone" />
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />

</org.thoughtcrime.securesms.contacts.ContactSelectionListItem>

0 comments on commit f25e8d6

Please sign in to comment.