Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into Confirm-add-to-playlist-#1283

Browse source
This commit is contained in:
Logic Gupta 2022-03-10 10:02:02 -08:00 • committed by GitHub
commit c37fca4a5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 71 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout/fragment_playlist_detail.xml
View file

@ -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>

4
app/src/main/res/values/strings.xml
View file

@ -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>
@ -547,4 +549,6 @@
<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>
</resources>

7
app/src/main/res/xml/pref_ui.xml
View file

@ -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