empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix see more icon tint and fix recipient bottom sheet scroll.

Browse source
This commit is contained in:
Alex Hart 2021-06-25 11:09:49 -03:00
parent f7212b9916
commit 7797351341
4 changed files with 200 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/preferences/BioTextPreference.kt
View file

@ -5,6 +5,7 @@ import android.view.View
import android.widget.TextView import android.widget.TextView
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.settings.PreferenceModel import org.thoughtcrime.securesms.components.settings.PreferenceModel
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.MappingAdapter import org.thoughtcrime.securesms.util.MappingAdapter
import org.thoughtcrime.securesms.util.MappingViewHolder import org.thoughtcrime.securesms.util.MappingViewHolder
@ -33,7 +34,7 @@ object BioTextPreference {
override fun getSubhead1Text(): String? = recipient.combinedAboutAndEmoji override fun getSubhead1Text(): String? = recipient.combinedAboutAndEmoji
override fun getSubhead2Text(): String? = recipient.e164.orNull() override fun getSubhead2Text(): String? = recipient.e164.transform(PhoneNumberFormatter::prettyPrint).orNull()
override fun areContentsTheSame(newItem: RecipientModel): Boolean { override fun areContentsTheSame(newItem: RecipientModel): Boolean {
return super.areContentsTheSame(newItem) && newItem.recipient.hasSameContent(recipient) return super.areContentsTheSame(newItem) && newItem.recipient.hasSameContent(recipient)

9
app/src/main/res/drawable/ic_chevron_down_icon_20.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@color/signal_icon_tint_primary"
android:pathData="M10,15.5l-8,-7.979l1.059,-1.062l6.941,6.923l6.941,-6.923l1.059,1.062l-8,7.979z"/>
</vector>

2
app/src/main/res/drawable/show_more.xml
View file

@ -6,5 +6,5 @@
<padding android:right="8dp" android:bottom="8dp" android:left="8dp" android:top="8dp" /> <padding android:right="8dp" android:bottom="8dp" android:left="8dp" android:top="8dp" />
</shape> </shape>
</item> </item>
<item android:drawable="@drawable/ic_chevron_down_20" /> <item android:drawable="@drawable/ic_chevron_down_icon_20" />
</layer-list> </layer-list>

371
app/src/main/res/layout/recipient_bottom_sheet.xml
View file

@ -1,206 +1,211 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView 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="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content">
tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light">
<org.thoughtcrime.securesms.components.AvatarImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rbs_recipient_avatar"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
android:id="@+id/rbs_admin_action_busy"
android:layout_width="0dp"
android:layout_height="0dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/rbs_recipient_avatar"
app:layout_constraintEnd_toEndOf="@+id/rbs_recipient_avatar"
app:layout_constraintStart_toStartOf="@+id/rbs_recipient_avatar"
app:layout_constraintTop_toTopOf="@+id/rbs_recipient_avatar"
tools:visibility="visible" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/rbs_full_name"
style="@style/Signal.Text.Headline.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="12dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:textColor="@color/signal_text_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rbs_recipient_avatar"
tools:text="Gwen Stacy" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/rbs_about"
style="@style/Signal.Text.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dsl_settings_gutter" tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light">
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:gravity="center"
android:textColor="@color/signal_text_secondary"
app:emoji_forceCustom="true"
app:layout_constraintTop_toBottomOf="@id/rbs_full_name"
tools:text="🕷🕷🕷Hangin' on the web🕷🕷" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/rbs_username_number" android:id="@+id/rbs_recipient_avatar"
style="@style/Signal.Text.Body" android:layout_width="80dp"
android:layout_width="wrap_content" android:layout_height="80dp"
android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/dsl_settings_gutter" android:layout_marginTop="24dp"
android:layout_marginTop="4dp" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dsl_settings_gutter" app:layout_constraintHorizontal_bias="0.5"
android:textColor="@color/signal_text_secondary" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rbs_about"
app:layout_goneMarginTop="8dp"
tools:text="\@spidergwen +1 555-654-6657" />
<TextView <ProgressBar
android:id="@+id/rbs_note_to_self_description" android:id="@+id/rbs_admin_action_busy"
style="@style/TextAppearance.Signal.Body2" android:layout_width="0dp"
android:layout_width="0dp" android:layout_height="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:text="@string/ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation"
android:textAlignment="center"
android:textColor="@color/signal_text_primary"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rbs_username_number"
tools:visibility="visible" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rbs_note_to_self_description">
<include layout="@layout/conversation_settings_button_strip" />
<include layout="@layout/dsl_divider_item" />
<Button
android:id="@+id/rbs_block_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_block"
android:visibility="gone" android:visibility="gone"
app:drawableStartCompat="@drawable/ic_block_tinted_24" app:layout_constraintBottom_toBottomOf="@+id/rbs_recipient_avatar"
app:layout_constraintEnd_toEndOf="@+id/rbs_recipient_avatar"
app:layout_constraintStart_toStartOf="@+id/rbs_recipient_avatar"
app:layout_constraintTop_toTopOf="@+id/rbs_recipient_avatar"
tools:visibility="visible" /> tools:visibility="visible" />
<Button <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/rbs_unblock_button" android:id="@+id/rbs_full_name"
style="@style/Widget.Signal.Button.TextButton.Drawable" style="@style/Signal.Text.Headline.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="12dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:textColor="@color/signal_text_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rbs_recipient_avatar"
tools:text="Gwen Stacy" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/rbs_about"
style="@style/Signal.Text.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="wrap_content"
android:paddingStart="20dp" android:layout_marginStart="@dimen/dsl_settings_gutter"
android:paddingEnd="20dp" android:layout_marginTop="8dp"
android:text="@string/RecipientBottomSheet_unblock" android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:gravity="center"
android:textColor="@color/signal_text_secondary"
app:emoji_forceCustom="true"
app:layout_constraintTop_toBottomOf="@id/rbs_full_name"
tools:text="🕷🕷🕷Hangin' on the web🕷🕷" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/rbs_username_number"
style="@style/Signal.Text.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="4dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:textColor="@color/signal_text_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rbs_about"
app:layout_goneMarginTop="8dp"
tools:text="\@spidergwen +1 555-654-6657" />
<TextView
android:id="@+id/rbs_note_to_self_description"
style="@style/TextAppearance.Signal.Body2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dsl_settings_gutter"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/dsl_settings_gutter"
android:text="@string/ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation"
android:textAlignment="center"
android:textColor="@color/signal_text_primary"
android:visibility="gone" android:visibility="gone"
app:drawableStartCompat="@drawable/ic_block_tinted_24" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rbs_username_number"
tools:visibility="visible" /> tools:visibility="visible" />
<Button <LinearLayout
android:id="@+id/rbs_remove_from_group_button" android:layout_width="0dp"
style="@style/Widget.Signal.Button.TextButton.Drawable" android:layout_height="wrap_content"
android:layout_width="match_parent" android:orientation="vertical"
android:layout_height="56dp" android:paddingBottom="16dp"
android:paddingStart="20dp" app:layout_constraintEnd_toEndOf="parent"
android:paddingEnd="20dp" app:layout_constraintStart_toStartOf="parent"
android:text="@string/RecipientBottomSheet_remove_from_group" app:layout_constraintTop_toBottomOf="@+id/rbs_note_to_self_description">
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_leave_tinted_24"
tools:visibility="visible" />
<Button <include layout="@layout/conversation_settings_button_strip" />
android:id="@+id/rbs_make_group_admin_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_make_admin"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_group_24"
tools:visibility="visible" />
<Button <include layout="@layout/dsl_divider_item" />
android:id="@+id/rbs_remove_group_admin_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_remove_as_admin"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_group_24"
tools:visibility="visible" />
<Button <Button
android:id="@+id/rbs_add_to_group_button" android:id="@+id/rbs_block_button"
style="@style/Widget.Signal.Button.TextButton.Drawable" style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:visibility="gone" android:text="@string/RecipientBottomSheet_block"
app:drawableStartCompat="@drawable/ic_group_24" android:visibility="gone"
tools:text="@string/RecipientBottomSheet_add_to_a_group" app:drawableStartCompat="@drawable/ic_block_tinted_24"
tools:visibility="visible" /> tools:visibility="visible" />
<Button <Button
android:id="@+id/rbs_add_contact_button" android:id="@+id/rbs_unblock_button"
style="@style/Widget.Signal.Button.TextButton.Drawable" style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_add_to_contacts" android:text="@string/RecipientBottomSheet_unblock"
android:visibility="gone" android:visibility="gone"
app:drawableStartCompat="@drawable/ic_plus_24" app:drawableStartCompat="@drawable/ic_block_tinted_24"
tools:visibility="visible" /> tools:visibility="visible" />
<Button <Button
android:id="@+id/rbs_view_safety_number_button" android:id="@+id/rbs_remove_from_group_button"
style="@style/Widget.Signal.Button.TextButton.Drawable" style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:paddingStart="20dp" android:paddingStart="20dp"
android:paddingEnd="20dp" android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_view_safety_number" android:text="@string/RecipientBottomSheet_remove_from_group"
android:visibility="gone" android:visibility="gone"
app:drawableStartCompat="@drawable/ic_safety_number_24" app:drawableStartCompat="@drawable/ic_leave_tinted_24"
app:drawableTint="@color/signal_icon_tint_primary" tools:visibility="visible" />
tools:visibility="visible" />
</LinearLayout> <Button
android:id="@+id/rbs_make_group_admin_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_make_admin"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_group_24"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> <Button
android:id="@+id/rbs_remove_group_admin_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_remove_as_admin"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_group_24"
tools:visibility="visible" />
<Button
android:id="@+id/rbs_add_to_group_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_group_24"
tools:text="@string/RecipientBottomSheet_add_to_a_group"
tools:visibility="visible" />
<Button
android:id="@+id/rbs_add_contact_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_add_to_contacts"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_plus_24"
tools:visibility="visible" />
<Button
android:id="@+id/rbs_view_safety_number_button"
style="@style/Widget.Signal.Button.TextButton.Drawable"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/RecipientBottomSheet_view_safety_number"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_safety_number_24"
app:drawableTint="@color/signal_icon_tint_primary"
tools:visibility="visible" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>