Update project

michaelbel · Nov 12, 2024 · d3fa2c1 · d3fa2c1
1 parent 8df795d
commit d3fa2c1
Show file tree

Hide file tree

Showing 16 changed files with 395 additions and 8 deletions.
diff --git a/.github/codeowners b/.github/codeowners
@@ -0,0 +1 @@
+* @michaelbel
diff --git a/.github/scripts/gitlog.sh b/.github/scripts/gitlog.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+LOG=releaseNotes.txt
+TEMP=releaseNotes.temp
+
+git log --oneline $(git describe --abbrev=0 --tags 2>&1).. > ${LOG}
+
+cut -d' ' -f2-  ${LOG} > ${TEMP}
+
+while read -r line
+do
+    echo "* $line"
+done <${TEMP} > ${LOG}
+
+rm ${TEMP}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,102 @@
+name: Check Commit CI
+
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+  workflow_dispatch:
+
+concurrency:
+  group: environment-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: setup jdk 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: cache gradle dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: gradle-${{ runner.os }}-${{ hashFiles('/*.gradle*', '/gradle-wrapper.properties') }}
+          restore-keys: |
+            gradle-${{ runner.os }}-
+
+      - name: cache gradle wrapper
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/wrapper
+          key: gradle-wrapper-${{ runner.os }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+
+      - name: clean outputs directory
+        run: rm -rf app/build/outputs/*
+
+      - name: make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: assemble debug artifact
+        run: ./gradlew :composeApp:assembleDebug
+
+      - name: upload artifacts to outputs
+        uses: actions/upload-artifact@v4
+        with:
+          path: |
+            composeApp/build/outputs/apk
+
+      - name: expose version name
+        id: version_name
+        run: |
+          VERSION_NAME=$(./gradlew printVersionName -q)
+          echo "VERSION_NAME=$VERSION_NAME" >> $GITHUB_ENV
+
+      - name: expose version code
+        id: version_code
+        run: |
+          VERSION_CODE=$(./gradlew printVersionCode -q)
+          echo "VERSION_CODE=$VERSION_CODE" >> $GITHUB_ENV
+
+      - name: list all apk files
+        run: |
+          echo "APKs:"
+          for apk in $(find composeApp/build/outputs/apk -name '*.apk'); do
+            echo "$apk"
+          done
+
+      - name: expose apk path
+        run: |
+          echo "APK_PATH=$(find composeApp/build/outputs/apk -name '*.apk' -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -d' ' -f2)" >> $GITHUB_ENV
+
+      - name: expose short commit sha
+        run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+
+      - name: send telegram message
+        env:
+          TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
+          CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+          THREAD_ID: ${{ secrets.TELEGRAM_THREAD_ID }}
+          MESSAGE: |
+            ✅ <b>${{ env.VERSION_NAME }} (${{ env.VERSION_CODE }})</b>
+            <b>Ветка:</b> ${{ github.ref_name }}
+            <b>Коммит:</b> <code>${{ env.SHORT_SHA }}</code>
+        run: |
+          curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendDocument" \
+            -F chat_id="${CHAT_ID}" \
+            -F document="@${{ env.APK_PATH }}" \
+            -F caption="${{ env.MESSAGE }}" \
+            -F message_thread_id="${THREAD_ID}" \
+            -F parse_mode="HTML"
diff --git a/README.md b/README.md
@@ -1,6 +1,9 @@
 Kotlin Multiplatform Template
 =
 
+![workflow-status](https://img.shields.io/github/actions/workflow/status/michaelbel/kmp-template/ci.yml?style=for-the-badge&logo=github&labelColor=3F464F)
+![last-commit](https://img.shields.io/github/last-commit/michaelbel/kmp-template?style=for-the-badge&logo=github&labelColor=3F464F)
+
 This is a Kotlin Multiplatform project targeting Android, iOS, Web, Desktop.
 
 [![android](https://img.shields.io/badge/android-000000.svg?style=for-the-badge&logo=android&logoColor=white)](https://github.com/michaelbel/movies)

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -1,10 +1,12 @@
 @file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
 
+import org.apache.commons.io.output.ByteArrayOutputStream
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
+import java.nio.charset.Charset
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -13,6 +15,15 @@ plugins {
     alias(libs.plugins.compose)
 }
 
+private val gitCommitsCount: Int by lazy {
+    val stdout = ByteArrayOutputStream()
+    rootProject.exec {
+        commandLine("git", "rev-list", "--count", "HEAD")
+        standardOutput = stdout
+    }
+    stdout.toString(Charset.defaultCharset()).trim().toInt()
+}
+
 kotlin {
     js {
         moduleName = "composeApp"
@@ -91,11 +102,12 @@ android {
     sourceSets["main"].resources.srcDirs("src/commonMain/resources")
 
     defaultConfig {
-        applicationId = "org.michaelbel.template"
+        applicationId = "org.michaelbel.kmptemplate"
         minSdk = libs.versions.min.sdk.get().toInt()
         targetSdk = libs.versions.target.sdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.0"
+        versionCode = gitCommitsCount
+        setProperty("archivesBaseName", "KmpTemplate-v$versionName($versionCode)")
     }
     packaging {
         resources {
@@ -115,6 +127,8 @@ android {
         compose = true
     }
     dependencies {
+        api(libs.androidx.core.splashscreen)
+        api(libs.google.material)
         debugImplementation(compose.uiTooling)
     }
 }
@@ -138,4 +152,16 @@ compose {
     experimental {
         web.application {}
     }
+}
+
+tasks.register("printVersionName") {
+    doLast {
+        println(android.defaultConfig.versionName)
+    }
+}
+
+tasks.register("printVersionCode") {
+    doLast {
+        println(android.defaultConfig.versionCode.toString())
+    }
 }
diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:allowBackup="true"
+        android:appCategory="productivity"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.Material.Light.NoActionBar">
+        android:theme="@style/Theme.App.Starting"
+        android:enableOnBackInvokedCallback="true"
+        tools:ignore="UnusedAttribute">
+
         <activity
             android:exported="true"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
             android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>
diff --git a/composeApp/src/androidMain/kotlin/org/michaelbel/template/MainActivity.kt b/composeApp/src/androidMain/kotlin/org/michaelbel/template/MainActivity.kt
@@ -3,11 +3,15 @@ package org.michaelbel.template
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 
 class MainActivity: ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
             App()
         }

diff --git a/composeApp/src/androidMain/res/drawable/branding_image.xml b/composeApp/src/androidMain/res/drawable/branding_image.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="180dp"
+    android:height="64dp"
+    android:viewportWidth="180"
+    android:viewportHeight="64">
+  <path
+      android:pathData="M22.26,23.14C22.26,24.61 21.61,26.09 20.32,27.59C19.05,29.06 17.55,30.31 15.82,31.34C16.21,31.73 16.72,32.8 17.36,34.53C17.99,36.27 18.49,37.61 18.87,38.56C19.24,39.5 19.69,40.39 20.21,41.25C20.75,42.11 21.29,42.54 21.84,42.54C21.95,42.54 22.03,42.53 22.09,42.51L22.37,43.52C21.45,44.25 20.41,44.61 19.23,44.61C18.06,44.61 17.23,44.3 16.74,43.69C16.25,43.09 15.81,41.85 15.4,39.96C15.34,39.72 15.18,38.95 14.92,37.64C14.34,34.78 13.87,33.03 13.52,32.38C13.41,32.39 13.18,32.4 12.85,32.4C12.51,32.4 12.26,32.34 12.09,32.21C11.96,32.08 11.9,31.76 11.9,31.26C11.9,30.75 11.94,30.37 12.04,30.11C12.13,29.83 12.44,29.69 12.96,29.69C13.5,29.69 14.01,29.85 14.5,30.16C15.17,29.72 16,28.86 16.99,27.59C17.51,26.64 17.78,25.55 17.78,24.34C17.78,23.8 17.73,23.23 17.64,22.63C18.25,22.24 18.88,21.93 19.51,21.71C20.17,21.47 20.66,21.33 21,21.29L21.5,21.23C22,21.53 22.26,22.17 22.26,23.14ZM8.51,23.61C8.51,23.18 8.28,22.72 7.84,22.21L7.86,22.02C8.89,21.42 10.15,21.12 11.64,21.12C12.22,21.12 12.65,21.17 12.93,21.26C13.03,21.47 13.07,21.75 13.07,22.13C13.07,22.48 13.04,22.89 12.99,23.36C12.93,23.81 12.88,24.21 12.82,24.56C12.78,24.9 12.69,25.39 12.54,26.05C12.39,26.7 12.28,27.17 12.2,27.45C10.67,33.37 9.81,37.78 9.6,40.69C8.5,41.01 7.28,41.17 5.93,41.17C5.61,41.17 5.38,41.14 5.23,41.08C5.33,39.93 5.89,37.03 6.94,32.4C7.99,27.77 8.51,24.84 8.51,23.61ZM49.69,40.08C48.48,40.92 47.34,41.34 46.27,41.34C45.21,41.34 44.45,41.08 44.01,40.58C43.58,40.08 43.36,39.41 43.36,38.59C43.36,37.77 43.8,35.66 44.68,32.26C45.56,28.85 45.99,26.73 45.99,25.91C45.99,24.88 45.63,24.37 44.9,24.37C44.17,24.37 43.19,24.91 41.93,25.99C41.9,26.14 41.59,27.28 41.01,29.41C39.74,34.07 39.06,37.84 38.97,40.69C38.24,40.97 36.92,41.11 35.02,41.11H34.65C34.65,39.95 35.15,37.29 36.14,33.1C37.13,28.92 37.62,26.49 37.62,25.8C37.62,24.84 37.24,24.37 36.47,24.37C35.65,24.37 34.58,24.95 33.25,26.1C33.25,29.91 32.58,33.48 31.24,36.8C30.6,38.37 29.77,39.65 28.75,40.64C27.74,41.61 26.69,42.09 25.61,42.09C24.55,42.09 23.71,41.77 23.09,41.11C22.49,40.48 22.19,39.59 22.19,38.45C22.19,37.29 22.61,35.94 23.43,34.39C24.25,32.82 25.12,31.49 26.03,30.39C26.96,29.27 27.92,28.26 28.89,27.36C28.89,25.65 28.68,24.61 28.27,24.26C28.07,24.09 27.77,24 27.37,24C27,24 26.44,24.17 25.69,24.51C24.97,24.84 24.27,25.3 23.59,25.88L22.89,24.9C23.55,24.1 24.53,23.32 25.83,22.58C27.14,21.83 28.3,21.46 29.31,21.46C30.33,21.46 31.14,21.73 31.71,22.27C32.31,22.79 32.73,23.46 32.97,24.28C35.55,22.17 37.59,21.12 39.08,21.12C39.83,21.12 40.46,21.35 40.98,21.82C41.52,22.29 41.87,22.99 42.02,23.92C44.22,22.05 46.06,21.12 47.53,21.12C48.36,21.12 49.05,21.45 49.61,22.1C50.19,22.75 50.47,23.64 50.47,24.76C50.47,25.86 50.02,28.09 49.1,31.45C48.19,34.81 47.73,36.94 47.73,37.84C47.73,38.71 48.01,39.15 48.57,39.15C48.76,39.15 48.99,39.11 49.27,39.01L49.69,40.08ZM25.08,39.43C25.83,39.43 26.56,38.51 27.29,36.66C28.04,34.79 28.54,32.46 28.8,29.66C27.61,30.89 26.53,32.36 25.58,34.06C24.63,35.74 24.15,37.05 24.15,38C24.15,38.96 24.46,39.43 25.08,39.43ZM56.9,26.5C56.9,26.14 56.86,25.88 56.76,25.71C56.69,25.54 56.51,25.3 56.23,24.98L56.26,24.79C57.25,24.21 58.48,23.92 59.96,23.92C60.54,23.92 60.96,23.97 61.24,24.06C61.34,24.25 61.38,24.64 61.38,25.24C61.38,25.81 60.94,27.91 60.04,31.54C60.45,31.7 60.92,31.79 61.44,31.79C62.34,31.79 63.07,31.48 63.65,30.86C64.23,30.25 64.6,29.59 64.77,28.88C64.96,28.15 65.05,27.38 65.05,26.58C65.05,25.11 64.65,24.04 63.85,23.39C63.06,22.72 61.79,22.38 60.01,22.38C57.7,22.38 55.78,22.85 54.24,23.78C52.71,24.71 51.95,25.69 51.95,26.72C51.95,27.24 52.14,27.67 52.54,28.01C52.95,28.33 53.37,28.54 53.8,28.65C53.72,29.32 53.49,30.01 53.1,30.72C52.39,30.63 51.72,30.26 51.08,29.6C50.43,28.95 50.1,28.09 50.1,27.03C50.1,25.12 51.16,23.59 53.29,22.44C55.42,21.28 57.9,20.7 60.74,20.7C63.58,20.7 65.72,21.18 67.18,22.13C68.64,23.06 69.36,24.52 69.36,26.5C69.36,29.09 68.33,31.05 66.26,32.38C65.14,33.1 63.79,33.47 62.22,33.47C61.24,33.47 60.39,33.32 59.68,33.02C58.89,36.21 58.42,38.77 58.25,40.69C57.15,41.01 55.92,41.17 54.58,41.17C54.26,41.17 54.03,41.14 53.88,41.08C53.97,39.91 54.5,37.46 55.45,33.75C56.42,30.03 56.9,27.62 56.9,26.5ZM79.25,24.31C77.7,24.31 76.45,24.69 75.5,25.46C74.92,25.16 74.58,24.92 74.49,24.73C74.49,23.61 74.77,22.62 75.33,21.76C75.89,20.89 76.71,20.45 77.79,20.45C78.91,20.45 80.69,21.06 83.11,22.3C84.01,22.76 84.6,23.03 84.88,23.11C85.6,22.53 86.41,22.05 87.28,21.68C88.18,21.31 88.95,21.12 89.61,21.12C90.28,21.12 90.9,21.32 91.46,21.71C92.02,22.1 92.3,22.69 92.3,23.47C92.3,24.26 91.98,24.95 91.34,25.54C90.73,26.14 89.86,26.44 88.74,26.44C88.24,26.44 87.68,26.37 87.06,26.22C86.46,26.05 86.1,25.95 85.97,25.94C85.39,26.51 84.75,27.32 84.04,28.34C83.35,29.35 82.76,30.41 82.27,31.51C82.57,31.47 82.79,31.45 82.94,31.45C84.38,31.45 85.66,31.87 86.78,32.71C87.92,33.53 88.49,34.67 88.49,36.13C88.49,37.58 87.95,38.86 86.86,39.96C85.8,41.07 84.35,41.62 82.52,41.62C80.69,41.62 79.29,41.01 78.3,39.8C77.33,38.58 76.84,37.16 76.84,35.54C75.66,36.64 74.91,37.85 74.57,39.15C74.14,39.08 73.73,38.95 73.34,38.76C72.95,38.55 72.7,38.36 72.58,38.17C73.31,36.32 74.86,34.59 77.23,32.96C77.68,31.51 78.4,30.07 79.39,28.65C80.4,27.23 81.47,25.97 82.61,24.87C81.43,24.5 80.31,24.31 79.25,24.31ZM86.56,36.04C86.56,35.24 86.21,34.59 85.52,34.08C84.83,33.56 84.12,33.3 83.39,33.3C82.66,33.3 82.05,33.4 81.54,33.61C81.36,34.24 81.26,35.01 81.26,35.9C81.26,36.78 81.51,37.55 81.99,38.2C82.5,38.83 83.13,39.15 83.9,39.15C84.68,39.15 85.31,38.83 85.8,38.2C86.3,37.55 86.56,36.83 86.56,36.04ZM90.53,23.67C90.53,23.31 90.26,23.14 89.72,23.14C89.2,23.14 88.49,23.53 87.59,24.31C87.93,24.5 88.34,24.59 88.82,24.59C89.31,24.59 89.71,24.51 90.03,24.34C90.36,24.17 90.53,23.95 90.53,23.67ZM91,36.16C91,33.82 91.7,31.98 93.1,30.64C94.52,29.28 96.12,28.6 97.91,28.6C99.01,28.6 99.92,28.87 100.63,29.41C101.34,29.95 101.69,30.68 101.69,31.59C101.69,32.49 101.46,33.24 100.99,33.86C100.55,34.48 99.99,34.95 99.34,35.29C98.02,35.94 96.8,36.35 95.7,36.52L95.03,36.6C95.16,38.36 95.88,39.24 97.19,39.24C97.63,39.24 98.11,39.12 98.61,38.9C99.12,38.68 99.51,38.45 99.79,38.23L100.21,37.89L100.88,38.79C100.73,38.99 100.43,39.26 99.99,39.6C99.54,39.94 99.12,40.22 98.73,40.44C97.64,41.04 96.46,41.34 95.17,41.34C93.88,41.34 92.86,40.88 92.12,39.96C91.37,39.05 91,37.78 91,36.16ZM95,35.23C95.95,35.06 96.71,34.66 97.27,34.03C97.83,33.39 98.11,32.57 98.11,31.56C98.11,30.56 97.81,30.05 97.21,30.05C96.5,30.05 95.95,30.66 95.56,31.87C95.19,33.07 95,34.19 95,35.23ZM103.05,41.08H102.52C102.52,40.21 102.78,38.53 103.3,36.04C103.84,33.56 104.11,32.15 104.11,31.82C104.11,31.2 103.85,30.55 103.33,29.86L103.08,29.52L103.11,29.16C104.11,28.88 105.73,28.74 107.95,28.74C108.21,29.09 108.34,29.67 108.34,30.47C110.02,29.22 111.36,28.6 112.35,28.6C113.6,28.6 114.33,29.24 114.56,30.53C115.06,30.12 115.71,29.7 116.52,29.27C117.34,28.82 118.07,28.6 118.7,28.6C119.35,28.6 119.9,28.81 120.32,29.24C120.75,29.65 120.97,30.23 120.97,30.98C120.97,31.72 120.76,32.95 120.35,34.67C119.94,36.39 119.74,37.55 119.74,38.14C119.74,38.72 119.82,39.01 119.99,39.01C120.1,39.01 120.48,38.83 121.14,38.48L121.44,38.31L121.95,39.29C121.46,39.78 120.8,40.24 119.96,40.69C119.14,41.12 118.41,41.34 117.78,41.34C116.38,41.34 115.68,40.54 115.68,38.96C115.68,38.38 115.87,37.22 116.26,35.48C116.68,33.73 116.88,32.59 116.88,32.07C116.88,31.53 116.72,31.26 116.4,31.26C115.86,31.26 115.25,31.46 114.56,31.87C114.52,32.25 114.26,33.51 113.77,35.68C113.31,37.85 113.07,39.53 113.07,40.72C112.53,40.96 111.26,41.08 109.26,41.08C109.23,40.88 109.21,40.38 109.21,39.6C109.21,38.82 109.42,37.48 109.85,35.6C110.3,33.71 110.53,32.52 110.53,32.01C110.53,31.51 110.35,31.26 109.99,31.26C109.43,31.26 108.82,31.48 108.14,31.93C108.11,32.1 107.92,32.92 107.58,34.39C106.91,37.34 106.58,39.44 106.58,40.69C105.92,40.95 104.75,41.08 103.05,41.08ZM122.04,47.27C121.95,47.05 121.9,46.55 121.9,45.79C121.9,45.02 122.27,42.97 123,39.63C123.72,36.27 124.09,33.68 124.09,31.87C124.09,31.52 124,31.14 123.84,30.75C123.67,30.34 123.49,30.02 123.3,29.8L123.05,29.49L123.08,29.13C123.96,28.85 125.51,28.71 127.73,28.71C127.93,29.1 128.06,29.65 128.12,30.36C129.56,29.18 130.75,28.6 131.7,28.6C132.67,28.6 133.45,29 134.03,29.8C134.63,30.6 134.92,31.78 134.92,33.33C134.92,36.03 134.43,38.05 133.44,39.38C132.45,40.68 131.2,41.34 129.69,41.34C128.9,41.34 128.25,41.22 127.73,41L127.45,40.89L127.64,39.8C127.81,39.83 128.01,39.85 128.23,39.85C128.72,39.85 129.14,39.63 129.49,39.18C129.87,38.73 130.15,38.16 130.33,37.47C130.71,36.09 130.89,34.81 130.89,33.64C130.89,31.96 130.55,31.12 129.86,31.12C129.31,31.12 128.74,31.33 128.12,31.76C128.04,33.07 127.66,35.35 126.97,38.62C126.28,41.89 125.94,44.52 125.94,46.52C124.93,46.93 123.63,47.18 122.04,47.27ZM138.35,41.34C137.72,41.34 137.19,41.12 136.76,40.69C136.35,40.26 136.14,39.67 136.14,38.9C136.14,38.12 136.6,35.64 137.51,31.48C138.45,27.3 138.91,24.28 138.91,22.44L138.75,21.2C140.2,20.7 141.57,20.45 142.84,20.45C143.02,20.71 143.12,21.17 143.12,21.82C143.12,23.31 142.64,26.21 141.69,30.5C140.75,34.77 140.29,37.27 140.29,37.98C140.29,38.67 140.37,39.01 140.54,39.01L142.5,38.31L143,39.29C142.37,39.8 141.59,40.26 140.68,40.69C139.78,41.12 139.01,41.34 138.35,41.34ZM151.98,29.41C152.02,29.37 152.12,29.13 152.29,28.68C153.17,28.68 154.34,28.94 155.82,29.46C155.35,31.01 154.98,32.64 154.7,34.34C154.42,36.02 154.28,37.22 154.28,37.95C154.28,38.66 154.35,39.01 154.5,39.01C154.61,39.01 155.02,38.83 155.73,38.48L156.07,38.31L156.57,39.29C156.4,39.44 156.18,39.63 155.9,39.85C155.64,40.08 155.14,40.38 154.39,40.78C153.64,41.15 152.97,41.34 152.37,41.34C151.22,41.34 150.54,40.81 150.36,39.77C149.16,40.81 148.08,41.34 147.11,41.34C146.16,41.34 145.35,40.96 144.67,40.22C144.02,39.47 143.69,38.29 143.69,36.69C143.69,34.19 144.21,32.22 145.23,30.78C146.26,29.32 147.5,28.6 148.96,28.6C150,28.6 151.01,28.87 151.98,29.41ZM148.79,38.96C149.24,38.96 149.74,38.78 150.3,38.42C150.43,35.79 150.87,33.19 151.62,30.61C151.06,30.37 150.58,30.25 150.19,30.25C149.52,30.25 148.94,30.91 148.45,32.24C147.99,33.54 147.75,34.99 147.75,36.58C147.75,38.16 148.1,38.96 148.79,38.96ZM165.85,28.93C165.82,29.4 165.66,29.94 165.38,30.56C164.67,30.48 164,30.44 163.36,30.44H162.86C162,34.61 161.57,37.2 161.57,38.23C161.57,38.77 161.68,39.04 161.91,39.04C162.15,39.04 162.77,38.81 163.78,38.34L164.29,39.26C162.63,40.65 161.09,41.34 159.67,41.34C159.01,41.34 158.47,41.13 158.04,40.72C157.63,40.31 157.43,39.77 157.43,39.1C157.43,38.41 157.5,37.63 157.65,36.77C157.82,35.91 158.04,34.87 158.32,33.64C158.6,32.39 158.81,31.38 158.94,30.61C158.25,30.67 157.73,30.72 157.4,30.78C157.36,30.56 157.34,30.26 157.34,29.88C157.34,29.49 157.37,29.17 157.43,28.93H159.19C159.34,27.92 159.41,26.97 159.41,26.08L159.39,25.21V25.12C160.84,24.62 162.21,24.37 163.5,24.37C163.58,24.74 163.61,25.21 163.61,25.77C163.61,26.33 163.46,27.38 163.14,28.93H165.85ZM165.24,36.16C165.24,33.82 165.94,31.98 167.34,30.64C168.75,29.28 170.36,28.6 172.15,28.6C173.25,28.6 174.16,28.87 174.87,29.41C175.58,29.95 175.93,30.68 175.93,31.59C175.93,32.49 175.7,33.24 175.23,33.86C174.78,34.48 174.23,34.95 173.58,35.29C172.25,35.94 171.04,36.35 169.94,36.52L169.27,36.6C169.4,38.36 170.12,39.24 171.42,39.24C171.87,39.24 172.35,39.12 172.85,38.9C173.36,38.68 173.75,38.45 174.03,38.23L174.45,37.89L175.12,38.79C174.97,38.99 174.67,39.26 174.22,39.6C173.78,39.94 173.36,40.22 172.96,40.44C171.88,41.04 170.7,41.34 169.41,41.34C168.12,41.34 167.1,40.88 166.36,39.96C165.61,39.05 165.24,37.78 165.24,36.16ZM169.24,35.23C170.19,35.06 170.95,34.66 171.51,34.03C172.07,33.39 172.35,32.57 172.35,31.56C172.35,30.56 172.05,30.05 171.45,30.05C170.74,30.05 170.19,30.66 169.8,31.87C169.43,33.07 169.24,34.19 169.24,35.23Z"
+      android:fillColor="#141414"/>
+</vector>