diff --git a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java index 74fa4f3352..f5f72e1790 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/permissions/RationaleDialog.java @@ -20,23 +20,29 @@ import androidx.core.graphics.drawable.DrawableCompat; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import org.signal.core.util.DimensionUnit; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.ViewUtil; +import java.util.Objects; + public class RationaleDialog { public static MaterialAlertDialogBuilder createFor(@NonNull Context context, @NonNull String message, @DrawableRes int... drawables) { - View view = LayoutInflater.from(context).inflate(R.layout.permissions_rationale_dialog, null); - ViewGroup header = view.findViewById(R.id.header_container); - TextView text = view.findViewById(R.id.message); + View view = LayoutInflater.from(context).inflate(R.layout.permissions_rationale_dialog, null); + ViewGroup header = view.findViewById(R.id.header_container); + TextView text = view.findViewById(R.id.message); + int iconSize = (int) DimensionUnit.DP.toPixels(32); for (int i=0;i + android:layout_height="wrap_content" + android:orientation="vertical" + tools:viewBindingIgnore="true"> - + android:orientation="horizontal" + android:padding="48dp"> - + android:textAppearance="@style/Signal.Text.BodyMedium" + android:textColor="@color/signal_colorOnSurfaceVariant" + tools:text="Signal needs access to your contacts and media in order to connect with friends, exchange messages, and make secure calls." /> \ No newline at end of file diff --git a/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt b/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt index 1cc5756642..8ffc3af522 100644 --- a/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt +++ b/core-ui/src/main/java/org/signal/core/ui/Dialogs.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.window.DialogProperties import org.signal.core.ui.Dialogs.PermissionRationaleDialog import org.signal.core.ui.Dialogs.SimpleAlertDialog import org.signal.core.ui.Dialogs.SimpleMessageDialog +import org.signal.core.ui.theme.SignalTheme object Dialogs { @@ -138,12 +139,14 @@ object Dialogs { onDismiss: () -> Unit ) { Dialog( - onDismissRequest = onDismiss + onDismissRequest = onDismiss, + properties = DialogProperties(usePlatformDefaultWidth = false) ) { Surface( modifier = Modifier + .fillMaxWidth(fraction = 0.75f) .background( - color = MaterialTheme.colorScheme.secondaryContainer, + color = SignalTheme.colors.colorSurface2, shape = AlertDialogDefaults.shape ) .clip(AlertDialogDefaults.shape) @@ -154,26 +157,28 @@ object Dialogs { modifier = Modifier .fillMaxWidth() .background(color = MaterialTheme.colorScheme.primary) - .padding(40.dp) + .padding(48.dp) ) { Icon( painter = icon, contentDescription = null, - tint = MaterialTheme.colorScheme.onPrimary + tint = MaterialTheme.colorScheme.onPrimary, + modifier = Modifier.size(32.dp) ) } Text( text = rationale, + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier - .padding(top = 20.dp) - .padding(horizontal = 20.dp) + .padding(horizontal = 24.dp, vertical = 16.dp) ) FlowRow( horizontalArrangement = Arrangement.End, modifier = Modifier .fillMaxWidth() - .padding(24.dp) + .padding(start = 24.dp, end = 24.dp, bottom = 24.dp) ) { TextButton(onClick = onDismiss) { Text(text = dismiss)