nyancrimew/PlayerAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix dialog for options menu

Browse source
This commit is contained in:
h4h13 2019-06-02 11:45:03 +05:30
parent cbfe8ec580
commit a83decd146
3 changed files with 54 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
View file

@ -19,7 +19,7 @@ import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.cardview.widget.CardView
import androidx.core.app.ShareCompat
import androidx.fragment.app.DialogFragment
import code.name.monkey.appthemehelper.ThemeStore
@ -31,35 +31,10 @@ import code.name.monkey.retromusic.util.NavigationUtil
import code.name.monkey.retromusic.util.PreferenceUtil
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet
import kotlinx.android.synthetic.main.fragment_main_options.*
import com.afollestad.materialdialogs.customview.customView
class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_main_options, container, false)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
actionSettings.setOnClickListener(this)
actionSleepTimer.setOnClickListener(this)
actionLibrary.setOnClickListener(this)
actionEqualizer.setOnClickListener(this)
actionFolders.setOnClickListener(this)
actionRate.setOnClickListener(this)
actionShare.setOnClickListener(this)
actionBugReport.setOnClickListener(this)
buyProContainer.apply {
setCardBackgroundColor(ThemeStore.accentColor(context!!))
visibility = if (!App.isProVersion) View.VISIBLE else View.GONE
setOnClickListener {
NavigationUtil.goToProVersion(context)
}
}
}
override fun onClick(view: View) {
val mainActivity = activity as MainActivity? ?: return
when (view.id) {
@ -93,10 +68,48 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
}
}
override fun getDialog(): Dialog? {
private lateinit var actionSettings: View
private lateinit var actionSleepTimer: View
private lateinit var actionLibrary: View
private lateinit var actionEqualizer: View
private lateinit var actionFolders: View
private lateinit var actionRate: View
private lateinit var actionShare: View
private lateinit var actionBugReport: View
private lateinit var buyProContainer: CardView
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val layout = LayoutInflater.from(context).inflate(R.layout.fragment_main_options, null)
actionSettings = layout.findViewById(R.id.actionSettings)
actionSleepTimer = layout.findViewById(R.id.actionSleepTimer)
actionLibrary = layout.findViewById(R.id.actionLibrary)
actionEqualizer = layout.findViewById(R.id.actionEqualizer)
actionFolders = layout.findViewById(R.id.actionFolders)
actionRate = layout.findViewById(R.id.actionRate)
actionShare = layout.findViewById(R.id.actionShare)
actionBugReport = layout.findViewById(R.id.actionBugReport)
buyProContainer = layout.findViewById(R.id.buyProContainer)
actionSettings.setOnClickListener(this)
actionSleepTimer.setOnClickListener(this)
actionLibrary.setOnClickListener(this)
actionEqualizer.setOnClickListener(this)
actionFolders.setOnClickListener(this)
actionRate.setOnClickListener(this)
actionShare.setOnClickListener(this)
actionBugReport.setOnClickListener(this)
buyProContainer.apply {
setCardBackgroundColor(ThemeStore.accentColor(context!!))
visibility = if (!App.isProVersion) View.VISIBLE else View.GONE
setOnClickListener {
NavigationUtil.goToProVersion(context)
}
}
return MaterialDialog(activity!!, BottomSheet())
.show {
customView(view = layout, scrollable = true)
}
}

22
app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt
View file

@ -26,6 +26,7 @@ import com.afollestad.materialdialogs.bottomsheets.BottomSheet
class RemoveFromPlaylistDialog : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val songs = arguments!!.getParcelableArrayList<PlaylistSong>("songs")
@ -40,16 +41,17 @@ class RemoveFromPlaylistDialog : DialogFragment() {
}
return MaterialDialog(activity!!, BottomSheet()).show {
title(title)
message(text = content)
negativeButton(android.R.string.cancel)
positiveButton(R.string.remove_action) {
if (activity == null)
return@positiveButton
PlaylistsUtil.removeFromPlaylist(activity!!, songs as MutableList<PlaylistSong>)
}
}
return MaterialDialog(activity!!, BottomSheet())
.show {
title(title)
message(text = content)
negativeButton(android.R.string.cancel)
positiveButton(R.string.remove_action) {
if (activity == null)
return@positiveButton
PlaylistsUtil.removeFromPlaylist(activity!!, songs as MutableList<PlaylistSong>)
}
}
}

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

@ -43,13 +43,6 @@
android:title="@string/pref_title_tab_text_mode"
app:iconSpaceReserved="false" />
<code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
android:defaultValue="false"
android:key="toggle_home_banner"
android:summary="@string/pref_summary_home_banner"
android:title="@string/pref_title_home_banner"
app:iconSpaceReserved="false" />
<code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
android:defaultValue="false"
android:key="toggle_genre"