From 9f039ff0b8f2fac6aed87c67e4ffa8e548b547c1 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Mon, 31 Oct 2022 14:46:22 +0000
Subject: [PATCH] Address review feedback.
---
.../contact/add/nearby/AddNearbyContactFragment.java | 3 +--
.../android/contact/add/remote/LinkExchangeFragment.java | 3 ++-
.../java/org/briarproject/briar/android/view/InfoView.java | 7 +++++++
briar-android/src/main/res/layout/info_view.xml | 2 ++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java
index c6fb17258c..76f87e409c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java
@@ -94,8 +94,7 @@ public class AddNearbyContactFragment extends BaseFragment
statusView = view.findViewById(R.id.status_container);
status = view.findViewById(R.id.connect_status);
infoView = view.findViewById(R.id.info_view);
- TextView info = view.findViewById(R.id.info_text);
- info.setText(R.string.info_both_must_scan);
+ infoView.setText(R.string.info_both_must_scan);
qrCodeView = view.findViewById(R.id.qr_code_view);
qrCodeView.setFullscreenListener(this);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
index 9acde98b62..6e797e23ec 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
@@ -16,6 +16,7 @@ import com.google.android.material.textfield.TextInputLayout;
import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.fragment.BaseFragment;
+import org.briarproject.briar.android.view.InfoView;
import org.briarproject.nullsafety.MethodsNotNullByDefault;
import org.briarproject.nullsafety.ParametersNotNullByDefault;
@@ -122,7 +123,7 @@ public class LinkExchangeFragment extends BaseFragment {
.startChooser());
shareButton.setEnabled(true);
- TextView infoText = v.findViewById(R.id.info_text);
+ InfoView infoText = v.findViewById(R.id.infoView);
infoText.setText(R.string.info_both_must_enter_links);
Button continueButton = v.findViewById(R.id.addButton);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/InfoView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/InfoView.java
index e50ec759fa..cc33df6a2b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/InfoView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/InfoView.java
@@ -3,11 +3,13 @@ package org.briarproject.briar.android.view;
import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater;
+import android.widget.TextView;
import org.briarproject.briar.R;
import org.briarproject.nullsafety.InterfaceNotNullByDefault;
import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import androidx.cardview.widget.CardView;
import static android.content.Context.LAYOUT_INFLATER_SERVICE;
@@ -30,4 +32,9 @@ public class InfoView extends CardView {
context.getSystemService(LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.info_view, this, true);
}
+
+ public void setText(@StringRes int resId) {
+ TextView infoText = findViewById(R.id.info_text);
+ infoText.setText(resId);
+ }
}
diff --git a/briar-android/src/main/res/layout/info_view.xml b/briar-android/src/main/res/layout/info_view.xml
index 32c0c87705..c7cf40f7b6 100644
--- a/briar-android/src/main/res/layout/info_view.xml
+++ b/briar-android/src/main/res/layout/info_view.xml
@@ -13,6 +13,8 @@
android:layout_margin="@dimen/margin_medium"
android:contentDescription="@string/info"
android:drawablePadding="@dimen/margin_medium"
+ android:drawableTint="?attr/colorControlNormal"
+ android:gravity="center_vertical"
app:drawableLeftCompat="@drawable/ic_info_dark"
app:drawableStartCompat="@drawable/ic_info_dark"
tools:text="Did you know that if you took all the veins out of your body and laid them out end to end, you would die?" />
--
GitLab