Merge branch 'dev' into reset_image
This commit is contained in:
commit
647e504f3d
37 changed files with 384 additions and 120 deletions
|
@ -14,6 +14,15 @@
|
|||
|
||||
<include layout="@layout/shadow_statusbar_toolbar" />
|
||||
|
||||
<View
|
||||
android:id="@+id/colorGradientBackground"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
|
|
@ -10,6 +10,15 @@
|
|||
|
||||
<include layout="@layout/shadow_statusbar_toolbar" />
|
||||
|
||||
<View
|
||||
android:id="@+id/colorGradientBackground"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/statusBarContainer"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
@ -67,6 +67,7 @@
|
|||
android:textAppearance="@style/TextViewHeadline5"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<com.google.android.material.progressindicator.CircularProgressIndicator
|
||||
|
@ -76,4 +77,4 @@
|
|||
android:layout_gravity="center"
|
||||
android:gravity="center"
|
||||
android:indeterminate="true" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
|
@ -31,6 +31,8 @@
|
|||
android:id="@android:id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="0dp"
|
||||
android:paddingEnd="16dp"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:tint="?attr/colorControlNormal"
|
||||
|
@ -53,6 +55,8 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:paddingStart="0dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:textAppearance="@style/TextViewNormal"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
app:layout_constrainedWidth="true"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
~ See the GNU General Public License for more details.
|
||||
-->
|
||||
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<resources>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<bool name="wallpaper_accent_enabled">true</bool>
|
||||
<bool name="wallpaper_accent_visible">true</bool>
|
||||
</resources>
|
|
@ -12,7 +12,7 @@
|
|||
~ See the GNU General Public License for more details.
|
||||
-->
|
||||
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<resources>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
|
|
|
@ -4,6 +4,5 @@
|
|||
<bool name="md3_enabled">true</bool>
|
||||
|
||||
<integer name="overScrollMode">0</integer>
|
||||
<bool name="wallpaper_accent_enabled">false</bool>
|
||||
<bool name="wallpaper_accent_visible">false</bool>
|
||||
</resources>
|
|
@ -356,6 +356,7 @@
|
|||
<string name="pref_summary_toggle_volume">If enough space is available, show volume controls in the now playing screen</string>
|
||||
<string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
|
||||
<string name="pref_summary_whitelist">Only show music from /Music Folder</string>
|
||||
<string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
|
||||
<string name="pref_title_album_art_on_lockscreen">Show album cover</string>
|
||||
<string name="pref_title_album_artists_only">Navigate by Album Artist</string>
|
||||
<string name="pref_title_album_cover_style">Album cover theme</string>
|
||||
|
@ -402,6 +403,7 @@
|
|||
<string name="pref_title_toggle_volume">Volume controls</string>
|
||||
<string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
|
||||
<string name="pref_title_whitelist">Whitelist music</string>
|
||||
<string name="pref_title_pause_history">Pause history</string>
|
||||
<string name="pro">Pro</string>
|
||||
<string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
|
||||
<string name="profile">Profile</string>
|
||||
|
@ -544,6 +546,11 @@
|
|||
<string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
|
||||
<string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
|
||||
<string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
|
||||
<string name="playlist_created_sucessfully">%s created successfully</string>
|
||||
<string name="playList_already_exits">Playlist already exists</string>
|
||||
<string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
|
||||
<string name="history_cleared">History cleared</string>
|
||||
<string name="history_undo_button">Undo</string>
|
||||
<string name="choose_image">Choose Image</string>
|
||||
<string name="remove_image">Remove Image</string>
|
||||
</resources>
|
||||
|
|
|
@ -211,7 +211,7 @@
|
|||
<style name="SearchChipStyle" parent="Widget.Material3.Chip.Filter">
|
||||
<item name="android:checked">false</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="checkedIconEnabled">true</item>
|
||||
<item name="checkedIconVisible">false</item>
|
||||
<item name="chipEndPadding">10dp</item>
|
||||
<item name="chipMinHeight">40dp</item>
|
||||
<item name="chipStartPadding">10dp</item>
|
||||
|
|
|
@ -48,8 +48,7 @@
|
|||
android:key="wallpaper_accent"
|
||||
android:layout="@layout/list_item_view_switch"
|
||||
android:summary="@string/pref_summary_wallpaper_accent"
|
||||
android:title="@string/pref_title_wallpaper_accent"
|
||||
app:isPreferenceVisible="@bool/wallpaper_accent_visible" />
|
||||
android:title="@string/pref_title_wallpaper_accent" />
|
||||
|
||||
<code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
|
||||
android:dependency="material_you"
|
||||
|
|
|
@ -40,6 +40,13 @@
|
|||
android:summary="@string/pref_summary_suggestions"
|
||||
android:title="@string/pref_title_suggestions" />
|
||||
|
||||
<code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pause_history"
|
||||
android:layout="@layout/list_item_view_switch"
|
||||
android:summary="@string/pref_summary_pause_history"
|
||||
android:title="@string/pref_title_pause_history" />
|
||||
|
||||
</code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
|
||||
|
||||
<code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue