Merge remote-tracking branch 'origin/master'

This commit is contained in:
Blatzar 2022-08-14 22:40:04 +02:00
commit 2d3d8dd781
2 changed files with 7 additions and 1 deletions

View file

@ -1,4 +1,4 @@
<vector android:height="24dp" android:tint="#FFFFFF" <vector android:height="24dp" android:tint="?attr/white"
android:viewportHeight="24" android:viewportWidth="24" android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7 1.49,0 2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z"/> <path android:fillColor="@android:color/white" android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7 1.49,0 2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z"/>

View file

@ -22,6 +22,8 @@
<item name="preferenceFragmentCompatStyle">@style/PreferenceTheme</item> <item name="preferenceFragmentCompatStyle">@style/PreferenceTheme</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item> <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="searchViewStyle">@style/AppSearchViewStyle</item> <item name="searchViewStyle">@style/AppSearchViewStyle</item>
<item name="android:searchViewStyle">@style/AndroidSearchView</item>
<item name="tabStyle">@style/Theme.Widget.Tabs</item> <item name="tabStyle">@style/Theme.Widget.Tabs</item>
<item name="android:divider">@color/transparent</item> <item name="android:divider">@color/transparent</item>
<item name="divider">@color/transparent</item> <item name="divider">@color/transparent</item>
@ -258,6 +260,10 @@
<item name="android:windowBackground">?attr/primaryBlackBackground</item> <item name="android:windowBackground">?attr/primaryBlackBackground</item>
</style> </style>
<style name="AndroidSearchView" parent="AppSearchViewStyle">
<item name="android:paddingStart">-10dp</item>
</style>
<style name="AppSearchViewStyle" parent="Theme.MaterialComponents.NoActionBar"> <style name="AppSearchViewStyle" parent="Theme.MaterialComponents.NoActionBar">
<item name="android:searchIcon">@drawable/search_icon</item> <item name="android:searchIcon">@drawable/search_icon</item>
<item name="android:queryHint">@string/search_hint</item> <item name="android:queryHint">@string/search_hint</item>