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

Update UI of toggling shared contact photo.

Browse source
This commit is contained in:
Greyson Parrelli 2018-07-05 10:05:54 -07:00
parent 42236d6c3d
commit 84e2fcad54
7 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-hdpi/baseline_account_circle_white_24.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 477 B

BIN
res/drawable-mdpi/baseline_account_circle_white_24.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 303 B

BIN
res/drawable-xhdpi/baseline_account_circle_white_24.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 571 B

BIN
res/drawable-xxhdpi/baseline_account_circle_white_24.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 832 B

BIN
res/drawable-xxxhdpi/baseline_account_circle_white_24.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

16
res/layout/item_selectable_contact_field.xml
View file

@ -9,15 +9,6 @@
android:paddingBottom="5dp"
android:gravity="center_vertical">
<ImageView
android:id="@+id/contact_field_avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:visibility="gone"
tools:src="@drawable/ic_contact_picture" />
<ImageView
android:id="@+id/contact_field_icon"
android:layout_width="24dp"
@ -26,6 +17,13 @@
android:tint="@color/grey_600"
tools:src="@drawable/ic_call_white_24dp" />
<ImageView
android:id="@+id/contact_field_avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:visibility="gone"
tools:src="@drawable/ic_contact_picture" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"

6
src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
View file

@ -99,15 +99,13 @@ class ContactFieldAdapter extends RecyclerView.Adapter<ContactFieldAdapter.Conta
value.setMaxLines(field.maxLines);
value.setText(field.value);
label.setText(field.label);
icon.setImageResource(field.iconResId);
if (field.iconUri != null) {
avatar.setVisibility(View.VISIBLE);
icon.setVisibility(View.GONE);
glideRequests.load(field.iconUri).circleCrop().into(avatar);
} else {
icon.setVisibility(View.VISIBLE);
avatar.setVisibility(View.GONE);
icon.setImageResource(field.iconResId);
}
if (selectable) {
@ -211,7 +209,7 @@ class ContactFieldAdapter extends RecyclerView.Adapter<ContactFieldAdapter.Conta
Field(@NonNull Avatar avatar) {
this.value = "";
this.iconResId = 0;
this.iconResId = R.drawable.baseline_account_circle_white_24;
this.iconUri = avatar.getAttachment() != null ? avatar.getAttachment().getDataUri() : null;
this.maxLines = 1;
this.selectable = avatar;