mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
Hocuri
11a2cfbff7
Depends on https://github.com/deltachat/deltachat-core-rust/pull/4315/. Follow-up for https://github.com/deltachat/deltachat-android/pull/2541. - Show a "verified" icon on protection changed update messages - Add C API - Show a dialog over the input bar not only for contact requests, but also when the protection is broken (using the new method `isHalfBlocked()`) - The positive button reads "OK" (as opposed to contact requests where it reads "Accept") - Add SVG icons, remove PNG one - Translations - When tapping on the `DC_INFO_PROTECTION_{EN|DIS}ABLED` message, show more information (for now, it leads to the online preview of my FAQ PR) - Block loading remote images in the "Full Msg View" not only for contact requests, also when the protection is broken (using the new method `isHalfBlocked()`) - Show a big verified/crossed-out-verified symbol over the `DC_INFO_PROTECTION_{EN|DIS}ABLED` messages - Fix a bug that was kind of present before (for contact requests) but only became really visible now: - Set a draft with an image (or other attachment) - Your chat partner breaks verification - Expected: Both the input bar and the draft image are hidden by the input-bar-dialog. - Bug behavior (before c31de5bcf): The input bar is hidden, but the draft image stays visible.
44 lines
1.7 KiB
XML
44 lines
1.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<merge xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
android:id="@+id/message_request_question"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="11dp"
|
|
android:paddingTop="11dp"
|
|
style="@style/Signal.Text.Body"
|
|
tools:text="Chat with Alice In Wondeful Wonderland (alice@wonderland.org)?"
|
|
app:layout_constraintBottom_toTopOf="@id/message_request_block"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent" />
|
|
|
|
<Button
|
|
android:id="@+id/message_request_block"
|
|
style="@style/ButtonPrimary"
|
|
android:text="@string/block"
|
|
android:layout_width="0dp"
|
|
android:layout_height="40dp"
|
|
android:layout_marginEnd="16dp"
|
|
android:layout_marginBottom="16dp"
|
|
android:layout_marginRight="16dp"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toStartOf="@id/message_request_accept"
|
|
app:layout_constraintHorizontal_bias="0.5"
|
|
app:layout_constraintStart_toStartOf="parent"/>
|
|
|
|
<Button
|
|
android:id="@+id/message_request_accept"
|
|
style="@style/ButtonPrimary"
|
|
android:text="@string/accept"
|
|
android:layout_width="0dp"
|
|
android:layout_height="40dp"
|
|
app:layout_constraintBottom_toBottomOf="@id/message_request_block"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toEndOf="@id/message_request_block"
|
|
app:layout_constraintTop_toTopOf="@id/message_request_block" />
|
|
</merge>
|