mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
f941fd3c53
See deltachat/deltachat-core-rust#2514 Fixes #1963 Fixes #1890 Before deleting a chat the user is asked for confirmation. Before blocking not, because blocking is not "destructive" (i.e. can be completely reverted by unblocking the contact). I'm wondering whether we should show a snackbar with an Undo button though, but we can probably wait for user feedback on this. * Start removing deaddrop chat * Generally works * Fix the buttons (it's not easy to not show one of the buttons in ConstraintLayout; if problems turn up, we should probably just not use ConstraintLayout) * fix more things * restartLoader() instead of notifyDataSetChanged() because the latter didn't do anything * Archived badge * Rename "Contact request" to "Request" * oops * Remove setStockTranslation(8, context.getString(R.string.chat_contact_request)); * Remove commented-out code, we probably won't need it * Don't show "Delete" button for 1:1 chats * Get rid of short flickering when declining a request * Set the app's night mode to match the preference This added 6ms to startup time, but I think that's OK, as we will also be able to use more `-night` views in the future * Make "Accept" text a bit brighter and easier to read in dark mode * Check if the chattype is Group instead of members.length == 1
39 lines
1.6 KiB
XML
39 lines
1.6 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"
|
|
android:textSize="14sp"
|
|
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/Signal.MessageRequest.Button.Deny"
|
|
android:text="@string/block"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginBottom="16dp"
|
|
android:layout_marginRight="8dp"
|
|
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/Signal.MessageRequest.Button.Accept"
|
|
android:text="@string/accept"
|
|
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> |