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>

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

@ -1,9 +1,13 @@
<?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">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light"> tools:theme="@style/Theme.Signal.RoundedBottomSheet.Light">
<org.thoughtcrime.securesms.components.AvatarImageView <org.thoughtcrime.securesms.components.AvatarImageView
@ -203,4 +207,5 @@
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>