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

Fix scrolling issue in transfer lock dialog for small displays.

main
Cody Henthorne 2023-02-15 14:46:46 -05:00 zatwierdzone przez Greyson Parrelli
rodzic a22a696722
commit e8ff1a04ed
2 zmienionych plików z 33 dodań i 25 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/devicetransfer/olddevice/OldDeviceTransferLockedDialog.java
Wyświetl plik

@ -41,7 +41,7 @@ public final class OldDeviceTransferLockedDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog);
MaterialAlertDialogBuilder dialogBuilder = new MaterialAlertDialogBuilder(requireContext());
dialogBuilder.setView(R.layout.old_device_transfer_locked_dialog_fragment)
.setPositiveButton(R.string.OldDeviceTransferLockedDialog__done, (d, w) -> OldDeviceExitActivity.exit(requireActivity()))
.setNegativeButton(R.string.OldDeviceTransferLockedDialog__cancel_and_activate_this_device, (d, w) -> onUnlockRequest());

56
app/src/main/res/layout/old_device_transfer_locked_dialog_fragment.xml
Wyświetl plik

@ -1,32 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
android:padding="?attr/dialogPreferredPadding">
android:fillViewport="true"
android:scrollbarAlwaysDrawVerticalTrack="true"
tools:viewBindingIgnore="true">
<androidx.appcompat.widget.AppCompatImageView
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="120dp"
android:layout_gravity="center"
app:srcCompat="@drawable/ic_complete_reg" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:text="@string/OldDeviceTransferLockedDialog__complete_registration_on_your_new_device"
android:textAppearance="@style/TextAppearance.Signal.Title2" />
android:layout_gravity="center_horizontal"
android:orientation="vertical"
android:padding="?attr/dialogPreferredPadding">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/OldDeviceTransferLockedDialog__your_signal_account_has_been_transferred_to_your_new_device"
android:textAppearance="@style/TextAppearance.Signal.Body1" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="1"
app:srcCompat="@drawable/ic_complete_reg" />
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"
android:text="@string/OldDeviceTransferLockedDialog__complete_registration_on_your_new_device"
android:textAppearance="@style/TextAppearance.Signal.Title2" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/OldDeviceTransferLockedDialog__your_signal_account_has_been_transferred_to_your_new_device"
android:textAppearance="@style/TextAppearance.Signal.Body1" />
</LinearLayout>
</ScrollView>