Archived
Fixed filtering behaviour, since it wouldn't recognise items with two preferences if only one had been selected; added icons for preferences
This commit is contained in:
denizk0461
@@ -2,8 +2,13 @@ package com.denizk0461.studip.adapter
|
|||||||
|
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import android.widget.ImageView
|
||||||
|
import androidx.core.widget.ImageViewCompat
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.denizk0461.studip.data.Misc
|
||||||
import com.denizk0461.studip.databinding.ItemCanteenBinding
|
import com.denizk0461.studip.databinding.ItemCanteenBinding
|
||||||
|
import com.denizk0461.studip.databinding.ItemCanteenLineBinding
|
||||||
|
import com.denizk0461.studip.databinding.ItemIconBinding
|
||||||
import com.denizk0461.studip.model.CanteenOffer
|
import com.denizk0461.studip.model.CanteenOffer
|
||||||
|
|
||||||
class CanteenOfferItemAdapter(private val offers: List<CanteenOffer>) : RecyclerView.Adapter<CanteenOfferItemAdapter.OfferViewHolder>() {
|
class CanteenOfferItemAdapter(private val offers: List<CanteenOffer>) : RecyclerView.Adapter<CanteenOfferItemAdapter.OfferViewHolder>() {
|
||||||
@@ -25,8 +30,32 @@ class CanteenOfferItemAdapter(private val offers: List<CanteenOffer>) : Recycler
|
|||||||
override fun onBindViewHolder(holder: OfferViewHolder, position: Int) {
|
override fun onBindViewHolder(holder: OfferViewHolder, position: Int) {
|
||||||
val currentItem = offers[position]
|
val currentItem = offers[position]
|
||||||
|
|
||||||
|
val line = ItemCanteenLineBinding.inflate(
|
||||||
|
LayoutInflater.from(holder.binding.root.context),
|
||||||
|
// holder.binding.root,
|
||||||
|
// true,
|
||||||
|
)
|
||||||
holder.binding.textCategory.text = currentItem.category
|
holder.binding.textCategory.text = currentItem.category
|
||||||
holder.binding.tempContent.text = "${currentItem.title} • ${currentItem.price}"
|
line.content.text = currentItem.title
|
||||||
|
val indices = arrayListOf<Int>()
|
||||||
|
currentItem.dietaryPreferences.filterIndexed { index, char ->
|
||||||
|
if (char == 't') {
|
||||||
|
indices.add(index)
|
||||||
|
true
|
||||||
|
} else false
|
||||||
|
}
|
||||||
|
if (indices.isEmpty()) indices.add(10)
|
||||||
|
indices.forEach { index ->
|
||||||
|
val img = ItemIconBinding.inflate(LayoutInflater.from(holder.binding.root.context))
|
||||||
|
// holder.binding.root.resources.getDrawable(Misc.indexToDrawable[index]!!, holder.binding.root.context.theme)
|
||||||
|
img.imageView.setImageDrawable(holder.binding.root.context.getDrawable(Misc.indexToDrawable[index]!!))
|
||||||
|
line.imageViewContainer.addView(img.root)
|
||||||
|
}
|
||||||
|
|
||||||
|
holder.binding.lineContainer.addView(line.root)
|
||||||
|
|
||||||
|
// holder.binding.textCategory.text = currentItem.category
|
||||||
|
// holder.binding.tempContent.text = "${currentItem.title} • ${currentItem.price}"
|
||||||
|
|
||||||
// TODO inflate view saying "no offers!" or sth
|
// TODO inflate view saying "no offers!" or sth
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class CanteenOfferPageAdapter(private var offers: List<CanteenOffer>, private va
|
|||||||
filteredForDate
|
filteredForDate
|
||||||
} else {
|
} else {
|
||||||
filteredForDate.filter {
|
filteredForDate.filter {
|
||||||
Log.d("eek!5", it.dietaryPreferences)
|
Log.d("eek!5", "${it.title}: - ${prefsRegex} vs ${it.dietaryPreferences}")
|
||||||
prefsRegex.matches(it.dietaryPreferences)
|
prefsRegex.matches(it.dietaryPreferences)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.denizk0461.studip.data
|
package com.denizk0461.studip.data
|
||||||
|
|
||||||
import com.denizk0461.studip.model.StudIPEvent
|
import com.denizk0461.studip.R
|
||||||
|
|
||||||
object Misc {
|
object Misc {
|
||||||
|
|
||||||
@@ -52,6 +52,20 @@ object Misc {
|
|||||||
"21:45" to 7,
|
"21:45" to 7,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val indexToDrawable: Map<Int, Int> = mapOf(
|
||||||
|
0 to R.drawable.handshake,
|
||||||
|
1 to R.drawable.fish,
|
||||||
|
2 to R.drawable.chicken,
|
||||||
|
3 to R.drawable.sheep,
|
||||||
|
4 to R.drawable.yoga,
|
||||||
|
5 to R.drawable.cow,
|
||||||
|
6 to R.drawable.pig,
|
||||||
|
7 to R.drawable.leaf,
|
||||||
|
8 to R.drawable.carrot,
|
||||||
|
9 to R.drawable.deer,
|
||||||
|
10 to R.drawable.circle,
|
||||||
|
)
|
||||||
|
|
||||||
fun parseTimeslot(time: String): Pair<Int, Int> {
|
fun parseTimeslot(time: String): Pair<Int, Int> {
|
||||||
val splitTime = time.split(" - ")
|
val splitTime = time.split(" - ")
|
||||||
val start = timeslotStartMap[splitTime[0]] ?: 0
|
val start = timeslotStartMap[splitTime[0]] ?: 0
|
||||||
|
|||||||
@@ -116,5 +116,6 @@ class CanteenFragment : Fragment() {
|
|||||||
viewModel.getPreference(pref)
|
viewModel.getPreference(pref)
|
||||||
|
|
||||||
private fun getPrefRegex(): Regex =
|
private fun getPrefRegex(): Regex =
|
||||||
Regex(viewModel.getDietaryPrefs().deconstruct().replace('t', '.'))
|
// Regex(viewModel.getDietaryPrefs().deconstruct().replace('t', '.'))
|
||||||
|
Regex(viewModel.getDietaryPrefs().deconstruct().replace('f', '.'))
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:duration="@android:integer/config_shortAnimTime">
|
||||||
|
|
||||||
|
<translate
|
||||||
|
android:fromYDelta="20%"
|
||||||
|
android:toYDelta="0"
|
||||||
|
android:interpolator="@android:anim/decelerate_interpolator"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<alpha
|
||||||
|
android:fromAlpha="0"
|
||||||
|
android:toAlpha="1"
|
||||||
|
android:interpolator="@android:anim/decelerate_interpolator"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<scale
|
||||||
|
android:fromXScale="100%"
|
||||||
|
android:fromYScale="100%"
|
||||||
|
android:toXScale="100%"
|
||||||
|
android:toYScale="100%"
|
||||||
|
android:pivotX="50%"
|
||||||
|
android:pivotY="50%"
|
||||||
|
android:interpolator="@android:anim/decelerate_interpolator"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</set>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<layoutAnimation
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:animation="@anim/item_animation_fall_down"
|
||||||
|
android:delay="15%"
|
||||||
|
android:animationOrder="normal"/>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="144.5dp"
|
||||||
|
android:height="144.5dp"
|
||||||
|
android:viewportWidth="144.5"
|
||||||
|
android:viewportHeight="144.5">
|
||||||
|
<path
|
||||||
|
android:pathData="m8.31,143.9c-5.54,-0.99 -8.72,-5.8 -8.13,-12.31 1,-11.05 11.6,-32.2 29.48,-58.8 11.21,-16.68 22.9,-31.83 28.77,-37.27 4.58,-4.25 10.04,-7.22 16,-8.71 3.07,-0.77 7.98,-1.22 10.75,-0.99l2.29,0.19 0.16,-6.87c0.14,-5.87 0.25,-7.14 0.75,-8.71 0.96,-3.02 2.4,-5.14 4.82,-7.09 2.56,-2.07 4.99,-2.88 8.61,-2.89 3.84,-0.01 7.08,1.27 9.71,3.83 1.16,1.13 3.12,3.87 3.13,4.37 0,0.12 0.12,0.4 0.26,0.62 0.21,0.33 0.42,0.26 1.16,-0.37 3.29,-2.76 9.05,-3.85 13.05,-2.46 2.59,0.9 4.32,1.97 5.95,3.69 2.57,2.7 3.84,5.9 3.84,9.7 0,2.93 -0.76,5.44 -2.4,7.93 -0.96,1.46 -1.19,2.01 -0.93,2.18 0.2,0.13 0.46,0.23 0.58,0.23 0.5,0.01 3.24,1.97 4.37,3.13 2.57,2.63 3.84,5.87 3.83,9.71 -0.02,6.48 -3.6,11.31 -9.98,13.49 -1.29,0.44 -2.73,0.55 -8.5,0.68l-6.95,0.15 -0,3.99c-0,6.1 -0.98,10.62 -3.46,15.91 -3.34,7.13 -8.34,12.11 -23.55,23.49 -18.14,13.56 -39.61,27.2 -54.9,34.86 -7.46,3.74 -15.61,6.92 -20.21,7.88 -2.65,0.56 -6.68,0.76 -8.52,0.43zM13.9,134.48c13.2,-2.36 45.3,-20.76 74.08,-42.48 14.48,-10.93 18.32,-15.15 20.64,-22.74 0.72,-2.36 0.78,-2.89 0.78,-7.48 0,-4.57 -0.06,-5.12 -0.76,-7.42 -2.47,-8.03 -7.94,-14.13 -15.45,-17.23 -3.28,-1.36 -6.28,-1.94 -10.01,-1.94 -4.6,-0.01 -8.14,0.83 -12.27,2.89 -2.04,1.02 -5.64,3.51 -5.64,3.9 0,0.1 3.31,3.49 7.36,7.53 4.05,4.03 7.54,7.68 7.76,8.1 0.22,0.42 0.4,1.38 0.4,2.15 0,3.24 -3.3,5.44 -6.4,4.27 -0.44,-0.16 -4.12,-3.62 -8.19,-7.68 -4.07,-4.06 -7.45,-7.32 -7.5,-7.25 -1.77,2.15 -6.21,7.85 -8.46,10.85l-2.95,3.95 6.57,6.63c7.09,7.16 7.46,7.69 7.02,10.09 -0.26,1.42 -2.16,3.34 -3.58,3.6 -2.42,0.45 -2.7,0.27 -9.25,-6.24 -3.35,-3.32 -6.17,-6.04 -6.27,-6.04 -0.21,0 -4.94,6.89 -8.39,12.23l-2.34,3.62 4.82,4.85c4.03,4.06 4.85,5.02 5.01,5.91 0.31,1.69 -0.08,3.03 -1.24,4.19 -1.33,1.33 -2.8,1.76 -4.53,1.33 -1.09,-0.27 -1.86,-0.89 -5.13,-4.08 -2.11,-2.07 -3.91,-3.76 -4,-3.76 -0.21,0 -4.14,6.81 -7,12.14 -5.09,9.49 -8.42,17.68 -9.32,22.93 -0.62,3.59 -0.11,3.97 4.25,3.2zM132.75,47.06c3.25,-1.83 3.14,-6.5 -0.2,-8.13 -0.99,-0.48 -1.73,-0.56 -5.39,-0.56 -3.95,0 -4.31,-0.04 -5.2,-0.64 -1.98,-1.34 -2.75,-3.61 -1.94,-5.74 0.16,-0.42 2.31,-2.82 4.78,-5.33 3.71,-3.77 4.52,-4.74 4.68,-5.61 0.59,-3.16 -1.44,-5.82 -4.45,-5.82 -0.76,0 -1.67,0.14 -2,0.32 -0.34,0.17 -2.58,2.25 -4.99,4.61 -4.72,4.64 -5.56,5.17 -7.71,4.82 -1.45,-0.23 -2.95,-1.35 -3.47,-2.59 -0.28,-0.66 -0.39,-2.18 -0.39,-5.07 0,-4.67 -0.29,-5.6 -2.14,-6.87 -1.37,-0.94 -3.67,-0.94 -5.04,0 -1.99,1.36 -2.09,1.8 -2.31,10.29l-0.2,7.61 2.39,1.18c6.82,3.38 12.97,9.6 16.22,16.42l1,2.09 7.62,-0.18c7.18,-0.17 7.68,-0.22 8.74,-0.81z"
|
||||||
|
android:strokeWidth="0.282222"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="135.47dp"
|
||||||
|
android:height="135.47dp"
|
||||||
|
android:viewportWidth="135.47"
|
||||||
|
android:viewportHeight="135.47">
|
||||||
|
<path
|
||||||
|
android:pathData="m40.59,134.9c-1.24,-0.61 -2.23,-2.14 -2.23,-3.43 0,-1.22 0.96,-2.76 2.12,-3.41 0.86,-0.48 1.43,-0.56 4.07,-0.56h3.07v-5.65,-5.65l-1.87,-0.17c-1.03,-0.1 -3.2,-0.46 -4.83,-0.81 -10.03,-2.17 -18.5,-6.78 -25.73,-14.01 -8.4,-8.4 -13.42,-18.74 -14.79,-30.48 -0.32,-2.74 -0.4,-7.11 -0.39,-22.2 0.01,-17.9 0.03,-18.84 0.51,-19.9 0.92,-2.02 3.4,-2.75 5.41,-1.6 1.04,0.6 1.29,1 7.61,12.09l0.82,1.45 1.29,-2.57c1.1,-2.19 1.44,-2.64 2.34,-3.1 1.32,-0.68 2.4,-0.68 3.71,-0.01 0.86,0.44 1.24,0.93 2.29,2.95 3.77,7.31 9.64,12.12 17.28,14.19 2.49,0.68 2.68,0.69 13.41,0.78 7.18,0.06 11.24,0 11.93,-0.18 1.51,-0.41 3.1,-1.66 3.96,-3.12 0.74,-1.26 0.75,-1.28 0.92,-7.49 0.18,-6.57 0.4,-7.97 1.7,-11.22l0.7,-1.74 -1.44,-1.59c-2.57,-2.84 -3.83,-6.31 -3.55,-9.8 0.52,-6.63 5.43,-11.67 12.01,-12.34 1.66,-0.17 1.89,-0.27 3.16,-1.43 5.69,-5.17 13.93,-5.25 19.55,-0.17 1.48,1.33 1.68,1.43 3.33,1.6 4.16,0.42 7.64,2.49 9.89,5.88 1.54,2.31 2.05,4.08 2.09,7.12 0.03,3.09 -0.58,5.19 -2.21,7.56l-0.98,1.42 0.99,2.12c1.06,2.27 2.09,5.79 2.09,7.15 0,0.45 0.15,1.01 0.33,1.24 0.18,0.23 3.25,1.34 6.81,2.47 7.75,2.47 8.29,2.71 8.99,4.09 0.68,1.33 0.67,2.4 -0.02,3.75 -0.53,1.04 -0.83,1.22 -8.18,4.8l-7.62,3.72 -0.14,9.41c-0.14,9.95 -0.28,11.36 -1.6,16.17 -4.85,17.72 -20.23,31.28 -38.14,33.62l-2.51,0.33v5.64,5.64h3.07c2.67,0 3.21,0.08 4.1,0.58 1.08,0.61 2.09,2.24 2.09,3.39 0,1.26 -1.03,2.85 -2.22,3.42 -1.11,0.54 -1.47,0.55 -21.61,0.54 -20.02,-0 -20.51,-0.01 -21.57,-0.53zM68.79,121.94v-5.56h-6.61,-6.61v5.56,5.56h6.61,6.61zM80.48,107.69c5.46,-1.23 10.87,-3.67 15.04,-6.77 1.24,-0.93 3.44,-2.92 4.89,-4.43 5.09,-5.3 8.32,-11.36 9.95,-18.68 0.52,-2.34 0.58,-3.53 0.69,-13.54 0.11,-10.19 0.15,-11.04 0.63,-11.97 0.46,-0.9 0.97,-1.23 4.81,-3.17l4.29,-2.16 -3.44,-1.1c-1.89,-0.61 -3.83,-1.3 -4.3,-1.55 -1.25,-0.65 -1.92,-2.14 -1.93,-4.32 -0.01,-4.51 -1.6,-8.35 -4.73,-11.46 -2.31,-2.29 -4.35,-3.47 -7.33,-4.23 -3.73,-0.95 -7.79,-0.46 -11.3,1.38 -2.15,1.12 -5.36,4.33 -6.48,6.48 -1.52,2.89 -1.9,5.06 -1.9,10.67 0,7.49 -0.83,10.1 -4.37,13.63 -2.17,2.17 -3.81,3.12 -6.64,3.84 -1.85,0.47 -2.95,0.52 -11.4,0.52h-9.35l0.01,1.39c0.01,3.16 1.21,5.96 3.55,8.28 0.88,0.88 2.17,1.88 2.86,2.21 2.69,1.29 3.27,1.34 15.77,1.35 11.57,0 11.75,0.01 12.77,0.58 1.08,0.61 2.09,2.24 2.09,3.39 0,1.28 -1.03,2.85 -2.25,3.44 -1.14,0.55 -1.37,0.56 -13.81,0.48l-12.65,-0.08 -2.51,-0.88c-3.19,-1.11 -5.75,-2.71 -7.98,-5 -3.74,-3.83 -5.39,-7.67 -5.7,-13.23l-0.16,-2.96 -2.27,-0.71c-1.25,-0.39 -2.96,-1.05 -3.79,-1.47 -0.83,-0.42 -1.59,-0.77 -1.69,-0.77 -0.09,0 -0.11,2.17 -0.03,4.83 0.1,3.62 0.27,5.36 0.67,6.95 2.56,10.1 10.34,17.88 20.55,20.57 1.97,0.52 3.02,0.57 15.48,0.71 12.7,0.14 13.4,0.18 14.23,0.67 0.92,0.56 1.91,2.27 1.91,3.31 0,1.28 -1.03,2.85 -2.26,3.44 -1.15,0.56 -1.32,0.56 -14.47,0.45 -14.43,-0.12 -14.71,-0.15 -19.79,-1.82 -10.39,-3.43 -19.28,-12.43 -22.58,-22.88 -1.43,-4.52 -1.55,-5.56 -1.69,-14.12l-0.13,-8.07 -1.24,-1.32c-0.68,-0.73 -1.5,-1.67 -1.83,-2.09 -0.33,-0.42 -0.64,-0.72 -0.69,-0.66 -0.05,0.06 -0.65,1.22 -1.33,2.57 -1.1,2.2 -1.35,2.52 -2.35,2.97 -1.46,0.66 -2.47,0.64 -3.73,-0.08 -0.83,-0.48 -1.39,-1.21 -2.84,-3.77l-1.81,-3.17 0,11.11c0,13.56 0.24,15.85 2.29,22.23 0.93,2.9 3.17,7.48 4.99,10.19 6.25,9.31 15.25,15.6 26.32,18.4 4.11,1.04 6.22,1.14 21.56,1.07 14.12,-0.07 14.94,-0.1 17.38,-0.65zM97.47,41.77c-1.24,-0.61 -2.23,-2.14 -2.23,-3.43 0,-1.22 0.96,-2.76 2.12,-3.41 1.27,-0.72 2.44,-0.71 3.73,0.02 1.08,0.61 2.09,2.24 2.09,3.39 0,1.26 -1.03,2.85 -2.22,3.42 -1.41,0.68 -2.13,0.69 -3.49,0.01zM80.12,21.3c8.18,-6.71 19.8,-7.22 28.59,-1.25 0.87,0.59 1.64,1.08 1.7,1.08 0.06,0 0.26,-0.54 0.45,-1.19 0.69,-2.47 -0.37,-4.94 -2.65,-6.15 -1.1,-0.58 -1.38,-0.62 -3.6,-0.45 -2.96,0.22 -3.68,-0.08 -5.01,-2.09 -1.06,-1.6 -2.05,-2.41 -3.6,-2.96 -2.92,-1.03 -5.84,0.08 -7.75,2.96 -1.34,2.01 -2.05,2.31 -5.01,2.09 -2.22,-0.16 -2.5,-0.13 -3.6,0.45 -0.65,0.35 -1.55,1.14 -1.98,1.76 -0.69,0.98 -0.79,1.36 -0.79,2.91 0,1.5 0.11,1.96 0.73,2.89 0.4,0.61 0.82,1.11 0.93,1.11 0.11,0 0.83,-0.52 1.6,-1.15z"
|
||||||
|
android:strokeWidth="0.264583"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<vector android:height="24dp" android:tint="#000000"
|
||||||
|
android:viewportHeight="24" android:viewportWidth="24"
|
||||||
|
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<path android:fillColor="@android:color/white" android:pathData="M12,2C6.47,2 2,6.47 2,12c0,5.53 4.47,10 10,10s10,-4.47 10,-10C22,6.47 17.53,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8c0,-4.42 3.58,-8 8,-8s8,3.58 8,8C20,16.42 16.42,20 12,20z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="135.45dp"
|
||||||
|
android:height="105.28dp"
|
||||||
|
android:viewportWidth="135.45"
|
||||||
|
android:viewportHeight="105.28">
|
||||||
|
<path
|
||||||
|
android:pathData="m36.36,104.75c-0.67,-0.33 -1.3,-0.92 -1.65,-1.56 -0.57,-1.01 -0.58,-1.19 -0.58,-13.29l-0,-12.27 -1.6,-1.59c-1.81,-1.79 -4.14,-5.14 -5.12,-7.34 -1.06,-2.4 -1.47,-4.36 -1.74,-8.27 -0.41,-6.16 -1.8,-10.41 -4.75,-14.62l-1.35,-1.92 -4.16,-0c-6.32,-0.01 -8.77,-0.78 -11.69,-3.71 -2.93,-2.93 -3.7,-5.37 -3.71,-11.71 -0.01,-5.93 -0.19,-5.65 5.62,-8.55l4.56,-2.27 5.29,-5.25c5.42,-5.38 6.36,-6.07 8.2,-6.07 1.61,0 4.92,-0.8 7.14,-1.72 2.06,-0.85 3.65,-1.71 6.86,-3.67 1.81,-1.11 2.85,-1.21 4.39,-0.43 2.14,1.09 3.04,4.56 2.84,10.86l-0.13,4.16 3.87,3.86 3.87,3.86 31.88,0.01c34.52,0.01 34.04,-0.01 37.69,1.45 5.19,2.08 8.97,5.65 11.37,10.73 1.73,3.66 1.81,4.26 1.93,13.54 0.11,8.17 0.09,8.44 -0.46,9.58 -0.6,1.24 -2.16,2.26 -3.45,2.26 -1.15,0 -2.78,-1 -3.39,-2.09 -0.56,-0.99 -0.58,-1.31 -0.58,-8.45 0,-4.38 -0.12,-8 -0.29,-8.83 -0.48,-2.32 -1.79,-4.68 -3.57,-6.43 -1.49,-1.46 -3.89,-3.06 -4.17,-2.77 -0.06,0.07 0.1,0.95 0.37,1.97 0.46,1.75 0.49,3.71 0.5,34.78 0.02,32.72 0.01,32.93 -0.53,34.05 -0.4,0.82 -0.85,1.28 -1.67,1.67 -1.07,0.52 -1.58,0.55 -10.22,0.55 -8.55,0 -9.16,-0.03 -10.19,-0.53 -0.7,-0.34 -1.3,-0.9 -1.67,-1.56 -0.56,-1 -0.58,-1.25 -0.58,-10.57v-9.54l-1.37,-3.45c-1.05,-2.66 -1.47,-3.43 -1.79,-3.33 -0.91,0.26 -6.42,0.95 -9.65,1.21 -6.21,0.49 -12.8,0.25 -19.31,-0.68 -1.58,-0.23 -2.96,-0.32 -3.07,-0.2 -0.11,0.12 -0.45,1.53 -0.76,3.13 -0.52,2.65 -0.57,3.78 -0.57,12.55 0,9.19 -0.03,9.69 -0.54,10.77 -0.4,0.82 -0.85,1.28 -1.67,1.67 -1.07,0.52 -1.58,0.55 -10.24,0.54 -8.6,-0 -9.17,-0.03 -10.19,-0.53zM51.06,89.6 L51.06,81.87 52.13,76.44c1.27,-6.48 1.63,-7.39 3.23,-8.17 1.42,-0.69 1.49,-0.69 4.66,-0.04 5.42,1.1 9.16,1.43 16.18,1.43 7.07,0 10.34,-0.29 16.32,-1.46 2.85,-0.56 3.01,-0.56 4.16,-0.12 1.54,0.59 1.82,1.06 4.47,7.5l2.15,5.22 0.09,8.27 0.09,8.27h4.49,4.49l-0.07,-30.78 -0.07,-30.78 -0.8,-1.3c-0.97,-1.58 -2.89,-2.93 -4.51,-3.17 -0.66,-0.1 -1.26,-0.11 -1.34,-0.04 -0.08,0.08 -0.26,1.08 -0.39,2.21 -0.82,6.78 -3.49,11.62 -7.6,13.8 -2.98,1.58 -5.87,1.71 -10.79,0.48 -2.49,-0.62 -3.98,-0.81 -5.83,-0.73 -0.64,0.03 -1.29,0.45 -2.7,1.74 -2.09,1.92 -3.29,2.61 -5.5,3.19 -4.25,1.11 -8.23,-0.08 -11.59,-3.44 -3.05,-3.05 -5.17,-7.43 -6.83,-14.09l-0.81,-3.24h-1.68c-0.92,0 -2.12,-0.18 -2.66,-0.41 -1.22,-0.51 -11.78,-10.93 -12.51,-12.34 -0.56,-1.09 -0.64,-2.12 -0.25,-3.28 0.14,-0.42 0.36,-1.64 0.48,-2.7 0.26,-2.24 0.51,-2.17 -2.78,-0.72 -2.29,1.01 -6.75,2.26 -8.09,2.26 -0.68,0 -1.56,0.75 -5.99,5.09l-5.19,5.09 -3.51,1.71 -3.51,1.71v2.41c0,3.03 0.61,4.39 2.37,5.33 1.09,0.58 1.43,0.61 6.35,0.61 4.67,0 5.3,0.05 6.23,0.53 1.07,0.55 2.74,2.29 4.41,4.6l0.97,1.34 3.4,0.03c2.78,0.02 3.71,0.14 5.12,0.62 2.66,0.92 5.01,2.44 7.03,4.57 5.11,5.38 6.02,13.37 2.24,19.8 -0.9,1.53 -3.24,4.13 -4.6,5.11 -0.48,0.34 -0.48,0.39 0.07,1.45 0.54,1.06 0.56,1.42 0.56,12.22v11.12h4.5,4.5l-0,-7.74zM82.87,62.52c-2.6,-1.32 -2.87,-5.09 -0.49,-6.79 1.12,-0.8 3.26,-0.82 4.3,-0.04 1.31,0.98 1.82,1.9 1.82,3.29 0,2.83 -3.15,4.81 -5.63,3.54zM25.77,28.55c-1.24,-0.61 -2.23,-2.14 -2.23,-3.43 0,-1.22 0.96,-2.76 2.12,-3.41 1.27,-0.72 2.44,-0.71 3.73,0.02 1.08,0.61 2.09,2.24 2.09,3.39 0,1.26 -1.03,2.85 -2.22,3.42 -1.41,0.68 -2.13,0.69 -3.49,0.01zM36.81,66.05c2.58,-1.97 3.84,-4.7 3.6,-7.78 -0.32,-3.97 -3.39,-7.29 -7.33,-7.92 -1.13,-0.18 -1.15,-0.17 -0.97,0.45 0.65,2.19 1.24,5.82 1.38,8.44 0.09,1.67 0.28,3.52 0.42,4.1 0.35,1.42 1.29,3.57 1.55,3.57 0.12,0 0.72,-0.39 1.35,-0.87zM71.52,44.12c0.32,-0.17 1.29,-0.96 2.16,-1.76 0.87,-0.8 2.36,-1.82 3.31,-2.27 2.38,-1.12 6.04,-1.27 9.93,-0.42 5.98,1.31 6.34,1.32 7.75,0.13 1.29,-1.09 2.25,-3.64 2.8,-7.48l0.16,-1.12h-17.86c-17,0 -17.86,0.02 -17.86,0.47 0,0.88 1.37,5.2 2.25,7.13 1.18,2.56 2.4,4.21 3.69,4.98 1.16,0.69 2.72,0.84 3.66,0.34z"
|
||||||
|
android:strokeWidth="0.264583"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="135.47dp"
|
||||||
|
android:height="135.47dp"
|
||||||
|
android:viewportWidth="135.47"
|
||||||
|
android:viewportHeight="135.47">
|
||||||
|
<path
|
||||||
|
android:pathData="m18.03,134.94c-1.88,-0.85 -1.95,-1.15 -3.52,-15.38l-1.39,-12.6 1.47,-2.61c2.38,-4.23 3.63,-8.02 4.06,-12.3 0.17,-1.72 0.16,-1.77 -0.81,-3.04 -0.54,-0.71 -1.11,-1.56 -1.26,-1.89 -0.15,-0.33 -0.37,-0.6 -0.49,-0.6 -0.12,0 -0.85,0.41 -1.63,0.91 -2.71,1.73 -7.07,3.06 -10.05,3.06 -1.59,0 -3.15,-0.86 -3.86,-2.12 -0.6,-1.06 -0.6,-1.1 -0.49,-10.12 0.12,-9.53 0.14,-9.75 1.5,-13.12 1.77,-4.42 6.22,-8.86 10.65,-10.64 3.7,-1.48 1.73,-1.39 32.89,-1.55 27,-0.13 28.91,-0.17 29.9,-0.62 2.7,-1.21 4.42,-3.09 5.54,-6.07l0.64,-1.71 -2.17,-0.18c-4.75,-0.39 -7.55,-1.63 -10.51,-4.62 -1.48,-1.5 -2.31,-2.64 -3.23,-4.41 -1.38,-2.67 -2.59,-6.48 -2.59,-8.15 0,-1.25 0.7,-2.57 1.73,-3.25 1.26,-0.83 5.11,-1.7 8.19,-1.86 6.23,-0.31 10.97,1.77 14.3,6.31l1.11,1.51 0.63,-0.67c1.36,-1.45 4.51,-3.28 6.9,-4l2.38,-0.72 -0.11,-1.47c-0.12,-1.73 -0.84,-2.89 -2.16,-3.52 -0.77,-0.37 -2.06,-0.43 -8.81,-0.43 -8.55,0 -9.64,-0.13 -12.3,-1.48 -2.81,-1.42 -5.32,-4.77 -6,-7.99 -0.16,-0.77 -0.3,-2.54 -0.3,-3.93 0,-2.98 0.5,-4.17 2.12,-5.09 1.26,-0.71 2.44,-0.71 3.69,-0.01 1.59,0.89 1.96,1.8 2.13,5.14 0.12,2.44 0.24,3.05 0.73,3.74 0.92,1.29 2.05,1.68 4.8,1.68h2.41L84.12,8.7c0,-2.85 0.52,-4.07 2.12,-4.97 1.27,-0.72 2.44,-0.71 3.73,0.02 1.53,0.86 2.09,2.21 2.09,5.06v2.3h1.44c2.68,0 5.41,0.87 7.64,2.45l0.75,0.53 0.72,-0.53c2.09,-1.54 4.89,-2.45 7.59,-2.45h1.44v-2.41c0,-2.85 0.52,-4.07 2.12,-4.97 1.27,-0.72 2.44,-0.71 3.73,0.02 1.53,0.86 2.09,2.21 2.09,5.06v2.3h2.39c4.32,0 5.55,-1.23 5.55,-5.58 0,-2.86 0.52,-4.08 2.12,-4.98 1.27,-0.72 2.44,-0.71 3.73,0.02 1.55,0.87 2.09,2.21 2.09,5.18 0,4.2 -0.93,6.88 -3.27,9.49 -1.38,1.54 -4.07,3.06 -6.2,3.5 -0.84,0.18 -4.51,0.29 -9.22,0.29 -8.65,0 -9.06,0.07 -10.22,1.69 -0.47,0.66 -0.59,1.19 -0.59,2.64v1.81l1.28,0.49c0.7,0.27 5.8,3.31 11.33,6.76 11.02,6.88 11.08,6.93 11.08,9.45 0,1.62 -0.91,4.99 -1.78,6.62 -0.94,1.76 -4.05,4.86 -5.81,5.81 -2.64,1.41 -4.87,1.78 -10.82,1.78h-5.36L105.76,67.67c-0.1,11.01 -0.13,11.67 -0.69,13.51 -1.43,4.74 -3.98,8.71 -7.37,11.47l-0.85,0.69 -2.15,19.41c-1.59,14.3 -2.28,19.69 -2.63,20.49 -0.36,0.82 -0.76,1.22 -1.65,1.65 -1.11,0.54 -1.55,0.57 -8.42,0.57 -6.7,0 -7.32,-0.04 -8.33,-0.53 -0.7,-0.34 -1.3,-0.9 -1.67,-1.56 -0.58,-1.03 -0.58,-1.03 -0.58,-18.26v-17.23h-13.24c-10.37,0 -13.26,0.07 -13.32,0.33 -0.05,0.18 -0.27,1.31 -0.5,2.51 -0.48,2.53 -1.75,5.62 -3.24,7.88 -1.05,1.6 -3.68,4.41 -5.46,5.84l-0.97,0.78 1.21,8.41 1.21,8.41 -0.57,1.17c-0.4,0.82 -0.88,1.33 -1.62,1.71 -0.99,0.5 -1.53,0.54 -8.41,0.53 -6.72,-0 -7.45,-0.05 -8.49,-0.52zM28.47,127.07c-0.07,-0.25 -0.58,-3.64 -1.12,-7.53 -0.98,-7.02 -0.99,-7.08 -0.51,-8.14 0.38,-0.84 0.91,-1.34 2.44,-2.29 5.07,-3.16 7.41,-7.18 7.68,-13.19 0.15,-3.39 0.61,-4.5 2.19,-5.39 0.99,-0.56 1.15,-0.56 19.05,-0.56h18.05l1.03,0.58c0.66,0.37 1.22,0.97 1.56,1.67 0.51,1.06 0.53,1.63 0.53,18.21v17.11h2.86,2.86l2.06,-18.59c1.13,-10.22 2.22,-18.96 2.4,-19.41 0.19,-0.45 0.8,-1.17 1.36,-1.59 2.17,-1.62 4.49,-4.2 5.33,-5.92 1.62,-3.32 1.64,-3.59 1.64,-17.81 0,-12.64 0.01,-12.96 0.55,-13.93 1.1,-1.96 1.22,-1.98 10.45,-2.13l8.22,-0.13 1.3,-0.8c1.1,-0.68 3.03,-2.94 3.02,-3.53 -0.01,-0.37 -16.63,-10.51 -17.99,-10.97 -3.09,-1.05 -6.96,-0.11 -9.36,2.29 -1.55,1.55 -1.79,2.06 -4.52,9.57 -1.27,3.49 -2.72,7.02 -3.22,7.85 -2.1,3.47 -5.55,6.24 -9.44,7.55l-2.17,0.73 -21.56,0.13 -21.56,0.13 -1.59,0.63c-5.7,2.27 -8.85,7.03 -8.86,13.4 -0.01,3.68 1.31,7.34 3.53,9.82 1.95,2.18 2.12,2.69 1.93,6.03 -0.3,5.53 -1.35,9.59 -3.83,14.77l-1.49,3.12 1.03,9.38 1.03,9.38h2.62c2.37,0 2.61,-0.04 2.49,-0.46zM10.31,80.68c0.65,-0.41 1.58,-1.15 2.05,-1.63l0.86,-0.88 0.09,-3.56c0.13,-5.07 1.24,-8.84 3.64,-12.32l0.86,-1.25 -0.84,0.17c-2.84,0.57 -6.47,3.5 -7.79,6.29 -1.08,2.3 -1.23,3.41 -1.24,9.05l-0.01,5.24 0.6,-0.18c0.33,-0.1 1.13,-0.52 1.79,-0.93zM81.69,36.29 L82.3,36.12 81.6,34.8c-1.09,-2.05 -2.08,-3.15 -3.61,-3.98 -1.2,-0.65 -1.77,-0.79 -3.86,-0.88 -1.73,-0.08 -2.45,-0.02 -2.45,0.2 0,0.55 1.31,2.9 2.16,3.87 1.69,1.93 5.34,2.99 7.85,2.28z"
|
||||||
|
android:strokeWidth="0.264583"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="135.47dp"
|
||||||
|
android:height="135.47dp"
|
||||||
|
android:viewportWidth="135.47"
|
||||||
|
android:viewportHeight="135.47">
|
||||||
|
<path
|
||||||
|
android:pathData="m37.69,135.2c-2.35,-0.3 -5.67,-1.15 -7.69,-1.97 -3.86,-1.57 -4.78,-2.35 -15.21,-12.79 -8.66,-8.68 -10.09,-10.22 -11.1,-12.01 -2.12,-3.75 -3.38,-8.38 -3.63,-13.37 -0.13,-2.61 -0.1,-2.9 0.47,-3.85 0.35,-0.59 1.06,-1.26 1.64,-1.57 0.97,-0.5 1.17,-0.51 3.31,-0.19 6.01,0.9 7.91,1.07 12.38,1.07 2.79,0 6.09,-0.16 7.83,-0.39 3.41,-0.45 8.13,-1.57 8.4,-2 0.1,-0.16 0.25,-1.65 0.35,-3.31 0.16,-2.8 0.99,-10.02 1.38,-11.92 0.15,-0.76 0.1,-0.84 -0.72,-1.04 -0.49,-0.12 -3.66,-0.24 -7.05,-0.26 -6.77,-0.06 -6.8,-0.06 -8.1,-1.82 -0.5,-0.67 -0.54,-1.07 -0.5,-4.48 0.11,-8.71 1.85,-19.77 4.37,-27.65 2.37,-7.41 5.21,-12.47 9.33,-16.6 2.38,-2.39 2.96,-2.82 5.44,-4.03 3.93,-1.93 6.9,-2.51 12.83,-2.53 3.81,-0.01 4.85,0.07 6.83,0.57 2.7,0.68 5.78,2.04 7.62,3.36l1.29,0.93 2.85,-1.94c20.66,-14.1 47.99,-21.13 59.11,-15.21 2.77,1.47 4.44,3.89 5.56,8.03 0.77,2.86 0.84,10.21 0.13,14.55 -2.77,17.03 -11.48,35.5 -23.21,49.21 -2.14,2.5 -7.91,8.23 -9.54,9.47 -0.9,0.69 -0.97,0.84 -1.14,2.64 -0.39,4.14 -1.88,9.74 -3.62,13.63 -3.68,8.23 -13.16,15.54 -25.3,19.54 -1.93,0.64 -3.8,1.16 -4.15,1.16 -0.91,0 -2.03,-0.47 -2.75,-1.14 -1.93,-1.81 -6.01,-11.63 -7.18,-17.33 -0.22,-1.08 -0.46,-1.62 -0.66,-1.55 -0.17,0.07 -2.15,0.26 -4.39,0.43 -6.3,0.48 -5.65,0.21 -6.29,2.59 -1.11,4.14 -1.42,6.69 -1.55,12.63 -0.13,5.81 -0.04,7.05 1.02,14.05 0.3,1.99 0.29,2.21 -0.21,3.17 -0.8,1.55 -2.17,2.22 -4.46,2.19 -1.02,-0.02 -2.67,-0.13 -3.67,-0.26zM37.42,126.18c-0.36,-1.89 -0.49,-12.6 -0.18,-15.57 0.27,-2.62 1,-6.78 1.51,-8.64 0.14,-0.51 0.06,-0.6 -0.58,-0.6 -1.37,0 -2.94,-0.99 -3.54,-2.22 -0.3,-0.62 -0.55,-1.45 -0.55,-1.85 0,-0.57 -0.1,-0.7 -0.46,-0.59 -1.25,0.37 -6.04,1.22 -8.32,1.47 -3.26,0.35 -11.26,0.36 -14.33,0.01 -1.29,-0.15 -2.42,-0.2 -2.51,-0.12 -0.28,0.28 0.74,3.66 1.69,5.6 0.85,1.74 1.72,2.69 10.29,11.25 6.71,6.7 9.76,9.57 10.76,10.12 1.56,0.85 4.8,1.97 5.76,1.98 0.56,0.01 0.61,-0.07 0.46,-0.85zM72.13,110.8c7.21,-2.79 13.28,-7.06 16.3,-11.48 1.32,-1.93 2.55,-4.7 3.32,-7.51l0.49,-1.75 -3.22,1.53c-6.03,2.86 -12.91,5.18 -20.08,6.79 -3.92,0.88 -3.72,0.55 -2.69,4.33 0.63,2.32 3.2,9 3.45,9 0.06,0 1.15,-0.4 2.42,-0.89zM54.46,92.77c10.53,-1.21 20.55,-3.74 28.7,-7.25 10.08,-4.34 16.82,-9.68 24.66,-19.52 1.94,-2.44 6.96,-9.71 6.96,-10.09 0,-0.1 -0.74,-0.41 -1.65,-0.7 -6.25,-1.99 -14.77,-7.72 -20.73,-13.96 -6.1,-6.38 -10.15,-12.83 -12.63,-20.11 -0.14,-0.41 -0.44,-0.3 -2.35,0.89 -7.76,4.83 -15.96,11.97 -20.2,17.6 -8.81,11.7 -14.33,29.76 -15.11,49.42l-0.18,4.48 4.47,-0.17c2.46,-0.09 6.08,-0.36 8.05,-0.58zM38.72,60.22c2.8,-9.75 6.9,-18.32 12.18,-25.41 0.85,-1.15 3.38,-3.93 5.6,-6.18 2.23,-2.25 4.05,-4.13 4.05,-4.18 0,-0.05 -0.64,-0.39 -1.43,-0.75 -4.34,-1.99 -12.34,-1.85 -16.71,0.28 -1.03,0.5 -2.42,1.4 -3.09,1.99 -4.64,4.09 -8.22,12.4 -10.36,24.08 -0.69,3.78 -1.48,10.31 -1.48,12.25v1.16l3.64,0.19c2,0.11 4.17,0.29 4.83,0.4 0.65,0.12 1.29,0.19 1.42,0.17 0.12,-0.02 0.74,-1.82 1.36,-4zM120.6,44.65c1.98,-4.48 4.48,-11.93 5.39,-16.04 2.28,-10.3 1.87,-18.28 -1.02,-19.65 -3.48,-1.66 -12.1,-1.14 -20.91,1.26 -5.16,1.4 -12.44,4.12 -16.05,5.98l-1.24,0.64 0.77,2.38c3.8,11.82 16.9,24.89 28.82,28.74 1.24,0.4 2.34,0.65 2.44,0.55 0.1,-0.1 0.91,-1.83 1.8,-3.85zM106.44,24.8c-1.96,-0.85 -2.89,-3.14 -2.09,-5.14 0.56,-1.4 1.69,-2.21 3.26,-2.35 2.28,-0.2 3.99,1.25 4.19,3.54 0.15,1.69 -0.53,2.92 -2.04,3.72 -1.29,0.68 -2.15,0.74 -3.32,0.23z"
|
||||||
|
android:strokeWidth="0.264583"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="180.31dp"
|
||||||
|
android:height="157.64dp"
|
||||||
|
android:viewportWidth="180.31"
|
||||||
|
android:viewportHeight="157.64">
|
||||||
|
<path
|
||||||
|
android:pathData="m81.18,157.14c-4.15,-1.12 -7.85,-4.09 -9.92,-7.97 -1.03,-1.93 -1.22,-2.1 -2.06,-1.92 -2.46,0.54 -5.47,0.63 -7.51,0.23 -6.46,-1.27 -11.54,-6.48 -12.69,-13.02 -0.36,-2.03 -0.44,-2.17 -1.34,-2.17 -0.53,0 -1.76,-0.24 -2.74,-0.53 -5.64,-1.67 -10.02,-6.57 -11.11,-12.41l-0.41,-2.18 -1.44,-0.22c-4.78,-0.74 -9.15,-3.75 -11.6,-7.98 -2.97,-5.12 -2.62,-12.42 0.83,-17.26l0.74,-1.04 -0.74,-1.2c-1.37,-2.22 -2.49,-6.12 -2.87,-10.01 -0.45,-4.62 -0.82,-6.14 -2,-8.19 -0.5,-0.87 -4.38,-5.1 -8.61,-9.39l-7.7,-7.8v-2.38,-2.38L21.66,27.4c26.33,-26.66 26.2,-26.52 27.68,-26.85 2.82,-0.62 3.14,-0.4 12.58,8.98 7.27,7.22 9.07,8.82 10.23,9.14 0.93,0.25 7.09,0.39 17.91,0.39 14.08,0 16.7,-0.08 17.82,-0.54 0.85,-0.35 4.38,-3.6 10.13,-9.32 7.66,-7.62 9,-8.81 10.18,-9.03 3.04,-0.56 2.3,-1.2 27.63,24.38 17.46,17.64 23.71,24.16 24.07,25.15 1.05,2.82 0.82,3.16 -8.7,12.96 -4.78,4.92 -8.87,9.3 -9.1,9.75 -0.22,0.45 -0.58,2.67 -0.8,4.95 -0.46,4.89 -1.86,9.48 -4,13.09l-1.42,2.41 1.53,3.02 1.53,3.02v4.29c0,4.24 -0.02,4.33 -1.3,6.92 -2.32,4.69 -6.51,7.94 -11.42,8.85l-2.13,0.4 -0.39,2.07c-1.14,5.97 -5.42,10.8 -11.04,12.41 -1.07,0.31 -2.36,0.64 -2.86,0.74 -0.8,0.16 -0.97,0.45 -1.32,2.22 -1.59,8.07 -8.64,13.6 -16.62,13.04 -3.38,-0.24 -4.64,-0.63 -7.42,-2.31l-2.25,-1.36 -1.28,1.98c-1.58,2.43 -5.61,6.27 -7.95,7.58 -3.36,1.88 -7.98,2.44 -11.76,1.42zM87.31,146.77c1.55,-0.59 4.68,-3.82 5.32,-5.49 1.5,-3.93 -1.78,-7.99 -5.92,-7.34 -2.09,0.33 -6.16,4.19 -6.64,6.31 -1,4.46 3.05,8.11 7.23,6.52zM115.71,138.56c2.14,-1.46 3.03,-4.38 2.1,-6.84 -0.21,-0.54 -2.97,-3.61 -6.14,-6.81 -4.66,-4.72 -5.84,-6.11 -6.15,-7.26 -0.64,-2.39 0.47,-4.94 2.59,-5.95 1.37,-0.65 3.44,-0.73 4.54,-0.17 0.42,0.22 3.39,2.98 6.59,6.14 6.46,6.38 7.51,7.02 10.18,6.22 1.49,-0.45 3.13,-1.88 3.62,-3.17 0.42,-1.1 0.39,-3.33 -0.05,-4.51 -0.2,-0.53 -2.88,-3.52 -5.95,-6.64 -3.07,-3.12 -5.77,-6.02 -5.98,-6.45 -0.56,-1.08 -0.49,-3.49 0.13,-4.69 1.03,-2 3.4,-3.1 5.74,-2.67 1.1,0.2 2.31,1.22 7.32,6.17 3.3,3.26 6.34,6.1 6.77,6.32 0.42,0.22 1.47,0.39 2.33,0.39 3.88,0 6.56,-4.48 4.75,-7.94 -0.31,-0.58 -8.66,-9.25 -18.56,-19.26l-18,-18.21 -4.87,-0.2c-5.12,-0.22 -7.28,-0.66 -11.63,-2.39 -2.77,-1.1 -4.76,-1.29 -6.36,-0.61 -0.54,0.23 -2.26,1.64 -3.81,3.13 -4.58,4.39 -8.39,6.46 -13.94,7.59 -7.83,1.59 -16.74,-0.7 -22.06,-5.67 -1.74,-1.62 -2.26,-3.35 -1.62,-5.41 0.26,-0.85 4.5,-6.21 12.39,-15.66 6.6,-7.9 12,-14.45 12,-14.54 0,-0.09 -0.6,-0.27 -1.32,-0.4 -0.73,-0.13 -2.35,-0.71 -3.62,-1.3 -1.94,-0.9 -3.36,-2.12 -9.17,-7.85l-6.88,-6.78 -19.12,19.3 -19.12,19.3 5.12,5.09c9,8.94 10.06,11.01 11.41,22.18 0.2,1.64 0.48,3.1 0.63,3.25 0.15,0.15 0.98,-0.34 1.85,-1.08 6.42,-5.48 15.77,-5.13 21.71,0.82 1.01,1.01 2.18,2.51 2.59,3.32 0.41,0.81 0.82,1.47 0.91,1.47 0.09,0 1.34,-0.4 2.79,-0.88 6.26,-2.1 13,-0.39 17.19,4.36 4.47,5.07 5.29,11.62 2.29,18.41 -0.17,0.4 0.17,0.78 1.27,1.39 2.03,1.14 4.73,3.7 5.77,5.48 1.08,1.85 2.27,5.27 2.27,6.56 0,0.8 0.19,1.04 0.97,1.2 6.34,1.33 7.34,1.99 15.08,9.89 2.91,2.97 5.69,5.56 6.17,5.75 1.62,0.64 4.04,0.46 5.29,-0.4zM67.42,136.45c0.7,-0.44 3.19,-2.79 5.54,-5.23 3.52,-3.66 4.33,-4.7 4.61,-5.93 0.91,-4.05 -2.39,-7.36 -6.57,-6.58 -1.08,0.2 -2.16,1.08 -5.85,4.71 -2.49,2.46 -4.83,5.06 -5.2,5.78 -2.49,4.82 2.93,10.08 7.47,7.24zM52.2,121.19c0.49,-0.26 4.5,-4.1 8.91,-8.55 8.06,-8.12 9.09,-9.46 9.09,-11.74 0,-1.55 -1.25,-3.79 -2.57,-4.6 -1.35,-0.83 -4.09,-0.92 -5.47,-0.19 -1.36,0.72 -16.81,16.38 -17.49,17.74 -0.7,1.39 -0.74,3.7 -0.07,4.97 1.51,2.9 4.7,3.89 7.61,2.36zM36.44,106.07c0.62,-0.27 3.23,-2.62 5.78,-5.23 4.94,-5.05 5.39,-5.83 4.94,-8.6 -0.53,-3.26 -4.57,-5.44 -7.41,-4 -1.14,0.58 -9.73,9.14 -10.35,10.32 -1.06,2 -0.5,5.13 1.17,6.65 1.48,1.34 3.9,1.69 5.86,0.86zM149.16,83.17c1.11,-2.97 1.42,-4.43 1.8,-8.41 0.64,-6.83 1.72,-8.59 10.74,-17.58l5.82,-5.8 -18.92,-19.07C138.21,21.82 129.55,13.18 129.38,13.11c-0.17,-0.07 -3.44,2.97 -7.26,6.75 -7.11,7.05 -8.58,8.14 -12.05,9.01 -0.91,0.23 -6.03,0.46 -11.99,0.55 -6.73,0.1 -10.94,0.31 -11.93,0.59 -1.42,0.41 -2.32,1.39 -13.71,15.11l-12.19,14.68 1.54,0.47c2.07,0.63 7.38,0.36 9.48,-0.48 2.29,-0.92 4.37,-2.41 7.7,-5.54 5.96,-5.6 11.78,-6.59 19.99,-3.37 3.88,1.52 3.88,1.52 8.47,1.5 3.95,-0.01 4.88,-0.13 6.7,-0.84 4.74,-1.85 8.3,-4.85 10.96,-9.22 2.01,-3.31 4.65,-4.27 7.61,-2.76 1.76,0.9 2.97,3.26 2.66,5.18 -0.52,3.22 -6.49,10.47 -10.96,13.29l-2.08,1.32 12.84,12.85c7.06,7.06 12.95,12.85 13.08,12.85 0.13,0 0.55,-0.84 0.94,-1.86z"
|
||||||
|
android:strokeWidth="0.352778"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="144.5dp"
|
||||||
|
android:height="144.5dp"
|
||||||
|
android:viewportWidth="144.5"
|
||||||
|
android:viewportHeight="144.5">
|
||||||
|
<path
|
||||||
|
android:pathData="m4.14,143.35c-2.21,-0.8 -3.48,-3.08 -2.97,-5.36 0.72,-3.2 4.79,-13.99 7.62,-20.18 0.78,-1.71 1.42,-3.27 1.42,-3.49 0,-0.21 -0.51,-1.64 -1.14,-3.18 -1.53,-3.74 -4.28,-11.92 -5.34,-15.86 -6.85,-25.44 -4.02,-45.84 8.6,-62.01 2.27,-2.91 7.73,-8.19 11.15,-10.78 20.78,-15.72 56.03,-23.65 99.46,-22.36 10.6,0.31 17.84,0.89 19.03,1.51 1.66,0.86 2.78,3.06 2.48,4.89 -0.09,0.55 -0.69,1.75 -1.32,2.66 -5.96,8.49 -11.15,29.5 -15.23,61.62 -1.75,13.76 -3.71,21.11 -7.9,29.63 -9.04,18.36 -25.4,29.52 -46.99,32.06 -4.02,0.47 -13.65,0.39 -18.06,-0.14 -11.91,-1.45 -22.94,-4.72 -35.18,-10.41l-2.16,-1 -1.17,2.65c-1.67,3.79 -3.99,9.85 -5.37,14.01 -0.65,1.97 -1.44,3.91 -1.76,4.31 -1.17,1.48 -3.36,2.09 -5.18,1.43zM72.02,123.13c12.15,-1.26 23.34,-6.47 30.84,-14.35 5.51,-5.78 8.93,-11.6 11.81,-20.05 1.98,-5.81 2.68,-9.4 4.48,-23.14 2.4,-18.28 5.35,-33.42 8.47,-43.56 0.62,-2 1.12,-3.75 1.12,-3.88 0,-0.57 -15.46,7.47 -23.57,12.25 -7.9,4.66 -22.15,14.04 -22.15,14.57 0,0.31 4.5,1.12 8.04,1.45 1.94,0.18 4.79,0.23 6.67,0.12 2.92,-0.17 3.42,-0.13 4.54,0.36 2.81,1.24 3.66,4.82 1.71,7.15 -1.15,1.37 -2.21,1.66 -6.65,1.85 -6.71,0.29 -13.72,-0.68 -20.15,-2.78 -3.09,-1.01 -3.55,-1.1 -3.98,-0.74 -0.26,0.22 -2.07,1.73 -4.01,3.34 -4.7,3.9 -12.58,11.2 -16.94,15.68 -5.4,5.56 -9.98,10.89 -9.54,11.13 0.58,0.31 8.57,2.18 11.32,2.66 7.05,1.21 15.46,1.59 21.43,0.97 3.71,-0.39 4.75,-0.21 6.13,1.04 1.97,1.78 2.07,4.6 0.22,6.54 -1.08,1.13 -1.84,1.37 -5.51,1.75 -10.76,1.11 -25.08,-0.52 -37.02,-4.23 -1.47,-0.46 -2.83,-0.83 -3.02,-0.83 -0.44,0 -4.91,6.27 -8.1,11.35 -2.83,4.5 -6.1,10.18 -6.1,10.59 0,0.6 8.05,4.1 14.25,6.2 12.42,4.2 24.43,5.74 35.7,4.58zM18.55,99.52c2.37,-3.9 7.36,-11.35 9.38,-13.99l1.26,-1.65 -0.53,-3.58c-0.64,-4.35 -0.73,-14.32 -0.16,-18.25 1.29,-8.88 3.64,-17.32 5.26,-18.95 2.51,-2.52 6.83,-1.32 7.77,2.15 0.3,1.11 0.25,1.49 -0.52,3.93 -1.86,5.9 -2.88,10.75 -3.42,16.25 -0.33,3.38 -0.37,8.05 -0.08,8.02 0.12,-0.01 1.61,-1.61 3.32,-3.54 5.64,-6.4 16.38,-16.59 24.28,-23.02l3.23,-2.63 0,-3.81c0.01,-5.83 1.39,-14.04 2.86,-16.98 2.18,-4.35 8.73,-2.91 8.71,1.92 -0,0.6 -0.31,2.18 -0.68,3.52 -0.73,2.63 -1.5,7.47 -1.24,7.73 0.09,0.09 1.72,-0.93 3.61,-2.27 10.89,-7.67 24.91,-15.99 36.97,-21.94 3.89,-1.92 5.6,-2.9 5.22,-2.98 -1.29,-0.29 -25.39,0.21 -30.07,0.62 -33.4,2.93 -56.22,10.98 -70.22,24.8 -8.56,8.45 -12.92,18.3 -13.89,31.4 -0.54,7.23 0.55,16.97 2.86,25.53 1.02,3.77 3.46,11.29 3.67,11.29 0.11,0 1.19,-1.62 2.39,-3.6z"
|
||||||
|
android:strokeWidth="0.282222"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="180.62dp"
|
||||||
|
android:height="145.66dp"
|
||||||
|
android:viewportWidth="180.62"
|
||||||
|
android:viewportHeight="145.66">
|
||||||
|
<path
|
||||||
|
android:pathData="m31.07,145.04c-1.8,-0.92 -2.38,-1.96 -3.55,-6.44 -6.18,-23.51 -10.16,-47.41 -10.82,-64.91 -0.34,-9.1 0.76,-15.92 3.63,-22.4 0.69,-1.55 1.32,-3.06 1.4,-3.35 0.09,-0.32 -1.61,-2.34 -4.31,-5.12 -7.31,-7.52 -10.33,-11.55 -13.21,-17.59 -2.6,-5.45 -4.21,-12.78 -4.21,-19.12 0,-2.49 0.98,-4.36 2.82,-5.4 1.67,-0.94 3.16,-0.95 4.95,-0.04 1.91,0.98 2.81,2.82 2.81,5.77 0,3.37 0.11,3.53 1.89,2.62 8.14,-4.16 17.75,-0.19 20.7,8.56 0.62,1.82 0.74,2.85 0.62,5.27 -0.23,4.93 -2.58,9.04 -6.67,11.66l-1.77,1.13 1.27,1.3 1.27,1.3 4.31,-4.27c4.85,-4.81 9.27,-8.09 14.71,-10.92 9.02,-4.69 17.02,-6.8 27.18,-7.17 12.55,-0.46 21.99,1.99 40.99,10.61l2.03,0.92 0.93,-1.49c3.36,-5.39 9.18,-10.57 15.52,-13.8 5.81,-2.96 8.29,-1.2 11.39,8.1 2.61,7.82 2.77,15.91 0.43,22l-0.74,1.92 4.15,4.25c4.71,4.83 6.28,6.79 10.03,12.57 1.46,2.25 3.17,4.68 3.81,5.4 2.16,2.46 5.97,3.73 11.25,3.74 2.95,0 4.91,0.92 5.96,2.78 0.75,1.34 0.77,1.67 0.77,13.82 0,11.91 -0.03,12.52 -0.74,13.98 -0.63,1.31 -1.1,1.7 -3.3,2.76 -3.84,1.85 -12.59,5.18 -20.04,7.62 -6.54,2.15 -6.61,2.18 -6.61,3.18 0,1.38 1.59,13.67 2.7,20.87l0.91,5.92 -0.83,1.62c-1.45,2.82 -1.93,2.94 -11.94,2.94 -9.42,-0 -10.28,-0.16 -11.71,-2.12 -0.64,-0.88 -2.84,-9.01 -4.87,-17.99 -0.59,-2.62 -1.14,-4.94 -1.22,-5.15 -0.09,-0.25 -0.64,-0.31 -1.5,-0.17 -1.11,0.18 -1.37,0.38 -1.46,1.1 -0.06,0.48 0.46,4.79 1.15,9.56 0.69,4.78 1.25,9.22 1.25,9.87 -0,1.52 -1.08,3.3 -2.55,4.19 -1.07,0.65 -1.79,0.7 -9.9,0.7 -9.33,0 -9.81,-0.08 -11.41,-1.82 -0.42,-0.45 -1.09,-1.94 -1.49,-3.31 -0.58,-1.96 -3.12,-12.25 -4.11,-16.66 -0.18,-0.78 -0.26,-0.79 -5.67,-0.79h-5.49l0.19,0.97c0.82,4.19 2.36,16.59 2.18,17.57 -0.27,1.46 -1.6,3.1 -2.95,3.66 -0.71,0.29 -3.67,0.38 -9.97,0.31 -11.56,-0.14 -10.98,0.22 -13.15,-8.04 -1.05,-3.97 -3.77,-15.53 -4.62,-19.62 -0.18,-0.84 -0.55,-1.25 -1.63,-1.73 -0.77,-0.35 -1.46,-0.56 -1.55,-0.48 -0.18,0.18 1.2,10.97 2.45,19.22 0.89,5.89 0.85,6.89 -0.34,8.71 -1.21,1.84 -2.19,2.02 -11.54,2.01 -7.48,-0 -8.75,-0.08 -9.8,-0.62zM41.98,134.81c0,-0.15 -0.39,-3.04 -0.86,-6.44 -1.21,-8.68 -2.38,-19.15 -2.44,-21.93 -0.04,-1.88 0.1,-2.55 0.68,-3.33 1.28,-1.73 2.54,-2.43 4.33,-2.43 1.39,0 2.28,0.36 5.71,2.36 11.3,6.56 23.81,9.48 40.7,9.5 11.27,0.01 11.17,-0.05 13.12,8.68 1.13,5.05 2.04,8.86 3.01,12.55l0.35,1.32h2.3c2.03,0 2.28,-0.07 2.12,-0.62 -0.47,-1.61 -2.1,-15.05 -2.13,-17.55 -0.03,-2.31 0.1,-2.99 0.67,-3.76 1.16,-1.55 2.23,-1.95 7.76,-2.92 15.24,-2.68 33.71,-7.87 48.15,-13.54l4.41,-1.73 0.1,-7.23 0.1,-7.23 -2,-0.24c-2.86,-0.34 -7.05,-1.81 -9.26,-3.27 -2.91,-1.91 -4.68,-3.95 -8.68,-10 -4.33,-6.53 -7.91,-10.71 -12.53,-14.59 -1.84,-1.55 -3.65,-3.28 -4.02,-3.85 -1.06,-1.63 -0.89,-3.58 0.59,-6.81 2.56,-5.59 2.96,-9.88 1.48,-15.75 -0.71,-2.81 -0.62,-2.82 -4.29,0.59 -2.96,2.74 -4.65,5.17 -5.77,8.31 -1.12,3.13 -1.55,3.73 -3.37,4.61 -2.08,1.01 -2.88,0.83 -8.73,-1.97 -11.19,-5.34 -21.25,-9.09 -27.57,-10.27 -5.24,-0.98 -15.27,-0.9 -20.17,0.16 -19.57,4.22 -35.06,18.91 -37.99,36.02 -1.88,10.97 1.48,37.1 8.6,66.97l1.12,4.67h2.26c1.25,0 2.26,-0.12 2.26,-0.27zM125.03,74.79c-3.48,-2.12 -3.83,-6.3 -0.72,-8.67 3.49,-2.67 8.34,-0.2 8.34,4.25 0,3.75 -4.47,6.34 -7.62,4.42zM72.68,134.64c0.02,-1.04 -1.55,-12.46 -1.74,-12.68 -0.24,-0.29 -5.69,-1.45 -5.88,-1.25 -0.12,0.12 2.81,12.9 3.2,13.93 0.11,0.29 0.91,0.44 2.29,0.44 1.46,0 2.13,-0.14 2.13,-0.44zM141.7,133.76c-0.57,-3.63 -2,-14.68 -2,-15.53 -0.01,-1.85 -0.32,-1.96 -3.32,-1.19 -1.5,0.38 -2.8,0.77 -2.89,0.86 -0.14,0.14 1.37,6.92 3.26,14.63l0.63,2.56h2.27,2.27zM20.95,25.89c1.36,-0.65 2.33,-2.18 2.33,-3.68 0,-3.19 -3.17,-5.18 -5.96,-3.74 -2.9,1.5 -2.88,5.93 0.04,7.37 1.46,0.72 2.17,0.73 3.6,0.06z"
|
||||||
|
android:strokeWidth="0.352778"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="135.33dp"
|
||||||
|
android:height="109.39dp"
|
||||||
|
android:viewportWidth="135.33"
|
||||||
|
android:viewportHeight="109.39">
|
||||||
|
<path
|
||||||
|
android:pathData="m40.44,108.81c-0.53,-0.31 -1.21,-1.01 -1.52,-1.55 -0.54,-0.96 -0.56,-1.33 -0.56,-10.03 0,-8.37 -0.03,-9.05 -0.46,-9.2 -2.39,-0.83 -5.42,-2.38 -8.01,-4.09 -6.2,-4.1 -11.2,-10.1 -13.87,-16.65l-0.91,-2.23 -2.46,-0.15c-3.1,-0.19 -4.97,-0.74 -6.97,-2.05 -1.91,-1.25 -2.71,-2.09 -3.92,-4.1 -1.34,-2.23 -1.75,-4.41 -1.75,-9.2 0,-5.83 0.34,-6.39 4.69,-7.76l2.12,-0.67 0.29,-1.45c0.7,-3.49 2.85,-7.43 5.62,-10.32 1.3,-1.36 1.66,-1.95 2.25,-3.72 4.2,-12.69 14.92,-22.11 28.51,-25.04 2.23,-0.48 3.52,-0.58 7.46,-0.57 5.05,0.01 6.53,0.22 11.04,1.59l2.31,0.7 1.53,-0.68c2.79,-1.24 4.71,-1.62 8.28,-1.62 3.57,0 5.48,0.37 8.28,1.62l1.53,0.68 2.31,-0.7c4.18,-1.28 6.22,-1.57 11.17,-1.59 5.11,-0.02 7.41,0.31 11.9,1.73 11.17,3.53 20.55,12.85 24.2,24.04 1.81,5.55 1.87,6.21 1.87,19.45 -0,11.34 -0.03,12.03 -0.59,14.58 -0.82,3.71 -1.75,6.41 -3.27,9.5 -3.93,7.97 -11.36,14.92 -19.4,18.14l-2.26,0.91 -0,8.96c-0,12.89 0.77,12.07 -11.4,12.07 -7.91,0 -8.28,-0.02 -9.24,-0.56 -0.55,-0.31 -1.25,-1.01 -1.56,-1.56 -0.54,-0.96 -0.56,-1.33 -0.56,-9.7v-8.71l-1.45,-0.45 -1.45,-0.45 -1.92,0.77c-2.38,0.95 -5.75,1.6 -8.24,1.6 -2.4,-0 -6.34,-0.81 -8.26,-1.69l-1.48,-0.68 -1.56,0.46 -1.56,0.46 -0,8.7c-0,12.59 0.75,11.81 -11.43,11.8 -7.94,-0.01 -8.32,-0.03 -9.24,-0.56zM53.18,95.88v-5.56h-2.21c-1.22,0 -2.76,-0.08 -3.44,-0.17l-1.23,-0.17v5.72,5.72h3.44,3.44zM101.86,95.72v-5.72l-0.99,0.16c-0.55,0.09 -2.09,0.17 -3.44,0.17l-2.45,0v5.56,5.56h3.44,3.44zM57.55,81.63c1.16,-0.29 3.12,-0.89 4.35,-1.35 2.56,-0.94 2.93,-0.92 5.54,0.41 4.47,2.26 8.81,2.27 13.26,0.02 2.68,-1.35 2.88,-1.37 5.91,-0.32 4.58,1.58 6.15,1.84 11.15,1.83 3.99,-0.01 4.79,-0.08 7.06,-0.69 10.84,-2.89 18.88,-10.93 21.86,-21.85l0.7,-2.56 0.01,-11.64c0.01,-13.13 -0.07,-13.86 -1.99,-18.79 -3.53,-9.04 -12.07,-16.27 -21.55,-18.26 -5.76,-1.21 -12.71,-0.58 -17.96,1.63 -1.98,0.83 -3.22,0.74 -5.06,-0.37 -2.19,-1.33 -3.93,-1.79 -6.75,-1.79 -2.81,0 -4.55,0.46 -6.75,1.79 -1.91,1.16 -3.02,1.2 -5.47,0.22 -3.79,-1.53 -6.25,-1.98 -10.81,-1.99 -2.41,-0.01 -4.76,0.13 -5.69,0.33 -8.15,1.76 -15.26,6.49 -19.48,12.95 -0.71,1.09 -1.27,2 -1.23,2.02 0.04,0.02 1.58,-0.01 3.42,-0.06l3.35,-0.09 1.18,-1.52c2.89,-3.73 7.75,-5.46 12.39,-4.42 7.82,1.74 11.96,10.37 8.42,17.56 -1.09,2.22 -3.38,4.52 -5.49,5.52l-1.61,0.76 -0.01,5.45c-0.02,8.06 -0.78,10.52 -4.38,14.14 -3.49,3.51 -6.14,4.36 -13.54,4.36h-4.86l0.57,1.12c1.89,3.74 5.4,7.83 9.01,10.52 3.59,2.67 8.78,4.83 13.32,5.54 2.51,0.39 8.66,0.12 11.11,-0.49zM51.03,68.59c-1.14,-0.66 -2.08,-2.2 -2.08,-3.4 0,-1.12 0.91,-2.71 1.87,-3.28 0.42,-0.25 1.43,-0.56 2.24,-0.69 0.81,-0.13 1.88,-0.49 2.37,-0.79 1.03,-0.63 1.99,-2.42 1.99,-3.69 0,-1.92 2.06,-3.99 3.97,-3.99 1.26,0 2.85,1.03 3.42,2.22 0.65,1.34 0.68,2.35 0.14,4.64 -0.54,2.3 -1.56,4.09 -3.3,5.84 -1.75,1.75 -3.54,2.76 -5.84,3.3 -2.32,0.55 -3.63,0.5 -4.78,-0.16zM95.48,68.59c-1.14,-0.66 -2.08,-2.2 -2.08,-3.4 0,-1.12 0.91,-2.71 1.87,-3.28 0.42,-0.25 1.43,-0.56 2.24,-0.69 0.81,-0.13 1.88,-0.49 2.37,-0.79 1.03,-0.63 1.99,-2.42 1.99,-3.69 0,-1.92 2.06,-3.99 3.97,-3.99 1.26,0 2.85,1.03 3.42,2.22 0.65,1.34 0.68,2.35 0.14,4.64 -0.54,2.3 -1.56,4.09 -3.3,5.84 -1.75,1.75 -3.54,2.76 -5.84,3.3 -2.32,0.55 -3.63,0.5 -4.78,-0.16zM93.36,36.84c-1.14,-0.66 -2.08,-2.2 -2.08,-3.4 0,-1.12 0.91,-2.71 1.87,-3.28 0.42,-0.25 1.43,-0.56 2.24,-0.69 0.81,-0.13 1.88,-0.49 2.37,-0.79 1.03,-0.63 1.99,-2.42 1.99,-3.69 0,-1.92 2.06,-3.99 3.97,-3.99 1.26,0 2.85,1.03 3.42,2.22 0.65,1.34 0.68,2.35 0.14,4.64 -0.54,2.3 -1.56,4.09 -3.3,5.84 -1.75,1.75 -3.54,2.76 -5.84,3.3 -2.32,0.55 -3.63,0.5 -4.78,-0.16zM33.93,56.61c1.46,-0.52 2.74,-1.6 3.57,-3 0.73,-1.25 0.73,-1.25 0.8,-6.94l0.07,-5.69 -1.66,-0.77c-2.95,-1.38 -5.99,-5.21 -6.46,-8.14l-0.16,-1.01h-2.03c-6.46,0 -11.52,3.84 -13.12,9.96 -0.22,0.84 -0.4,2.01 -0.4,2.6 -0.01,1.55 -0.84,3.19 -1.89,3.74 -0.48,0.25 -1.71,0.73 -2.73,1.05l-1.85,0.59 -0.08,2.22c-0.1,2.81 0.54,4.23 2.31,5.16 1.15,0.61 1.18,0.61 11.89,0.6 8.28,-0.01 10.97,-0.09 11.73,-0.37zM23.51,45.31c-1.14,-0.66 -2.08,-2.2 -2.08,-3.4 0,-1.9 2.07,-3.97 3.97,-3.97 1.26,0 2.85,1.03 3.42,2.22 0.7,1.45 0.69,2.35 -0.05,3.66 -1.08,1.92 -3.39,2.57 -5.27,1.49zM44.46,33.1c1.35,-0.71 2.37,-2.39 2.37,-3.89 0,-2.3 -2.2,-4.5 -4.5,-4.5 -2.3,0 -4.5,2.2 -4.5,4.5 0,1.5 1.02,3.17 2.37,3.89 0.63,0.34 1.59,0.61 2.13,0.61 0.54,0 1.49,-0.27 2.13,-0.61z"
|
||||||
|
android:strokeWidth="0.264583"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="135.47dp"
|
||||||
|
android:height="135.47dp"
|
||||||
|
android:viewportWidth="135.47"
|
||||||
|
android:viewportHeight="135.47">
|
||||||
|
<path
|
||||||
|
android:pathData="m2.23,134.93c-1.24,-0.61 -2.23,-2.14 -2.23,-3.43 0,-1.22 0.96,-2.76 2.12,-3.41 0.97,-0.55 1.29,-0.56 11.77,-0.56h10.78l-0.21,-0.73c-0.36,-1.26 -0.46,-27.5 -0.11,-29.3 0.47,-2.42 1.49,-4.31 3.28,-6.09 1.5,-1.49 2.35,-1.96 13.2,-7.39 6.37,-3.19 11.64,-5.88 11.7,-5.98 0.06,-0.1 -0.13,-0.89 -0.42,-1.74 -1.63,-4.72 -3.94,-16.56 -3.95,-20.27 -0,-0.44 -1.07,-0.46 -18.73,-0.46 -15.75,0 -18.97,-0.06 -20.25,-0.39 -4.75,-1.24 -8.15,-4.9 -8.97,-9.65 -0.84,-4.88 1.79,-10.11 6.19,-12.34 2.85,-1.45 2.55,-1.43 26,-1.45 19.29,-0.02 21.51,-0.06 19.99,-0.39 -7.01,-1.51 -12.43,-8.25 -12.43,-15.46 0,-8.55 7.32,-15.87 15.87,-15.87 8.55,0 15.87,7.31 15.87,15.87 0,7.21 -5.42,13.95 -12.43,15.46 -1.52,0.33 1.23,0.37 23.73,0.39 17.55,0.01 25.89,0.11 26.86,0.31 6.08,1.27 10.3,7.41 9.26,13.47 -0.83,4.82 -4.58,8.77 -9.26,9.75 -0.95,0.2 -7.31,0.29 -19.67,0.29L71.92,55.56l0.17,1.39c1.04,8.3 2.19,10.96 5.82,13.44 3.55,2.42 4.93,3.57 6.37,5.26 2.82,3.34 4.4,7.48 4.89,12.8 0.15,1.63 0.45,3.57 0.66,4.31 0.64,2.22 2.26,4.33 5.18,6.76 6.16,5.11 13.72,9.32 21.41,11.9 5.81,1.95 7.76,3.34 9.49,6.78 1.32,2.61 1.61,5.28 0.94,8.46l-0.18,0.86h2.84c2.43,0 2.99,0.08 3.87,0.58 1.08,0.61 2.09,2.24 2.09,3.39 0,1.26 -1.03,2.85 -2.22,3.42l-1.13,0.55 -64.41,-0c-64.06,-0 -64.41,-0 -65.49,-0.53zM37.84,126.99c1.98,-1.01 1.96,-0.91 2.11,-13.01 0.13,-10.29 0.16,-10.8 0.67,-11.51 0.39,-0.54 3,-1.99 9.26,-5.16 4.8,-2.43 8.84,-4.47 8.99,-4.53 0.15,-0.06 -0.54,-1.73 -1.52,-3.72l-1.79,-3.61 -11.09,5.56c-9.03,4.52 -11.21,5.72 -11.71,6.42l-0.62,0.86v13.36,13.36l0.59,0.82c1.17,1.64 3.24,2.11 5.11,1.16zM93.66,127.42c0,-0.06 -0.86,-0.61 -1.92,-1.24 -9.96,-5.88 -19.12,-14.21 -26.34,-23.93 -1.08,-1.46 -2,-2.68 -2.04,-2.73 -0.04,-0.04 -3.53,1.65 -7.76,3.76l-7.69,3.84 -0.11,9.47c-0.06,5.21 -0.2,9.79 -0.31,10.19l-0.2,0.73h23.18c12.75,0 23.18,-0.05 23.18,-0.1zM117.32,126.92c1.83,-1.05 2.49,-3.2 1.58,-5.12 -0.59,-1.24 -1.43,-1.77 -4.11,-2.58 -8.08,-2.46 -16.84,-7.18 -24.05,-12.96 -6.41,-5.14 -8.57,-8.91 -9.37,-16.31 -0.43,-3.99 -0.69,-5.11 -1.63,-6.97 -0.94,-1.86 -2.54,-3.47 -5.25,-5.29 -3.06,-2.06 -4.63,-3.54 -6.11,-5.77 -3.05,-4.59 -4.27,-10.64 -4.56,-22.72 -0.16,-6.69 -0.2,-7.05 -0.76,-7.84 -1.27,-1.78 0.23,-1.69 -27.19,-1.69 -27.42,0 -25.92,-0.09 -27.19,1.69 -0.82,1.15 -0.82,3.41 0,4.56 1.26,1.76 0.2,1.69 23.21,1.69 20.08,0 20.84,0.02 21.81,0.51 1.7,0.87 1.94,1.5 2.3,6.1 0.96,12.13 3.26,20.58 8.44,31.09 4.14,8.39 8.74,14.81 15.35,21.44 9.23,9.26 18.74,15.24 30.96,19.46 4.17,1.44 5.11,1.54 6.59,0.7zM109.28,47.09c2.78,-1.42 2.72,-5.63 -0.11,-6.98 -0.81,-0.38 -2.89,-0.43 -19.48,-0.43L71.11,39.68l0.18,0.73c0.1,0.4 0.25,2.19 0.33,3.97l0.15,3.24h18.23c17.75,0 18.26,-0.01 19.28,-0.53zM58.65,23.24c2.95,-1.1 5.12,-4.23 5.12,-7.37 0,-1.95 -0.92,-4.12 -2.37,-5.57 -3.11,-3.11 -8.03,-3.11 -11.14,0 -3.11,3.11 -3.11,8.03 0,11.14 2.24,2.24 5.4,2.92 8.39,1.8z"
|
||||||
|
android:strokeWidth="0.264583"
|
||||||
|
android:fillColor="#000000"/>
|
||||||
|
</vector>
|
||||||
@@ -77,10 +77,6 @@
|
|||||||
android:paddingHorizontal="16dp"
|
android:paddingHorizontal="16dp"
|
||||||
android:paddingVertical="8dp">
|
android:paddingVertical="8dp">
|
||||||
|
|
||||||
<!-- android:clickable="true"-->
|
|
||||||
<!-- android:focusable="true"-->
|
|
||||||
<!-- android:background="@drawable/layout_ripple"-->
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.LinearLayoutCompat
|
<androidx.appcompat.widget.LinearLayoutCompat
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
@@ -115,6 +111,48 @@
|
|||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
<!-- Highlight course -->
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/layout_highlight"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingHorizontal="16dp"
|
||||||
|
android:paddingVertical="8dp">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.LinearLayoutCompat
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:fontFamily="@font/lato_bolditalic"
|
||||||
|
android:text="@string/settings_highlight_title"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:text="@string/settings_highlight_subtitle"/>
|
||||||
|
|
||||||
|
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||||
|
|
||||||
|
<com.google.android.material.materialswitch.MaterialSwitch
|
||||||
|
style="@style/SwitchTheme"
|
||||||
|
android:id="@+id/switch_highlight"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"/>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
<!-- App version -->
|
<!-- App version -->
|
||||||
<androidx.appcompat.widget.LinearLayoutCompat
|
<androidx.appcompat.widget.LinearLayoutCompat
|
||||||
android:id="@+id/button_app_version"
|
android:id="@+id/button_app_version"
|
||||||
|
|||||||
@@ -26,22 +26,23 @@
|
|||||||
android:fontFamily="@font/lato_bolditalic"
|
android:fontFamily="@font/lato_bolditalic"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"/>
|
||||||
android:layout_marginBottom="8dp"/>
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.LinearLayoutCompat
|
<androidx.appcompat.widget.LinearLayoutCompat
|
||||||
|
android:id="@+id/line_container"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/text_category"
|
app:layout_constraintTop_toBottomOf="@+id/text_category"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical"
|
||||||
|
android:layout_marginTop="8dp">
|
||||||
|
|
||||||
<TextView
|
<!-- <TextView-->
|
||||||
android:id="@+id/temp_content"
|
<!-- android:id="@+id/temp_content"-->
|
||||||
android:layout_width="wrap_content"
|
<!-- android:layout_width="wrap_content"-->
|
||||||
android:layout_height="wrap_content"/>
|
<!-- android:layout_height="wrap_content"/>-->
|
||||||
|
|
||||||
</androidx.appcompat.widget.LinearLayoutCompat>
|
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.LinearLayoutCompat
|
||||||
|
android:id="@+id/image_view_container"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/content"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="8dp"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/image_view_container"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"/>
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="20dp"
|
||||||
|
android:layout_height="20dp">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/image_view"
|
||||||
|
android:layout_width="20dp"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:scaleType="centerInside"
|
||||||
|
app:tint="?attr/colorText"/>
|
||||||
|
|
||||||
|
</androidx.appcompat.widget.LinearLayoutCompat>
|
||||||
@@ -8,7 +8,8 @@
|
|||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/page_recycler_view"
|
android:id="@+id/page_recycler_view"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:layoutAnimation="@anim/layout_animation_fall_down">
|
||||||
|
|
||||||
</androidx.recyclerview.widget.RecyclerView>
|
</androidx.recyclerview.widget.RecyclerView>
|
||||||
|
|
||||||
|
|||||||
@@ -47,6 +47,8 @@
|
|||||||
<string name="refresh_schedule_subtitle">Dies wird alle Anpassungen löschen!</string>
|
<string name="refresh_schedule_subtitle">Dies wird alle Anpassungen löschen!</string>
|
||||||
<string name="settings_quarter_title">Nutze akademisches Viertel</string>
|
<string name="settings_quarter_title">Nutze akademisches Viertel</string>
|
||||||
<string name="settings_quarter_subtitle">Wo es passt</string>
|
<string name="settings_quarter_subtitle">Wo es passt</string>
|
||||||
|
<string name="settings_highlight_title">Markiere meinen nächsten Kurs</string>
|
||||||
|
<string name="settings_highlight_subtitle">Funktioniert nur wenn Kurse sich nicht überschneiden!</string>
|
||||||
<string name="settings_app_version">App-Verison</string>
|
<string name="settings_app_version">App-Verison</string>
|
||||||
|
|
||||||
<string name="with_love">mit ♡️ aus Bremen-Osterholz\von denizk0461 \\__*</string>
|
<string name="with_love">mit ♡️ aus Bremen-Osterholz\von denizk0461 \\__*</string>
|
||||||
|
|||||||
@@ -47,6 +47,8 @@
|
|||||||
<string name="refresh_schedule_subtitle">This will clear any customisations!</string>
|
<string name="refresh_schedule_subtitle">This will clear any customisations!</string>
|
||||||
<string name="settings_quarter_title">Use academic quarter</string>
|
<string name="settings_quarter_title">Use academic quarter</string>
|
||||||
<string name="settings_quarter_subtitle">Where applicable</string>
|
<string name="settings_quarter_subtitle">Where applicable</string>
|
||||||
|
<string name="settings_highlight_title">Highlight next course</string>
|
||||||
|
<string name="settings_highlight_subtitle">Only works if courses don\'t overlap!</string>
|
||||||
<string name="settings_app_version">App Version</string>
|
<string name="settings_app_version">App Version</string>
|
||||||
|
|
||||||
<string name="with_love">with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__*</string>
|
<string name="with_love">with ♡️ from Bremen-Osterholz\nmade by denizk0461 \\__*</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user