awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
adbenitez
2021-01-06 17:29:14 -05:00
parent 0a29e32680 a96aa2ff48
commit 2ad6da4f56
2 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/autodel_confirm.xml
+29 -14
View File
@@ -1,19 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
<ScrollView android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools">
<CheckBox
android:id="@+id/i_understand"
android:text="@string/autodel_confirm"
android:textSize="16sp"
android:textColor="@color/red_500"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="8dp"
/>
android:paddingLeft="25dp"
android:paddingRight="25dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/autodel_ask_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textColor="?android:attr/textColorPrimary"
android:paddingBottom="10dp"
tools:text="Really delete these msgs?" />
<CheckBox
android:id="@+id/i_understand"
android:text="@string/autodel_confirm"
android:textSize="16sp"
android:textColor="@color/red_500"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
</FrameLayout>
src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
+13 -9
View File
@@ -4,17 +4,17 @@ import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.NonNull;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.CheckBoxPreference;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import android.view.View;
import android.widget.CheckBox;
import android.widget.Toast;
import com.b44t.messenger.DcContext;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
@@ -165,13 +165,16 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
View gl = View.inflate(getActivity(), R.layout.autodel_confirm, null);
CheckBox confirmCheckbox = gl.findViewById(R.id.i_understand);
String msg = String.format(context.getString(fromServer?
TextView msg = gl.findViewById(R.id.autodel_ask_msg);
// If we'd use both `setMessage()` and `setView()` on the same AlertDialog, on small screens the
// "OK" and "Cancel" buttons would not be show. So, put the message into our custom view:
msg.setText(String.format(context.getString(fromServer?
R.string.autodel_server_ask : R.string.autodel_device_ask),
delCount, getSelectedSummary(preference, newValue));
delCount, getSelectedSummary(preference, newValue)));
new AlertDialog.Builder(context)
.setTitle(preference.getTitle())
.setMessage(msg)
.setView(gl)
.setPositiveButton(android.R.string.ok, (dialog, whichButton) -> {
if (confirmCheckbox.isChecked()) {
@@ -182,7 +185,8 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
}
})
.setNegativeButton(android.R.string.cancel, (dialog, whichButton) -> initAutodelFromCore())
.setCancelable(false)
.setCancelable(true) // Enable the user to quickly cancel if they are intimidated by the warnings :)
.setOnCancelListener(dialog -> initAutodelFromCore())
.show();
} else {
updateListSummary(preference, newValue);