diff --git a/briar-android/artwork/il_transfer_data_send.svg b/briar-android/artwork/il_transfer_data_send.svg
new file mode 100644
index 000000000..2c8e6e16e
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_send.svg
@@ -0,0 +1,47 @@
+
diff --git a/briar-android/artwork/il_transfer_data_send_night.svg b/briar-android/artwork/il_transfer_data_send_night.svg
new file mode 100644
index 000000000..c53d8b800
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_send_night.svg
@@ -0,0 +1,47 @@
+
diff --git a/briar-android/artwork/transfer_data_send.svg b/briar-android/artwork/transfer_data_send.svg
deleted file mode 100644
index 4cbdb88f9..000000000
--- a/briar-android/artwork/transfer_data_send.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java
index a39326bba..06b6a0b2b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/SendFragment.java
@@ -9,7 +9,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ProgressBar;
-import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
@@ -31,13 +30,13 @@ import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.ViewModelProvider;
import static android.os.Build.VERSION.SDK_INT;
-import static android.view.View.FOCUS_DOWN;
import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.util.LogUtils.logException;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@RequiresApi(19)
@MethodsNotNullByDefault
@@ -55,7 +54,6 @@ public class SendFragment extends Fragment {
ViewModelProvider.Factory viewModelFactory;
private RemovableDriveViewModel viewModel;
- private ScrollView scrollView;
private TextView introTextView;
private Button button;
private ProgressBar progressBar;
@@ -78,7 +76,6 @@ public class SendFragment extends Fragment {
View v = inflater.inflate(R.layout.fragment_transfer_data_send,
container, false);
- scrollView = (ScrollView) v;
introTextView = v.findViewById(R.id.introTextView);
progressBar = v.findViewById(R.id.progressBar);
button = v.findViewById(R.id.fileButton);
@@ -107,8 +104,7 @@ public class SendFragment extends Fragment {
public void onStart() {
super.onStart();
requireActivity().setTitle(R.string.removable_drive_title_send);
- // 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));
}
@Override
diff --git a/briar-android/src/main/res/drawable-night/il_transfer_data_send.xml b/briar-android/src/main/res/drawable-night/il_transfer_data_send.xml
new file mode 100644
index 000000000..cd05a4d9c
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_transfer_data_send.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/drawable/ic_transfer_data_send.xml b/briar-android/src/main/res/drawable/ic_transfer_data_send.xml
deleted file mode 100644
index 59b6f35ba..000000000
--- a/briar-android/src/main/res/drawable/ic_transfer_data_send.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/il_transfer_data_send.xml b/briar-android/src/main/res/drawable/il_transfer_data_send.xml
new file mode 100644
index 000000000..cf3187010
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_transfer_data_send.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
index f8bf50af3..a7564a398 100644
--- a/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
+++ b/briar-android/src/main/res/layout/fragment_transfer_data_send.xml
@@ -1,70 +1,77 @@
-
+ android:orientation="vertical">
-
+ android:layout_height="0dp"
+ android:layout_weight="1">
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+