Merge branch '14-alpha' of https://github.com/nulldrf/lawnchair into …

…14-alpha
nulldrf · Sep 19, 2024 · db698b4 · db698b4
2 parents 04da6e1 + 910da98
commit db698b4
Show file tree

Hide file tree

Showing 123 changed files with 1,932 additions and 928 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -57,6 +57,7 @@ Here are some contribution tips to help you get started:
 
 #### Additional documentation
 
+-   The Lawnchair Wiki ([at Github](https://github.com/LawnchairLauncher/lawnchair/wiki))
 -   Lawnchair Visual Guidelines ([README.md](/docs/assets/README.md))
 -   Lawnchair Quickstep Compat Lib ([README.md](compatLib/README.md))
 -   Lawnchair Preferences Components ([README.md](lawnchair/src/app/lawnchair/ui/preferences/components/README.md))

diff --git a/baseline-profile/build.gradle b/baseline-profile/build.gradle
@@ -41,5 +41,5 @@ dependencies {
     implementation 'androidx.test.ext:junit:1.2.1'
     implementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'androidx.test.uiautomator:uiautomator:2.3.0'
-    implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.0'
+    implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.1'
 }
diff --git a/build.gradle b/build.gradle
@@ -3,15 +3,15 @@ import com.android.build.gradle.api.AndroidBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id 'com.android.application' version "8.6.0"
-    id 'com.android.library' version "8.6.0" apply false
-    id 'com.android.test' version '8.6.0' apply false
-    id 'androidx.baselineprofile' version '1.3.0'
+    id 'com.android.application' version "8.6.1"
+    id 'com.android.library' version "8.6.1" apply false
+    id 'com.android.test' version '8.6.1' apply false
+    id 'androidx.baselineprofile' version '1.3.1'
     id 'org.jetbrains.kotlin.android' version "2.0.20"
     id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20"
     id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.20"
     id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.20"
-    id "com.google.devtools.ksp" version "2.0.20-1.0.24"
+    id "com.google.devtools.ksp" version "2.0.20-1.0.25"
     id 'com.google.protobuf' version "0.9.4"
     id 'app.cash.licensee' version "1.11.0"
     id 'dev.rikka.tools.refine' version "4.4.0"
@@ -37,12 +37,11 @@ allprojects {
         }
         dependencies {
             implementation 'androidx.core:core-ktx:1.13.1'
-            implementation 'androidx.appcompat:appcompat:1.7.0'
         }
     }
 
     plugins.withId('com.google.protobuf') {
-        def protocVersion = '4.28.0'
+        def protocVersion = '4.28.2'
         protobuf {
             // Configure the protoc executable
             protoc {
@@ -167,19 +166,6 @@ android {
         resValues true
     }
 
-    final def keystorePropertiesFile = rootProject.file("keystore.properties")
-    def releaseSigning = signingConfigs.debug
-    if (keystorePropertiesFile.exists()) {
-        final def keystoreProperties = new Properties()
-        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-        releaseSigning = signingConfigs.create("release") {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile rootProject.file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
-    }
-
     packagingOptions.resources.excludes += [
         "**/*.proto",
         "**/*.bin",
@@ -205,6 +191,20 @@ android {
         .findAll { it.exists() }
         .toArray()
 
+    def releaseSigning
+    try {
+        def keystoreProperties = new Properties()
+        keystoreProperties.load(rootProject.file("keystore.properties").newInputStream())
+        releaseSigning = signingConfigs.create("release") {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile rootProject.file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    } catch (Exception ignored) {
+        releaseSigning = signingConfigs.debug
+    }
+
     buildTypes {
         all {
             signingConfig releaseSigning
@@ -318,6 +318,11 @@ androidComponents {
     }
 }
 
+composeCompiler {
+    stabilityConfigurationFile = layout.projectDirectory.file("compose_compiler_config.conf")
+    reportsDestination = layout.buildDirectory.dir("compose_build_reports")
+}
+
 addFrameworkJar('framework-14.jar')
 
 dependencies {
@@ -349,7 +354,7 @@ dependencies {
     implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-14.jar')
     withQuickstepCompileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'framework-14.jar')
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
 
     implementation 'androidx.profileinstaller:profileinstaller:1.3.1'
     baselineProfile projects.baselineProfile
@@ -358,13 +363,12 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.preference:preference-ktx:1.2.1"
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2'
-    implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
     implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
     implementation 'dev.rikka.tools.refine:runtime:4.4.0'
 
-    implementation platform("androidx.compose:compose-bom:2024.08.00")
+    implementation platform("androidx.compose:compose-bom:2024.09.02")
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.ui:ui-util"
     debugImplementation "androidx.compose.ui:ui-tooling"
@@ -374,15 +378,15 @@ dependencies {
     implementation "androidx.compose.material:material-icons-extended"
     implementation "androidx.compose.material:material"
     implementation "androidx.compose.runtime:runtime-livedata"
-    implementation 'androidx.compose.material3:material3:1.3.0-rc01'
-    implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-rc01'
+    implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.compose.material3:material3-window-size-class'
+    implementation "androidx.activity:activity-compose:1.9.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6"
+    implementation "androidx.navigation:navigation-compose:2.8.1"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.activity:activity-compose:1.9.1"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
-    implementation "androidx.navigation:navigation-compose:2.8.0-rc01"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.slice:slice-core:1.1.0-alpha02"
-    def accompanistVersion = '0.34.0'
+    def accompanistVersion = '0.36.0'
     implementation "com.google.accompanist:accompanist-adaptive:$accompanistVersion"
     implementation "com.google.accompanist:accompanist-drawablepainter:$accompanistVersion"
     implementation "com.google.accompanist:accompanist-permissions:$accompanistVersion"
@@ -410,10 +414,10 @@ dependencies {
     // Persian Date
     implementation 'com.github.samanzamani:PersianDate:1.7.1'
 
-    implementation 'com.airbnb.android:lottie:6.5.1'
+    implementation 'com.airbnb.android:lottie:6.5.2'
 
     // Compose drag and drop library
-    implementation 'sh.calvin.reorderable:reorderable:2.3.2'
+    implementation 'sh.calvin.reorderable:reorderable:2.3.3'
 
     // Smartspacer
     implementation('com.kieronquinn.smartspacer:sdk-client:1.0.11') {
@@ -438,7 +442,7 @@ spotless {
     kotlin {
         target("lawnchair/src/**/*.kt")
         ktlint().customRuleSets([
-            "io.nlopez.compose.rules:ktlint:0.4.11",
+            "io.nlopez.compose.rules:ktlint:0.4.12",
         ]).editorConfigOverride([
             "ktlint_compose_compositionlocal-allowlist": "disabled",
         ])

diff --git a/compose_compiler_config.conf b/compose_compiler_config.conf
@@ -0,0 +1,8 @@
+androidx.collection.*
+
+java.nio.file.Path
+
+kotlin.collections.*
+kotlin.time.Duration
+
+kotlinx.coroutines.CoroutineScope
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionSha256Sum=1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/lawnchair/res/drawable/ic_firefox.xml b/lawnchair/res/drawable/ic_firefox.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group>
+    <path
+        android:pathData="m98.9 37.7c-2.1-5.1-6.4-10.6-9.8-12.3 2.5 4.6 4.1 9.6 5 14.7v0.1c-5.5-13.7-14.9-19.2-22.5-31.3q-0.6-0.9-1.2-1.8-0.3-0.5-0.5-1-0.5-1-0.7-2 0 0-0.1-0.1 0 0-0.1 0 0 0 0 0 0 0-0.1 0 0 0 0 0c-10.8 6.3-15.3 17.4-16.5 24.5-3.3 0.2-6.6 1-9.7 2.5-0.2 0.1-0.5 0.4-0.6 0.7-0.1 0.3-0.1 0.6 0.1 0.9q0.2 0.5 0.7 0.7c0.3 0.1 0.6 0.1 0.9-0.1 2.7-1.2 5.5-2 8.4-2.2h0.3q0.6 0 1.2 0 3.6-0.1 7 0.9 0.2 0.1 0.4 0.2 0.6 0.1 1.1 0.4 0.4 0.1 0.8 0.3 0.4 0.1 0.7 0.2 0.5 0.2 1 0.5 0.2 0.1 0.4 0.2 0.5 0.3 1 0.5 0.3 0.2 0.6 0.4c3.5 2.2 6.5 5.2 8.5 8.8-3.4-2.4-7.6-3.4-11.7-2.8 17.5 8.7 12.8 38.8-11.5 37.7-2.2-0.1-4.3-0.5-6.4-1.2q-0.7-0.3-1.4-0.6-0.4-0.2-0.8-0.4c-6-3.1-10.9-8.9-11.5-15.9 0 0 2.2-8.4 16.1-8.4 1.5 0 5.8-4.2 5.9-5.4 0-0.4-8.5-3.7-11.8-7-1.8-1.7-2.6-2.6-3.4-3.2q-0.6-0.5-1.2-0.9c-1.2-3.9-1.2-8-0.2-11.9-4.5 2.1-8.5 5.2-11.7 9-2-2.4-1.9-10.5-1.8-12.2q-0.8 0.4-1.6 0.9c-1.7 1.2-3.3 2.6-4.7 4.1q-2.5 2.5-4.6 5.4c-3.1 4.5-5.4 9.5-6.6 14.8q-0.4 2.2-0.7 4.5-0.1 0.5-0.2 1.1-0.2 1.4-0.3 2.8 0 0 0 0.1 0 0.8-0.1 1.6v0.3c0.1 12.2 4.8 24 13 32.9 8.3 9 19.6 14.5 31.7 15.5 12.1 1.1 24.2-2.5 33.8-9.9 9.7-7.5 16.2-18.3 18.4-30.3q0.1-0.9 0.2-1.9c1-8.2-0.1-16.7-3.2-24.4z"
+        android:fillColor="#ff5a32"/>
+  </group>
+</vector>
diff --git a/lawnchair/res/drawable/ic_firefox_tinted.xml b/lawnchair/res/drawable/ic_firefox_tinted.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group>
+    <path
+        android:pathData="m98.9 37.7c-2.1-5.1-6.4-10.6-9.8-12.3 2.5 4.6 4.1 9.6 5 14.7v0.1c-5.5-13.7-14.9-19.2-22.5-31.3q-0.6-0.9-1.2-1.8-0.3-0.5-0.5-1-0.5-1-0.7-2 0 0-0.1-0.1 0 0-0.1 0 0 0 0 0 0 0-0.1 0 0 0 0 0c-10.8 6.3-15.3 17.4-16.5 24.5-3.3 0.2-6.6 1-9.7 2.5-0.2 0.1-0.5 0.4-0.6 0.7-0.1 0.3-0.1 0.6 0.1 0.9q0.2 0.5 0.7 0.7c0.3 0.1 0.6 0.1 0.9-0.1 2.7-1.2 5.5-2 8.4-2.2h0.3q0.6 0 1.2 0 3.6-0.1 7 0.9 0.2 0.1 0.4 0.2 0.6 0.1 1.1 0.4 0.4 0.1 0.8 0.3 0.4 0.1 0.7 0.2 0.5 0.2 1 0.5 0.2 0.1 0.4 0.2 0.5 0.3 1 0.5 0.3 0.2 0.6 0.4c3.5 2.2 6.5 5.2 8.5 8.8-3.4-2.4-7.6-3.4-11.7-2.8 17.5 8.7 12.8 38.8-11.5 37.7-2.2-0.1-4.3-0.5-6.4-1.2q-0.7-0.3-1.4-0.6-0.4-0.2-0.8-0.4c-6-3.1-10.9-8.9-11.5-15.9 0 0 2.2-8.4 16.1-8.4 1.5 0 5.8-4.2 5.9-5.4 0-0.4-8.5-3.7-11.8-7-1.8-1.7-2.6-2.6-3.4-3.2q-0.6-0.5-1.2-0.9c-1.2-3.9-1.2-8-0.2-11.9-4.5 2.1-8.5 5.2-11.7 9-2-2.4-1.9-10.5-1.8-12.2q-0.8 0.4-1.6 0.9c-1.7 1.2-3.3 2.6-4.7 4.1q-2.5 2.5-4.6 5.4c-3.1 4.5-5.4 9.5-6.6 14.8q-0.4 2.2-0.7 4.5-0.1 0.5-0.2 1.1-0.2 1.4-0.3 2.8 0 0 0 0.1 0 0.8-0.1 1.6v0.3c0.1 12.2 4.8 24 13 32.9 8.3 9 19.6 14.5 31.7 15.5 12.1 1.1 24.2-2.5 33.8-9.9 9.7-7.5 16.2-18.3 18.4-30.3q0.1-0.9 0.2-1.9c1-8.2-0.1-16.7-3.2-24.4z"
+        android:fillColor="#000000"/>
+  </group>
+</vector>
diff --git a/lawnchair/res/drawable/ic_iceraven.xml b/lawnchair/res/drawable/ic_iceraven.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="m31.6 25.8l2-2.4q0 0 0.1 0l2.1-2.2q0 0 0.1-0.1l2.3-2q0 0 0 0l2.5-1.8q0 0 0-0.1l2.6-1.5q0.1-0.1 0.1-0.1l2.7-1.3q0 0 0.1-0.1l2.8-1q0-0.1 0.1-0.1l2.8-0.8q0.1 0 0.1 0l2.9-0.7q0.1 0 0.1 0l3-0.3q0 0 0.1 0l2.9-0.1q0.1 0 0.1 0l3 0.2q0 0 0.1 0l2.9 0.4q0.1 0 0.1 0l2.9 0.7q0.1 0 0.1 0l2.9 0.9q0 0.1 0 0.1l2.8 1.1q0 0 0.1 0.1l2.6 1.4q0.1 0 0.1 0l2.6 1.7q0 0 0 0l2.5 1.9q0 0 0 0l2.3 2.1q0 0 0 0l2.1 2.3q0 0 0.1 0l1.9 2.4q0 0.1 0 0.1l1.8 2.6q0 0 0 0l1.4 2.6q0.1 0.1 0.1 0.1l1.2 2.7q0 0.1 0.1 0.1l1 2.8q0 0 0 0.1l0.9 2.9q0 0 0 0.1l0.6 2.9q0 0 0 0.1l0.4 2.9q0 0.1 0 0.1l0.2 3q0 0.1 0 0.1l-0.1 3q0 0.1 0 0.1l-0.2 3q0 0-0.1 0.1l-0.5 2.9q0 0.1 0 0.1l-0.7 2.9q0 0 0 0.1l-0.9 2.8q-0.1 0.1-0.1 0.1l-1.1 2.8q0 0 0 0.1l-1.4 2.6q0 0.1 0 0.1l-1.6 2.5q0 0.1 0 0.1l-1.7 2.4q-0.1 0-0.1 0.1l-1.9 2.2c-0.4 0.5-1.1 0.5-1.5 0.1-0.5-0.4-0.5-1.1-0.1-1.6l1.9-2.3-0.1 0.1 1.8-2.4-0.1 0.1 1.5-2.5 1.3-2.6v0.1l1.1-2.8v0.1l0.9-2.8v0.1l0.7-2.9 0.5-2.9v0.1l0.3-3v0.1-3 0.1l-0.2-3v0.1l-0.4-3 0.1 0.1-0.6-2.9-0.9-2.8h0.1l-1.1-2.7h0.1l-1.3-2.7 0.1 0.1-1.5-2.6 0.1 0.1-1.8-2.6 0.1 0.1-1.9-2.4v0.1l-2-2.3v0.1l-2.2-2-2.4-1.8h0.1l-2.5-1.6-2.6-1.4 0.1 0.1-2.8-1.2h0.1l-2.8-0.9h0.1l-3-0.7 0.1 0.1-2.9-0.5 0.1 0.1-3-0.2h0.1l-3 0.1h0.1l-3 0.3h0.1l-2.9 0.6h0.1l-2.9 0.8h0.1l-2.8 1.1h0.1l-2.7 1.3 0.1-0.1-2.6 1.6h0.1l-2.5 1.7h0.1l-2.3 2 0.1-0.1-2.2 2.2 0.1-0.1-1.9 2.4c-0.4 0.5-1.1 0.5-1.6 0.1-0.4-0.4-0.5-1.2-0.1-1.6z"
+      android:strokeLineJoin="miter"
+      android:fillColor="#055493"/>
+  <path
+      android:pathData="m48.3 7c-6.3 0.1-12.9 2.2-15.9 3.8-12.5 7.1-18 13.2-26.4 22.3l8.8-6.3c-4.1 5.7-7 14-7.4 23.4-0.2 4.4 0.3 12.4 2.8 18.4 3.1 7.4 6.5 11.5 10.2 14.4q0.1 0.1 0.3 0.2l1.9 1.3c8.1 2.8 13.9 3.8 20.7 3.8 2 0 4-0.2 5.7-0.6 5.5-1.3 10.2-4.8 14.8-9.5 2.5-2.8 4.6-6.5 6.3-11.4 2-5.6 2.6-10.2 1.8-15.2-2.9 4-5.5 4.3-5.6 4.3 0 0 5.4-9.4 7.3-17.2-6.7 5.7-12.9 9.2-18.6 10.5-3.6 0.8-6.9 1.3-9.9 1.3q-5.7 0-9.9-2.1c-3.2-6.9-3.9-13-1.9-18.3 0.9-2.4 2.3-4.6 4-6.7l11-16.4zm44.7 24.2c3.2 10.9 4.8 16.5-0.2 28.9-5.8 14.2-15 18-22.7 18.6-5.8 6.4-12.2 12-20 13.8-2.2 0.6-4.4 0.8-6.7 0.8q-2.5 0-5.1-0.3l-7.2-1.1c3.6 3.1 12.4 7.2 17 8.1 3.9 0.7 9.6 0.8 13.1 0.8 19.3 0 33.4-13.6 39.2-32.8 3.7-12 0.8-25.8-1.3-35.5l-0.1 10.8-6-12.1z"
+      android:strokeLineJoin="miter"
+      android:fillColor="#055493"/>
+</vector>
diff --git a/lawnchair/res/drawable/ic_iceraven_tinted.xml b/lawnchair/res/drawable/ic_iceraven_tinted.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="m31.6 25.8l2-2.4q0 0 0.1 0l2.1-2.2q0 0 0.1-0.1l2.3-2q0 0 0 0l2.5-1.8q0 0 0-0.1l2.6-1.5q0.1-0.1 0.1-0.1l2.7-1.3q0 0 0.1-0.1l2.8-1q0-0.1 0.1-0.1l2.8-0.8q0.1 0 0.1 0l2.9-0.7q0.1 0 0.1 0l3-0.3q0 0 0.1 0l2.9-0.1q0.1 0 0.1 0l3 0.2q0 0 0.1 0l2.9 0.4q0.1 0 0.1 0l2.9 0.7q0.1 0 0.1 0l2.9 0.9q0 0.1 0 0.1l2.8 1.1q0 0 0.1 0.1l2.6 1.4q0.1 0 0.1 0l2.6 1.7q0 0 0 0l2.5 1.9q0 0 0 0l2.3 2.1q0 0 0 0l2.1 2.3q0 0 0.1 0l1.9 2.4q0 0.1 0 0.1l1.8 2.6q0 0 0 0l1.4 2.6q0.1 0.1 0.1 0.1l1.2 2.7q0 0.1 0.1 0.1l1 2.8q0 0 0 0.1l0.9 2.9q0 0 0 0.1l0.6 2.9q0 0 0 0.1l0.4 2.9q0 0.1 0 0.1l0.2 3q0 0.1 0 0.1l-0.1 3q0 0.1 0 0.1l-0.2 3q0 0-0.1 0.1l-0.5 2.9q0 0.1 0 0.1l-0.7 2.9q0 0 0 0.1l-0.9 2.8q-0.1 0.1-0.1 0.1l-1.1 2.8q0 0 0 0.1l-1.4 2.6q0 0.1 0 0.1l-1.6 2.5q0 0.1 0 0.1l-1.7 2.4q-0.1 0-0.1 0.1l-1.9 2.2c-0.4 0.5-1.1 0.5-1.5 0.1-0.5-0.4-0.5-1.1-0.1-1.6l1.9-2.3-0.1 0.1 1.8-2.4-0.1 0.1 1.5-2.5 1.3-2.6v0.1l1.1-2.8v0.1l0.9-2.8v0.1l0.7-2.9 0.5-2.9v0.1l0.3-3v0.1-3 0.1l-0.2-3v0.1l-0.4-3 0.1 0.1-0.6-2.9-0.9-2.8h0.1l-1.1-2.7h0.1l-1.3-2.7 0.1 0.1-1.5-2.6 0.1 0.1-1.8-2.6 0.1 0.1-1.9-2.4v0.1l-2-2.3v0.1l-2.2-2-2.4-1.8h0.1l-2.5-1.6-2.6-1.4 0.1 0.1-2.8-1.2h0.1l-2.8-0.9h0.1l-3-0.7 0.1 0.1-2.9-0.5 0.1 0.1-3-0.2h0.1l-3 0.1h0.1l-3 0.3h0.1l-2.9 0.6h0.1l-2.9 0.8h0.1l-2.8 1.1h0.1l-2.7 1.3 0.1-0.1-2.6 1.6h0.1l-2.5 1.7h0.1l-2.3 2 0.1-0.1-2.2 2.2 0.1-0.1-1.9 2.4c-0.4 0.5-1.1 0.5-1.6 0.1-0.4-0.4-0.5-1.2-0.1-1.6z"
+      android:strokeLineJoin="miter"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="m48.3 7c-6.3 0.1-12.9 2.2-15.9 3.8-12.5 7.1-18 13.2-26.4 22.3l8.8-6.3c-4.1 5.7-7 14-7.4 23.4-0.2 4.4 0.3 12.4 2.8 18.4 3.1 7.4 6.5 11.5 10.2 14.4q0.1 0.1 0.3 0.2l1.9 1.3c8.1 2.8 13.9 3.8 20.7 3.8 2 0 4-0.2 5.7-0.6 5.5-1.3 10.2-4.8 14.8-9.5 2.5-2.8 4.6-6.5 6.3-11.4 2-5.6 2.6-10.2 1.8-15.2-2.9 4-5.5 4.3-5.6 4.3 0 0 5.4-9.4 7.3-17.2-6.7 5.7-12.9 9.2-18.6 10.5-3.6 0.8-6.9 1.3-9.9 1.3q-5.7 0-9.9-2.1c-3.2-6.9-3.9-13-1.9-18.3 0.9-2.4 2.3-4.6 4-6.7l11-16.4zm44.7 24.2c3.2 10.9 4.8 16.5-0.2 28.9-5.8 14.2-15 18-22.7 18.6-5.8 6.4-12.2 12-20 13.8-2.2 0.6-4.4 0.8-6.7 0.8q-2.5 0-5.1-0.3l-7.2-1.1c3.6 3.1 12.4 7.2 17 8.1 3.9 0.7 9.6 0.8 13.1 0.8 19.3 0 33.4-13.6 39.2-32.8 3.7-12 0.8-25.8-1.3-35.5l-0.1 10.8-6-12.1z"
+      android:strokeLineJoin="miter"
+      android:fillColor="#000000"/>
+</vector>