readme update, more/fix icons, aboutbuttons reworked, DrawerLayout close on back click

Author: Yanndroid

README.md

@@ -1,10 +1,9 @@
 <h2 align="center">
 
-[![](https://img.shields.io/github/v/release/Yanndroid/OneUI-Design-Library?color=%235555ff)](https://github.com/Yanndroid/OneUI-Design-Library/releases)
-![](https://img.shields.io/github/last-commit/Yanndroid/OneUI-Design-Library)
+[![](https://img.shields.io/maven-central/v/io.github.yanndroid/oneui?label=maven%20central)](https://mvnrepository.com/artifact/io.github.yanndroid/oneui)
+[![](https://img.shields.io/github/last-commit/Yanndroid/OneUI-Design-Library)](https://github.com/Yanndroid/OneUI-Design-Library/commits/master)
 [![](https://img.shields.io/github/issues-raw/Yanndroid/OneUI-Design-Library?color=%23ff4400)](https://github.com/Yanndroid/OneUI-Design-Library/issues)
 [![](https://img.shields.io/github/issues-pr-raw/Yanndroid/OneUI-Design-Library?color=%23bb00bb)](https://github.com/Yanndroid/OneUI-Design-Library/pulls)
-[![](https://img.shields.io/github/forks/Yanndroid/OneUI-Design-Library?color=%2300bbbb)](https://github.com/Yanndroid/OneUI-Design-Library/network/members)
 [![](https://img.shields.io/github/contributors/Yanndroid/OneUI-Design-Library)](https://github.com/Yanndroid/OneUI-Design-Library/graphs/contributors)
 
 </h2>
@@ -53,7 +52,10 @@ dependencies {
 </application>
 ```
 
-Specifically for Samsung devices, two flags are needed in order to enable some UI elements in system frameworks:
+<details>
+<summary>If you're building apps specifically for Samsung devices, also check this out.</summary>
+
+In order to enable even more UI elements, two flags can be used:
 - In AndroidManifest.xml, add the following flags inside the "application" tag:
 ```xml
 <application
@@ -74,6 +76,8 @@ res/values-v25/styles.xml
 ```
 ...with ```Theme.DeviceDefault.NoActionBar```.
 
+</details>
+
 
 <details>
 <summary>older versions</summary>
@@ -793,7 +797,7 @@ Samsung's BottomNavigationView.
 </de.dlyt.yanndroid.oneui.view.BottomNavigationView>
 ```
 
-If you want to set it up with a ViewPager you'll have to use the [ViewPager](#ViewPager) bundled in the library, the usage is the same as Google's [TabLayout](https://developer.android.com/reference/com/google/android/material/tabs/TabLayout).
+If you want to set it up with a ViewPager you'll have to use the [ViewPager](#ViewPager) bundled in the library, the usage is the same as Google's [TabLayout](https://developer.android.com/reference/com/google/android/material/tabs/TabLayout), but you'll have to call ```updateWidget(Activity activity)``` after you configurated it. 
 
 ### TabLayout
 Samsung's TabLayout.
@@ -808,7 +812,7 @@ Samsung's TabLayout.
 </de.dlyt.yanndroid.oneui.view.TabLayout>
 ```
 
-If you want to set it up with a ViewPager you'll have to use the [ViewPager](#ViewPager) bundled in the library, the usage is the same as Google's [TabLayout](https://developer.android.com/reference/com/google/android/material/tabs/TabLayout).
+If you want to set it up with a ViewPager you'll have to use the [ViewPager](#ViewPager) bundled in the library, the usage is the same as Google's [TabLayout](https://developer.android.com/reference/com/google/android/material/tabs/TabLayout), but you'll have to call ```updateWidget()``` after you configurated it. 
 
 ### ViewPager
 ViewPager working with [BottomNavigationView](#BottomNavigationView) and [TabLayout](#TabLayout).
@@ -1248,6 +1252,7 @@ My sample app icon for example:
 - a lot of fixes and improvements
 - support for api 21> (needs to be tested)
 - Snackbar & PopupMenu
+- more icons
 - now available on mavencentral
 
 </details>

app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/IconsTab.java

@@ -22,7 +22,13 @@
 import de.dlyt.yanndroid.oneuiexample.R;
 
 public class IconsTab extends Fragment {
-    Integer[] imageIDs = {R.drawable.ic_samsung_apk,
+    Integer[] imageIDs = {R.drawable.ic_samsung_accessibility,
+            R.drawable.ic_samsung_account,
+            R.drawable.ic_samsung_advanced_feature,
+            R.drawable.ic_samsung_anc,
+            R.drawable.ic_samsung_apk,
+            R.drawable.ic_samsung_apps,
+            R.drawable.ic_samsung_apps_2,
             R.drawable.ic_samsung_archive,
             R.drawable.ic_samsung_arrow_down,
             R.drawable.ic_samsung_arrow_left,
@@ -31,6 +37,12 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_attach,
             R.drawable.ic_samsung_audio,
             R.drawable.ic_samsung_back,
+            R.drawable.ic_samsung_biometric_face,
+            R.drawable.ic_samsung_biometric_fingerprint,
+            R.drawable.ic_samsung_biometric_fingerprint_2,
+            R.drawable.ic_samsung_bluetooth_off,
+            R.drawable.ic_samsung_bluetooth_on,
+            R.drawable.ic_samsung_bluetooth_sync,
             R.drawable.ic_samsung_book,
             R.drawable.ic_samsung_bookmark,
             R.drawable.ic_samsung_briefcase,
@@ -49,6 +61,8 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_copy,
             R.drawable.ic_samsung_delete,
             R.drawable.ic_samsung_device,
+            R.drawable.ic_samsung_devicecare,
+            R.drawable.ic_samsung_digitalwellbeing,
             R.drawable.ic_samsung_document,
             R.drawable.ic_samsung_download,
             R.drawable.ic_samsung_drawer,
@@ -89,6 +103,7 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_file_type_word,
             R.drawable.ic_samsung_file_type_zip,
             R.drawable.ic_samsung_folder,
+            R.drawable.ic_samsung_game,
             R.drawable.ic_samsung_google_drive,
             R.drawable.ic_samsung_group,
             R.drawable.ic_samsung_help,
@@ -99,15 +114,18 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_import,
             R.drawable.ic_samsung_info,
             R.drawable.ic_samsung_keyboard,
+            R.drawable.ic_samsung_light_bulb,
             R.drawable.ic_samsung_list,
             R.drawable.ic_samsung_list_extended,
             R.drawable.ic_samsung_list_grid,
-            R.drawable.ic_samsung_location,
+            R.drawable.ic_samsung_list_search,
             R.drawable.ic_samsung_location_2,
             R.drawable.ic_samsung_location_off,
+            R.drawable.ic_samsung_location_on,
             R.drawable.ic_samsung_lock,
             R.drawable.ic_samsung_mail,
-            R.drawable.ic_samsung_mail_2,
+            R.drawable.ic_samsung_manage,
+            R.drawable.ic_samsung_manual,
             R.drawable.ic_samsung_maximize,
             R.drawable.ic_samsung_memo,
             R.drawable.ic_samsung_message,
@@ -119,7 +137,10 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_network_storage,
             R.drawable.ic_samsung_network_storage_manage,
             R.drawable.ic_samsung_onedrive,
+            R.drawable.ic_samsung_open,
             R.drawable.ic_samsung_page,
+            R.drawable.ic_samsung_password_hide,
+            R.drawable.ic_samsung_password_view,
             R.drawable.ic_samsung_pause,
             R.drawable.ic_samsung_pdf,
             R.drawable.ic_samsung_pen,
@@ -133,11 +154,14 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_phone,
             R.drawable.ic_samsung_play,
             R.drawable.ic_samsung_plus,
+            R.drawable.ic_samsung_privacy,
             R.drawable.ic_samsung_recent,
             R.drawable.ic_samsung_rectify,
             R.drawable.ic_samsung_redo,
-            R.drawable.ic_samsung_reminder,
+            R.drawable.ic_samsung_refresh,
             R.drawable.ic_samsung_reminder_2,
+            R.drawable.ic_samsung_reminder_off,
+            R.drawable.ic_samsung_reminder_on,
             R.drawable.ic_samsung_rename,
             R.drawable.ic_samsung_reorder,
             R.drawable.ic_samsung_repeat,
@@ -146,6 +170,9 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_scan,
             R.drawable.ic_samsung_sd_card,
             R.drawable.ic_samsung_search,
+            R.drawable.ic_samsung_secure_folder,
+            R.drawable.ic_samsung_security,
+            R.drawable.ic_samsung_security_2,
             R.drawable.ic_samsung_selected,
             R.drawable.ic_samsung_send,
             R.drawable.ic_samsung_settings,
@@ -154,25 +181,31 @@ public class IconsTab extends Fragment {
             R.drawable.ic_samsung_shuffle,
             R.drawable.ic_samsung_sim,
             R.drawable.ic_samsung_smart_view,
+            R.drawable.ic_samsung_software_update,
+            R.drawable.ic_samsung_speed,
             R.drawable.ic_samsung_sticker,
             R.drawable.ic_samsung_stop,
             R.drawable.ic_samsung_store,
             R.drawable.ic_samsung_subscription,
+            R.drawable.ic_samsung_support,
             R.drawable.ic_samsung_sync,
             R.drawable.ic_samsung_tag,
             R.drawable.ic_samsung_text,
             R.drawable.ic_samsung_text_2,
             R.drawable.ic_samsung_time,
             R.drawable.ic_samsung_undo,
             R.drawable.ic_samsung_unlock,
+            R.drawable.ic_samsung_unpair,
             R.drawable.ic_samsung_usb,
             R.drawable.ic_samsung_video,
             R.drawable.ic_samsung_video_conference,
             R.drawable.ic_samsung_voice,
+            R.drawable.ic_samsung_voice_2,
             R.drawable.ic_samsung_volume,
             R.drawable.ic_samsung_warning,
             R.drawable.ic_samsung_web_search,
             R.drawable.ic_samsung_website,
+            R.drawable.ic_samsung_wifi,
             R.drawable.ic_samsung_work,
             -1};
     RecyclerView listView;

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/DrawerLayout.java

@@ -11,6 +11,7 @@
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.Display;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -91,6 +92,15 @@ public DrawerLayout(Context context, @Nullable AttributeSet attrs) {
         drawerButton.setImageTintList(ColorStateList.valueOf(getResources().getColor(R.color.drawer_icon_color)));
         setDrawerButtonIcon(mDrawerIcon);
 
+        /*back logic*/
+        requestFocus();
+        setOnKeyListener((v, keyCode, event) -> {
+            if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK && drawerLayout.isDrawerOpen(drawer)) {
+                drawerLayout.closeDrawer(drawer, true);
+                return true;
+            }
+            return false;
+        });
 
         /*drawer logic*/
         View translationView = findViewById(R.id.drawer_custom_translation);

yanndroid/oneui/src/main/res/drawable/about_screen_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple android:color="@color/item_color"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="22.0dip" />
+        </shape>
+    </item>
+</ripple>

yanndroid/oneui/src/main/res/drawable/ic_samsung_accessibility.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <group
+        android:translateX="-2"
+        android:translateY="-2">
+
+        <path
+            android:fillColor="?actionMenuTextColor"
+            android:fillType="nonZero"
+            android:pathData="M20.3456,10.4265C20.935,10.4265 21.4126,10.9059 21.4126,11.4981C21.4126,12.0911 20.935,12.5706 20.3456,12.5706L20.3456,12.5706L16.6405,12.8437C16.5378,12.8511 16.4489,12.9235 16.4241,13.0234C16.2848,13.5651 16.2142,13.9245 16.2151,14.4855C16.2151,14.722 16.2472,14.9585 16.3095,15.1867L16.3095,15.1867L18.098,21.5007C18.251,22.0727 17.9128,22.6603 17.3445,22.8152C16.7743,22.9683 16.1895,22.6291 16.0373,22.0571L16.0373,22.0571L14.06,17.076L13.7117,17.076L11.7345,22.0571C11.5823,22.6291 10.9975,22.9683 10.4273,22.8152C9.859,22.6603 9.5207,22.0727 9.6729,21.5007L9.6729,21.5007L11.4622,15.1867C11.5245,14.9585 11.5566,14.722 11.5566,14.4855C11.5566,13.9245 11.487,13.5651 11.3485,13.0234C11.322,12.9235 11.234,12.8511 11.1304,12.8437L11.1304,12.8437L7.6544,12.5706C7.0659,12.5706 6.5874,12.0911 6.5874,11.4981C6.5874,10.9059 7.0659,10.4265 7.6544,10.4265L7.6544,10.4265ZM13.886,5.148C14.898,5.148 15.7193,5.9694 15.7193,6.9814C15.7193,7.9934 14.898,8.8147 13.886,8.8147C12.874,8.8147 12.0526,7.9934 12.0526,6.9814C12.0526,5.9694 12.874,5.148 13.886,5.148Z"
+            android:strokeWidth="1.0"
+            android:strokeColor="#00000000" />
+
+    </group>
+</vector>

yanndroid/oneui/src/main/res/drawable/ic_samsung_account.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="56.0"
+    android:viewportHeight="56.0">
+    <path
+        android:fillColor="?actionMenuTextColor"
+        android:fillType="nonZero"
+        android:pathData="M27.9971,0C12.533,0 0,12.5343 0,28C0,43.4657 12.533,56 27.9971,56C43.4613,56 56,43.4629 56,28C56,12.5371 43.4613,0 27.9971,0ZM28,11.5294C31.6346,11.5294 34.5882,14.472 34.5882,18.1176C34.5882,21.755 31.6401,24.7059 28,24.7059C24.3599,24.7059 21.4118,21.7606 21.4118,18.1176C21.4145,14.472 24.3571,11.5294 28,11.5294ZM27.9956,47.7647C21.9948,47.7647 16.646,45.1114 13.1765,40.9667C14.6958,34.4867 20.7498,29.6471 27.9956,29.6471C35.2443,29.6471 41.3101,34.4895 42.8235,40.9667C39.3452,45.1085 33.9993,47.7647 27.9956,47.7647Z"
+        android:strokeWidth="1.0"
+        android:strokeColor="#00000000" />
+</vector>

yanndroid/oneui/src/main/res/drawable/ic_samsung_advanced_feature.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="22.0"
+    android:viewportHeight="22.0">
+    <group
+        android:translateX="-3"
+        android:translateY="-3">
+        <path
+            android:fillColor="?actionMenuTextColor"
+            android:fillType="nonZero"
+            android:pathData="M16.8641,14.6875L14.687,14.6875L14.687,16.8646C14.687,17.245 14.38,17.5521 13.9995,17.5521C13.62,17.5521 13.312,17.245 13.312,16.8646L13.312,14.6875L11.135,14.6875C10.7555,14.6875 10.4475,14.3804 10.4475,14C10.4475,13.6205 10.7555,13.3125 11.135,13.3125L13.312,13.3125L13.312,11.1354C13.312,10.7559 13.62,10.4479 13.9995,10.4479C14.38,10.4479 14.687,10.7559 14.687,11.1354L14.687,13.3125L16.8641,13.3125C17.2445,13.3125 17.5516,13.6205 17.5516,14C17.5516,14.3804 17.2445,14.6875 16.8641,14.6875L16.8641,14.6875ZM19.9441,13.8222C19.9313,13.6297 20.067,13.3272 20.2457,13.1503L21.508,11.9054C21.6876,11.7285 21.7316,11.4049 21.606,11.1868L20.2301,8.7943C20.1045,8.5752 19.803,8.4523 19.56,8.5192L17.8569,8.9941C17.6149,9.061 17.283,9.0317 17.1199,8.9263C16.9576,8.8218 16.4516,8.3863 16.3893,8.1425L15.9465,6.4228C15.8842,6.179 15.6257,5.9792 15.3745,5.9792L12.6245,5.9792C12.3734,5.9792 12.1149,6.179 12.0525,6.4228L11.6107,8.1425C11.5475,8.3863 11.3559,8.6604 11.1835,8.7502C11.0112,8.841 10.3851,9.061 10.1422,8.9941L8.44,8.5192C8.197,8.4523 7.8955,8.5752 7.7699,8.7943L6.394,11.1868C6.2684,11.4049 6.3124,11.7285 6.492,11.9054L7.7534,13.1493C7.933,13.3263 8.0687,13.6287 8.0559,13.8222L8.0559,14L8.0559,14.1778C8.0687,14.3713 7.933,14.6737 7.7534,14.8507L6.492,16.0955C6.3124,16.2724 6.2684,16.596 6.394,16.8151L7.7699,19.2076C7.8955,19.4258 8.197,19.5495 8.44,19.4807L10.1422,19.0068C10.3851,18.939 10.717,18.9692 10.8792,19.0737C11.0424,19.1782 11.5475,19.6137 11.6107,19.8575L12.0525,21.5772C12.1158,21.821 12.3734,22.0208 12.6255,22.0208L15.3745,22.0208C15.6257,22.0208 15.8842,21.821 15.9465,21.5772L16.3893,19.8575C16.4516,19.6137 16.6441,19.3405 16.8165,19.2507C16.9879,19.1599 17.6149,18.939 17.8569,19.0068L19.56,19.4807C19.803,19.5495 20.1045,19.4258 20.2301,19.2076L21.606,16.8151C21.7316,16.596 21.6876,16.2724 21.508,16.0955L20.2457,14.8507C20.067,14.6737 19.9313,14.3713 19.9441,14.1778L19.9441,14L19.9441,13.8222Z"
+            android:strokeWidth="1.0"
+            android:strokeColor="#00000000" />
+    </group>
+
+</vector>

yanndroid/oneui/src/main/res/drawable/ic_samsung_anc.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="30.0"
+    android:viewportHeight="30.0">
+    <group
+        android:translateX="-5"
+        android:translateY="-5">
+        <path
+            android:fillColor="?actionMenuTextColor"
+            android:fillType="nonZero"
+            android:pathData="M20,9.3885C22.835,9.3885 25.5,10.4925 27.504,12.4965C29.603,14.5955 30.724,17.5135 30.583,20.5065L30.583,20.5065L31.73,20.5065C32.172,20.5065 32.531,20.8655 32.531,21.3065C32.531,21.7475 32.172,22.1055 31.73,22.1055L31.73,22.1055L30.395,22.1055C29.982,24.1585 28.983,26.0255 27.504,27.5035C25.501,29.5075 22.836,30.6115 20,30.6115C17.165,30.6115 14.5,29.5075 12.497,27.5035C11.017,26.0255 10.017,24.1585 9.605,22.1055L9.605,22.1055L8.269,22.1055C7.828,22.1055 7.469,21.7475 7.469,21.3065C7.469,20.8655 7.828,20.5065 8.269,20.5065L8.269,20.5065L9.417,20.5065C9.275,17.5135 10.397,14.5955 12.497,12.4965C14.501,10.4925 17.165,9.3885 20,9.3885ZM26.909,14.2225L14.221,26.9105C15.86,28.2855 17.858,29.0125 20,29.0125C22.408,29.0125 24.672,28.0755 26.373,26.3735C27.547,25.1995 28.37,23.7255 28.757,22.1055L28.757,22.1055L26.476,22.1055C26.159,22.1055 25.872,21.9185 25.745,21.6285L25.745,21.6285L24.911,19.7315L23.245,24.8215C23.138,25.1495 22.827,25.3715 22.481,25.3715L22.481,25.3715L22.45,25.3715C22.091,25.3555 21.786,25.1005 21.707,24.7525L21.707,24.7525L20.99,21.6415L22.324,20.3075L22.334,20.3515L22.62,21.5925L23.393,19.2385L25.507,17.1245L25.523,17.1545C25.528,17.1625 25.532,17.1665 25.534,17.1725L25.534,17.1725L26.999,20.5065L28.986,20.5065C29.112,18.2035 28.376,15.9735 26.909,14.2225L26.909,14.2225ZM19.0871,23.544L19.0741,23.622L18.5811,26.535C18.5161,26.916 18.1891,27.196 17.8031,27.201L17.8031,27.201L17.7921,27.201C17.4121,27.201 17.0831,26.93 17.0091,26.556L17.0091,26.556L16.8551,25.776L16.8651,25.767L19.0871,23.544ZM15.436,18.5815L13.98,21.6495C13.848,21.9265 13.564,22.1055 13.257,22.1055L13.257,22.1055L11.244,22.1055C11.567,23.4505 12.205,24.7195 13.09,25.7775L13.09,25.7775L16.235,22.6345L15.436,18.5815ZM20,10.9875C17.592,10.9875 15.33,11.9255 13.627,13.6275C11.819,15.4355 10.867,17.9415 11.012,20.5065L11.012,20.5065L12.753,20.5065L15.029,15.7085C15.165,15.4235 15.439,15.2515 15.747,15.2515C15.781,15.2515 15.816,15.2535 15.85,15.2575C16.194,15.3005 16.469,15.5575 16.536,15.8965L16.536,15.8965L17.597,21.2735L17.9,20.9695L19.169,13.4645C19.232,13.0905 19.553,12.8105 19.932,12.7995C19.94,12.7985 19.95,12.7985 19.957,12.7985C20.332,12.7985 20.652,13.0535 20.735,13.4195L20.735,13.4195L21.619,17.2505L25.779,13.0895C24.165,11.7345 22.113,10.9875 20,10.9875ZM20.078,17.6835L19.852,19.0175L20.285,18.5845L20.078,17.6835Z"
+            android:strokeWidth="1.0"
+            android:strokeColor="#00000000" />
+    </group>
+
+</vector>

yanndroid/oneui/src/main/res/drawable/ic_samsung_apps.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dip"
+    android:height="24.0dip"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="?actionMenuTextColor"
+        android:pathData="M6 8c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm6 12c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm-6 0c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm0-6c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm6 0c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm4-8c0 1.1 0.9 2 2 2s2-0.9 2-2-0.9-2-2-2-2 0.9-2 2zm-4 2c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm6 6c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm0 6c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2z" />
+</vector>