diff --git a/briar-android/artwork/il_transfer_data_dark.svg b/briar-android/artwork/il_transfer_data_dark.svg
new file mode 100644
index 000000000..4a35f3a9c
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_dark.svg
@@ -0,0 +1,30 @@
+
diff --git a/briar-android/artwork/il_transfer_data_light.svg b/briar-android/artwork/il_transfer_data_light.svg
new file mode 100644
index 000000000..c9c704d26
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_light.svg
@@ -0,0 +1,30 @@
+
diff --git a/briar-android/artwork/transfer_data.svg b/briar-android/artwork/transfer_data.svg
deleted file mode 100644
index af653ac7e..000000000
--- a/briar-android/artwork/transfer_data.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java
index c6a4f9465..dacf25ed4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ChooserFragment.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.briar.android.widget.OnboardingFullDialogFragment;
@@ -20,8 +19,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,7 +32,6 @@ public class ChooserFragment extends Fragment {
ViewModelProvider.Factory viewModelFactory;
private RemovableDriveViewModel viewModel;
- private ScrollView scrollView;
@Override
public void onAttach(Context context) {
@@ -51,8 +49,6 @@ public class ChooserFragment extends Fragment {
View v = inflater.inflate(R.layout.fragment_transfer_data_chooser,
container, false);
- scrollView = (ScrollView) v;
-
Button buttonLearnMore = v.findViewById(R.id.buttonLearnMore);
buttonLearnMore.setOnClickListener(e -> showLearnMoreDialog());
@@ -75,8 +71,7 @@ public class ChooserFragment extends Fragment {
// as we only support one per ViewModel instance
requireActivity().supportFinishAfterTransition();
} else {
- // 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/il_transfer_data.xml b/briar-android/src/main/res/drawable-night/il_transfer_data.xml
new file mode 100644
index 000000000..1551b6c1b
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_transfer_data.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/drawable/ic_transfer_data.xml b/briar-android/src/main/res/drawable/ic_transfer_data.xml
deleted file mode 100644
index 68d313e52..000000000
--- a/briar-android/src/main/res/drawable/ic_transfer_data.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/il_transfer_data.xml b/briar-android/src/main/res/drawable/il_transfer_data.xml
new file mode 100644
index 000000000..5e21244d6
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_transfer_data.xml
@@ -0,0 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
index 3bfc7c9f0..697d55b4a 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_chooser.xml
@@ -1,81 +1,88 @@
-
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_weight="1">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+