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

Fix search keyboard not poping, removed divider, removed card in about etc

Browse source
This commit is contained in:
h4h13 2019-02-24 01:40:15 +05:30
parent b9412c6ef6
commit c179d8772d
32 changed files with 658 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
View file

@ -38,9 +38,8 @@ class ArtistImageFetcher(private val context: Context, private val lastFMRestCli
return InputStream::class.java
}
override fun getDataSource(): DataSource {
return DataSource.REMOTE
return DataSource.MEMORY_CACHE
}
override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {

8
app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
View file

@ -41,8 +41,7 @@ class AlbumCoverStylePreference : DialogPreference {
class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener {
override fun onDialogClosed(positiveResult: Boolean) {
val nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition]
PreferenceUtil.getInstance().albumCoverStyle = nowPlayingScreen
}
private var viewPagerPosition: Int = 0
@ -57,7 +56,10 @@ class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPa
return MaterialDialog(activity!!).show {
title(R.string.pref_title_album_cover_style)
positiveButton(android.R.string.ok)
positiveButton(R.string.set) {
val nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition]
PreferenceUtil.getInstance().albumCoverStyle = nowPlayingScreen
}
negativeButton(android.R.string.cancel)
customView(view = view, scrollable = false, noVerticalPadding = false)
}

2
app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt
View file

@ -52,7 +52,7 @@ class MaterialListPreferenceDialog : PreferenceDialogFragmentCompat() {
return MaterialDialog(activity!!).show {
title(text = materialListPreference.title.toString())
positiveButton(R.string.set)
listItemsSingleChoice(items = entries, initialSelection = position) { dialog, index, text ->
listItemsSingleChoice(items = entries, initialSelection = position) { _, index, _ ->
materialListPreference.callChangeListener(entriesValues!![index])
materialListPreference.setCustomValue(entriesValues[index])
materialListPreference.summary = entries!![index]

20
app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
View file

@ -56,14 +56,7 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP
}
override fun onDialogClosed(positiveResult: Boolean) {
val nowPlayingScreen = NowPlayingScreen.values()[viewPagerPosition]
if (isNowPlayingThemes(nowPlayingScreen)) {
val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
NavigationUtil.goToProVersion(activity!!)
} else {
PreferenceUtil.getInstance().nowPlayingScreen = nowPlayingScreen
}
}
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@ -78,7 +71,16 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP
return MaterialDialog(activity!!).show {
title(R.string.pref_title_album_cover_style)
positiveButton(android.R.string.ok)
positiveButton(R.string.set) {
val nowPlayingScreen = NowPlayingScreen.values()[viewPagerPosition]
if (isNowPlayingThemes(nowPlayingScreen)) {
val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
NavigationUtil.goToProVersion(activity!!)
} else {
PreferenceUtil.getInstance().nowPlayingScreen = nowPlayingScreen
}
}
negativeButton(android.R.string.cancel)
customView(view = view, scrollable = false, noVerticalPadding = false)
}

22
app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt
View file

@ -29,7 +29,7 @@ import java.util.*
class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchContract.SearchView, TextWatcher {
private var searchPresenter: SearchPresenter? = null
private lateinit var searchPresenter: SearchPresenter
private var searchAdapter: SearchAdapter? = null
private var query: String? = null
@ -49,11 +49,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
setUpToolBar()
setupSearchView()
if (savedInstanceState != null) {
query = savedInstanceState.getString(QUERY)
searchPresenter!!.search(query!!)
}
if (intent.getBooleanExtra("mic_search", false)) {
startMicSearch()
}
@ -76,7 +71,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
layoutManager = LinearLayoutManager(this@SearchActivity)
adapter = searchAdapter
}
}
private fun setupSearchView() {
@ -86,13 +80,13 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
override fun onResume() {
super.onResume()
searchPresenter!!.subscribe()
searchPresenter!!.search(query)
searchPresenter.subscribe()
searchPresenter.search(query)
}
override fun onDestroy() {
super.onDestroy()
searchPresenter!!.unsubscribe()
searchPresenter.unsubscribe()
}
override fun onSaveInstanceState(outState: Bundle) {
@ -102,7 +96,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
override fun onRestoreInstanceState(savedInstanceState: Bundle) {
super.onRestoreInstanceState(savedInstanceState)
searchPresenter!!.search(savedInstanceState.getString(QUERY, ""))
searchPresenter.search(savedInstanceState.getString(QUERY, ""))
}
private fun setUpToolBar() {
@ -113,12 +107,12 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
private fun search(query: String) {
this.query = query.trim { it <= ' ' }
voiceSearch.visibility = if (query.isNotEmpty()) View.GONE else View.VISIBLE
searchPresenter!!.search(query)
searchPresenter.search(query)
}
override fun onMediaStoreChanged() {
super.onMediaStoreChanged()
searchPresenter!!.search(query!!)
searchPresenter.search(query!!)
}
override fun onQueryTextSubmit(query: String): Boolean {
@ -164,7 +158,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
query = result[0]
searchView.setText(query, BufferType.EDITABLE)
searchPresenter!!.search(query!!)
searchPresenter.search(query!!)
}
}
}

2
app/src/main/java/code/name/monkey/retromusic/ui/activities/WhatsNewActivity.java
View file

@ -65,7 +65,7 @@ public class WhatsNewActivity extends AbsBaseActivity {
setTitle(null);
toolbar.setNavigationOnClickListener(v -> onBackPressed());
title.setTextColor(ThemeStore.Companion.textColorPrimary(this));
ToolbarContentTintHelper.colorBackButton(toolbar,ThemeStore.Companion.textColorSecondary(this));
try {
// Load from phonograph-changelog.html in the assets folder

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt
View file

@ -42,7 +42,7 @@ class GenreAdapter(private val mActivity: Activity, dataSet: ArrayList<Genre>, p
}
if (holder.separator != null) {
holder.separator!!.visibility = View.VISIBLE
holder.separator!!.visibility = View.GONE
}
}

6
app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt
View file

@ -115,10 +115,8 @@ class SearchAdapter(private val activity: AppCompatActivity, private var dataSet
override fun onClick(v: View?) {
val item = dataSet!![adapterPosition]
when (itemViewType) {
ALBUM -> NavigationUtil.goToAlbum(activity,
(item as Album).id, Pair.create(image, activity.resources.getString(R.string.transition_album_art)))
ARTIST -> NavigationUtil.goToArtist(activity,
(item as Artist).id, Pair.create(image, activity.resources.getString(R.string.transition_artist_image)))
ALBUM -> NavigationUtil.goToAlbum(activity, (item as Album).id, Pair.create(image, activity.resources.getString(R.string.transition_album_art)))
ARTIST -> NavigationUtil.goToArtist(activity, (item as Artist).id, Pair.create(image, activity.resources.getString(R.string.transition_artist_image)))
SONG -> {
val playList = ArrayList<Song>()
playList.add(item as Song)

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt
View file

@ -91,7 +91,7 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
}
} else {
if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.VISIBLE
holder.shortSeparator!!.visibility = View.GONE
}
}

4
app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt
View file

@ -52,7 +52,7 @@ class ArtistAdapter(val activity: AppCompatActivity,
return createViewHolder(view)
}
protected fun createViewHolder(view: View): ViewHolder {
private fun createViewHolder(view: View): ViewHolder {
return ViewHolder(view)
}
@ -69,7 +69,7 @@ class ArtistAdapter(val activity: AppCompatActivity,
holder.text!!.visibility = View.GONE
}
if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.VISIBLE
holder.shortSeparator!!.visibility = View.GONE
}
loadArtistImage(artist, holder)
}

42
app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt
View file

@ -1,5 +1,6 @@
package code.name.monkey.retromusic.ui.adapter.base
import android.graphics.Color
import android.os.Build
import android.view.View
import android.view.ViewGroup
@ -10,8 +11,9 @@ import androidx.cardview.widget.CardView
import androidx.recyclerview.widget.RecyclerView
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.R
import com.google.android.material.card.MaterialCardView
open class MediaEntryViewHolder(w: View) : RecyclerView.ViewHolder(w), View.OnClickListener, View.OnLongClickListener {
open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener {
override fun onLongClick(v: View?): Boolean {
return false
}
@ -38,31 +40,33 @@ open class MediaEntryViewHolder(w: View) : RecyclerView.ViewHolder(w), View.OnCl
var imageTextContainer: CardView? = null
init {
title = w.findViewById(R.id.title)
text = w.findViewById(R.id.text)
image = w.findViewById(R.id.image)
imageContainer = w.findViewById(R.id.image_container)
imageTextContainer = w.findViewById(R.id.image_text_container)
imageContainerCard = w.findViewById(R.id.image_container_card)
imageText = w.findViewById(R.id.image_text)
title = view.findViewById(R.id.title)
text = view.findViewById(R.id.text)
menu = w.findViewById(R.id.menu)
dragView = w.findViewById(R.id.drag_view)
image = view.findViewById(R.id.image)
imageContainer = view.findViewById(R.id.image_container)
imageTextContainer = view.findViewById(R.id.image_text_container)
imageContainerCard = view.findViewById(R.id.image_container_card)
separator = w.findViewById(R.id.separator)
shortSeparator = w.findViewById(R.id.short_separator)
paletteColorContainer = w.findViewById(R.id.palette_color_container)
imageText = view.findViewById(R.id.image_text)
time = w.findViewById(R.id.time);
recyclerView = w.findViewById(R.id.recycler_view)
menu = view.findViewById(R.id.menu)
dragView = view.findViewById(R.id.drag_view)
mask = w.findViewById(R.id.mask)
playSongs = w.findViewById(R.id.playSongs)
separator = view.findViewById(R.id.separator)
shortSeparator = view.findViewById(R.id.short_separator)
paletteColorContainer = view.findViewById(R.id.palette_color_container)
w.setOnClickListener(this)
w.setOnLongClickListener(this)
time = view.findViewById(R.id.time);
recyclerView = view.findViewById(R.id.recycler_view)
mask = view.findViewById(R.id.mask)
playSongs = view.findViewById(R.id.playSongs)
view.setOnClickListener(this@MediaEntryViewHolder)
view.setOnLongClickListener(this)
if (imageTextContainer != null) {
imageTextContainer!!.setCardBackgroundColor(ThemeStore.primaryColor(itemView.context))

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt
View file

@ -92,7 +92,7 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL
}
} else {
if (holder.shortSeparator != null && dataSet[position] !is AbsSmartPlaylist) {
holder.shortSeparator!!.visibility = View.VISIBLE
holder.shortSeparator!!.visibility = View.GONE
}
}
}

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt
View file

@ -49,7 +49,7 @@ open class PlaylistSongAdapter(activity: AppCompatActivity, dataSet: ArrayList<S
holder.dragView!!.visibility = View.GONE
}
if (holder.separator != null) {
holder.separator!!.visibility = View.VISIBLE
holder.separator!!.visibility = View.GONE
}
if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.GONE

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt
View file

@ -41,7 +41,7 @@ class ShuffleButtonSongAdapter(activity: AppCompatActivity,
holder.image!!.setImageResource(R.drawable.ic_shuffle_white_24dp)
}
if (holder.separator != null) {
holder.separator!!.visibility = View.VISIBLE
holder.separator!!.visibility = View.GONE
}
if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.GONE

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/SongAdapter.kt
View file

@ -84,7 +84,7 @@ open class SongAdapter @JvmOverloads constructor(protected val activity: AppComp
}
} else {
if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.VISIBLE
holder.shortSeparator!!.visibility = View.GONE
}
}