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

Fix sleep timer crash, removed discord etc

Browse source
This commit is contained in:
h4h13 2019-06-16 23:40:28 +05:30
parent 933bf70068
commit 55807200d5
48 changed files with 104 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,9 +42,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
R.id.actionFolders -> mainActivity.selectedFragment(R.id.action_folder)
R.id.actionLibrary -> mainActivity.selectedFragment(PreferenceUtil.getInstance().lastPage)
R.id.actionSettings -> NavigationUtil.goToSettings(mainActivity)
R.id.actionSleepTimer -> if (fragmentManager != null) {
SleepTimerDialog().show(fragmentManager!!, TAG)
}
R.id.actionRate -> NavigationUtil.goToPlayStore(mainActivity)
R.id.actionShare -> shareApp()
R.id.actionBugReport -> prepareBugReport()
@ -67,7 +64,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
}
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
@ -79,7 +75,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
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)
@ -88,7 +83,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
actionBugReport = layout.findViewById(R.id.actionBugReport)
actionSettings.setOnClickListener(this)
actionSleepTimer.setOnClickListener(this)
actionLibrary.setOnClickListener(this)
actionEqualizer.setOnClickListener(this)
actionFolders.setOnClickListener(this)

2
app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
View file

@ -146,7 +146,7 @@ class SleepTimerDialog : DialogFragment() {
}
private fun makeTimerPendingIntent(flag: Int): PendingIntent {
private fun makeTimerPendingIntent(flag: Int): PendingIntent? {
return PendingIntent.getService(activity, 0, makeTimerIntent(), flag)
}