mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

better resource wording

Browse source
This commit is contained in:
Arne 2023-10-19 15:10:12 +02:00
parent 70f4360d6f
commit 71e60af844
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -1141,10 +1141,10 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
} }
if (xmppConnectionService.getBooleanPreference("set_round_avatars", R.bool.set_round_avatars)) { if (xmppConnectionService.getBooleanPreference("set_round_avatars", R.bool.set_round_avatars)) {
AvatarWorkerTask.loadAvatar(conversation, findViewById(R.id.toolbar_avatar), R.dimen.muc_avatar_actionbar); AvatarWorkerTask.loadAvatar(conversation, findViewById(R.id.toolbar_avatar), R.dimen.muc_avatar_actionbar);
findViewById(R.id.details_muc_avatar).setVisibility(View.VISIBLE); findViewById(R.id.toolbar_avatar).setVisibility(View.VISIBLE);
} else if (!xmppConnectionService.getBooleanPreference("set_round_avatars", R.bool.set_round_avatars)) { } else if (!xmppConnectionService.getBooleanPreference("set_round_avatars", R.bool.set_round_avatars)) {
AvatarWorkerTask.loadAvatar(conversation, findViewById(R.id.toolbar_avatar_square), R.dimen.muc_avatar_actionbar); AvatarWorkerTask.loadAvatar(conversation, findViewById(R.id.toolbar_avatar_square), R.dimen.muc_avatar_actionbar);
findViewById(R.id.details_muc_avatar_square).setVisibility(View.VISIBLE); findViewById(R.id.toolbar_avatar_square).setVisibility(View.VISIBLE);
} }
ActionBarUtil.setCustomActionBarOnClickListener( ActionBarUtil.setCustomActionBarOnClickListener(
binding.toolbar, binding.toolbar,

12
src/main/res/layout/ab_title.xml
View file

@ -27,8 +27,8 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:padding="1dp" android:padding="1dp"
android:clickable="true" android:clickable="true"
android:layout_toRightOf="@+id/details_muc_avatar" android:layout_toRightOf="@+id/toolbar_avatar"
android:layout_toEndOf="@+id/details_muc_avatar" android:layout_toEndOf="@+id/toolbar_avatar"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_centerVertical="true" android:layout_centerVertical="true"
app:riv_corner_radius="5dp" app:riv_corner_radius="5dp"
@ -40,8 +40,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:layout_toRightOf="@+id/details_muc_avatar_square" android:layout_toRightOf="@+id/toolbar_avatar_square"
android:layout_toEndOf="@+id/details_muc_avatar_square" android:layout_toEndOf="@+id/toolbar_avatar_square"
android:ellipsize="end" android:ellipsize="end"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:onClick="onClick" android:onClick="onClick"
@ -55,8 +55,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@android:id/text1" android:layout_below="@android:id/text1"
android:layout_toRightOf="@+id/details_muc_avatar_square" android:layout_toRightOf="@+id/toolbar_avatar_square"
android:layout_toEndOf="@+id/details_muc_avatar_square" android:layout_toEndOf="@+id/toolbar_avatar_square"
android:clickable="true" android:clickable="true"
android:ellipsize="end" android:ellipsize="end"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"