mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-15 12:19:54 +01:00
Replace illustration for connecting via Bluetooth
This commit is contained in:
Torsten Grote
@@ -25,6 +25,7 @@ import androidx.lifecycle.ViewModelProvider;
|
||||
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
|
||||
import static android.widget.Toast.LENGTH_LONG;
|
||||
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
|
||||
import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
|
||||
|
||||
@MethodsNotNullByDefault
|
||||
@ParametersNotNullByDefault
|
||||
@@ -71,6 +72,7 @@ public class BluetoothIntroFragment extends Fragment {
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
hideViewOnSmallScreen(requireView().findViewById(R.id.introImageView));
|
||||
conditionManager.reset();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="200dp"
|
||||
android:height="100dp"
|
||||
android:viewportWidth="289"
|
||||
android:viewportHeight="145">
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M268.9,41.8C268.9,37.39 265.32,33.8 260.9,33.8H234.9C230.48,33.8 226.9,37.39 226.9,41.8V103.81C226.9,108.22 230.48,111.81 234.9,111.81H260.9C265.32,111.81 268.9,108.22 268.9,103.81V41.8Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M234.9,35.3H260.9C264.49,35.3 267.4,38.21 267.4,41.8V103.81C267.4,107.39 264.49,110.31 260.9,110.31H234.9C231.31,110.31 228.4,107.39 228.4,103.81V41.8C228.4,38.21 231.31,35.3 234.9,35.3ZM260.9,33.8C265.32,33.8 268.9,37.39 268.9,41.8V103.81C268.9,108.22 265.32,111.81 260.9,111.81H234.9C230.48,111.81 226.9,108.22 226.9,103.81V41.8C226.9,37.39 230.48,33.8 234.9,33.8H260.9Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M246.9,41.81C246.9,42.36 247.35,42.81 247.9,42.81C248.45,42.81 248.9,42.36 248.9,41.81C248.9,41.25 248.45,40.8 247.9,40.8C247.35,40.8 246.9,41.25 246.9,41.81Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M239.15,41.83C239.15,41.41 239.49,41.08 239.9,41.08H243.9C244.32,41.08 244.65,41.41 244.65,41.83C244.65,42.24 244.32,42.58 243.9,42.58H239.9C239.49,42.58 239.15,42.24 239.15,41.83Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M251.15,41.83C251.15,41.41 251.49,41.08 251.9,41.08H255.9C256.32,41.08 256.65,41.41 256.65,41.83C256.65,42.24 256.32,42.58 255.9,42.58H251.9C251.49,42.58 251.15,42.24 251.15,41.83Z" />
|
||||
<path
|
||||
android:fillColor="#0B1120"
|
||||
android:pathData="M268.9,48.05H226.9V102.05H268.9V48.05Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M228.4,49.55H267.4V100.55H228.4V49.55ZM268.9,48.05V102.05H226.9V48.05H268.9Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M61.9,41.8C61.9,37.39 58.32,33.8 53.9,33.8H27.9C23.48,33.8 19.9,37.39 19.9,41.8V103.81C19.9,108.22 23.48,111.81 27.9,111.81H53.9C58.32,111.81 61.9,108.22 61.9,103.81V41.8Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M27.9,35.3H53.9C57.49,35.3 60.4,38.21 60.4,41.8V103.81C60.4,107.39 57.49,110.31 53.9,110.31H27.9C24.31,110.31 21.4,107.39 21.4,103.81V41.8C21.4,38.21 24.31,35.3 27.9,35.3ZM53.9,33.8C58.32,33.8 61.9,37.39 61.9,41.8V103.81C61.9,108.22 58.32,111.81 53.9,111.81H27.9C23.48,111.81 19.9,108.22 19.9,103.81V41.8C19.9,37.39 23.48,33.8 27.9,33.8H53.9Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M39.9,41.81C39.9,42.36 40.35,42.81 40.9,42.81C41.45,42.81 41.9,42.36 41.9,41.81C41.9,41.25 41.45,40.8 40.9,40.8C40.35,40.8 39.9,41.25 39.9,41.81Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M32.15,41.83C32.15,41.41 32.49,41.08 32.9,41.08H36.9C37.32,41.08 37.65,41.41 37.65,41.83C37.65,42.24 37.32,42.58 36.9,42.58H32.9C32.49,42.58 32.15,42.24 32.15,41.83Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M44.15,41.83C44.15,41.41 44.49,41.08 44.9,41.08H48.9C49.32,41.08 49.65,41.41 49.65,41.83C49.65,42.24 49.32,42.58 48.9,42.58H44.9C44.49,42.58 44.15,42.24 44.15,41.83Z" />
|
||||
<path
|
||||
android:fillColor="#0B1120"
|
||||
android:pathData="M61.9,48.05H19.9V102.05H61.9V48.05Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M21.4,49.55H60.4V100.55H21.4V49.55ZM61.9,48.05V102.05H19.9V48.05H61.9Z" />
|
||||
<path
|
||||
android:fillColor="#4D7C0F"
|
||||
android:pathData="M96.15,72.8C96.15,75.01 94.36,76.8 92.15,76.8C89.94,76.8 88.15,75.01 88.15,72.8C88.15,70.6 89.94,68.8 92.15,68.8C94.36,68.8 96.15,70.6 96.15,72.8Z" />
|
||||
<path
|
||||
android:fillColor="#82C91E"
|
||||
android:pathData="M112.15,72.8C112.15,75.01 110.36,76.8 108.15,76.8C105.94,76.8 104.15,75.01 104.15,72.8C104.15,70.6 105.94,68.8 108.15,68.8C110.36,68.8 112.15,70.6 112.15,72.8Z" />
|
||||
<path
|
||||
android:fillColor="#365314"
|
||||
android:pathData="M80.15,72.8C80.15,75.01 78.36,76.8 76.15,76.8C73.94,76.8 72.15,75.01 72.15,72.8C72.15,70.6 73.94,68.8 76.15,68.8C78.36,68.8 80.15,70.6 80.15,72.8Z" />
|
||||
<path
|
||||
android:fillColor="#1457C5"
|
||||
android:pathData="M192.65,72.8C192.65,70.6 194.44,68.8 196.65,68.8C198.86,68.8 200.65,70.6 200.65,72.8C200.65,75.01 198.86,76.8 196.65,76.8C194.44,76.8 192.65,75.01 192.65,72.8Z" />
|
||||
<path
|
||||
android:fillColor="#2B8EF1"
|
||||
android:pathData="M176.65,72.8C176.65,70.6 178.44,68.8 180.65,68.8C182.86,68.8 184.65,70.6 184.65,72.8C184.65,75.01 182.86,76.8 180.65,76.8C178.44,76.8 176.65,75.01 176.65,72.8Z" />
|
||||
<path
|
||||
android:fillColor="#184080"
|
||||
android:pathData="M208.65,72.8C208.65,70.6 210.44,68.8 212.65,68.8C214.86,68.8 216.65,70.6 216.65,72.8C216.65,75.01 214.86,76.8 212.65,76.8C210.44,76.8 208.65,75.01 208.65,72.8Z" />
|
||||
<path
|
||||
android:fillColor="#1E293B"
|
||||
android:pathData="M166.27,62.8C166.27,56.18 160.9,50.8 154.27,50.8H134.27C127.64,50.8 122.27,56.18 122.27,62.8V82.8C122.27,89.43 127.64,94.8 134.27,94.8H154.27C160.9,94.8 166.27,89.43 166.27,82.8V62.8Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M134.27,52.3H154.27C160.07,52.3 164.77,57.01 164.77,62.8V82.8C164.77,88.6 160.07,93.3 154.27,93.3H134.27C128.47,93.3 123.77,88.6 123.77,82.8V62.8C123.77,57.01 128.47,52.3 134.27,52.3ZM154.27,50.8C160.9,50.8 166.27,56.18 166.27,62.8V82.8C166.27,89.43 160.9,94.8 154.27,94.8H134.27C127.64,94.8 122.27,89.43 122.27,82.8V62.8C122.27,56.18 127.64,50.8 134.27,50.8H154.27Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M144.08,62.35C144.34,62.23 144.65,62.26 144.88,62.45L150.58,67.15C150.75,67.29 150.85,67.5 150.85,67.72C150.86,67.94 150.76,68.15 150.6,68.3L145.55,72.68L150.6,77.05C150.76,77.19 150.85,77.4 150.85,77.62C150.85,77.83 150.76,78.04 150.6,78.18L144.89,83.15C144.67,83.34 144.36,83.39 144.09,83.27C143.82,83.14 143.65,82.88 143.65,82.58V74.32L139.19,78.19C138.88,78.46 138.4,78.42 138.13,78.11C137.86,77.8 137.89,77.32 138.21,77.05L143.26,72.68L138.21,68.3C137.89,68.03 137.86,67.55 138.13,67.24C138.4,66.93 138.88,66.89 139.19,67.17L143.65,71.03V63.03C143.65,62.74 143.82,62.47 144.08,62.35ZM145.15,74.32L148.96,77.62L145.15,80.94V74.32ZM145.15,71.03V64.62L148.94,67.75L145.15,71.03Z" />
|
||||
</vector>
|
||||
@@ -1,21 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="100dp"
|
||||
android:height="35dp"
|
||||
android:viewportWidth="500"
|
||||
android:viewportHeight="175">
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="m459.809,167.16 l-4.327,-4.334 -7.07,-2.427c-3.888,-1.335 -8.723,-2.996 -10.744,-3.691l-3.674,-1.263 3.524,-0.173c8.242,-0.404 12.988,-4.007 14.336,-10.884 0.796,-4.061 1.129,-17.298 0.83,-33.041 -0.153,-8.084 -0.166,-15.416 -0.028,-16.295 0.138,-0.878 0.535,-2.42 0.883,-3.426 1.222,-3.532 0.34,-11.908 -1.858,-17.631 -0.348,-0.908 -1.934,-4.215 -3.524,-7.35 -4.158,-8.2 -4.505,-8.942 -4.893,-10.484 -0.459,-1.821 -0.212,-5.435 0.463,-6.766 0.666,-1.315 2.157,-2.916 3.246,-3.487 1.299,-0.68 2.616,0.122 4.686,2.855 3.422,4.516 14.001,19.441 15.732,22.193 3.746,5.956 5.956,11.165 7.972,18.788 0.655,2.475 1.885,6.997 2.735,10.05 0.849,3.053 2.714,10.158 4.144,15.79l2.6,10.24 4.65,5.193c2.557,2.856 5.798,6.464 7.2,8.017 1.403,1.553 2.55,2.975 2.55,3.161 0,0.335 -34.5,29.299 -34.899,29.299 -0.115,0 -2.156,-1.95 -4.535,-4.334zM365.944,150.772c-1.258,-0.628 -2.206,-1.379 -2.914,-2.307 -2.089,-2.736 -1.95,2.369 -1.864,-68.482l0.078,-64.039 0.661,-1.235c1.015,-1.898 1.992,-2.911 3.74,-3.879l1.6,-0.886 37.784,-0.08c42.456,-0.089 39.402,-0.248 42.116,2.192 0.875,0.787 1.757,1.959 2.184,2.904 0.713,1.577 0.716,1.638 0.806,14.204l0.09,12.62 -1.798,-0.13c-1.426,-0.103 -2.081,0.007 -3.166,0.532 -2.013,0.974 -3.94,2.899 -5.115,5.108l-1.037,1.95 -0.007,-12.825 -0.007,-12.825h-33.6,-33.6v51.3,51.3h33.599,33.599l0.076,-34.425c0.073,-32.96 0.098,-34.361 0.591,-32.925 0.283,0.825 1.806,3.997 3.383,7.05 5.493,10.626 5.405,9.86 5.396,47.203 -0.007,27.621 -0.124,29.951 -1.662,33.109 -1.071,2.199 -2.711,3.71 -5.058,4.66l-1.674,0.677 -36.168,0.08 -36.168,0.08 -1.864,-0.931zM408.344,145.734c2.871,-1.309 4.458,-3.678 4.43,-6.617 -0.039,-4.116 -3.109,-7.223 -7.136,-7.223 -2.12,0 -3.567,0.609 -5.164,2.172 -2.245,2.198 -2.754,5.439 -1.301,8.287 0.713,1.398 2.521,3.009 3.962,3.53 1.497,0.542 3.84,0.475 5.209,-0.149z" />
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="m39.434,167.16 l4.327,-4.334 7.07,-2.427c3.888,-1.335 8.723,-2.996 10.744,-3.691l3.674,-1.263 -3.524,-0.173c-8.242,-0.404 -12.988,-4.007 -14.336,-10.884 -0.796,-4.061 -1.129,-17.298 -0.83,-33.041 0.153,-8.084 0.166,-15.416 0.028,-16.295 -0.138,-0.878 -0.535,-2.42 -0.883,-3.426 -1.222,-3.532 -0.34,-11.908 1.858,-17.631 0.348,-0.908 1.934,-4.215 3.524,-7.35 4.158,-8.2 4.505,-8.942 4.893,-10.484 0.459,-1.821 0.212,-5.435 -0.463,-6.766 -0.666,-1.315 -2.157,-2.916 -3.246,-3.487 -1.299,-0.68 -2.616,0.122 -4.686,2.855 -3.422,4.516 -14.001,19.441 -15.732,22.193 -3.746,5.956 -5.956,11.165 -7.972,18.788 -0.655,2.475 -1.885,6.997 -2.735,10.05 -0.849,3.053 -2.714,10.158 -4.144,15.79L14.4,125.824 9.75,131.017c-2.557,2.856 -5.798,6.464 -7.2,8.017 -1.403,1.553 -2.55,2.975 -2.55,3.161 0,0.335 34.5,29.299 34.899,29.299 0.115,0 2.156,-1.95 4.535,-4.334zM133.299,150.772c1.258,-0.628 2.206,-1.379 2.914,-2.307 2.089,-2.736 1.95,2.369 1.864,-68.482l-0.078,-64.039 -0.661,-1.235c-1.015,-1.898 -1.992,-2.911 -3.74,-3.879L132,9.944 94.216,9.865c-42.456,-0.089 -39.402,-0.248 -42.116,2.192 -0.875,0.787 -1.757,1.959 -2.184,2.904 -0.713,1.577 -0.716,1.638 -0.806,14.204l-0.09,12.62 1.798,-0.13c1.426,-0.103 2.081,0.007 3.166,0.532 2.013,0.974 3.94,2.899 5.115,5.108l1.037,1.95 0.007,-12.825 0.007,-12.825h33.6,33.6v51.3,51.3L93.752,126.194 60.153,126.194l-0.076,-34.425c-0.073,-32.96 -0.098,-34.361 -0.591,-32.925 -0.283,0.825 -1.806,3.997 -3.383,7.05 -5.493,10.626 -5.405,9.86 -5.396,47.203 0.007,27.621 0.124,29.951 1.662,33.109 1.071,2.199 2.711,3.71 5.058,4.66l1.674,0.677 36.168,0.08 36.168,0.08 1.864,-0.931zM90.9,145.734c-2.871,-1.309 -4.458,-3.678 -4.43,-6.617 0.039,-4.116 3.109,-7.223 7.136,-7.223 2.12,0 3.567,0.609 5.164,2.172 2.245,2.198 2.754,5.439 1.301,8.287 -0.713,1.398 -2.521,3.009 -3.962,3.53 -1.497,0.542 -3.84,0.475 -5.209,-0.149z" />
|
||||
<path
|
||||
android:fillColor="#0a3d91"
|
||||
android:pathData="m247.254,71.979h4.736c13.165,0 23.763,10.599 23.763,23.763v32.175c0,13.165 -10.599,23.763 -23.763,23.763h-4.736c-13.165,0 -23.763,-10.599 -23.763,-23.763V95.743c0,-13.165 10.599,-23.763 23.763,-23.763z" />
|
||||
<path
|
||||
android:fillColor="#0a3d91"
|
||||
android:pathData="m143.679,23.557c-1.59,2.624 0.182,5.575 2.785,6.643 2.695,1.572 6.171,4.987 9.148,2.232 2.233,-2.04 0.601,-5.728 -2.041,-6.67 -3.064,-1.677 -6.552,-5.515 -9.891,-2.205zM351.705,23.129c-2.768,1.961 -7.068,2.695 -8.378,6.043 -0.642,2.731 1.936,4.993 4.584,4.426 3.202,-1.638 7.057,-2.842 9.178,-5.948 0.569,-2.604 -1.493,-5.351 -4.268,-4.746 -0.416,-0.108 -0.76,0.035 -1.117,0.224zM324.943,36.301c-2.934,1.708 -7.32,1.923 -8.931,5.153 -0.908,2.654 1.432,5.159 4.124,4.861 3.356,-1.304 7.32,-2.113 9.737,-5.002 0.814,-2.538 -0.977,-5.47 -3.796,-5.129 -0.403,-0.146 -0.76,-0.038 -1.133,0.117zM169.707,38.764c-1.219,2.712 0.757,5.461 3.444,6.145 2.858,1.081 6.669,4.118 9.312,1.234 2.315,-2.037 0.339,-5.835 -2.41,-6.418 -3.328,-1.176 -7.385,-4.714 -10.346,-0.961zM296.98,46.381c-3.123,1.309 -7.492,0.971 -9.492,3.97 -1.232,2.519 0.773,5.298 3.48,5.34 3.487,-0.907 7.567,-1.113 10.303,-3.739 1.114,-2.422 -0.312,-5.546 -3.152,-5.551 -0.383,-0.196 -0.75,-0.127 -1.139,-0.02zM199.49,47.926c-2.229,1.462 -2.68,4.866 -0.276,6.377 2.587,1.471 5.915,1.955 8.84,2.495 2.785,0.332 4.746,-2.479 3.891,-5.049 -2.043,-3.28 -6.472,-2.734 -9.717,-4.089 -0.913,0.089 -1.826,0.177 -2.738,0.266zM268.003,52.434c-3.276,0.789 -7.461,-0.188 -9.936,2.382 -1.65,2.268 -0.157,5.354 2.504,5.862 3.612,-0.292 7.718,0.091 10.84,-2.094 1.462,-2.228 0.523,-5.532 -2.285,-5.959 -0.349,-0.249 -0.722,-0.239 -1.123,-0.19zM228.554,53.852c-1.933,1.836 -1.765,5.267 0.871,6.321 2.809,0.989 6.171,0.847 9.144,0.861 2.799,-0.173 4.226,-3.29 2.924,-5.665 -2.604,-2.852 -6.847,-1.542 -10.293,-2.27 -0.882,0.251 -1.764,0.501 -2.646,0.752z" />
|
||||
<path
|
||||
android:fillColor="#ffffff"
|
||||
android:pathData="m252.501,112.09 l11.656,-11.452 -17.126,-19.791 0.019,25.792 -9.142,-9.245 -3.125,3.091 11.521,11.581 -11.498,11.308c3.031,3.056 0,0 3.031,3.056l9.189,-8.973c0.044,4.735 0.004,27.165 0.004,27.165l17.102,-20.773zM251.424,92.519 L258.222,100.383 251.424,107.016zM251.4,132.547 L251.424,117.151 258.317,124.139z" />
|
||||
</vector>
|
||||
85
briar-android/src/main/res/drawable/il_bluetooth_connect.xml
Normal file
85
briar-android/src/main/res/drawable/il_bluetooth_connect.xml
Normal file
@@ -0,0 +1,85 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="200dp"
|
||||
android:height="100dp"
|
||||
android:viewportWidth="289"
|
||||
android:viewportHeight="145">
|
||||
<path
|
||||
android:fillColor="#DDEDFE"
|
||||
android:pathData="M268.9,40.8C268.9,36.39 265.32,32.8 260.9,32.8H234.9C230.48,32.8 226.9,36.39 226.9,40.8V102.81C226.9,107.22 230.48,110.81 234.9,110.81H260.9C265.32,110.81 268.9,107.22 268.9,102.81V40.8Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M234.9,34.3H260.9C264.49,34.3 267.4,37.21 267.4,40.8V102.81C267.4,106.39 264.49,109.31 260.9,109.31H234.9C231.31,109.31 228.4,106.39 228.4,102.81V40.8C228.4,37.21 231.31,34.3 234.9,34.3ZM260.9,32.8C265.32,32.8 268.9,36.39 268.9,40.8V102.81C268.9,107.22 265.32,110.81 260.9,110.81H234.9C230.48,110.81 226.9,107.22 226.9,102.81V40.8C226.9,36.39 230.48,32.8 234.9,32.8H260.9Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:pathData="M246.9,40.81C246.9,41.36 247.35,41.81 247.9,41.81C248.45,41.81 248.9,41.36 248.9,40.81C248.9,40.25 248.45,39.8 247.9,39.8C247.35,39.8 246.9,40.25 246.9,40.81Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M239.15,40.83C239.15,40.41 239.49,40.08 239.9,40.08H243.9C244.32,40.08 244.65,40.41 244.65,40.83C244.65,41.24 244.32,41.58 243.9,41.58H239.9C239.49,41.58 239.15,41.24 239.15,40.83Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M251.15,40.83C251.15,40.41 251.49,40.08 251.9,40.08H255.9C256.32,40.08 256.65,40.41 256.65,40.83C256.65,41.24 256.32,41.58 255.9,41.58H251.9C251.49,41.58 251.15,41.24 251.15,40.83Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M268.9,47.05H226.9V101.05H268.9V47.05Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M228.4,48.55H267.4V99.55H228.4V48.55ZM268.9,47.05V101.05H226.9V47.05H268.9Z" />
|
||||
<path
|
||||
android:fillColor="#ECFCCB"
|
||||
android:pathData="M61.9,40.8C61.9,36.39 58.32,32.8 53.9,32.8H27.9C23.48,32.8 19.9,36.39 19.9,40.8V102.81C19.9,107.22 23.48,110.81 27.9,110.81H53.9C58.32,110.81 61.9,107.22 61.9,102.81V40.8Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M27.9,34.3H53.9C57.49,34.3 60.4,37.21 60.4,40.8V102.81C60.4,106.39 57.49,109.31 53.9,109.31H27.9C24.31,109.31 21.4,106.39 21.4,102.81V40.8C21.4,37.21 24.31,34.3 27.9,34.3ZM53.9,32.8C58.32,32.8 61.9,36.39 61.9,40.8V102.81C61.9,107.22 58.32,110.81 53.9,110.81H27.9C23.48,110.81 19.9,107.22 19.9,102.81V40.8C19.9,36.39 23.48,32.8 27.9,32.8H53.9Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:pathData="M39.9,40.81C39.9,41.36 40.35,41.81 40.9,41.81C41.45,41.81 41.9,41.36 41.9,40.81C41.9,40.25 41.45,39.8 40.9,39.8C40.35,39.8 39.9,40.25 39.9,40.81Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M32.15,40.83C32.15,40.41 32.49,40.08 32.9,40.08H36.9C37.32,40.08 37.65,40.41 37.65,40.83C37.65,41.24 37.32,41.58 36.9,41.58H32.9C32.49,41.58 32.15,41.24 32.15,40.83Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M44.15,40.83C44.15,40.41 44.49,40.08 44.9,40.08H48.9C49.32,40.08 49.65,40.41 49.65,40.83C49.65,41.24 49.32,41.58 48.9,41.58H44.9C44.49,41.58 44.15,41.24 44.15,40.83Z" />
|
||||
<path
|
||||
android:fillColor="#F9FAFB"
|
||||
android:pathData="M61.9,47.05H19.9V101.05H61.9V47.05Z" />
|
||||
<path
|
||||
android:fillColor="#65A30D"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M21.4,48.55H60.4V99.55H21.4V48.55ZM61.9,47.05V101.05H19.9V47.05H61.9Z" />
|
||||
<path
|
||||
android:fillColor="#BEF264"
|
||||
android:pathData="M96.15,71.8C96.15,74.01 94.36,75.8 92.15,75.8C89.94,75.8 88.15,74.01 88.15,71.8C88.15,69.6 89.94,67.8 92.15,67.8C94.36,67.8 96.15,69.6 96.15,71.8Z" />
|
||||
<path
|
||||
android:fillColor="#A3E635"
|
||||
android:pathData="M112.15,71.8C112.15,74.01 110.36,75.8 108.15,75.8C105.94,75.8 104.15,74.01 104.15,71.8C104.15,69.6 105.94,67.8 108.15,67.8C110.36,67.8 112.15,69.6 112.15,71.8Z" />
|
||||
<path
|
||||
android:fillColor="#D9F99D"
|
||||
android:pathData="M80.15,71.8C80.15,74.01 78.36,75.8 76.15,75.8C73.94,75.8 72.15,74.01 72.15,71.8C72.15,69.6 73.94,67.8 76.15,67.8C78.36,67.8 80.15,69.6 80.15,71.8Z" />
|
||||
<path
|
||||
android:fillColor="#8BCAFD"
|
||||
android:pathData="M192.65,71.8C192.65,69.6 194.44,67.8 196.65,67.8C198.86,67.8 200.65,69.6 200.65,71.8C200.65,74.01 198.86,75.8 196.65,75.8C194.44,75.8 192.65,74.01 192.65,71.8Z" />
|
||||
<path
|
||||
android:fillColor="#52ADF9"
|
||||
android:pathData="M176.65,71.8C176.65,69.6 178.44,67.8 180.65,67.8C182.86,67.8 184.65,69.6 184.65,71.8C184.65,74.01 182.86,75.8 180.65,75.8C178.44,75.8 176.65,74.01 176.65,71.8Z" />
|
||||
<path
|
||||
android:fillColor="#BDDFFE"
|
||||
android:pathData="M208.65,71.8C208.65,69.6 210.44,67.8 212.65,67.8C214.86,67.8 216.65,69.6 216.65,71.8C216.65,74.01 214.86,75.8 212.65,75.8C210.44,75.8 208.65,74.01 208.65,71.8Z" />
|
||||
<path
|
||||
android:fillColor="#DDEDFE"
|
||||
android:pathData="M166.27,61.8C166.27,55.18 160.9,49.8 154.27,49.8H134.27C127.64,49.8 122.27,55.18 122.27,61.8V81.8C122.27,88.43 127.64,93.8 134.27,93.8H154.27C160.9,93.8 166.27,88.43 166.27,81.8V61.8Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M134.27,51.3H154.27C160.07,51.3 164.77,56.01 164.77,61.8V81.8C164.77,87.6 160.07,92.3 154.27,92.3H134.27C128.47,92.3 123.77,87.6 123.77,81.8V61.8C123.77,56.01 128.47,51.3 134.27,51.3ZM154.27,49.8C160.9,49.8 166.27,55.18 166.27,61.8V81.8C166.27,88.43 160.9,93.8 154.27,93.8H134.27C127.64,93.8 122.27,88.43 122.27,81.8V61.8C122.27,55.18 127.64,49.8 134.27,49.8H154.27Z" />
|
||||
<path
|
||||
android:fillColor="#196FDE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M144.08,61.35C144.34,61.23 144.65,61.26 144.88,61.45L150.58,66.15C150.75,66.29 150.85,66.5 150.85,66.72C150.86,66.94 150.76,67.15 150.6,67.3L145.55,71.68L150.6,76.05C150.76,76.19 150.85,76.4 150.85,76.62C150.85,76.83 150.76,77.04 150.6,77.18L144.89,82.15C144.67,82.34 144.36,82.39 144.09,82.27C143.82,82.14 143.65,81.88 143.65,81.58V73.32L139.19,77.19C138.88,77.46 138.4,77.42 138.13,77.11C137.86,76.8 137.89,76.32 138.21,76.05L143.26,71.68L138.21,67.3C137.89,67.03 137.86,66.55 138.13,66.24C138.4,65.93 138.88,65.89 139.19,66.17L143.65,70.03V62.03C143.65,61.74 143.82,61.47 144.08,61.35ZM145.15,73.32L148.96,76.62L145.15,79.94V73.32ZM145.15,70.03V63.62L148.94,66.75L145.15,70.03Z" />
|
||||
</vector>
|
||||
@@ -1,51 +1,56 @@
|
||||
<?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"
|
||||
tools:context=".android.contact.connect.BluetoothIntroFragment">
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
<ScrollView
|
||||
android:id="@+id/scrollView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/introImageView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_margin="16dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/introTextView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHeight_percent="0.2"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/ic_bluetooth" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/introTextView"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:text="@string/connect_via_bluetooth_intro"
|
||||
app:layout_constraintBottom_toTopOf="@+id/startButton"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/introImageView" />
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/introImageView"
|
||||
android:layout_width="@dimen/hero_rect_width"
|
||||
android:layout_height="@dimen/hero_rect_height"
|
||||
android:layout_margin="16dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/introTextView"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:srcCompat="@drawable/il_bluetooth_connect" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/startButton"
|
||||
style="@style/BriarButton"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="16dp"
|
||||
android:text="@string/start"
|
||||
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_margin="16dp"
|
||||
android:text="@string/connect_via_bluetooth_intro"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.5"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/introImageView" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</ScrollView>
|
||||
</ScrollView>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startButton"
|
||||
style="@style/BriarButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:text="@string/start"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:srcCompat="@drawable/ic_bluetooth" />
|
||||
app:srcCompat="@drawable/il_bluetooth_connect" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/progressBar"
|
||||
|
||||
Reference in New Issue
Block a user