Merge branch 'dashpay' of https://github.com/dashevo/dash-wallet into…

… dashpay-core-20
dashpay · Oct 12, 2023 · 0fd636e · 0fd636e
2 parents 8d9bca3 + c97e236
commit 0fd636e
Show file tree

Hide file tree

Showing 33 changed files with 957 additions and 564 deletions.
diff --git a/common/src/main/res/drawable/ic_advanced_privacy.xml b/common/src/main/res/drawable/ic_advanced_privacy.xml
@@ -1,9 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="23dp"
-    android:viewportWidth="18"
-    android:viewportHeight="23">
-  <path
-      android:pathData="M8.848,22.094C8.934,22.094 9.037,22.076 9.159,22.04C9.288,22.011 9.421,21.961 9.557,21.89C11.089,21.088 12.371,20.364 13.402,19.72C14.441,19.075 15.268,18.438 15.884,17.808C16.507,17.177 16.954,16.501 17.227,15.777C17.499,15.047 17.635,14.198 17.635,13.231V5.132C17.635,4.58 17.517,4.183 17.28,3.939C17.051,3.696 16.711,3.481 16.26,3.295C16.009,3.188 15.665,3.051 15.229,2.887C14.792,2.722 14.308,2.543 13.778,2.35C13.255,2.156 12.729,1.963 12.199,1.77C11.676,1.576 11.197,1.404 10.76,1.254C10.33,1.096 9.99,0.975 9.739,0.889C9.596,0.846 9.449,0.81 9.299,0.781C9.148,0.753 8.998,0.738 8.848,0.738C8.697,0.738 8.547,0.753 8.396,0.781C8.253,0.81 8.11,0.846 7.967,0.889C7.716,0.975 7.372,1.096 6.936,1.254C6.499,1.404 6.015,1.576 5.485,1.77C4.963,1.956 4.436,2.149 3.906,2.35C3.383,2.543 2.904,2.726 2.467,2.897C2.03,3.062 1.686,3.195 1.436,3.295C0.992,3.474 0.651,3.689 0.415,3.939C0.179,4.183 0.061,4.58 0.061,5.132V13.231C0.061,14.198 0.2,15.04 0.479,15.756C0.766,16.465 1.221,17.127 1.844,17.743C2.474,18.352 3.305,18.982 4.336,19.634C5.374,20.285 6.642,21.037 8.139,21.89C8.275,21.961 8.404,22.011 8.525,22.04C8.654,22.076 8.762,22.094 8.848,22.094Z"
-      android:fillColor="#CED2D5"/>
+<vector android:autoMirrored="true" android:height="22dp"
+    android:viewportHeight="22" android:viewportWidth="18"
+    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:fillColor="#008DE4" android:pathData="M9,21.678C9.086,21.678 9.19,21.66 9.312,21.624C9.44,21.595 9.573,21.545 9.709,21.474C11.241,20.671 12.523,19.948 13.555,19.304C14.593,18.659 15.42,18.022 16.036,17.392C16.659,16.761 17.107,16.085 17.379,15.361C17.651,14.631 17.787,13.782 17.787,12.815V4.716C17.787,4.164 17.669,3.767 17.433,3.523C17.204,3.28 16.863,3.065 16.412,2.879C16.162,2.771 15.818,2.635 15.381,2.471C14.944,2.306 14.461,2.127 13.931,1.934C13.408,1.74 12.882,1.547 12.352,1.354C11.829,1.16 11.349,0.988 10.912,0.838C10.482,0.68 10.142,0.559 9.892,0.473C9.748,0.43 9.602,0.394 9.451,0.365C9.301,0.337 9.15,0.322 9,0.322C8.85,0.322 8.699,0.337 8.549,0.365C8.406,0.394 8.262,0.43 8.119,0.473C7.868,0.559 7.525,0.68 7.088,0.838C6.651,0.988 6.168,1.16 5.638,1.354C5.115,1.54 4.589,1.733 4.059,1.934C3.536,2.127 3.056,2.31 2.619,2.481C2.182,2.646 1.839,2.779 1.588,2.879C1.144,3.058 0.804,3.273 0.567,3.523C0.331,3.767 0.213,4.164 0.213,4.716V12.815C0.213,13.782 0.353,14.624 0.632,15.34C0.918,16.049 1.373,16.711 1.996,17.327C2.626,17.936 3.457,18.566 4.488,19.218C5.527,19.869 6.794,20.621 8.291,21.474C8.427,21.545 8.556,21.595 8.678,21.624C8.807,21.66 8.914,21.678 9,21.678ZM4.155,11.354C4.155,11.204 4.216,11.061 4.338,10.925L10.407,3.309C10.565,3.115 10.733,3.022 10.912,3.029C11.098,3.029 11.241,3.104 11.342,3.255C11.449,3.398 11.456,3.588 11.363,3.824L9.354,9.206H13.114C13.257,9.206 13.376,9.253 13.469,9.346C13.569,9.439 13.619,9.557 13.619,9.7C13.619,9.843 13.558,9.987 13.436,10.13L7.367,17.746C7.217,17.94 7.049,18.036 6.862,18.036C6.676,18.029 6.529,17.95 6.422,17.8C6.322,17.649 6.318,17.456 6.411,17.22L8.42,11.838H4.66C4.517,11.838 4.395,11.795 4.295,11.709C4.202,11.616 4.155,11.498 4.155,11.354Z"/>
 </vector>
diff --git a/common/src/main/res/drawable/ic_clock.xml b/common/src/main/res/drawable/ic_clock.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="13">
   <path
       android:pathData="M2.961,7.402H6.02C6.137,7.402 6.234,7.363 6.313,7.285C6.391,7.207 6.43,7.109 6.43,6.992V3.043C6.43,2.93 6.391,2.834 6.313,2.756C6.234,2.678 6.137,2.639 6.02,2.639C5.906,2.639 5.811,2.678 5.732,2.756C5.654,2.834 5.615,2.93 5.615,3.043V6.588H2.961C2.844,6.588 2.746,6.627 2.668,6.705C2.59,6.783 2.551,6.879 2.551,6.992C2.551,7.109 2.59,7.207 2.668,7.285C2.746,7.363 2.844,7.402 2.961,7.402ZM6.025,12.746C6.842,12.746 7.609,12.59 8.328,12.277C9.051,11.965 9.688,11.533 10.238,10.982C10.789,10.432 11.221,9.797 11.533,9.078C11.846,8.355 12.002,7.586 12.002,6.77C12.002,5.953 11.846,5.186 11.533,4.467C11.221,3.744 10.789,3.107 10.238,2.557C9.688,2.006 9.051,1.574 8.328,1.262C7.605,0.949 6.836,0.793 6.02,0.793C5.203,0.793 4.434,0.949 3.711,1.262C2.992,1.574 2.357,2.006 1.807,2.557C1.26,3.107 0.83,3.744 0.518,4.467C0.205,5.186 0.049,5.953 0.049,6.77C0.049,7.586 0.205,8.355 0.518,9.078C0.83,9.797 1.262,10.432 1.813,10.982C2.363,11.533 2.998,11.965 3.717,12.277C4.439,12.59 5.209,12.746 6.025,12.746ZM6.025,11.75C5.334,11.75 4.688,11.621 4.086,11.363C3.484,11.106 2.955,10.75 2.498,10.297C2.045,9.84 1.689,9.311 1.432,8.709C1.178,8.107 1.051,7.461 1.051,6.77C1.051,6.078 1.178,5.432 1.432,4.83C1.689,4.229 2.045,3.699 2.498,3.242C2.951,2.785 3.479,2.43 4.08,2.176C4.682,1.918 5.328,1.789 6.02,1.789C6.711,1.789 7.357,1.918 7.959,2.176C8.564,2.43 9.094,2.785 9.547,3.242C10.004,3.699 10.361,4.229 10.619,4.83C10.877,5.432 11.006,6.078 11.006,6.77C11.006,7.461 10.877,8.107 10.619,8.709C10.365,9.311 10.01,9.84 9.553,10.297C9.096,10.75 8.566,11.106 7.965,11.363C7.363,11.621 6.717,11.75 6.025,11.75Z"
-      android:fillColor="#191C1F"/>
+      android:fillColor="@color/content_primary"/>
 </vector>
diff --git a/common/src/main/res/drawable/ic_intermediate_privacy.xml b/common/src/main/res/drawable/ic_intermediate_privacy.xml
@@ -1,9 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="19dp"
-    android:height="23dp"
-    android:viewportWidth="19"
-    android:viewportHeight="23">
-  <path
-      android:pathData="M0.921,13.371C0.921,14.352 1.064,15.204 1.351,15.928C1.637,16.651 2.099,17.324 2.736,17.947C3.374,18.57 4.215,19.215 5.261,19.881C6.313,20.547 7.603,21.31 9.128,22.169C9.264,22.241 9.396,22.294 9.525,22.33C9.654,22.366 9.762,22.384 9.848,22.384C9.934,22.384 10.041,22.366 10.17,22.33C10.299,22.294 10.431,22.241 10.567,22.169C12.1,21.31 13.389,20.547 14.435,19.881C15.487,19.222 16.332,18.581 16.97,17.958C17.607,17.335 18.065,16.662 18.345,15.939C18.631,15.208 18.774,14.352 18.774,13.371V5.153C18.774,4.588 18.656,4.183 18.42,3.939C18.184,3.696 17.836,3.478 17.378,3.284C17.127,3.177 16.78,3.041 16.336,2.876C15.892,2.704 15.401,2.521 14.864,2.328C14.334,2.128 13.801,1.931 13.264,1.737C12.727,1.544 12.236,1.368 11.792,1.211C11.348,1.053 11.001,0.932 10.75,0.846C10.607,0.803 10.456,0.767 10.299,0.738C10.148,0.702 9.998,0.685 9.848,0.685C9.697,0.685 9.547,0.702 9.396,0.738C9.246,0.774 9.099,0.81 8.956,0.846C8.698,0.917 8.347,1.032 7.903,1.189C7.459,1.34 6.969,1.515 6.432,1.716C5.902,1.909 5.368,2.106 4.831,2.307C4.294,2.507 3.803,2.693 3.359,2.865C2.915,3.037 2.568,3.177 2.317,3.284C1.866,3.47 1.519,3.689 1.275,3.939C1.039,4.183 0.921,4.588 0.921,5.153V13.371ZM10.073,20.396V2.446C10.102,2.453 10.13,2.461 10.159,2.468C10.195,2.475 10.234,2.489 10.277,2.511C10.6,2.64 10.976,2.786 11.405,2.951C11.835,3.109 12.286,3.277 12.759,3.456C13.239,3.628 13.715,3.8 14.188,3.972C14.667,4.144 15.122,4.308 15.552,4.466C15.989,4.616 16.375,4.749 16.712,4.863C16.855,4.913 16.948,4.985 16.991,5.078C17.041,5.171 17.066,5.307 17.066,5.486V12.974C17.066,13.804 16.955,14.51 16.733,15.09C16.519,15.67 16.157,16.204 15.648,16.69C15.147,17.177 14.474,17.693 13.629,18.237C12.791,18.782 11.753,19.43 10.514,20.182C10.435,20.232 10.356,20.275 10.277,20.31C10.206,20.346 10.138,20.375 10.073,20.396Z"
-      android:fillColor="#CED2D5"/>
+<vector android:autoMirrored="true" android:height="22dp"
+    android:viewportHeight="22" android:viewportWidth="18"
+    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:fillColor="#008DE4" android:pathData="M0.073,12.837C0.073,13.818 0.216,14.67 0.503,15.394C0.789,16.117 1.251,16.79 1.889,17.413C2.526,18.036 3.368,18.681 4.413,19.347C5.466,20.013 6.755,20.775 8.28,21.635C8.416,21.706 8.549,21.76 8.678,21.796C8.807,21.832 8.914,21.85 9,21.85C9.086,21.85 9.193,21.832 9.322,21.796C9.451,21.76 9.584,21.706 9.72,21.635C11.252,20.775 12.541,20.013 13.587,19.347C14.64,18.688 15.485,18.047 16.122,17.424C16.759,16.801 17.218,16.128 17.497,15.404C17.784,14.674 17.927,13.818 17.927,12.837V4.619C17.927,4.053 17.809,3.649 17.572,3.405C17.336,3.162 16.989,2.943 16.53,2.75C16.28,2.643 15.932,2.507 15.488,2.342C15.044,2.17 14.554,1.987 14.017,1.794C13.487,1.593 12.953,1.396 12.416,1.203C11.879,1.01 11.388,0.834 10.944,0.677C10.5,0.519 10.153,0.397 9.902,0.312C9.759,0.269 9.609,0.233 9.451,0.204C9.301,0.168 9.15,0.15 9,0.15C8.85,0.15 8.699,0.168 8.549,0.204C8.398,0.24 8.252,0.276 8.108,0.312C7.851,0.383 7.5,0.498 7.056,0.655C6.612,0.806 6.121,0.981 5.584,1.182C5.054,1.375 4.521,1.572 3.983,1.772C3.446,1.973 2.956,2.159 2.512,2.331C2.068,2.503 1.72,2.643 1.47,2.75C1.019,2.936 0.671,3.155 0.428,3.405C0.191,3.649 0.073,4.053 0.073,4.619V12.837ZM9.226,19.862V1.912C9.254,1.919 9.283,1.926 9.312,1.934C9.347,1.941 9.387,1.955 9.43,1.977C9.752,2.105 10.128,2.252 10.558,2.417C10.987,2.575 11.439,2.743 11.911,2.922C12.391,3.094 12.867,3.266 13.34,3.438C13.82,3.609 14.274,3.774 14.704,3.932C15.141,4.082 15.528,4.215 15.864,4.329C16.007,4.379 16.101,4.451 16.144,4.544C16.194,4.637 16.219,4.773 16.219,4.952V12.439C16.219,13.27 16.108,13.976 15.886,14.556C15.671,15.136 15.309,15.669 14.801,16.156C14.3,16.643 13.626,17.159 12.781,17.703C11.943,18.247 10.905,18.896 9.666,19.647C9.587,19.698 9.508,19.741 9.43,19.776C9.358,19.812 9.29,19.841 9.226,19.862Z"/>
 </vector>
diff --git a/common/src/main/res/drawable/light_grey_border_item.xml b/common/src/main/res/drawable/light_grey_border_item.xml
@@ -4,7 +4,7 @@
         <shape android:shape="rectangle"  >
             <corners android:radius="14dp" />
             <solid android:color="@color/background_secondary" />
-            <stroke android:color="@color/light_gray" android:width="1.5dp"/>
+            <stroke android:color="@color/divider_color" android:width="1.5dp"/>
         </shape>
     </item>
     <item android:state_pressed="true">
@@ -25,7 +25,7 @@
         <shape android:shape="rectangle"  >
             <corners android:radius="14dp" />
             <solid android:color="@color/background_secondary" />
-            <stroke android:color="@color/light_gray" android:width="1.5dp"/>
+            <stroke android:color="@color/divider_color" android:width="1.5dp"/>
         </shape>
     </item>
 </selector>
diff --git a/common/src/main/res/layout/dialog_simple.xml b/common/src/main/res/layout/dialog_simple.xml
@@ -39,39 +39,25 @@
         tools:text="Cancel transaction?" />
 
     <Button
-        android:id="@+id/dialog_negative_button"
-        style="@style/Button.Tertiary.Blue"
+        android:id="@+id/dialog_positive_button"
+        style="@style/Button.Primary.Blue"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
-        android:layout_marginEnd="6dp"
-        app:layout_constraintEnd_toStartOf="@id/dialog_positive_button"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dialog_message"
-        tools:text="No, keep it" />
+        tools:text="Yes, cancel" />
 
     <Button
-        android:id="@+id/dialog_negative_button_secondary"
-        style="@style/Button.Secondary"
+        android:id="@+id/dialog_negative_button"
+        style="@style/Button.Tertiary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:layout_marginEnd="6dp"
-        android:visibility="gone"
+        android:layout_marginTop="5dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/dialog_message"
+        app:layout_constraintTop_toBottomOf="@id/dialog_positive_button"
         tools:text="No, keep it" />
-
-    <Button
-        android:id="@+id/dialog_positive_button"
-        style="@style/Button.Primary.Blue"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/dialog_negative_button"
-        app:layout_constraintTop_toBottomOf="@id/dialog_message"
-        tools:text="Yes, cancel" />
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
@@ -809,13 +809,20 @@
         <item name="rippleColor">@color/button_ripple_color</item>
     </style>
 
-    <style name="PrimaryButtonTheme.Large.Red">
+    <style name="PrimaryButtonTheme.Large.LightRed">
         <item name="backgroundColor">@color/system_red_0.1</item>
         <item name="strokeColor">@android:color/transparent</item>
         <item name="titleTextColor">@color/system_red</item>
         <item name="rippleColor">@color/button_ripple_color</item>
     </style>
 
+    <style name="PrimaryButtonTheme.Large.Red">
+        <item name="backgroundColor">@color/system_red</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_white</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
     <style name="PrimaryButtonTheme.Large.TransparentBlue">
         <item name="backgroundColor">@color/light_blue</item>
         <item name="strokeColor">@android:color/transparent</item>
@@ -934,6 +941,10 @@
         <item name="android:theme">@style/PrimaryButtonTheme.Large.Grey</item>
     </style>
 
+    <style name="Button.Primary.Large.LightRed">
+        <item name="android:theme">@style/PrimaryButtonTheme.Large.LightRed</item>
+    </style>
+
     <style name="Button.Primary.Large.Red">
         <item name="android:theme">@style/PrimaryButtonTheme.Large.Red</item>
     </style>

diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml
@@ -365,6 +365,11 @@
             android:theme="@style/My.Theme.ChildActivity"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name="de.schildbach.wallet.ui.coinjoin.CoinJoinActivity"
+            android:theme="@style/LockScreenActivity.Child.Theme"
+            android:screenOrientation="portrait" />
+
         <provider
             android:name="de.schildbach.wallet.data.AddressBookProvider"
             android:authorities="${applicationId}.address_book"

diff --git a/wallet/res/drawable/ic_battery.xml b/wallet/res/drawable/ic_battery.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="13dp"
+    android:viewportHeight="13" android:viewportWidth="28"
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#008DE4" android:pathData="M5.026,9.977C4.751,9.977 4.525,9.953 4.35,9.906C4.18,9.859 4.039,9.78 3.928,9.669C3.816,9.552 3.737,9.408 3.69,9.238C3.644,9.068 3.62,8.846 3.62,8.57V4.756C3.62,4.48 3.644,4.255 3.69,4.079C3.737,3.903 3.816,3.76 3.928,3.648C4.039,3.537 4.18,3.458 4.35,3.411C4.525,3.364 4.757,3.341 5.044,3.341H15.538C15.808,3.341 16.027,3.364 16.197,3.411C16.373,3.458 16.517,3.537 16.628,3.648C16.745,3.76 16.824,3.903 16.865,4.079C16.912,4.249 16.935,4.472 16.935,4.747V8.57C16.935,9.092 16.833,9.458 16.628,9.669C16.517,9.78 16.376,9.859 16.206,9.906C16.036,9.953 15.814,9.977 15.538,9.977H5.026ZM5.606,12.807C4.804,12.807 4.089,12.742 3.462,12.613C2.841,12.479 2.305,12.183 1.854,11.726C1.396,11.28 1.104,10.747 0.975,10.126C0.846,9.499 0.781,8.784 0.781,7.981V5.31C0.781,4.524 0.846,3.821 0.975,3.2C1.109,2.579 1.402,2.04 1.854,1.583C2.305,1.138 2.841,0.848 3.462,0.713C4.089,0.578 4.798,0.511 5.589,0.511H19.388C20.19,0.511 20.905,0.578 21.532,0.713C22.159,0.842 22.698,1.132 23.149,1.583C23.601,2.034 23.891,2.573 24.02,3.2C24.154,3.821 24.222,4.533 24.222,5.336V7.981C24.222,8.784 24.154,9.499 24.02,10.126C23.891,10.747 23.601,11.28 23.149,11.726C22.698,12.183 22.159,12.479 21.532,12.613C20.905,12.742 20.19,12.807 19.388,12.807H5.606ZM5.369,11.075H19.634C20.091,11.075 20.519,11.034 20.917,10.952C21.321,10.87 21.644,10.709 21.884,10.469C22.13,10.223 22.291,9.903 22.367,9.511C22.449,9.112 22.49,8.682 22.49,8.219V5.081C22.49,4.63 22.449,4.208 22.367,3.815C22.291,3.417 22.13,3.095 21.884,2.849C21.644,2.608 21.321,2.447 20.917,2.365C20.519,2.277 20.091,2.233 19.634,2.233H5.387C4.924,2.233 4.487,2.274 4.077,2.356C3.673,2.438 3.351,2.603 3.11,2.849C2.87,3.089 2.709,3.411 2.627,3.815C2.551,4.214 2.513,4.645 2.513,5.107V8.219C2.513,8.682 2.551,9.112 2.627,9.511C2.703,9.903 2.864,10.223 3.11,10.469C3.356,10.709 3.679,10.87 4.077,10.952C4.481,11.034 4.912,11.075 5.369,11.075ZM25.496,9.045V4.272C25.742,4.284 25.997,4.393 26.261,4.598C26.53,4.797 26.756,5.072 26.938,5.424C27.119,5.775 27.21,6.186 27.21,6.654C27.21,7.129 27.119,7.542 26.938,7.894C26.756,8.239 26.53,8.515 26.261,8.72C25.997,8.919 25.742,9.027 25.496,9.045Z"/>
+</vector>
diff --git a/wallet/res/drawable/ic_coinjoin.xml b/wallet/res/drawable/ic_coinjoin.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="20dp"
+    android:viewportHeight="20" android:viewportWidth="20"
+    android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#008DE4" android:pathData="M10,20C8.634,20 7.346,19.739 6.137,19.216C4.935,18.693 3.873,17.971 2.951,17.049C2.029,16.128 1.307,15.065 0.784,13.863C0.261,12.654 0,11.366 0,10C0,8.634 0.261,7.35 0.784,6.147C1.307,4.938 2.026,3.873 2.941,2.951C3.863,2.029 4.925,1.307 6.127,0.784C7.337,0.261 8.624,0 9.99,0C11.356,0 12.644,0.261 13.853,0.784C15.062,1.307 16.128,2.029 17.049,2.951C17.971,3.873 18.693,4.938 19.216,6.147C19.739,7.35 20,8.634 20,10C20,11.366 19.739,12.654 19.216,13.863C18.693,15.065 17.971,16.128 17.049,17.049C16.128,17.971 15.062,18.693 13.853,19.216C12.65,19.739 11.366,20 10,20ZM7.843,7.892C8.32,7.892 8.732,7.719 9.078,7.373C9.431,7.02 9.608,6.605 9.608,6.127C9.608,5.644 9.431,5.232 9.078,4.892C8.732,4.546 8.32,4.373 7.843,4.373C7.359,4.373 6.944,4.546 6.598,4.892C6.258,5.232 6.088,5.644 6.088,6.127C6.088,6.605 6.258,7.02 6.598,7.373C6.938,7.719 7.353,7.892 7.843,7.892ZM12.167,7.892C12.65,7.892 13.062,7.719 13.402,7.373C13.748,7.02 13.922,6.605 13.922,6.127C13.922,5.644 13.748,5.232 13.402,4.892C13.062,4.546 12.65,4.373 12.167,4.373C11.689,4.373 11.274,4.546 10.922,4.892C10.575,5.232 10.402,5.644 10.402,6.127C10.402,6.605 10.575,7.02 10.922,7.373C11.274,7.719 11.689,7.892 12.167,7.892ZM5.696,11.755C6.173,11.755 6.582,11.582 6.922,11.235C7.268,10.889 7.441,10.477 7.441,10C7.441,9.523 7.268,9.111 6.922,8.765C6.582,8.412 6.173,8.235 5.696,8.235C5.212,8.235 4.794,8.412 4.441,8.765C4.095,9.111 3.922,9.523 3.922,10C3.922,10.477 4.095,10.889 4.441,11.235C4.788,11.582 5.206,11.755 5.696,11.755ZM10.01,11.755C10.487,11.755 10.899,11.582 11.245,11.235C11.592,10.889 11.765,10.477 11.765,10C11.765,9.523 11.592,9.111 11.245,8.765C10.899,8.412 10.487,8.235 10.01,8.235C9.526,8.235 9.111,8.412 8.765,8.765C8.418,9.111 8.245,9.523 8.245,10C8.245,10.477 8.418,10.889 8.765,11.235C9.111,11.582 9.526,11.755 10.01,11.755ZM14.323,11.755C14.801,11.755 15.212,11.582 15.559,11.235C15.912,10.889 16.088,10.477 16.088,10C16.088,9.523 15.912,9.111 15.559,8.765C15.212,8.412 14.801,8.235 14.323,8.235C13.84,8.235 13.425,8.412 13.078,8.765C12.739,9.111 12.569,9.523 12.569,10C12.569,10.477 12.739,10.889 13.078,11.235C13.425,11.582 13.84,11.755 14.323,11.755ZM7.843,15.627C8.32,15.627 8.732,15.458 9.078,15.118C9.431,14.771 9.608,14.356 9.608,13.873C9.608,13.389 9.431,12.974 9.078,12.627C8.732,12.281 8.32,12.108 7.843,12.108C7.359,12.108 6.944,12.281 6.598,12.627C6.258,12.974 6.088,13.389 6.088,13.873C6.088,14.35 6.258,14.761 6.598,15.108C6.938,15.454 7.353,15.627 7.843,15.627ZM12.167,15.627C12.65,15.627 13.062,15.458 13.402,15.118C13.748,14.771 13.922,14.356 13.922,13.873C13.922,13.389 13.748,12.974 13.402,12.627C13.062,12.281 12.65,12.108 12.167,12.108C11.689,12.108 11.274,12.281 10.922,12.627C10.575,12.974 10.402,13.389 10.402,13.873C10.402,14.356 10.575,14.771 10.922,15.118C11.274,15.458 11.689,15.627 12.167,15.627Z"/>
+</vector>