Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

[android] Make link warning dialog scrollable

Browse Source
This commit is contained in:
Torsten Grote
2019-02-26 17:13:12 -03:00
parent 8343f5c2db
commit 106d80ef76
2 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java
View File

@@ -5,7 +5,7 @@ import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@@ -13,10 +13,18 @@ import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import java.util.List; import java.util.List;
import static android.content.Intent.ACTION_VIEW;
import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
import static java.util.Objects.requireNonNull;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
public class LinkDialogFragment extends DialogFragment { public class LinkDialogFragment extends DialogFragment {
private static final String TAG = LinkDialogFragment.class.getName(); private static final String TAG = LinkDialogFragment.class.getName();
@@ -34,17 +42,19 @@ public class LinkDialogFragment extends DialogFragment {
} }
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
url = getArguments().getString("url"); Bundle args = requireNonNull(getArguments());
url = requireNonNull(args.getString("url"));
setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme); setStyle(STYLE_NO_TITLE, R.style.BriarDialogTheme);
} }
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, public View onCreateView(LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) { @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_link_dialog, container, View v = inflater.inflate(R.layout.fragment_link_dialog, container,
false); false);
@@ -53,10 +63,11 @@ public class LinkDialogFragment extends DialogFragment {
urlView.setText(url); urlView.setText(url);
// prepare normal intent or intent chooser // prepare normal intent or intent chooser
Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); Intent i = new Intent(ACTION_VIEW, Uri.parse(url));
PackageManager packageManager = getContext().getPackageManager(); PackageManager packageManager =
requireNonNull(getContext()).getPackageManager();
List activities = packageManager.queryIntentActivities(i, List activities = packageManager.queryIntentActivities(i,
PackageManager.MATCH_DEFAULT_ONLY); MATCH_DEFAULT_ONLY);
boolean choice = activities.size() > 1; boolean choice = activities.size() > 1;
Intent intent = choice ? Intent.createChooser(i, Intent intent = choice ? Intent.createChooser(i,
getString(R.string.link_warning_open_link)) : i; getString(R.string.link_warning_open_link)) : i;

113
briar-android/src/main/res/layout/fragment_link_dialog.xml
View File

@@ -1,69 +1,90 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:orientation="vertical"
android:padding="16dp">
<TextView <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/link_warning_title" android:padding="16dp">
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_large"
android:textStyle="bold"/>
<TextView <TextView
android:layout_width="match_parent" android:id="@+id/linkWarning"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_marginTop="@dimen/margin_large" android:layout_height="wrap_content"
android:text="@string/link_warning_intro" android:text="@string/link_warning_title"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_medium"/> android:textSize="@dimen/text_size_large"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/linkIntro"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView <TextView
android:id="@+id/urlView" android:id="@+id/linkIntro"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_large" android:layout_marginTop="16dp"
android:textColor="?android:attr/textColorPrimary" android:text="@string/link_warning_intro"
android:textIsSelectable="true" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_medium" android:textSize="@dimen/text_size_medium"
android:typeface="monospace" app:layout_constraintBottom_toTopOf="@+id/urlView"
tools:text="http://very.bad.site.com"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linkWarning"/>
<TextView <TextView
android:layout_width="match_parent" android:id="@+id/urlView"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="@dimen/margin_large" android:layout_height="wrap_content"
android:text="@string/link_warning_text" android:layout_marginBottom="16dp"
android:textColor="?android:attr/textColorPrimary" android:layout_marginTop="16dp"
android:textSize="@dimen/text_size_medium"/> android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
android:typeface="monospace"
app:layout_constraintBottom_toTopOf="@+id/thinkBeforeOpen"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linkIntro"
tools:text="http://very.bad.site.com/with/a/super/long/address/that/can/push/stuff/off/screen/so/much/that/buttons/are/not/visible/which/is/bad/for/users/when/they/dont/know/what/to/do/they/might/be/completely/lost/crying/in/despair/so/we/need/to/make/sure/that/they/see/all/buttons"/>
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/thinkBeforeOpen"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="@dimen/margin_xxlarge" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_xxlarge" android:text="@string/link_warning_text"
android:gravity="end" android:textColor="?android:attr/textColorPrimary"
android:orientation="horizontal"> android:textSize="@dimen/text_size_medium"
app:layout_constraintBottom_toTopOf="@+id/openButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/urlView"/>
<Button <Button
android:id="@+id/cancelButton" android:id="@+id/cancelButton"
style="@style/BriarButtonFlat.Positive" style="@style/BriarButtonFlat.Positive"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/cancel"/> android:text="@string/cancel"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/openButton"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/thinkBeforeOpen"/>
<Button <Button
android:id="@+id/openButton" android:id="@+id/openButton"
style="@style/BriarButtonFlat.Negative" style="@style/BriarButtonFlat.Negative"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/link_warning_open_link"/> android:text="@string/link_warning_open_link"
app:layout_constraintBaseline_toBaselineOf="@+id/cancelButton"
app:layout_constraintEnd_toEndOf="@+id/thinkBeforeOpen"
app:layout_constraintStart_toEndOf="@+id/cancelButton"/>
</LinearLayout> </android.support.constraint.ConstraintLayout>
</LinearLayout> </ScrollView>