thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests Wiki Activity Actions

Revert "Apply option to show less avatars"

Browse source 
This reverts commit 5c35f0cb
This commit is contained in:
Arne 2024-11-29 20:32:41 +01:00
parent c3b3148a3f
commit e31d9770a7
5 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -1173,9 +1173,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.message_box_inner = view.findViewById(R.id.message_box_inner);
viewHolder.message_box = view.findViewById(R.id.message_box);
viewHolder.contact_picture = view.findViewById(R.id.message_photo);
if (activity.xmppConnectionService != null && !activity.xmppConnectionService.getBooleanPreference("show_less_avatars", R.bool.show_less_avatars)) {
viewHolder.contact_picture.setVisibility(View.VISIBLE);
}
viewHolder.download_button = view.findViewById(R.id.download_button);
viewHolder.indicator = view.findViewById(R.id.security_indicator);
viewHolder.edit_indicator = view.findViewById(R.id.edit_indicator);
@ -1203,9 +1200,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.message_box_inner = view.findViewById(R.id.message_box_inner);
viewHolder.message_box = view.findViewById(R.id.message_box);
viewHolder.contact_picture = view.findViewById(R.id.message_photo);
if (message.getConversation().getMode() == Conversation.MODE_SINGLE && activity.xmppConnectionService.getBooleanPreference("show_less_avatars", R.bool.show_less_avatars)) {
viewHolder.contact_picture.setVisibility(View.GONE);
}
viewHolder.download_button = view.findViewById(R.id.download_button);
viewHolder.indicator = view.findViewById(R.id.security_indicator);
viewHolder.edit_indicator = view.findViewById(R.id.edit_indicator);
@ -1390,7 +1384,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
} else if (message.getCounterpart() != null
|| message.getTrueCounterpart() != null
|| (message.getCounterparts() != null
&& !message.getCounterparts().isEmpty())) {
&& message.getCounterparts().size() > 0)) {
showAvatar = true;
AvatarWorkerTask.loadAvatar(
message, viewHolder.contact_picture, R.dimen.avatar_on_status_message);

3
src/main/res/layout/item_message_received.xml
View file

@ -33,8 +33,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/message_box"
android:layout_marginEnd="0dp"
android:scaleType="centerCrop"
android:visibility="visible" />
android:scaleType="centerCrop" />
<!-- TODO port app:layout_constraintWidth_max="@dimen/message_bubble_max_width" from c3 -->

3
src/main/res/layout/item_message_sent.xml
View file

@ -40,8 +40,7 @@
android:id="@+id/message_photo"
android:layout_width="48dp"
android:layout_height="48dp"
android:scaleType="centerCrop"
android:visibility="gone" />
android:scaleType="centerCrop" />
</LinearLayout>
<LinearLayout

1
src/main/res/values/bools.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="show_avatar_incoming_call">true</bool>
<bool name="show_less_avatars">true</bool>
<bool name="show_thread_feature">false</bool>
<bool name="show_maps_inside">true</bool>
<bool name="show_own_accounts">false</bool>

6
src/main/res/xml/preferences_interface.xml
View file

@ -97,12 +97,6 @@
android:key="unicolored_chatbg"
android:summary="@string/pref_use_unicolored_chatbg_summary"
android:title="@string/pref_use_unicolored_chatbg" />
<SwitchPreferenceCompat
android:defaultValue="@bool/show_less_avatars"
android:icon="@drawable/ic_person_24dp"
android:key="show_less_avatars"
android:summary="@string/pref_show_less_avatars_summary"
android:title="@string/pref_show_less_avatars" />
<SwitchPreferenceCompat
android:defaultValue="@bool/show_own_accounts"
android:icon="@drawable/ic_person_24dp"