Skip to content

Commit

Permalink
Add scrolling to rationale prompt.
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholas-signal authored and alex-signal committed Oct 25, 2022
1 parent 371267a commit fb8b230
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.text.method.ScrollingMovementMethod;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
Expand Down Expand Up @@ -54,6 +55,7 @@ public static MaterialAlertDialogBuilder createFor(@NonNull Context context, @No
}

text.setText(message);
text.setMovementMethod(new ScrollingMovementMethod());

return new MaterialAlertDialogBuilder(context,
ThemeUtil.isDarkTheme(context) ? R.style.Theme_Signal_AlertDialog_Dark_Cornered
Expand Down
38 changes: 19 additions & 19 deletions app/src/main/res/layout/permissions_rationale_dialog.xml
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<LinearLayout android:id="@+id/header_container"
android:background="@color/core_ultramarine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:padding="40dp">
android:background="@color/core_ultramarine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center"
android:padding="40dp">

</LinearLayout>

<TextView android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="40dp"
android:paddingBottom="40dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="15sp"
android:lineSpacingMultiplier="1.3"
tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls."/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="15sp"
android:lineSpacingMultiplier="1.3"
android:scrollbars="vertical"
tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls."/>

</LinearLayout>

0 comments on commit fb8b230

Please sign in to comment.