Merge branch 'devel' into feature/kitsu

# Conflicts:
#	app/src/main/res/values/strings.xml
This commit is contained in:
Zakhar Timoshenko
2023-06-05 17:21:56 +03:00
187 changed files with 3068 additions and 1355 deletions

View File

@@ -2,7 +2,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?colorControlNormal"
android:tint="?colorError"
android:viewportWidth="24"
android:viewportHeight="24">
<path

View File

@@ -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:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:pathData="M18 21L14 17H17V7H14L18 3L22 7H19V17H22M2 19V17H12V19M2 13V11H9V13M2 7V5H6V7H2Z" />
</vector>