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 0000000000000000000000000000000000000000..2c8e6e16ece48950951f949a2453e45fcc4a7d12
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_send.svg
@@ -0,0 +1,47 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <rect x="-0.75" y="0.75" width="40.5" height="76.5" rx="7.25"
+ transform="matrix(-1 0 0 1 55.4341 33)" fill="#ECFCCB" stroke="#65A30D"
+ stroke-width="1.5" />
+ <path d="M56.1841 47.9976H15.6843V100.498H56.1841V47.9976Z" fill="#F9FAFB" stroke="#65A30D"
+ stroke-width="1.5" />
+ <rect x="19.5396" y="65.1011" width="32.7896" height="18.293" rx="4" fill="#DDEDFE" />
+ <path d="M26.0518 71.5542H45.9243" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M26.0518 77.6519H36.7318" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <ellipse rx="1" ry="1.00118" transform="matrix(-1 0 0 1 35.9341 41.0012)" fill="#65A30D" />
+ <path
+ d="M27.9341 40.2744C27.5199 40.2744 27.1841 40.6102 27.1841 41.0244C27.1841 41.4386 27.5199 41.7744 27.9341 41.7744V40.2744ZM31.9341 41.7744C32.3483 41.7744 32.6841 41.4386 32.6841 41.0244C32.6841 40.6102 32.3483 40.2744 31.9341 40.2744V41.7744ZM27.9341 41.7744H31.9341V40.2744H27.9341V41.7744Z"
+ fill="#65A30D" />
+ <path
+ d="M39.9341 40.2744C39.5199 40.2744 39.1841 40.6102 39.1841 41.0244C39.1841 41.4386 39.5199 41.7744 39.9341 41.7744V40.2744ZM43.9341 41.7744C44.3483 41.7744 44.6841 41.4386 44.6841 41.0244C44.6841 40.6102 44.3483 40.2744 43.9341 40.2744V41.7744ZM39.9341 41.7744H43.9341V40.2744H39.9341V41.7744Z"
+ fill="#65A30D" />
+ <circle cx="89.9341" cy="72" r="4" fill="#8BCAFD" />
+ <circle cx="105.934" cy="72" r="4" fill="#52ADF9" />
+ <circle cx="73.9341" cy="72" r="4" fill="#BDDFFE" />
+ <circle cx="198.934" cy="72" r="4" fill="#8BCAFD" />
+ <circle cx="214.934" cy="72" r="4" fill="#52ADF9" />
+ <circle cx="182.934" cy="72" r="4" fill="#BDDFFE" />
+ <path
+ d="M236.505 43C236.505 41.8954 237.401 41 238.505 41H257.363C258.468 41 259.363 41.8954 259.363 43V61.3864H236.505V43Z"
+ fill="#F9FAFB" stroke="#65A30D" stroke-width="1.5" />
+ <path
+ d="M231.934 65.3789C231.934 63.1698 233.725 61.3789 235.934 61.3789H259.934C262.143 61.3789 263.934 63.1698 263.934 65.3789V100C263.934 102.209 262.143 104 259.934 104H235.934C233.725 104 231.934 102.209 231.934 100V65.3789Z"
+ fill="#ECFCCB" stroke="#65A30D" stroke-width="1.5" />
+ <rect x="240.557" y="49.4141" width="4.55576" height="3.12838" fill="#65A30D" />
+ <rect x="250.756" y="49.4141" width="4.55576" height="3.12838" fill="#65A30D" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M152.332 42L144.434 42H126.934C124.725 42 122.934 43.7909 122.934 46L122.934 98C122.934 100.209 124.725 102 126.934 102L161.934 102C164.143 102 165.934 100.209 165.934 98L165.934 55.9695L152.332 42Z"
+ fill="#DDEDFE" />
+ <path
+ d="M144.434 42L144.434 41.25H144.434V42ZM152.332 42L152.869 41.4768L152.648 41.25L152.332 41.25L152.332 42ZM122.934 46H123.684H122.934ZM122.934 98H122.184H122.934ZM126.934 102V101.25V102ZM161.934 102V102.75V102ZM165.934 98H165.184H165.934ZM165.934 55.9695H166.684V55.6646L166.471 55.4462L165.934 55.9695ZM144.434 42.75L152.332 42.75L152.332 41.25L144.434 41.25L144.434 42.75ZM126.934 42.75H144.434V41.25H126.934V42.75ZM123.684 46C123.684 44.2051 125.139 42.75 126.934 42.75V41.25C124.311 41.25 122.184 43.3766 122.184 46H123.684ZM123.684 98L123.684 46H122.184L122.184 98H123.684ZM126.934 101.25C125.139 101.25 123.684 99.7949 123.684 98H122.184C122.184 100.623 124.311 102.75 126.934 102.75V101.25ZM161.934 101.25L126.934 101.25V102.75L161.934 102.75V101.25ZM165.184 98C165.184 99.7949 163.729 101.25 161.934 101.25V102.75C164.557 102.75 166.684 100.623 166.684 98H165.184ZM165.184 55.9695L165.184 98H166.684L166.684 55.9695H165.184ZM166.471 55.4462L152.869 41.4768L151.795 42.5232L165.397 56.4927L166.471 55.4462Z"
+ fill="#196FDE" />
+ <path
+ d="M165.665 55.6787L156.629 55.6787C154.42 55.6787 152.629 53.8878 152.629 51.6787L152.629 42.2911L165.665 55.6787Z"
+ fill="#EFF7FF" stroke="#196FDE" stroke-width="1.5" stroke-linejoin="round" />
+ <path d="M134.537 63.4902H154.378" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M134.537 69.0361H145.2" stroke="#196FDE" stroke-width="1.5" stroke-linecap="round" />
+ <path
+ d="M143.631 80.7328C143.631 78.654 141.946 76.9688 139.867 76.9688C137.789 76.9688 136.103 78.654 136.103 80.7328V87.4129C136.103 89.4917 137.789 91.1769 139.867 91.1769C141.946 91.1769 143.631 89.4917 143.631 87.4129V80.7328Z"
+ stroke="#196FDE" stroke-width="1.5" />
+ <rect x="133.533" y="84.52" width="12.671" height="9.44635" rx="1.25" fill="#52ADF9"
+ stroke="#196FDE" stroke-width="1.5" />
+</svg>
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 0000000000000000000000000000000000000000..c53d8b800163fad2d53d3bbccaaec56b3c6e986e
--- /dev/null
+++ b/briar-android/artwork/il_transfer_data_send_night.svg
@@ -0,0 +1,47 @@
+<svg width="289" height="144" viewBox="0 0 289 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <rect x="-0.75" y="0.75" width="40.5" height="76.5" rx="7.25"
+ transform="matrix(-1 0 0 1 55.4341 33)" fill="#1E293B" stroke="#A3E635"
+ stroke-width="1.5" />
+ <path d="M56.1841 47.9976H15.6843V100.498H56.1841V47.9976Z" fill="#0B1120" stroke="#A3E635"
+ stroke-width="1.5" />
+ <rect x="19.5393" y="65.1011" width="32.7896" height="18.293" rx="4" fill="#184080" />
+ <path d="M26.0515 71.5542H45.924" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M26.0515 77.6519H36.7315" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <ellipse rx="1" ry="1.00118" transform="matrix(-1 0 0 1 35.9341 41.0012)" fill="#A3E635" />
+ <path
+ d="M27.9341 40.2744C27.5199 40.2744 27.1841 40.6102 27.1841 41.0244C27.1841 41.4386 27.5199 41.7744 27.9341 41.7744V40.2744ZM31.9341 41.7744C32.3483 41.7744 32.6841 41.4386 32.6841 41.0244C32.6841 40.6102 32.3483 40.2744 31.9341 40.2744V41.7744ZM27.9341 41.7744H31.9341V40.2744H27.9341V41.7744Z"
+ fill="#A3E635" />
+ <path
+ d="M39.9341 40.2744C39.5199 40.2744 39.1841 40.6102 39.1841 41.0244C39.1841 41.4386 39.5199 41.7744 39.9341 41.7744V40.2744ZM43.9341 41.7744C44.3483 41.7744 44.6841 41.4386 44.6841 41.0244C44.6841 40.6102 44.3483 40.2744 43.9341 40.2744V41.7744ZM39.9341 41.7744H43.9341V40.2744H39.9341V41.7744Z"
+ fill="#A3E635" />
+ <circle cx="89.9341" cy="72" r="4" fill="#1457C5" />
+ <circle cx="105.934" cy="72" r="4" fill="#2B8EF1" />
+ <circle cx="73.9341" cy="72" r="4" fill="#184080" />
+ <circle cx="198.934" cy="72" r="4" fill="#1457C5" />
+ <circle cx="214.934" cy="72" r="4" fill="#2B8EF1" />
+ <circle cx="182.934" cy="72" r="4" fill="#184080" />
+ <path
+ d="M236.505 43C236.505 41.8954 237.401 41 238.505 41H257.363C258.468 41 259.363 41.8954 259.363 43V61.3864H236.505V43Z"
+ fill="#123060" stroke="#A3E635" stroke-width="1.5" />
+ <path
+ d="M231.934 65.3789C231.934 63.1698 233.725 61.3789 235.934 61.3789H259.934C262.143 61.3789 263.934 63.1698 263.934 65.3789V100C263.934 102.209 262.143 104 259.934 104H235.934C233.725 104 231.934 102.209 231.934 100V65.3789Z"
+ fill="#1E293B" stroke="#A3E635" stroke-width="1.5" />
+ <rect x="240.557" y="49.4141" width="4.55576" height="3.12838" fill="#A3E635" />
+ <rect x="250.756" y="49.4141" width="4.55576" height="3.12838" fill="#A3E635" />
+ <path fill-rule="evenodd" clip-rule="evenodd"
+ d="M152.332 42L144.434 42H126.934C124.725 42 122.934 43.7909 122.934 46L122.934 98C122.934 100.209 124.725 102 126.934 102L161.934 102C164.143 102 165.934 100.209 165.934 98L165.934 55.9695L152.332 42Z"
+ fill="#184080" />
+ <path
+ d="M144.434 42L144.434 41.25H144.434V42ZM152.332 42L152.869 41.4768L152.648 41.25L152.332 41.25L152.332 42ZM122.934 46H123.684H122.934ZM122.934 98H122.184H122.934ZM126.934 102V101.25V102ZM161.934 102V102.75V102ZM165.934 98H165.184H165.934ZM165.934 55.9695H166.684V55.6646L166.471 55.4462L165.934 55.9695ZM144.434 42.75L152.332 42.75L152.332 41.25L144.434 41.25L144.434 42.75ZM126.934 42.75H144.434V41.25H126.934V42.75ZM123.684 46C123.684 44.2051 125.139 42.75 126.934 42.75V41.25C124.311 41.25 122.184 43.3766 122.184 46H123.684ZM123.684 98L123.684 46H122.184L122.184 98H123.684ZM126.934 101.25C125.139 101.25 123.684 99.7949 123.684 98H122.184C122.184 100.623 124.311 102.75 126.934 102.75V101.25ZM161.934 101.25L126.934 101.25V102.75L161.934 102.75V101.25ZM165.184 98C165.184 99.7949 163.729 101.25 161.934 101.25V102.75C164.557 102.75 166.684 100.623 166.684 98H165.184ZM165.184 55.9695L165.184 98H166.684L166.684 55.9695H165.184ZM166.471 55.4462L152.869 41.4768L151.795 42.5232L165.397 56.4927L166.471 55.4462Z"
+ fill="#52ADF9" />
+ <path
+ d="M165.664 55.6787L156.629 55.6787C154.419 55.6787 152.629 53.8878 152.629 51.6787L152.629 42.2911L165.664 55.6787Z"
+ fill="#196FDE" stroke="#52ADF9" stroke-width="1.5" stroke-linejoin="round" />
+ <path d="M134.537 63.4902H154.378" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <path d="M134.537 69.0361H145.2" stroke="#52ADF9" stroke-width="1.5" stroke-linecap="round" />
+ <path
+ d="M143.631 80.7328C143.631 78.654 141.946 76.9688 139.867 76.9688C137.788 76.9688 136.103 78.654 136.103 80.7328V87.4129C136.103 89.4917 137.788 91.1769 139.867 91.1769C141.946 91.1769 143.631 89.4917 143.631 87.4129V80.7328Z"
+ stroke="#52ADF9" stroke-width="1.5" />
+ <rect x="133.533" y="84.52" width="12.671" height="9.44635" rx="1.25" fill="#196FDE"
+ stroke="#52ADF9" stroke-width="1.5" />
+</svg>
diff --git a/briar-android/artwork/transfer_data_send.svg b/briar-android/artwork/transfer_data_send.svg
deleted file mode 100644
index 4cbdb88f9fb73ad642c3d4187c4bad00e1724c59..0000000000000000000000000000000000000000
--- a/briar-android/artwork/transfer_data_send.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="120" height="52"
- viewBox="0 0 120 52" fill="none" version="1.1" id="svg24"
- sodipodi:docname="transfer_data_send.svg" inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
- <defs id="defs11" />
- <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1"
- objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0"
- inkscape:pageshadow="2" inkscape:window-width="1920" inkscape:window-height="982"
- id="namedview9" showgrid="false" inkscape:zoom="4.1077454" inkscape:cx="35.020218"
- inkscape:cy="26.319497" inkscape:window-x="1920" inkscape:window-y="72"
- inkscape:window-maximized="1" inkscape:current-layer="svg24" inkscape:document-rotation="0"
- fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"
- lock-margins="true" />
- <metadata id="metadata30">
- <rdf:RDF>
- <cc:Work rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <path id="path8"
- style="fill:#8a9cb3;stroke:none;stroke-width:0.749281;stroke-miterlimit:4;stroke-dasharray:none"
- d="m 91.223138,12.30985 c -0.596207,0 -1.167798,0.237677 -1.588736,0.659365 -0.421693,0.42094 -0.659371,0.992537 -0.659371,1.588743 v 10.111264 c -0.596207,0 -1.16631,0.236178 -1.58725,0.657875 -0.421682,0.420938 -0.659361,0.992529 -0.659361,1.588736 v 12.35937 h 2.246611 v -12.35937 h 17.977399 v 12.359369 h 2.24662 V 26.915833 c 0,-0.596207 -0.23619,-1.167798 -0.65788,-1.588737 -0.42094,-0.421697 -0.99253,-0.657875 -1.58874,-0.657875 V 14.557958 c 0,-0.596206 -0.23768,-1.167804 -0.65937,-1.588743 -0.42094,-0.421688 -0.99252,-0.659365 -1.58873,-0.659365 z m 0,2.248108 H 104.70433 V 24.669222 H 91.223138 Z m 2.24662,2.224241 v 2.246609 h 3.369915 v -2.246609 z m 5.618031,0 v 2.246609 h 3.369931 v -2.246609 z"
- sodipodi:nodetypes="scsccsccccccsccscssccccccccccccccc" />
- <path
- d="m 47.827564,24.463076 v 3.073847 h 18.443085 l -8.45308,8.453081 2.182432,2.182432 12.172435,-12.172438 -12.172435,-12.172434 -2.182432,2.182431 8.45308,8.45308 z"
- id="path895" style="fill:#82c91e;fill-opacity:1;stroke:none;stroke-width:1.53692" />
- <path id="path8-3"
- style="fill:#8a9cb3;stroke:none;stroke-width:0.985186;stroke-miterlimit:4;stroke-dasharray:none"
- d="M 6.4982841,0 C 4.7744519,0 3.1234817,0.68560936 1.9045686,1.9045677 0.68565358,3.1235212 0,4.7763832 0,6.5002454 V 45.497793 c 0,1.723832 0.68565358,3.378724 1.9045686,4.597639 C 3.1234817,51.314343 4.7744519,52 6.4982841,52 H 25.999019 c 1.723832,0 3.376764,-0.685657 4.595677,-1.904568 1.218914,-1.218917 1.904569,-2.873807 1.904568,-4.597639 V 6.5002454 c 0,-1.7238622 -0.685654,-3.3767242 -1.904568,-4.5956777 C 29.375783,0.68560936 27.722851,0 25.999019,0 Z m 0,3.2520847 H 25.999019 c 0.861916,0 1.689313,0.339865 2.29882,0.9493418 0.609407,0.6094767 0.951302,1.4368929 0.951302,2.2988189 V 45.497793 c 0,0.861916 -0.341895,1.689315 -0.951302,2.29882 -0.609507,0.609408 -1.436904,0.953264 -2.29882,0.953264 H 6.4982841 c -0.8619161,0 -1.6873525,-0.343856 -2.2968577,-0.953264 C 3.5920186,47.187108 3.2501219,46.359709 3.2501219,45.497793 V 6.5002454 c 0,-0.861926 0.3418967,-1.6893422 0.9513045,-2.2988189 C 4.8109316,3.5919497 5.636368,3.2520847 6.4982841,3.2520847 Z M 16.248652,36.016144 c -0.861916,0 -1.68745,0.341895 -2.296859,0.951302 -0.609506,0.609506 -0.953264,1.436905 -0.953264,2.29882 0,0.861916 0.343758,1.687452 0.953264,2.29686 0.609409,0.609507 1.434943,0.951302 2.296859,0.951302 0.861916,0 1.689312,-0.341797 2.298819,-0.951302 0.609408,-0.609408 0.951303,-1.434942 0.951303,-2.29686 0,-0.861915 -0.341895,-1.689311 -0.951303,-2.29882 -0.609507,-0.609407 -1.436903,-0.951302 -2.298819,-0.951302 z"
- sodipodi:nodetypes="sssssssscsssssscsscsscsscsssscssscs" />
-</svg>
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 a39326bba7fb6d2457cb11c2cc6a73983721492f..06b6a0b2ba25acbab901b67015651754728b2959 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 0000000000000000000000000000000000000000..cd05a4d9c11dae78b3846dce0c5eab06f4f61342
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_transfer_data_send.xml
@@ -0,0 +1,109 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="144">
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M48.93,33.75L22.93,33.75A7.25,7.25 0,0 0,15.68 41L15.68,103A7.25,7.25 0,0 0,22.93 110.25L48.93,110.25A7.25,7.25 0,0 0,56.18 103L56.18,41A7.25,7.25 0,0 0,48.93 33.75z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#0B1120"
+ android:pathData="M56.18,48H15.68V100.5H56.18V48Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M23.54,65.1L48.33,65.1A4,4 0,0 1,52.33 69.1L52.33,79.39A4,4 0,0 1,48.33 83.39L23.54,83.39A4,4 0,0 1,19.54 79.39L19.54,69.1A4,4 0,0 1,23.54 65.1z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,71.55H45.92"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,77.65H36.73"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M36.93,41a1,1 90,1 1,-2 0a1,1 90,1 1,2 0z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M27.93,40.27C27.52,40.27 27.18,40.61 27.18,41.02C27.18,41.44 27.52,41.77 27.93,41.77V40.27ZM31.93,41.77C32.35,41.77 32.68,41.44 32.68,41.02C32.68,40.61 32.35,40.27 31.93,40.27V41.77ZM27.93,41.77H31.93V40.27H27.93V41.77Z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M39.93,40.27C39.52,40.27 39.18,40.61 39.18,41.02C39.18,41.44 39.52,41.77 39.93,41.77V40.27ZM43.93,41.77C44.35,41.77 44.68,41.44 44.68,41.02C44.68,40.61 44.35,40.27 43.93,40.27V41.77ZM39.93,41.77H43.93V40.27H39.93V41.77Z" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M89.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M105.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M73.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#1457C5"
+ android:pathData="M198.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#2B8EF1"
+ android:pathData="M214.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#184080"
+ android:pathData="M182.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#123060"
+ android:pathData="M236.51,43C236.51,41.9 237.4,41 238.51,41H257.36C258.47,41 259.36,41.9 259.36,43V61.39H236.51V43Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#1E293B"
+ android:pathData="M231.93,65.38C231.93,63.17 233.73,61.38 235.93,61.38H259.93C262.14,61.38 263.93,63.17 263.93,65.38V100C263.93,102.21 262.14,104 259.93,104H235.93C233.73,104 231.93,102.21 231.93,100V65.38Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#A3E635" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M240.56,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#A3E635"
+ android:pathData="M250.76,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#184080"
+ android:fillType="evenOdd"
+ android:pathData="M152.33,42L144.43,42H126.93C124.72,42 122.93,43.79 122.93,46L122.93,98C122.93,100.21 124.72,102 126.93,102L161.93,102C164.14,102 165.93,100.21 165.93,98L165.93,55.97L152.33,42Z" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M144.43,42L144.43,41.25H144.43V42ZM152.33,42L152.87,41.48L152.65,41.25L152.33,41.25L152.33,42ZM122.93,46H123.68H122.93ZM122.93,98H122.18H122.93ZM126.93,102V101.25V102ZM161.93,102V102.75V102ZM165.93,98H165.18H165.93ZM165.93,55.97H166.68V55.66L166.47,55.45L165.93,55.97ZM144.43,42.75L152.33,42.75L152.33,41.25L144.43,41.25L144.43,42.75ZM126.93,42.75H144.43V41.25H126.93V42.75ZM123.68,46C123.68,44.21 125.14,42.75 126.93,42.75V41.25C124.31,41.25 122.18,43.38 122.18,46H123.68ZM123.68,98L123.68,46H122.18L122.18,98H123.68ZM126.93,101.25C125.14,101.25 123.68,99.79 123.68,98H122.18C122.18,100.62 124.31,102.75 126.93,102.75V101.25ZM161.93,101.25L126.93,101.25V102.75L161.93,102.75V101.25ZM165.18,98C165.18,99.79 163.73,101.25 161.93,101.25V102.75C164.56,102.75 166.68,100.62 166.68,98H165.18ZM165.18,55.97L165.18,98H166.68L166.68,55.97H165.18ZM166.47,55.45L152.87,41.48L151.79,42.52L165.4,56.49L166.47,55.45Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M165.66,55.68L156.63,55.68C154.42,55.68 152.63,53.89 152.63,51.68L152.63,42.29L165.66,55.68Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineJoin="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,63.49H154.38"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,69.04H145.2"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M143.63,80.73C143.63,78.65 141.95,76.97 139.87,76.97C137.79,76.97 136.1,78.65 136.1,80.73V87.41C136.1,89.49 137.79,91.18 139.87,91.18C141.95,91.18 143.63,89.49 143.63,87.41V80.73Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M134.78,84.52L144.95,84.52A1.25,1.25 0,0 1,146.2 85.77L146.2,92.72A1.25,1.25 0,0 1,144.95 93.97L134.78,93.97A1.25,1.25 0,0 1,133.53 92.72L133.53,85.77A1.25,1.25 0,0 1,134.78 84.52z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#52ADF9" />
+</vector>
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 59b6f35ba289e0b9924b48cb20842fcb765e72cc..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_transfer_data_send.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="120dp"
- android:height="52dp"
- android:viewportWidth="120"
- android:viewportHeight="52">
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="m91.223,12.31c-0.596,0 -1.168,0.238 -1.589,0.659 -0.422,0.421 -0.659,0.993 -0.659,1.589v10.111c-0.596,0 -1.166,0.236 -1.587,0.658 -0.422,0.421 -0.659,0.993 -0.659,1.589v12.359h2.247v-12.359h17.977v12.359h2.247L109.199,26.916c0,-0.596 -0.236,-1.168 -0.658,-1.589 -0.421,-0.422 -0.993,-0.658 -1.589,-0.658L106.952,14.558c0,-0.596 -0.238,-1.168 -0.659,-1.589 -0.421,-0.422 -0.993,-0.659 -1.589,-0.659zM91.223,14.558L104.704,14.558L104.704,24.669L91.223,24.669ZM93.47,16.782v2.247h3.37v-2.247zM99.088,16.782v2.247h3.37v-2.247z" />
- <path
- android:fillColor="@color/briar_brand_green"
- android:pathData="m47.828,24.463v3.074h18.443l-8.453,8.453 2.182,2.182 12.172,-12.172 -12.172,-12.172 -2.182,2.182 8.453,8.453z" />
- <path
- android:fillColor="?attr/colorControlNormal"
- android:pathData="M6.498,0C4.774,0 3.123,0.686 1.905,1.905 0.686,3.124 0,4.776 0,6.5L0,45.498c0,1.724 0.686,3.379 1.905,4.598C3.123,51.314 4.774,52 6.498,52L25.999,52c1.724,0 3.377,-0.686 4.596,-1.905 1.219,-1.219 1.905,-2.874 1.905,-4.598L32.499,6.5c0,-1.724 -0.686,-3.377 -1.905,-4.596C29.376,0.686 27.723,0 25.999,0ZM6.498,3.252L25.999,3.252c0.862,0 1.689,0.34 2.299,0.949 0.609,0.609 0.951,1.437 0.951,2.299L29.249,45.498c0,0.862 -0.342,1.689 -0.951,2.299 -0.61,0.609 -1.437,0.953 -2.299,0.953L6.498,48.75c-0.862,0 -1.687,-0.344 -2.297,-0.953C3.592,47.187 3.25,46.36 3.25,45.498L3.25,6.5c0,-0.862 0.342,-1.689 0.951,-2.299C4.811,3.592 5.636,3.252 6.498,3.252ZM16.249,36.016c-0.862,0 -1.687,0.342 -2.297,0.951 -0.61,0.61 -0.953,1.437 -0.953,2.299 0,0.862 0.344,1.687 0.953,2.297 0.609,0.61 1.435,0.951 2.297,0.951 0.862,0 1.689,-0.342 2.299,-0.951 0.609,-0.609 0.951,-1.435 0.951,-2.297 0,-0.862 -0.342,-1.689 -0.951,-2.299 -0.61,-0.609 -1.437,-0.951 -2.299,-0.951z" />
-</vector>
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 0000000000000000000000000000000000000000..cf31870103802022287d83d8003124052359d670
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_transfer_data_send.xml
@@ -0,0 +1,109 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="200dp"
+ android:height="100dp"
+ android:viewportWidth="289"
+ android:viewportHeight="144">
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M48.93,33.75L22.93,33.75A7.25,7.25 0,0 0,15.68 41L15.68,103A7.25,7.25 0,0 0,22.93 110.25L48.93,110.25A7.25,7.25 0,0 0,56.18 103L56.18,41A7.25,7.25 0,0 0,48.93 33.75z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M56.18,48H15.68V100.5H56.18V48Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:pathData="M23.54,65.1L48.33,65.1A4,4 0,0 1,52.33 69.1L52.33,79.39A4,4 0,0 1,48.33 83.39L23.54,83.39A4,4 0,0 1,19.54 79.39L19.54,69.1A4,4 0,0 1,23.54 65.1z" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,71.55H45.92"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M26.05,77.65H36.73"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M36.93,41a1,1 90,1 1,-2 0a1,1 90,1 1,2 0z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M27.93,40.27C27.52,40.27 27.18,40.61 27.18,41.02C27.18,41.44 27.52,41.77 27.93,41.77V40.27ZM31.93,41.77C32.35,41.77 32.68,41.44 32.68,41.02C32.68,40.61 32.35,40.27 31.93,40.27V41.77ZM27.93,41.77H31.93V40.27H27.93V41.77Z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M39.93,40.27C39.52,40.27 39.18,40.61 39.18,41.02C39.18,41.44 39.52,41.77 39.93,41.77V40.27ZM43.93,41.77C44.35,41.77 44.68,41.44 44.68,41.02C44.68,40.61 44.35,40.27 43.93,40.27V41.77ZM39.93,41.77H43.93V40.27H39.93V41.77Z" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M89.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M105.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M73.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#8BCAFD"
+ android:pathData="M198.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M214.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#BDDFFE"
+ android:pathData="M182.93,72m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+ <path
+ android:fillColor="#F9FAFB"
+ android:pathData="M236.51,43C236.51,41.9 237.4,41 238.51,41H257.36C258.47,41 259.36,41.9 259.36,43V61.39H236.51V43Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#ECFCCB"
+ android:pathData="M231.93,65.38C231.93,63.17 233.73,61.38 235.93,61.38H259.93C262.14,61.38 263.93,63.17 263.93,65.38V100C263.93,102.21 262.14,104 259.93,104H235.93C233.73,104 231.93,102.21 231.93,100V65.38Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#65A30D" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M240.56,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#65A30D"
+ android:pathData="M250.76,49.41h4.56v3.13h-4.56z" />
+ <path
+ android:fillColor="#DDEDFE"
+ android:fillType="evenOdd"
+ android:pathData="M152.33,42L144.43,42H126.93C124.72,42 122.93,43.79 122.93,46L122.93,98C122.93,100.21 124.72,102 126.93,102L161.93,102C164.14,102 165.93,100.21 165.93,98L165.93,55.97L152.33,42Z" />
+ <path
+ android:fillColor="#196FDE"
+ android:pathData="M144.43,42L144.43,41.25H144.43V42ZM152.33,42L152.87,41.48L152.65,41.25L152.33,41.25L152.33,42ZM122.93,46H123.68H122.93ZM122.93,98H122.18H122.93ZM126.93,102V101.25V102ZM161.93,102V102.75V102ZM165.93,98H165.18H165.93ZM165.93,55.97H166.68V55.66L166.47,55.45L165.93,55.97ZM144.43,42.75L152.33,42.75L152.33,41.25L144.43,41.25L144.43,42.75ZM126.93,42.75H144.43V41.25H126.93V42.75ZM123.68,46C123.68,44.21 125.14,42.75 126.93,42.75V41.25C124.31,41.25 122.18,43.38 122.18,46H123.68ZM123.68,98L123.68,46H122.18L122.18,98H123.68ZM126.93,101.25C125.14,101.25 123.68,99.79 123.68,98H122.18C122.18,100.62 124.31,102.75 126.93,102.75V101.25ZM161.93,101.25L126.93,101.25V102.75L161.93,102.75V101.25ZM165.18,98C165.18,99.79 163.73,101.25 161.93,101.25V102.75C164.56,102.75 166.68,100.62 166.68,98H165.18ZM165.18,55.97L165.18,98H166.68L166.68,55.97H165.18ZM166.47,55.45L152.87,41.48L151.79,42.52L165.4,56.49L166.47,55.45Z" />
+ <path
+ android:fillColor="#EFF7FF"
+ android:pathData="M165.66,55.68L156.63,55.68C154.42,55.68 152.63,53.89 152.63,51.68L152.63,42.29L165.66,55.68Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineJoin="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,63.49H154.38"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M134.54,69.04H145.2"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE"
+ android:strokeLineCap="round" />
+ <path
+ android:fillColor="#00000000"
+ android:pathData="M143.63,80.73C143.63,78.65 141.95,76.97 139.87,76.97C137.79,76.97 136.1,78.65 136.1,80.73V87.41C136.1,89.49 137.79,91.18 139.87,91.18C141.95,91.18 143.63,89.49 143.63,87.41V80.73Z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+ <path
+ android:fillColor="#52ADF9"
+ android:pathData="M134.78,84.52L144.95,84.52A1.25,1.25 0,0 1,146.2 85.77L146.2,92.72A1.25,1.25 0,0 1,144.95 93.97L134.78,93.97A1.25,1.25 0,0 1,133.53 92.72L133.53,85.77A1.25,1.25 0,0 1,134.78 84.52z"
+ android:strokeWidth="1.5"
+ android:strokeColor="#196FDE" />
+</vector>
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 f8bf50af3e54813142b7386e21d92feff8971c35..a7564a3986f911b398230e13488250d55179b60f 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fillViewport="true">
+ android:orientation="vertical">
- <androidx.constraintlayout.widget.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <ImageView
- android:id="@+id/imageView"
- android:layout_width="@dimen/hero_rect_width"
- android:layout_height="@dimen/hero_rect_height"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- app:layout_constraintBottom_toTopOf="@+id/progressBar"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.25"
- app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_transfer_data_send"
- tools:ignore="ContentDescription" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <ProgressBar
- android:id="@+id/progressBar"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/margin_xlarge"
- android:layout_marginTop="@dimen/margin_xlarge"
- android:visibility="invisible"
- app:layout_constraintBottom_toTopOf="@+id/introTextView"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/imageView"
- tools:visibility="visible" />
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="@dimen/hero_rect_width"
+ android:layout_height="@dimen/hero_rect_height"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ app:layout_constraintBottom_toTopOf="@+id/progressBar"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.25"
+ app:layout_constraintVertical_chainStyle="packed"
+ app:srcCompat="@drawable/il_transfer_data_send"
+ tools:ignore="ContentDescription" />
- <TextView
- android:id="@+id/introTextView"
- 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:text="@string/removable_drive_send_intro"
- android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
- app:layout_constraintBottom_toTopOf="@+id/fileButton"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/progressBar" />
+ <ProgressBar
+ android:id="@+id/progressBar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/margin_xlarge"
+ android:layout_marginTop="@dimen/margin_xlarge"
+ android:visibility="gone"
+ app:layout_constraintBottom_toTopOf="@+id/introTextView"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView"
+ tools:visibility="visible" />
- <Button
- android:id="@+id/fileButton"
- style="@style/BriarButton"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/margin_large"
- android:enabled="false"
- android:text="@string/removable_drive_send_button"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ <TextView
+ android:id="@+id/introTextView"
+ 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:text="@string/removable_drive_send_intro"
+ android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/progressBar" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+ </ScrollView>
+
+ <Button
+ android:id="@+id/fileButton"
+ style="@style/BriarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/margin_large"
+ android:enabled="false"
+ android:text="@string/removable_drive_send_button"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent" />
+
+</LinearLayout>