diff --git a/briar-android/artwork/il_mailbox_setup_dark.svg b/briar-android/artwork/il_mailbox_setup_dark.svg
new file mode 100644
index 000000000..4f3523935
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_setup_dark.svg
@@ -0,0 +1,31 @@
+
diff --git a/briar-android/artwork/il_mailbox_setup_light.svg b/briar-android/artwork/il_mailbox_setup_light.svg
new file mode 100644
index 000000000..6aefc130f
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_setup_light.svg
@@ -0,0 +1,31 @@
+
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
index 74595a015..bf76492b7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupDownloadFragment.java
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
-import android.widget.ScrollView;
import org.briarproject.briar.R;
import org.briarproject.nullsafety.MethodsNotNullByDefault;
@@ -21,8 +20,8 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
-import static android.view.View.FOCUS_DOWN;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -36,7 +35,6 @@ public class SetupDownloadFragment extends Fragment {
private MailboxViewModel viewModel;
private CameraPermissionManager permissionManager;
- private ScrollView scrollView;
private final ActivityResultLauncher permissionLauncher =
registerForActivityResult(new RequestMultiplePermissions(), r -> {
@@ -62,7 +60,6 @@ public class SetupDownloadFragment extends Fragment {
@Nullable Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_mailbox_setup_download,
container, false);
- scrollView = v.findViewById(R.id.scrollView);
permissionManager = new CameraPermissionManager(requireActivity(),
permissionLauncher::launch);
@@ -80,8 +77,7 @@ public class SetupDownloadFragment extends Fragment {
public void onStart() {
super.onStart();
requireActivity().setTitle(R.string.mailbox_setup_title);
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
// Permissions may have been granted manually while we were stopped
permissionManager.resetPermissions();
}
diff --git a/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml b/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
new file mode 100644
index 000000000..aecec6a67
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_mailbox_setup.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/drawable/il_mailbox_setup.xml b/briar-android/src/main/res/drawable/il_mailbox_setup.xml
new file mode 100644
index 000000000..97f79a54a
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_mailbox_setup.xml
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml b/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
index c3850b4af..45bec3efb 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_setup_download.xml
@@ -1,63 +1,65 @@
-
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_weight="1">
-
+
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml b/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
index 8fee198d7..5639d8a59 100644
--- a/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_mailbox_setup_intro.xml
@@ -34,9 +34,7 @@
android:id="@+id/introView"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:layout_marginBottom="@dimen/margin_large"
+ android:layout_margin="@dimen/margin_large"
android:text="@string/mailbox_setup_intro"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:layout_constraintBottom_toBottomOf="parent"