Merge branch 'develop' into dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.18.1

This commit is contained in:
Nite 2021-09-15 15:35:59 +02:00 committed by GitHub
commit 1f5de82004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 13 deletions

View File

@ -20,7 +20,9 @@ App is available to download at following stores:
**Warning**: All three versions (Google Play, F-Droid and the APKs) are not
compatible (not signed by the same key)! You must uninstall one to install
the other, which will delete all your data.
the other, which will delete all your data.
If you want to use the version downloaded from F-Droid or form Github with **Android Auto**, you must enable Unknown Sources as it is described in [this wiki page](https://github.com/ultrasonic/ultrasonic/wiki/Using-Ultrasonic-with-Android-Auto).
## Bugs and issues

View File

@ -0,0 +1,8 @@
<!-- drawable/drag_vertical.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#FFF" android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
</vector>

View File

@ -0,0 +1,8 @@
<!-- drawable/drag_vertical.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#000" android:pathData="M9,3H11V5H9V3M13,3H15V5H13V3M9,7H11V9H9V7M13,7H15V9H13V7M9,11H11V13H9V11M13,11H15V13H13V11M9,15H11V17H9V15M13,15H15V17H13V15M9,19H11V21H9V19M13,19H15V21H13V19Z" />
</vector>

View File

@ -4,7 +4,21 @@
a:layout_width="fill_parent"
a:layout_height="wrap_content"
a:minHeight="?android:attr/listPreferredItemHeight"
a:orientation="horizontal" >
a:orientation="horizontal"
a:background="?attr/color_menu_background">
<ImageView
a:id="@+id/song_drag"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:paddingLeft="5dip"
a:paddingStart="5dip"
a:paddingRight="0dip"
a:paddingEnd="0dip"
a:background="@android:color/transparent"
a:focusable="false"
a:gravity="center_vertical"
a:src="?attr/drag_vertical" />
<CheckedTextView
a:id="@+id/song_check"
@ -87,15 +101,4 @@
a:paddingRight="8dip"
a:src="?attr/star_hollow" />
<ImageView
a:id="@+id/song_drag"
a:layout_width="wrap_content"
a:layout_height="fill_parent"
a:background="@android:color/transparent"
a:focusable="false"
a:gravity="center_vertical"
a:layout_marginRight="16dip"
a:src="?attr/drag_queue"
a:layout_marginEnd="16dip" />
</LinearLayout>

View File

@ -92,6 +92,7 @@
<attr name="filepicker_subdirectory_up" format="reference"/>
<attr name="filepicker_sd_card" format="reference"/>
<attr name="drag_queue" format="reference"/>
<attr name="drag_vertical" format="reference"/>
<attr name="more_vert" format="reference"/>
<attr name="list_selector_holo" format="reference"/>
<attr name="list_selector_holo_selected" format="reference"/>

View File

@ -57,6 +57,7 @@
<item name="filepicker_subdirectory_up">@drawable/ic_subdirectory_up_dark</item>
<item name="filepicker_sd_card">@drawable/ic_sd_storage_dark</item>
<item name="drag_queue">@drawable/ic_drag_queue_dark</item>
<item name="drag_vertical">@drawable/ic_drag_vertical_dark</item>
<item name="more_vert">@drawable/ic_more_vert_dark</item>
<item name="list_selector_holo">@drawable/list_selector_holo_dark</item>
<item name="list_selector_holo_selected">@drawable/list_selector_holo_dark_selected</item>
@ -119,6 +120,7 @@
<item name="filepicker_subdirectory_up">@drawable/ic_subdirectory_up_dark</item>
<item name="filepicker_sd_card">@drawable/ic_sd_storage_dark</item>
<item name="drag_queue">@drawable/ic_drag_queue_dark</item>
<item name="drag_vertical">@drawable/ic_drag_vertical_dark</item>
<item name="more_vert">@drawable/ic_more_vert_dark</item>
<item name="list_selector_holo">@drawable/list_selector_holo_dark</item>
<item name="list_selector_holo_selected">@drawable/list_selector_holo_dark_selected</item>
@ -181,6 +183,7 @@
<item name="filepicker_subdirectory_up">@drawable/ic_subdirectory_up_light</item>
<item name="filepicker_sd_card">@drawable/ic_sd_storage_light</item>
<item name="drag_queue">@drawable/ic_drag_queue_light</item>
<item name="drag_vertical">@drawable/ic_drag_vertical_light</item>
<item name="more_vert">@drawable/ic_more_vert_light</item>
<item name="list_selector_holo">@drawable/list_selector_holo_light</item>
<item name="list_selector_holo_selected">@drawable/list_selector_holo_light_selected</item>