TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-08 00:42:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ProfilePictureView

Browse Source
This commit is contained in:
andrew
2023-06-30 11:01:57 +09:30
parent 6d596226b3
commit 876e12c411
33 changed files with 90 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_conversation_v2_action_bar.xml
View File

@@ -8,7 +8,7 @@
android:orientation="horizontal"
android:gravity="center_vertical">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/medium_profile_picture_size"
android:layout_height="@dimen/medium_profile_picture_size" />

2
app/src/main/res/layout/activity_home.xml
View File

@@ -27,7 +27,7 @@
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profileButton"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size"

2
app/src/main/res/layout/activity_settings.xml
View File

@@ -21,7 +21,7 @@
android:orientation="vertical"
android:gravity="center_horizontal">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/large_profile_picture_size"
android:layout_height="@dimen/large_profile_picture_size"

2
app/src/main/res/layout/blocked_contact_layout.xml
View File

@@ -9,7 +9,7 @@
android:gravity="center_vertical"
android:background="?selectableItemBackground"
android:id="@+id/backgroundContainer">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_height="@dimen/small_profile_picture_size"
android:layout_width="@dimen/small_profile_picture_size"

2
app/src/main/res/layout/dialog_change_avatar.xml
View File

@@ -45,7 +45,7 @@
</FrameLayout>
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:layout_margin="30dp"
android:id="@+id/profile_picture_view"
android:layout_gravity="center"

2
app/src/main/res/layout/fragment_call_bottom_sheet.xml
View File

@@ -13,7 +13,7 @@
app:behavior_hideable="true"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/large_profile_picture_size"
android:layout_height="@dimen/large_profile_picture_size"

2
app/src/main/res/layout/fragment_user_details_bottom_sheet.xml
View File

@@ -13,7 +13,7 @@
app:behavior_hideable="true"
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/large_profile_picture_size"
android:layout_height="@dimen/large_profile_picture_size"

2
app/src/main/res/layout/reactions_bottom_sheet_dialog_fragment_recipient_item.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="52dp">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/reactions_bottom_view_avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/view_contact.xml
View File

@@ -15,7 +15,7 @@
android:paddingHorizontal="@dimen/large_spacing"
android:paddingVertical="@dimen/small_spacing">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size" />

2
app/src/main/res/layout/view_conversation.xml
View File

@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:background="?colorAccent" />
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/medium_profile_picture_size"
android:layout_height="@dimen/medium_profile_picture_size"

2
app/src/main/res/layout/view_global_search_result.xml
View File

@@ -18,7 +18,7 @@
android:id="@+id/search_result_profile_picture_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:visibility="gone"
android:id="@+id/search_result_profile_picture"
android:layout_width="@dimen/medium_profile_picture_size"

2
app/src/main/res/layout/view_mention_candidate.xml
View File

@@ -13,7 +13,7 @@
android:layout_width="26dp"
android:layout_height="32dp">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/very_small_profile_picture_size"
android:layout_height="@dimen/very_small_profile_picture_size"

2
app/src/main/res/layout/view_mention_candidate_v2.xml
View File

@@ -17,7 +17,7 @@
android:layout_width="26dp"
android:layout_height="32dp">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/very_small_profile_picture_size"
android:layout_height="@dimen/very_small_profile_picture_size"

2
app/src/main/res/layout/view_message_request.xml
View File

@@ -7,7 +7,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/medium_profile_picture_size"
android:layout_height="@dimen/medium_profile_picture_size"

8
app/src/main/res/layout/view_profile_picture.xml
View File

@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.components.ProfilePictureView
android:contentDescription="@string/AccessibilityId_profile_picture"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<RelativeLayout
android:id="@+id/doubleModeImageViewContainer"
@@ -40,4 +36,4 @@
android:layout_height="@dimen/large_profile_picture_size"
android:background="@drawable/profile_picture_view_large_background" />
</org.thoughtcrime.securesms.components.ProfilePictureView>
</merge>

2
app/src/main/res/layout/view_user.xml
View File

@@ -15,7 +15,7 @@
android:gravity="center_vertical"
android:paddingHorizontal="@dimen/medium_spacing">
<include layout="@layout/view_profile_picture"
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="@dimen/small_profile_picture_size"

3
app/src/main/res/layout/view_visible_message.xml
View File

@@ -27,9 +27,8 @@
android:gravity="bottom"
android:paddingBottom="@dimen/small_spacing">
<include
<org.thoughtcrime.securesms.components.ProfilePictureView
android:id="@+id/profilePictureView"
layout="@layout/view_profile_picture"
android:layout_marginBottom="@dimen/small_spacing"
android:layout_marginEnd="@dimen/small_spacing"
android:layout_width="@dimen/very_small_profile_picture_size"