Merge branch 'develop' into refactor-events

This commit is contained in:
Nite 2021-11-15 18:20:56 +01:00 committed by GitHub
commit d6f908b80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 238 additions and 526 deletions

File diff suppressed because it is too large Load Diff

View File

@ -102,7 +102,7 @@ object Util {
when (Settings.theme.lowercase()) {
Constants.PREFERENCES_KEY_THEME_DARK,
"fullscreen" -> {
context!!.setTheme(R.style.UltrasonicTheme)
context!!.setTheme(R.style.UltrasonicTheme_Dark)
}
Constants.PREFERENCES_KEY_THEME_BLACK -> {
context!!.setTheme(R.style.UltrasonicTheme_Black)

View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 The Android Open Source Project Licensed under the
Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
the specific language governing permissions and limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
<item android:drawable="@color/ics_opaque" android:state_pressed="true"/>
<item android:drawable="@color/ics_opaque" android:state_enabled="true" android:state_focused="true"/>
</selector>

View File

@ -4,8 +4,8 @@
<gradient
android:angle="90"
android:endColor="#00000000"
android:startColor="#80000000"
android:endColor="@android:color/transparent"
android:startColor="#73111111"
android:type="linear" />
</shape>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/darker_gray" />
<padding
android:top="10dp"
android:left="10dp"
android:right="10dp"
android:bottom="10dp"/>
</shape>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/line"/>
<item
android:drawable="@drawable/line"/>
</selector>

View File

@ -21,7 +21,8 @@
android:layout_height="64.0dip"
android:focusable="true"
android:gravity="center"
android:layout_marginStart="6dp" />
android:layout_marginStart="6dp"
android:importantForAccessibility="no"/>
<LinearLayout
android:layout_width="0.0dp"
@ -62,7 +63,8 @@
android:layout_weight="0.0"
android:focusable="false"
android:scaleType="fitCenter"
android:src="?attr/media_pause" />
android:src="?attr/media_pause"
android:contentDescription="@string/buttons.play"/>
</LinearLayout>

View File

@ -7,7 +7,7 @@
a:id="@+id/select_album_art"
a:layout_width="160dip"
a:layout_height="160dip"
a:layout_alignParentLeft="true"
a:layout_alignParentStart="true"
a:layout_alignParentTop="true"
a:layout_marginEnd="10dip"
a:contentDescription="@null"

View File

@ -26,10 +26,10 @@
a:layout_height="wrap_content"
a:layout_gravity="left|center_vertical"
a:layout_weight="1"
a:drawablePadding="6dip"
a:drawablePadding="4dip"
a:ellipsize="end"
a:paddingStart="4dip"
a:paddingEnd="2dip"
a:paddingStart="6dip"
a:paddingEnd="4dip"
a:singleLine="true"
a:textAppearance="?android:attr/textAppearanceMedium"/>
@ -55,7 +55,8 @@
a:layout_gravity="left|center_vertical"
a:layout_weight="1"
a:ellipsize="middle"
a:paddingStart="4dip"
a:paddingStart="1dip"
a:paddingEnd="4dip"
a:singleLine="true"
a:textAppearance="?android:attr/textAppearanceSmall"/>

View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<item
a:id="@+id/main_shuffle"
a:icon="?attr/media_shuffle"
app:showAsAction="ifRoom|withText"
a:title="@string/main.shuffle"/>
</menu>

View File

@ -6,8 +6,6 @@
<color name="cyan">#0099cc</color>
<color name="navigation_header_light">#6200EE</color>
<color name="navigation_header_dark">#BB86FC</color>
<color name="ics_opaque">#8033b5e5</color>
<color name="md__transparent">#00000000</color>
<color name="translucent">#80000000</color>
<color name="background_color_dark">#000000</color>
<color name="background_color_grey">#333333</color>

View File

@ -64,7 +64,7 @@
<item name="list_selector_holo_selected">@drawable/list_selector_holo_dark_selected</item>
</style>
<style name="UltrasonicTheme" parent="Theme.MaterialComponents">
<style name="UltrasonicTheme.Dark" parent="Theme.MaterialComponents">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="color_background">@color/background_color_grey</item>

View File

@ -19,7 +19,7 @@
a:title="@string/settings.server_scaling_title"
app:iconSpaceReserved="false"/>
<CheckBoxPreference
a:defaultValue="true"
a:defaultValue="false"
a:key="displayBitrateWithArtist"
a:summary="@string/settings.display_bitrate_summary"
a:title="@string/settings.display_bitrate"