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 c6fb17258cb9fed9f1bce0c4a45d8a2529106b42..76f87e409cc2c7793e8775838760028dc633ae95 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 9acde98b621e726d2cc390a1c2c7b911a2dfba22..6e797e23ece28fff53f13231eccdbf906fc05ef8 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 e50ec759fa4b5b0613ca07814575686b53e969fa..cc33df6a2bdc0be60ae60073ba1321c013bb9477 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 32c0c87705f84d7363ca1752710650eb7281eb55..c7cf40f7b6cdce0e42e6b1057d07d793a7968fca 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?" />