diff --git a/briar-android/artwork/il_add_contact_remote_nickname_dark.svg b/briar-android/artwork/il_add_contact_remote_nickname_dark.svg
new file mode 100644
index 000000000..402a1fa62
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_nickname_dark.svg
@@ -0,0 +1,45 @@
+
diff --git a/briar-android/artwork/il_add_contact_remote_nickname_light.svg b/briar-android/artwork/il_add_contact_remote_nickname_light.svg
new file mode 100644
index 000000000..b67573b36
--- /dev/null
+++ b/briar-android/artwork/il_add_contact_remote_nickname_light.svg
@@ -0,0 +1,45 @@
+
diff --git a/briar-android/artwork/nickname.svg b/briar-android/artwork/nickname.svg
deleted file mode 100644
index 7daecca04..000000000
--- a/briar-android/artwork/nickname.svg
+++ /dev/null
@@ -1,176 +0,0 @@
-
-
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
index f273af285..229683f7c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
@@ -8,8 +8,6 @@ import android.text.Editable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ProgressBar;
import android.widget.Toast;
import com.google.android.material.textfield.TextInputEditText;
@@ -23,6 +21,7 @@ import org.briarproject.bramble.api.identity.Author;
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.BriarButton;
import org.briarproject.nullsafety.MethodsNotNullByDefault;
import org.briarproject.nullsafety.ParametersNotNullByDefault;
@@ -35,13 +34,12 @@ import androidx.appcompat.app.AlertDialog.Builder;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.Objects.requireNonNull;
import static org.briarproject.bramble.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
import static org.briarproject.briar.android.util.UiUtils.getDialogIcon;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -57,8 +55,6 @@ public class NicknameFragment extends BaseFragment {
private TextInputLayout contactNameLayout;
private TextInputEditText contactNameInput;
- private Button addButton;
- private ProgressBar progressBar;
@Override
public String getUniqueTag() {
@@ -95,14 +91,18 @@ public class NicknameFragment extends BaseFragment {
contactNameLayout = v.findViewById(R.id.contactNameLayout);
contactNameInput = v.findViewById(R.id.contactNameInput);
- addButton = v.findViewById(R.id.addButton);
+ BriarButton addButton = v.findViewById(R.id.addButton);
addButton.setOnClickListener(view -> onAddButtonClicked());
- progressBar = v.findViewById(R.id.progressBar);
-
return v;
}
+ @Override
+ public void onStart() {
+ super.onStart();
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
+ }
+
@Override
public void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
@@ -131,9 +131,6 @@ public class NicknameFragment extends BaseFragment {
String name = getNicknameOrNull();
if (name == null) return; // invalid nickname
- addButton.setVisibility(INVISIBLE);
- progressBar.setVisibility(VISIBLE);
-
LifecycleOwner owner = getViewLifecycleOwner();
viewModel.getAddContactResult().observe(owner, result -> {
if (result == null) return;
diff --git a/briar-android/src/main/res/drawable-night/il_add_contact_remote_nickname.xml b/briar-android/src/main/res/drawable-night/il_add_contact_remote_nickname.xml
new file mode 100644
index 000000000..d9b87d8b6
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_add_contact_remote_nickname.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/drawable/ic_nickname.xml b/briar-android/src/main/res/drawable/ic_nickname.xml
deleted file mode 100644
index f7e69d377..000000000
--- a/briar-android/src/main/res/drawable/ic_nickname.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/il_add_contact_remote_nickname.xml b/briar-android/src/main/res/drawable/il_add_contact_remote_nickname.xml
new file mode 100644
index 000000000..5eda3f0d8
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_add_contact_remote_nickname.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/layout/fragment_nickname.xml b/briar-android/src/main/res/layout/fragment_nickname.xml
index a07cc970b..34d8c98b3 100644
--- a/briar-android/src/main/res/layout/fragment_nickname.xml
+++ b/briar-android/src/main/res/layout/fragment_nickname.xml
@@ -1,176 +1,166 @@
-
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_weight="1">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:padding="@dimen/margin_large">
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+