Skip to content

Commit 55c80e7

Browse files
tibbitibbi
committed
use the newer UI for selected items
1 parent 194189e commit 55c80e7

19 files changed

+26
-34
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ android {
7070
}
7171

7272
dependencies {
73-
implementation 'com.github.SimpleMobileTools:Simple-Commons:bce3441c67'
73+
implementation 'com.github.SimpleMobileTools:Simple-Commons:c09f8dfda1'
7474
implementation 'org.greenrobot:eventbus:3.3.1'
7575
implementation 'androidx.media:media:1.6.0'
7676
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/SettingsActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class SettingsActivity : SimpleActivity() {
4444
setupGaplessPlayback()
4545
updateTextColors(settings_nested_scrollview)
4646

47-
arrayOf(settings_color_customization_section_label, settings_general_settings_label).forEach {
47+
arrayOf(settings_color_customization_section_label, settings_general_settings_label, settings_playback_section_label).forEach {
4848
it.setTextColor(getProperPrimaryColor())
4949
}
5050
}

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/AlbumsAdapter.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity
1212
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
1313
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
1414
import com.simplemobiletools.commons.extensions.highlightTextPart
15+
import com.simplemobiletools.commons.extensions.setupViewBackground
1516
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
1617
import com.simplemobiletools.commons.views.MyRecyclerView
1718
import com.simplemobiletools.musicplayer.R
@@ -148,6 +149,7 @@ class AlbumsAdapter(activity: BaseSimpleActivity, var albums: ArrayList<Album>,
148149

149150
private fun setupView(view: View, album: Album) {
150151
view.apply {
152+
setupViewBackground(activity)
151153
album_frame?.isSelected = selectedKeys.contains(album.hashCode())
152154
album_title.text = if (textToHighlight.isEmpty()) album.title else album.title.highlightTextPart(textToHighlight, properPrimaryColor)
153155
album_title.setTextColor(textColor)

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/AlbumsTracksAdapter.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog
1313
import com.simplemobiletools.commons.extensions.beGone
1414
import com.simplemobiletools.commons.extensions.beVisible
1515
import com.simplemobiletools.commons.extensions.getFormattedDuration
16+
import com.simplemobiletools.commons.extensions.setupViewBackground
1617
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
1718
import com.simplemobiletools.commons.views.MyRecyclerView
1819
import com.simplemobiletools.musicplayer.R
@@ -204,6 +205,7 @@ class AlbumsTracksAdapter(
204205

205206
private fun setupTrack(view: View, track: Track) {
206207
view.apply {
208+
setupViewBackground(activity)
207209
track_frame?.isSelected = selectedKeys.contains(track.hashCode())
208210
track_title.text = track.title
209211
track_title.setTextColor(textColor)

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/ArtistsAdapter.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity
1414
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
1515
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
1616
import com.simplemobiletools.commons.extensions.highlightTextPart
17+
import com.simplemobiletools.commons.extensions.setupViewBackground
1718
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
1819
import com.simplemobiletools.commons.views.MyRecyclerView
1920
import com.simplemobiletools.musicplayer.R
@@ -156,6 +157,7 @@ class ArtistsAdapter(activity: BaseSimpleActivity, var artists: ArrayList<Artist
156157

157158
private fun setupView(view: View, artist: Artist) {
158159
view.apply {
160+
setupViewBackground(activity)
159161
artist_frame?.isSelected = selectedKeys.contains(artist.hashCode())
160162
artist_title.text = if (textToHighlight.isEmpty()) artist.title else artist.title.highlightTextPart(textToHighlight, properPrimaryColor)
161163
artist_title.setTextColor(textColor)

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/ExcludedFoldersAdapter.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
77
import com.simplemobiletools.commons.extensions.getPopupMenuTheme
88
import com.simplemobiletools.commons.extensions.getProperTextColor
99
import com.simplemobiletools.commons.extensions.humanizePath
10+
import com.simplemobiletools.commons.extensions.setupViewBackground
1011
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
1112
import com.simplemobiletools.commons.views.MyRecyclerView
1213
import com.simplemobiletools.musicplayer.R
@@ -65,6 +66,7 @@ class ExcludedFoldersAdapter(
6566

6667
private fun setupView(view: View, folder: String) {
6768
view.apply {
69+
setupViewBackground(activity)
6870
excluded_folder_holder?.isSelected = selectedKeys.contains(folder.hashCode())
6971
excluded_folder_title.apply {
7072
text = context.humanizePath(folder) + "/"

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/FoldersAdapter.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
77
import com.simplemobiletools.commons.activities.BaseSimpleActivity
88
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
99
import com.simplemobiletools.commons.extensions.highlightTextPart
10+
import com.simplemobiletools.commons.extensions.setupViewBackground
1011
import com.simplemobiletools.commons.views.MyRecyclerView
1112
import com.simplemobiletools.musicplayer.R
1213
import com.simplemobiletools.musicplayer.extensions.config
@@ -84,6 +85,7 @@ class FoldersAdapter(
8485

8586
private fun setupView(view: View, folder: Folder) {
8687
view.apply {
88+
setupViewBackground(activity)
8789
folder_frame?.isSelected = selectedKeys.contains(folder.hashCode())
8890
folder_title.text = if (textToHighlight.isEmpty()) folder.title else folder.title.highlightTextPart(textToHighlight, properPrimaryColor)
8991
folder_title.setTextColor(textColor)

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/PlaylistsAdapter.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
99
import com.simplemobiletools.commons.extensions.deleteFiles
1010
import com.simplemobiletools.commons.extensions.getFilenameFromPath
1111
import com.simplemobiletools.commons.extensions.highlightTextPart
12+
import com.simplemobiletools.commons.extensions.setupViewBackground
1213
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
1314
import com.simplemobiletools.commons.models.FileDirItem
1415
import com.simplemobiletools.commons.views.MyRecyclerView
@@ -150,6 +151,7 @@ class PlaylistsAdapter(
150151

151152
private fun setupView(view: View, playlist: Playlist) {
152153
view.apply {
154+
setupViewBackground(activity)
153155
playlist_frame?.isSelected = selectedKeys.contains(playlist.id)
154156
playlist_title.text = if (textToHighlight.isEmpty()) playlist.title else playlist.title.highlightTextPart(textToHighlight, properPrimaryColor)
155157
playlist_title.setTextColor(textColor)

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/QueueAdapter.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ class QueueAdapter(activity: SimpleActivity, var items: ArrayList<Track>, recycl
161161

162162
private fun setupView(view: View, track: Track, holder: ViewHolder) {
163163
view.apply {
164+
setupViewBackground(activity)
164165
track_queue_frame?.isSelected = selectedKeys.contains(track.hashCode())
165166
track_queue_title.text = if (textToHighlight.isEmpty()) track.title else track.title.highlightTextPart(textToHighlight, properPrimaryColor)
166167

‎app/src/main/kotlin/com/simplemobiletools/musicplayer/adapters/TracksAdapter.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ class TracksAdapter(
207207

208208
private fun setupView(view: View, track: Track, holder: ViewHolder) {
209209
view.apply {
210+
setupViewBackground(activity)
210211
track_frame?.isSelected = selectedKeys.contains(track.hashCode())
211212
track_title.text = if (textToHighlight.isEmpty()) track.title else track.title.highlightTextPart(textToHighlight, properPrimaryColor)
212213
track_drag_handle.beVisibleIf(isPlaylistContent && selectedKeys.isNotEmpty())

0 commit comments

Comments
 (0)