Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: start settings page #37

Merged
merged 14 commits into from
Aug 20, 2024
+2,240 −10
Merged

feat: start settings page #37

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8e37f16
feat: start settings page
aanorbel Aug 6, 2024
5b25633
Merge branch 'main' of github.com:ooni/probe-multiplatform into issue…
aanorbel Aug 6, 2024
7040e18
Merge branch 'main' of github.com:ooni/probe-multiplatform into issue…
aanorbel Aug 14, 2024
f085311
feat: add tests
aanorbel Aug 14, 2024
cef7b32
bootstrap settings
aanorbel Aug 16, 2024
13d6f41
chore: remove synchronize lock
aanorbel Aug 19, 2024
1c5f18f
chore: remove synchronize lock
aanorbel Aug 19, 2024
5afc260
chore: update based on review
aanorbel Aug 19, 2024
ed9649d
chore: update based on review
aanorbel Aug 19, 2024
c04d094
chore: update based on review
aanorbel Aug 19, 2024
4ce823f
chore: update based on review
aanorbel Aug 19, 2024
e23d3e8
chore: add comment for enabled categories.
aanorbel Aug 20, 2024
9d6b734
revert: pod copy removed from ios project
aanorbel Aug 20, 2024
acf8d07
chore: update from review
aanorbel Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ kotlin {
all {
languageSettings {
optIn("kotlin.ExperimentalStdlibApi")
// optIn("kotlinx.cinterop.ExperimentalForeignApi")
optIn("kotlinx.cinterop.ExperimentalForeignApi")
optIn("kotlinx.cinterop.BetaInteropApi")
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
optIn("androidx.compose.foundation.ExperimentalFoundationApi")
Expand Down
10 changes: 10 additions & 0 deletions composeApp/src/androidMain/kotlin/org/ooni/probe/AndroidApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package org.ooni.probe
import android.app.Application
import android.net.ConnectivityManager
import android.os.Build
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.SharedPreferencesMigration
import androidx.datastore.preferences.core.Preferences
import app.cash.sqldelight.db.SqlDriver
import app.cash.sqldelight.driver.android.AndroidSqliteDriver
import org.ooni.engine.AndroidNetworkTypeFinder
Expand All @@ -26,6 +29,7 @@ class AndroidApplication : Application() {
databaseDriverFactory = ::buildDatabaseDriver,
networkTypeFinder =
AndroidNetworkTypeFinder(getSystemService(ConnectivityManager::class.java)),
buildDataStore = ::buildDataStore,
)
}

Expand All @@ -41,4 +45,10 @@ class AndroidApplication : Application() {
private fun buildDatabaseDriver(): SqlDriver = AndroidSqliteDriver(Database.Schema, this, "v2")

private fun readAssetFile(path: String) = assets.open(path).bufferedReader().use { it.readText() }

private fun buildDataStore(): DataStore<Preferences> =
Dependencies.getDataStore(
producePath = { this.filesDir.resolve(Dependencies.Companion.DATA_STORE_FILE_NAME).absolutePath },
migrations = listOf(SharedPreferencesMigration(this, "${packageName}_preferences")),
)
}
14 changes: 14 additions & 0 deletions composeApp/src/androidUnitTest/kotlin/org/ooni/testing/CreatePreferenceDataStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.ooni.testing

import android.app.Application
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.test.core.app.ApplicationProvider
import org.ooni.probe.di.Dependencies

internal actual fun createPreferenceDataStore(): DataStore<Preferences> {
val app = ApplicationProvider.getApplicationContext<Application>()
return Dependencies.getDataStore(
producePath = { app.filesDir.resolve("test" + Dependencies.Companion.DATA_STORE_FILE_NAME).absolutePath },
)
}
27 changes: 27 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/advanced.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="36dp"
android:height="36dp"
android:viewportWidth="29"
android:viewportHeight="29">
<group android:name="group_1">
<group android:name="group">
<path
android:name="path"
android:pathData="M 7.076 12.481 C 6.501 12.481 5.949 12.71 5.542 13.116 C 5.135 13.523 4.907 14.075 4.907 14.65 C 4.907 15.225 5.135 15.777 5.542 16.184 C 5.949 16.59 6.501 16.819 7.076 16.819 C 7.651 16.819 8.203 16.59 8.609 16.184 C 9.016 15.777 9.245 15.225 9.245 14.65 C 9.245 14.075 9.016 13.523 8.609 13.116 C 8.203 12.71 7.651 12.481 7.076 12.481 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_1"
android:pathData="M 14.307 12.481 C 13.732 12.481 13.18 12.71 12.773 13.116 C 12.366 13.523 12.138 14.075 12.138 14.65 C 12.138 15.225 12.366 15.777 12.773 16.184 C 13.18 16.59 13.732 16.819 14.307 16.819 C 14.882 16.819 15.434 16.59 15.84 16.184 C 16.247 15.777 16.476 15.225 16.476 14.65 C 16.476 14.075 16.247 13.523 15.84 13.116 C 15.434 12.71 14.882 12.481 14.307 12.481 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_2"
android:pathData="M 21.538 12.481 C 20.963 12.481 20.411 12.71 20.004 13.116 C 19.597 13.523 19.369 14.075 19.369 14.65 C 19.369 15.225 19.597 15.777 20.004 16.184 C 20.411 16.59 20.963 16.819 21.538 16.819 C 22.113 16.819 22.665 16.59 23.071 16.184 C 23.478 15.777 23.707 15.225 23.707 14.65 C 23.707 14.075 23.478 13.523 23.071 13.116 C 22.665 12.71 22.113 12.481 21.538 12.481 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
</group>
</group>
</vector>
25 changes: 25 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/category_aldr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="36dp"
android:height="36dp"
android:viewportWidth="29"
android:viewportHeight="29">
<group android:name="group">
<path
android:name="path"
android:pathData="M 18.685 17.233 L 19.773 17.233 L 19.773 18.321 L 18.685 18.321 L 18.685 19.41 L 19.773 19.41 L 19.773 20.498 L 18.685 20.498 L 18.685 21.586 L 20.862 21.586 L 20.862 16.145 L 18.685 16.145 L 18.685 17.233 Z M 20.318 12.698 L 20.318 15.057 L 21.951 15.057 L 21.951 22.494 L 20.318 22.494 L 20.318 23.582 L 21.406 23.582 L 21.406 24.67 L 18.141 24.67 L 18.141 23.583 L 19.229 23.583 L 19.229 22.494 L 17.597 22.494 L 17.597 15.057 L 19.23 15.057 L 19.23 11.61 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_1"
android:pathData="M 13.424 10.158 L 13.061 6.893 L 9.796 6.893 L 9.615 10.158 C 9.035 10.465 8.536 10.904 8.157 11.44 C 7.779 11.975 7.532 12.593 7.438 13.242 L 7.438 23.401 C 7.464 23.777 7.625 24.132 7.891 24.399 C 8.158 24.665 8.513 24.826 8.889 24.852 L 13.789 24.852 C 14.165 24.826 14.519 24.665 14.785 24.398 C 15.051 24.131 15.212 23.777 15.238 23.401 L 15.238 13.242 C 15.256 12.61 15.095 11.985 14.774 11.439 C 14.454 10.894 13.985 10.45 13.424 10.158 Z M 11.61 18.321 C 10.941 18.307 10.302 18.035 9.829 17.562 C 9.356 17.089 9.084 16.45 9.07 15.781 C 9.119 15.141 9.408 14.543 9.879 14.108 C 10.349 13.672 10.968 13.429 11.609 13.429 C 12.251 13.429 12.869 13.672 13.34 14.108 C 13.811 14.543 14.1 15.141 14.149 15.781 C 14.16 16.23 14.049 16.673 13.828 17.064 C 13.606 17.455 13.283 17.778 12.893 17.999 C 12.502 18.221 12.059 18.332 11.61 18.321 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_2"
android:pathData="M 13.059 4.716 C 13.051 4.575 12.991 4.441 12.891 4.341 C 12.791 4.241 12.658 4.181 12.517 4.172 L 10.703 4.172 C 10.604 4.158 10.503 4.175 10.414 4.221 C 10.326 4.267 10.253 4.339 10.208 4.428 C 10.162 4.516 10.145 4.617 10.159 4.716 L 10.159 5.805 L 13.243 5.805 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
</group>
</vector>
35 changes: 35 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/category_anon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="36dp"
android:height="36dp"
android:viewportWidth="29"
android:viewportHeight="29">
<group android:name="group">
<path
android:name="path"
android:pathData="M 14.513 5.442 C 13.226 5.418 11.946 5.236 10.704 4.898 C 10.341 4.717 10.16 4.898 9.978 5.261 L 9.071 9.614 C 9.071 9.977 9.252 10.34 9.615 10.34 L 19.415 10.34 C 19.778 10.34 19.959 9.977 19.959 9.614 L 18.871 5.261 C 18.871 4.898 18.508 4.717 18.145 4.898 C 16.968 5.255 15.746 5.438 14.517 5.442 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_1"
android:pathData="M 7.983 11.61 C 6.981 12.209 6.065 12.942 5.261 13.787 C 5.08 13.968 5.08 14.331 5.442 14.331 L 23.582 14.331 C 23.945 14.331 24.126 13.968 23.763 13.787 C 22.935 12.893 21.953 12.155 20.863 11.61 L 7.983 11.61 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_2"
android:pathData="M 8.889 15.782 C 8.883 16.218 9 16.648 9.226 17.021 C 9.452 17.394 9.779 17.697 10.168 17.894 C 10.557 18.092 10.994 18.176 11.429 18.138 C 12.88 18.138 13.969 16.138 13.969 16.138 C 14.067 16.04 14.194 15.976 14.332 15.957 C 14.469 15.976 14.597 16.04 14.695 16.138 C 14.695 16.138 15.783 18.138 17.235 18.138 C 17.67 18.176 18.107 18.092 18.496 17.894 C 18.886 17.696 19.212 17.394 19.438 17.02 C 19.664 16.646 19.781 16.217 19.775 15.78 L 19.775 15.238 L 8.889 15.238 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_3"
android:pathData="M 12.518 24.126 L 6.35 24.126 C 6.169 24.126 6.169 23.945 6.169 23.763 L 8.169 22.675 C 8.35 22.675 8.35 22.494 8.169 22.312 C 6.899 21.405 4.178 20.679 3.269 20.312 C 3.088 20.312 3.088 20.131 3.269 19.949 C 4.831 18.505 6.788 17.56 8.89 17.233 C 9.071 17.233 9.071 17.233 9.071 17.414 C 9.491 19.842 10.781 22.035 12.699 23.582 C 12.699 23.945 12.699 24.126 12.518 24.126 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_4"
android:pathData="M 16.507 24.126 L 22.675 24.126 C 22.856 24.126 22.856 23.945 22.856 23.763 L 20.856 22.675 C 20.675 22.675 20.675 22.494 20.856 22.312 C 22.126 21.405 24.847 20.679 25.756 20.312 C 25.937 20.312 25.937 20.131 25.756 19.949 C 24.194 18.505 22.236 17.56 20.135 17.233 C 19.954 17.233 19.954 17.233 19.954 17.414 C 19.534 19.842 18.243 22.035 16.326 23.582 C 16.326 23.945 16.326 24.126 16.507 24.126 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
</group>
</vector>
15 changes: 15 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/category_comm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="36dp"
android:height="36dp"
android:viewportWidth="29"
android:viewportHeight="29">
<group android:name="group">
<path
android:name="path"
android:pathData="M 12.154 22.313 C 12.116 22.698 11.992 23.07 11.791 23.401 C 11.655 23.56 11.488 23.69 11.301 23.783 C 11.114 23.876 10.91 23.932 10.702 23.945 C 10.493 23.931 10.29 23.876 10.103 23.783 C 9.916 23.689 9.75 23.56 9.614 23.401 C 9.476 23.258 9.372 23.086 9.309 22.898 C 9.246 22.71 9.226 22.51 9.251 22.313 C 9.288 21.928 9.412 21.556 9.614 21.225 C 9.736 21.052 9.9 20.912 10.09 20.817 C 10.279 20.722 10.49 20.676 10.702 20.681 C 10.91 20.695 11.114 20.75 11.301 20.843 C 11.488 20.937 11.655 21.066 11.791 21.225 C 11.928 21.368 12.032 21.54 12.095 21.728 C 12.158 21.916 12.178 22.116 12.154 22.313 Z M 22.675 22.313 C 22.637 22.698 22.513 23.07 22.312 23.401 C 22.176 23.56 22.009 23.689 21.822 23.783 C 21.636 23.876 21.432 23.931 21.224 23.945 C 21.015 23.931 20.812 23.876 20.625 23.783 C 20.438 23.689 20.272 23.56 20.136 23.401 C 19.998 23.258 19.894 23.086 19.831 22.898 C 19.768 22.71 19.748 22.51 19.773 22.313 C 19.81 21.928 19.934 21.556 20.136 21.225 C 20.272 21.067 20.438 20.937 20.625 20.843 C 20.812 20.75 21.015 20.695 21.224 20.681 C 21.432 20.695 21.636 20.75 21.823 20.843 C 22.009 20.937 22.176 21.066 22.312 21.225 C 22.513 21.556 22.638 21.928 22.676 22.313 Z M 24.127 9.252 L 24.127 15.42 C 24.139 15.519 24.129 15.618 24.098 15.713 C 24.066 15.807 24.014 15.893 23.946 15.964 C 23.874 16.033 23.788 16.085 23.694 16.116 C 23.6 16.147 23.5 16.157 23.402 16.145 L 11.067 17.596 C 11.184 17.884 11.246 18.192 11.248 18.503 C 11.248 18.684 11.067 18.866 10.885 19.229 L 21.769 19.229 C 21.867 19.217 21.967 19.227 22.061 19.258 C 22.155 19.289 22.241 19.341 22.313 19.41 C 22.382 19.481 22.434 19.567 22.465 19.661 C 22.497 19.756 22.507 19.856 22.495 19.954 C 22.507 20.053 22.497 20.153 22.465 20.247 C 22.434 20.341 22.382 20.427 22.313 20.498 C 22.241 20.567 22.155 20.619 22.061 20.65 C 21.967 20.681 21.867 20.691 21.769 20.679 L 9.796 20.679 C 9.697 20.691 9.597 20.681 9.503 20.65 C 9.409 20.619 9.323 20.567 9.252 20.498 C 9.183 20.427 9.131 20.341 9.1 20.247 C 9.068 20.152 9.058 20.053 9.071 19.954 C 9.084 19.815 9.148 19.685 9.252 19.591 C 9.27 19.454 9.334 19.326 9.433 19.228 C 9.433 19.047 9.614 18.865 9.614 18.684 C 9.717 18.59 9.782 18.46 9.795 18.321 L 7.795 8.521 L 5.437 8.521 C 5.338 8.533 5.238 8.523 5.144 8.492 C 5.05 8.461 4.964 8.409 4.893 8.34 C 4.824 8.269 4.772 8.183 4.741 8.089 C 4.709 7.994 4.699 7.895 4.712 7.796 C 4.699 7.698 4.709 7.598 4.741 7.504 C 4.772 7.41 4.824 7.324 4.893 7.252 C 4.964 7.183 5.05 7.131 5.144 7.1 C 5.238 7.069 5.338 7.059 5.437 7.071 L 8.884 7.071 C 8.916 7.071 8.947 7.079 8.975 7.094 C 9.002 7.11 9.025 7.133 9.041 7.161 C 9.057 7.189 9.065 7.22 9.065 7.252 C 9.163 7.35 9.227 7.478 9.246 7.615 C 9.246 7.796 9.246 7.796 9.427 7.978 C 9.608 8.16 9.427 8.159 9.427 8.341 L 9.427 8.704 L 23.576 8.704 C 23.674 8.692 23.774 8.702 23.868 8.733 C 23.962 8.764 24.048 8.816 24.12 8.885 C 24.12 8.885 24.127 9.075 24.127 9.252 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
</group>
</vector>
20 changes: 20 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/category_comt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="36dp"
android:height="36dp"
android:viewportWidth="29"
android:viewportHeight="29">
<group android:name="group">
<path
android:name="path"
android:pathData="M 24.852 9.614 L 20.499 9.614 L 20.499 15.6 C 20.488 16.222 20.236 16.816 19.796 17.256 C 19.356 17.696 18.762 17.949 18.14 17.959 L 10.34 17.959 L 10.34 20.136 C 10.326 20.235 10.343 20.336 10.388 20.424 C 10.434 20.513 10.507 20.586 10.595 20.631 C 10.684 20.677 10.785 20.694 10.884 20.68 L 21.224 20.68 C 21.405 20.68 21.587 20.68 21.587 20.861 L 24.127 23.761 C 24.238 23.878 24.389 23.948 24.551 23.957 C 24.712 23.966 24.87 23.913 24.994 23.81 C 25.117 23.706 25.196 23.558 25.215 23.398 L 25.215 10.158 C 25.396 9.795 25.215 9.614 24.852 9.614 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_1"
android:pathData="M 18.14 16.145 C 18.239 16.159 18.339 16.142 18.428 16.096 C 18.517 16.051 18.589 15.978 18.635 15.889 C 18.681 15.801 18.698 15.7 18.684 15.601 L 18.684 5.624 C 18.698 5.525 18.681 5.424 18.635 5.336 C 18.589 5.247 18.517 5.175 18.428 5.129 C 18.339 5.083 18.239 5.066 18.14 5.08 L 4.172 5.08 C 3.809 4.898 3.628 5.258 3.628 5.624 L 3.628 18.866 C 3.636 19.008 3.696 19.141 3.796 19.241 C 3.897 19.342 4.03 19.402 4.172 19.41 C 4.353 19.41 4.535 19.41 4.535 19.229 L 7.256 16.329 C 7.256 16.148 7.437 16.148 7.619 16.148 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
</group>
</vector>
55 changes: 55 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/category_ctrl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:name="vector"
android:width="36dp"
android:height="36dp"
android:viewportWidth="29"
android:viewportHeight="29">
<group android:name="group">
<path
android:name="path"
android:pathData="M 9.07 7.072 L 9.07 5.442 C 9.075 5.218 9.02 4.996 8.909 4.8 C 8.798 4.605 8.637 4.443 8.441 4.333 C 8.246 4.222 8.024 4.167 7.8 4.172 C 7.575 4.167 7.353 4.222 7.158 4.333 C 6.963 4.443 6.801 4.605 6.69 4.8 C 6.58 4.996 6.524 5.218 6.53 5.442 L 6.53 7.072 C 6.932 6.91 7.368 6.848 7.8 6.891 C 8.231 6.848 8.667 6.91 9.07 7.072 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_1"
android:pathData="M 7.8 15.419 C 7.368 15.462 6.932 15.399 6.53 15.237 L 6.53 23.582 C 6.523 23.807 6.578 24.029 6.689 24.225 C 6.799 24.421 6.961 24.584 7.157 24.695 C 7.352 24.806 7.575 24.862 7.8 24.856 C 8.024 24.862 8.246 24.806 8.441 24.695 C 8.637 24.585 8.798 24.423 8.909 24.228 C 9.02 24.032 9.075 23.811 9.07 23.586 L 9.07 15.056 C 8.684 15.283 8.247 15.408 7.8 15.419 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_2"
android:pathData="M 13.243 21.224 L 13.243 23.583 C 13.244 23.919 13.378 24.241 13.616 24.479 C 13.854 24.716 14.177 24.849 14.513 24.849 C 14.849 24.849 15.171 24.716 15.409 24.479 C 15.647 24.241 15.782 23.919 15.783 23.583 L 15.783 21.043 C 15.377 21.192 14.944 21.253 14.513 21.224 C 14.094 21.316 13.661 21.316 13.243 21.224 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_3"
android:pathData="M 15.783 13.059 L 15.783 5.441 C 15.788 5.217 15.733 4.995 15.622 4.799 C 15.511 4.604 15.35 4.442 15.154 4.332 C 14.959 4.221 14.737 4.166 14.513 4.171 C 13.787 3.99 13.243 4.715 13.243 5.441 L 13.243 13.059 C 13.645 12.897 14.081 12.835 14.513 12.878 C 14.944 12.835 15.38 12.897 15.783 13.059 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_4"
android:pathData="M 22.494 8.888 L 22.494 5.441 C 22.499 5.217 22.444 4.995 22.333 4.799 C 22.222 4.604 22.061 4.442 21.865 4.332 C 21.67 4.221 21.448 4.166 21.224 4.171 C 20.498 3.99 19.954 4.715 19.954 5.441 L 19.954 8.888 C 20.36 8.739 20.792 8.678 21.224 8.707 C 21.655 8.664 22.091 8.726 22.494 8.888 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_5"
android:pathData="M 19.954 17.052 L 19.954 23.582 C 19.953 23.851 20.037 24.113 20.195 24.331 C 20.352 24.548 20.575 24.71 20.83 24.794 C 21.086 24.877 21.361 24.877 21.617 24.794 C 21.872 24.71 22.095 24.548 22.253 24.331 C 22.41 24.113 22.494 23.851 22.494 23.582 L 22.494 17.052 C 22.088 17.201 21.655 17.262 21.224 17.233 C 20.68 17.233 20.317 17.052 19.954 17.052 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_6"
android:pathData="M 7.8 8.163 C 7.03 8.163 6.292 8.469 5.748 9.013 C 5.204 9.557 4.898 10.296 4.898 11.065 C 4.898 11.834 5.204 12.573 5.748 13.117 C 6.292 13.661 7.03 13.967 7.8 13.967 C 8.569 13.967 9.308 13.661 9.852 13.117 C 10.396 12.573 10.702 11.834 10.702 11.065 C 10.702 10.296 10.396 9.557 9.852 9.013 C 9.308 8.469 8.569 8.163 7.8 8.163 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_7"
android:pathData="M 14.512 14.149 C 13.742 14.149 13.004 14.455 12.46 14.999 C 11.916 15.543 11.61 16.282 11.61 17.051 C 11.61 17.82 11.916 18.559 12.46 19.103 C 13.004 19.647 13.742 19.953 14.512 19.953 C 15.281 19.953 16.02 19.647 16.564 19.103 C 17.108 18.559 17.414 17.82 17.414 17.051 C 17.414 16.282 17.108 15.543 16.564 14.999 C 16.02 14.455 15.281 14.149 14.512 14.149 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
<path
android:name="path_8"
android:pathData="M 21.222 9.977 C 20.414 10.051 19.664 10.43 19.126 11.036 C 18.587 11.642 18.299 12.431 18.322 13.242 C 18.322 14.875 19.592 15.782 21.222 15.782 C 21.732 15.788 22.236 15.658 22.679 15.404 C 23.123 15.151 23.49 14.783 23.744 14.34 C 23.997 13.896 24.128 13.393 24.122 12.882 C 24.102 12.119 23.79 11.392 23.251 10.851 C 22.711 10.311 21.985 9.998 21.222 9.977 Z"
android:fillColor="#495057"
android:strokeWidth="1"/>
</group>
</vector>
Loading