mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix block box hiding conversation search navigation. 

Fixes #12329
fork-5.53.8
Cody Henthorne 2022-07-08 14:49:28 -04:00 zatwierdzone przez Alex Hart
rodzic 65965e8ac5
commit e80df64698
2 zmienionych plików z 36 dodań i 29 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
Wyświetl plik

@ -416,7 +416,6 @@ public class ConversationParentFragment extends Fragment
protected HidingLinearLayout quickAttachmentToggle;
protected HidingLinearLayout inlineAttachmentToggle;
private InputPanel inputPanel;
private View panelParent;
private View noLongerMemberBanner;
private Stub<TextView> cannotSendInAnnouncementGroupBanner;
private View requestingMemberBanner;
@ -2135,7 +2134,6 @@ public class ConversationParentFragment extends Fragment
quickAttachmentToggle = view.findViewById(R.id.quick_attachment_toggle);
inlineAttachmentToggle = view.findViewById(R.id.inline_attachment_container);
inputPanel = view.findViewById(R.id.bottom_panel);
panelParent = view.findViewById(R.id.conversation_activity_panel_parent);
searchNav = view.findViewById(R.id.conversation_search_nav);
messageRequestBottomView = view.findViewById(R.id.conversation_activity_message_request_bottom_bar);
mentionsSuggestions = ViewUtil.findStubById(view, R.id.conversation_mention_suggestions_stub);

63
app/src/main/res/layout/conversation_activity.xml
Wyświetl plik

@ -68,45 +68,54 @@
android:inflatedId="@+id/attachment_editor"
android:layout="@layout/conversation_activity_attachment_editor_stub" />
<FrameLayout
<LinearLayout
android:id="@+id/conversation_activity_panel_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:clipChildren="false"
android:clipToPadding="false">
<include
layout="@layout/conversation_no_longer_a_member"
android:visibility="gone" />
<include
layout="@layout/conversation_requesting_bottom_banner"
android:visibility="gone" />
<include layout="@layout/conversation_input_panel" />
<ViewStub
android:id="@+id/conversation_cannot_send_announcement_stub"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout="@layout/conversation_cannot_send_announcement_group" />
<include layout="@layout/conversation_search_nav" />
<org.thoughtcrime.securesms.messagerequests.MessageRequestsBottomView
android:id="@+id/conversation_activity_message_request_bottom_bar"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:visibility="gone" />
android:clipChildren="false"
android:clipToPadding="false">
<ViewStub
android:id="@+id/conversation_release_notes_unmute_stub"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout="@layout/conversation_activity_unmute" />
<include
layout="@layout/conversation_no_longer_a_member"
android:visibility="gone" />
</FrameLayout>
<include
layout="@layout/conversation_requesting_bottom_banner"
android:visibility="gone" />
<include layout="@layout/conversation_input_panel" />
<ViewStub
android:id="@+id/conversation_cannot_send_announcement_stub"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout="@layout/conversation_cannot_send_announcement_group" />
<org.thoughtcrime.securesms.messagerequests.MessageRequestsBottomView
android:id="@+id/conversation_activity_message_request_bottom_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:visibility="gone" />
<ViewStub
android:id="@+id/conversation_release_notes_unmute_stub"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout="@layout/conversation_activity_unmute" />
</FrameLayout>
</LinearLayout>
<Button
android:id="@+id/register_button"