mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-15 12:19:54 +01:00
Merge branch '1802-sync-via-removable-storage' into offline-testing
# Conflicts: # bramble-api/src/main/java/org/briarproject/bramble/api/FeatureFlags.java # bramble-core/build.gradle # bramble-core/src/test/java/org/briarproject/bramble/test/BrambleCoreIntegrationTestModule.java # bramble-core/witness.gradle # bramble-java/src/main/java/org/briarproject/bramble/plugin/tor/UnixTorPluginFactory.java # briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java # briar-android/src/main/java/org/briarproject/briar/android/AppModule.java # briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java # briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java # briar-android/src/main/res/values/strings.xml # briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt # briar-headless/src/test/java/org/briarproject/briar/headless/HeadlessTestModule.kt
This commit is contained in:
Torsten Grote
11
briar-android/src/main/res/drawable/ic_arrow_back.xml
Normal file
11
briar-android/src/main/res/drawable/ic_arrow_back.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:autoMirrored="true"
|
||||
android:tint="?attr/colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
|
||||
</vector>
|
||||
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?attr/colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M16.59,7.58L10,14.17l-3.59,-3.58L5,12l5,5 8,-8zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z" />
|
||||
</vector>
|
||||
21
briar-android/src/main/res/drawable/ic_transfer_data.xml
Normal file
21
briar-android/src/main/res/drawable/ic_transfer_data.xml
Normal file
@@ -0,0 +1,21 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="155dp"
|
||||
android:height="155dp"
|
||||
android:viewportWidth="155"
|
||||
android:viewportHeight="155">
|
||||
<path
|
||||
android:fillColor="@color/briar_lime_400"
|
||||
android:pathData="m34.889,27.866c-0.93,-0.021 -1.779,0.612 -1.994,1.555 -0.246,1.077 0.427,2.148 1.504,2.395l5.34,1.223c-6.857,4.771 -12.782,10.788 -17.445,17.768 -5.477,8.197 -9.072,17.492 -10.541,27.219 -0.217,1.437 0.827,2.738 2.271,2.898 1.444,0.16 2.741,-0.88 2.963,-2.316 1.373,-8.889 4.673,-17.381 9.682,-24.877 4.281,-6.406 9.717,-11.929 16.004,-16.316l-1.271,5.559c-0.246,1.077 0.427,2.15 1.504,2.396 1.077,0.246 2.15,-0.427 2.396,-1.504l2.076,-9.08c0.167,-0.732 0.108,-1.458 -0.109,-2.123 -0.033,-0.348 -0.136,-0.693 -0.314,-1.018 -0.354,-0.642 -0.935,-1.078 -1.586,-1.258 -0.31,-0.167 -0.638,-0.31 -0.998,-0.393l-9.078,-2.076c-0.135,-0.031 -0.269,-0.048 -0.402,-0.051zM111.871,30.743c-0.836,0.055 -1.633,0.527 -2.082,1.316 -0.717,1.263 -0.271,2.864 0.961,3.635 8.143,5.096 14.998,12.029 20.002,20.258 4.936,8.117 7.92,17.253 8.746,26.689l-4.25,-3.395c-0.863,-0.689 -2.121,-0.549 -2.811,0.314 -0.689,0.863 -0.549,2.121 0.314,2.811l7.277,5.813c1.726,1.379 4.242,1.097 5.621,-0.629l5.813,-7.277c0.69,-0.863 0.549,-2.121 -0.314,-2.811 -0.863,-0.689 -2.122,-0.549 -2.811,0.314l-3.59,4.494c-0.886,-10.274 -4.128,-20.221 -9.502,-29.057 -5.469,-8.994 -12.974,-16.564 -21.895,-22.105 -0.463,-0.288 -0.979,-0.404 -1.48,-0.371zM45.191,140.86c-0.852,0.028 -1.671,0.446 -2.164,1.209 -0.789,1.219 -0.443,2.855 0.807,3.596 9.034,5.356 19.211,8.518 29.715,9.217 10.503,0.699 21.012,-1.086 30.676,-5.197 1.337,-0.569 1.897,-2.143 1.277,-3.457 -0.621,-1.313 -2.188,-1.87 -3.527,-1.305 -8.852,3.73 -18.466,5.348 -28.076,4.709 -9.61,-0.64 -18.923,-3.518 -27.203,-8.389 -0.47,-0.276 -0.993,-0.4 -1.504,-0.383z" />
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="M68.475,3.03C66.724,3.03 65.046,3.726 63.809,4.964 62.571,6.201 61.875,7.879 61.875,9.63L61.875,49.229c0,1.75 0.696,3.43 1.934,4.668 1.238,1.238 2.916,1.934 4.666,1.934h19.801c1.75,0 3.428,-0.696 4.666,-1.934 1.238,-1.238 1.934,-2.918 1.934,-4.668L94.875,9.63c0,-1.75 -0.696,-3.428 -1.934,-4.666C91.704,3.726 90.026,3.03 88.275,3.03ZM68.475,6.331h19.801c0.875,0 1.715,0.346 2.334,0.965 0.619,0.619 0.965,1.459 0.965,2.334L91.574,49.229c0,0.875 -0.346,1.715 -0.965,2.334C89.99,52.182 89.151,52.53 88.275,52.53L68.475,52.53c-0.875,0 -1.715,-0.348 -2.334,-0.967 -0.619,-0.619 -0.965,-1.459 -0.965,-2.334L65.176,9.63c0,-0.875 0.346,-1.715 0.965,-2.334 0.619,-0.619 1.459,-0.965 2.334,-0.965zM11.25,100.03 L0,111.43v22.799C0,136.319 1.688,138.03 3.75,138.03h22.5c2.063,0 3.75,-1.711 3.75,-3.801L30,103.831C30,101.741 28.313,100.03 26.25,100.03ZM131,103.63c-0.796,0 -1.559,0.316 -2.121,0.879 -0.563,0.562 -0.879,1.325 -0.879,2.121v13.5c-0.796,0 -1.559,0.316 -2.121,0.879 -0.563,0.562 -0.879,1.325 -0.879,2.121v16.5h3v-16.5h24v16.5h3v-16.5c0,-0.796 -0.316,-1.559 -0.879,-2.121 -0.562,-0.563 -1.325,-0.879 -2.121,-0.879v-13.5c0,-0.796 -0.316,-1.559 -0.879,-2.121 -0.562,-0.563 -1.325,-0.879 -2.121,-0.879zM12.807,103.831L26.25,103.831v30.398L3.75,134.229L3.75,113.007ZM131,106.63h18v13.5L131,120.13ZM9.375,109.53v7.6h3.75L13.125,109.53ZM15,109.53v7.6h3.75L18.75,109.53ZM20.625,109.53v7.6h3.75L24.375,109.53Z" />
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="m78.375,46.2c0.875,0 1.715,-0.348 2.333,-0.967 0.619,-0.619 0.966,-1.458 0.966,-2.333 0,-0.875 -0.348,-1.715 -0.966,-2.333C80.09,39.948 79.25,39.6 78.375,39.6c-0.875,0 -1.715,0.348 -2.333,0.966 -0.619,0.619 -0.967,1.458 -0.967,2.333 0,0.875 0.348,1.715 0.967,2.333 0.619,0.619 1.458,0.967 2.333,0.967z" />
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="m134,109.6h4.5v3H134Z" />
|
||||
<path
|
||||
android:fillColor="?attr/colorControlNormal"
|
||||
android:pathData="m141.5,109.6h4.5v3h-4.5z" />
|
||||
</vector>
|
||||
@@ -0,0 +1,15 @@
|
||||
<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="m15.975,14.267c-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.247L33.951,28.873c0,-0.596 -0.236,-1.168 -0.658,-1.589 -0.421,-0.422 -0.993,-0.658 -1.589,-0.658L31.704,16.515c0,-0.596 -0.238,-1.168 -0.659,-1.589 -0.421,-0.422 -0.993,-0.659 -1.589,-0.659zM15.975,16.515L29.456,16.515L29.456,26.626L15.975,26.626ZM18.222,18.739v2.247h3.37v-2.247zM23.84,18.739v2.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="M93.999,0C92.275,0 90.624,0.686 89.405,1.905 88.186,3.124 87.501,4.776 87.501,6.5L87.501,45.498c0,1.724 0.686,3.379 1.905,4.598C90.624,51.314 92.275,52 93.999,52h19.501c1.724,0 3.377,-0.686 4.596,-1.905C119.314,48.877 120,47.222 120,45.498L120,6.5C120,4.776 119.314,3.124 118.095,1.905 116.877,0.686 115.224,0 113.5,0ZM93.999,3.252h19.501c0.862,0 1.689,0.34 2.299,0.949 0.609,0.609 0.951,1.437 0.951,2.299L116.75,45.498c0,0.862 -0.342,1.689 -0.951,2.299 -0.609,0.609 -1.437,0.953 -2.299,0.953L93.999,48.75c-0.862,0 -1.687,-0.344 -2.297,-0.953 -0.609,-0.61 -0.951,-1.437 -0.951,-2.299L90.751,6.5c0,-0.862 0.342,-1.689 0.951,-2.299 0.61,-0.609 1.435,-0.949 2.297,-0.949zM103.749,36.016c-0.862,0 -1.687,0.342 -2.297,0.951 -0.609,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>
|
||||
@@ -0,0 +1,15 @@
|
||||
<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>
|
||||
Reference in New Issue
Block a user