diff --git a/briar-android/artwork/il_mailbox_dark.svg b/briar-android/artwork/il_mailbox_dark.svg
new file mode 100644
index 000000000..eda21fc5a
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_dark.svg
@@ -0,0 +1,37 @@
+
diff --git a/briar-android/artwork/il_mailbox_light.svg b/briar-android/artwork/il_mailbox_light.svg
new file mode 100644
index 000000000..0f9c331bf
--- /dev/null
+++ b/briar-android/artwork/il_mailbox_light.svg
@@ -0,0 +1,37 @@
+
diff --git a/briar-android/artwork/mailbox_onboarding_dark.svg b/briar-android/artwork/mailbox_onboarding_dark.svg
deleted file mode 100644
index ea1a19757..000000000
--- a/briar-android/artwork/mailbox_onboarding_dark.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-
diff --git a/briar-android/artwork/mailbox_onboarding_light.svg b/briar-android/artwork/mailbox_onboarding_light.svg
deleted file mode 100644
index 988d2438d..000000000
--- a/briar-android/artwork/mailbox_onboarding_light.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java
index f3f231422..cd1984c6f 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/SetupIntroFragment.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;
@@ -19,8 +18,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
@@ -33,8 +32,6 @@ public class SetupIntroFragment extends Fragment {
private MailboxViewModel viewModel;
- private ScrollView scrollView;
-
@Override
public void onAttach(Context context) {
super.onAttach(context);
@@ -51,7 +48,6 @@ public class SetupIntroFragment extends Fragment {
@Nullable Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_mailbox_setup_intro,
container, false);
- scrollView = v.findViewById(R.id.scrollView);
Button button = v.findViewById(R.id.continueButton);
button.setOnClickListener(view -> viewModel.showDownloadFragment());
return v;
@@ -61,8 +57,7 @@ public class SetupIntroFragment 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));
}
}
diff --git a/briar-android/src/main/res/drawable-night/ic_mailbox_onboarding.xml b/briar-android/src/main/res/drawable-night/ic_mailbox_onboarding.xml
deleted file mode 100644
index 76a2beda4..000000000
--- a/briar-android/src/main/res/drawable-night/ic_mailbox_onboarding.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/briar-android/src/main/res/drawable-night/il_mailbox.xml b/briar-android/src/main/res/drawable-night/il_mailbox.xml
new file mode 100644
index 000000000..2421f9434
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_mailbox.xml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/drawable/ic_mailbox_onboarding.xml b/briar-android/src/main/res/drawable/ic_mailbox_onboarding.xml
deleted file mode 100644
index abd0bc87b..000000000
--- a/briar-android/src/main/res/drawable/ic_mailbox_onboarding.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/il_mailbox.xml b/briar-android/src/main/res/drawable/il_mailbox.xml
new file mode 100644
index 000000000..cc4f7945d
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_mailbox.xml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 613287b0a..8fee198d7 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
@@ -1,59 +1,60 @@
-
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_weight="1">
-
+
-
+
-
+
-
+
-
+
+
+
+
+