narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

OTR & another.im #23

Merged
Sergei Poljanski merged 65 commits from develop into master 2024-12-09 18:42:00 +00:00
Conversation 0 Commits 65 Files changed 245 +23 -2
6 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 4dab5156e1 - Show all commits

2
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -3610,7 +3610,7 @@ public class ConversationFragment extends XmppFragment
conversation.refreshSessions();
if (conversation != null && conversation.getMode() == Conversational.MODE_MULTI) {
if (conversation != null && conversation.getMode() == Conversational.MODE_MULTI && conversation.getNextCounterpart() == null) {
String subject = conversation.getMucOptions().getSubject();
Boolean hidden = conversation.getMucOptions().subjectHidden();

9
src/main/res/drawable/ic_subject_black.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#000000"
android:pathData="M160,760L160,680L560,680L560,760L160,760ZM160,600L160,520L800,520L800,600L160,600ZM160,440L160,360L800,360L800,440L160,440ZM160,280L160,200L800,200L800,280L160,280Z"/>
</vector>

9
src/main/res/drawable/ic_subject_white.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#ffffff"
android:pathData="M160,760L160,680L560,680L560,760L160,760ZM160,600L160,520L800,520L800,600L160,600ZM160,440L160,360L800,360L800,440L160,440ZM160,280L160,200L800,200L800,280L160,280Z"/>
</vector>

2
src/main/res/layout/fragment_conversation.xml
View file

@ -54,7 +54,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="?attr/ic_pin"
android:src="?attr/ic_subject"
android:layout_marginEnd="8dp"
/>

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

@ -40,6 +40,7 @@
<attr name="ic_send_voice_offline" format="reference" />
<attr name="ic_pin" format="reference" />
<attr name="ic_subject" format="reference" />
<attr name="ic_close" format="reference" />
<attr name="ic_attach_camera" format="reference" />
<attr name="ic_attach_videocam" format="reference" />

2
src/main/res/values/themes.xml
View file

@ -59,6 +59,7 @@
<item name="ic_attach_videocam" type="reference">@drawable/ic_attach_videocam</item>
<item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item>
<item name="ic_pin" type="reference">@drawable/ic_pin_black</item>
<item name="ic_subject" type="reference">@drawable/ic_subject_black</item>
<item name="ic_close" type="reference">@drawable/ic_close_24dp_black</item>
<item name="ic_attach_location" type="reference">@drawable/ic_attach_location</item>
<item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo</item>
@ -239,6 +240,7 @@
<item name="ic_attach_videocam" type="reference">@drawable/ic_attach_videocam_white</item>
<item name="ic_attach_document" type="reference">@drawable/ic_attach_document_white</item>
<item name="ic_pin" type="reference">@drawable/ic_pin_white</item>
<item name="ic_subject" type="reference">@drawable/ic_subject_white</item>
<item name="ic_close" type="reference">@drawable/ic_close_24dp</item>
<item name="ic_attach_location" type="reference">@drawable/ic_attach_location_white</item>
<item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo_white</item>