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

Code Cleanup

Browse source
This commit is contained in:
Prathamesh More 2022-05-18 16:00:54 +05:30
parent 077089c94c
commit 0b54044752
5 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
View file

@ -3,19 +3,19 @@ package code.name.monkey.retromusic.activities
import android.os.Bundle import android.os.Bundle
import android.widget.Button import android.widget.Button
import android.widget.ImageView import android.widget.ImageView
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import cat.ereza.customactivityoncrash.CustomActivityOnCrash import cat.ereza.customactivityoncrash.CustomActivityOnCrash
import code.name.monkey.retromusic.R import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.util.FileUtils.createFile import code.name.monkey.retromusic.util.FileUtils.createFile
import code.name.monkey.retromusic.util.Share.shareFile import code.name.monkey.retromusic.util.Share.shareFile
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import java.text.DateFormat import java.text.DateFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
class ErrorActivity : AppCompatActivity() { class ErrorActivity : AppCompatActivity() {
private val dayFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) private val dayFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
private val ReportPrefix = "bug_report-" private val reportPrefix = "bug_report-"
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.customactivityoncrash_default_error_activity) setContentView(R.layout.customactivityoncrash_default_error_activity)
@ -39,7 +39,7 @@ class ErrorActivity : AppCompatActivity() {
findViewById<Button>(R.id.customactivityoncrash_error_activity_more_info_button) findViewById<Button>(R.id.customactivityoncrash_error_activity_more_info_button)
moreInfoButton.setOnClickListener { //We retrieve all the error data and show it moreInfoButton.setOnClickListener { //We retrieve all the error data and show it
AlertDialog.Builder(this@ErrorActivity) MaterialAlertDialogBuilder(this@ErrorActivity)
.setTitle(R.string.customactivityoncrash_error_activity_error_details_title) .setTitle(R.string.customactivityoncrash_error_activity_error_details_title)
.setMessage( .setMessage(
CustomActivityOnCrash.getAllErrorDetailsFromIntent( CustomActivityOnCrash.getAllErrorDetailsFromIntent(
@ -58,7 +58,7 @@ class ErrorActivity : AppCompatActivity() {
val bugReport = createFile( val bugReport = createFile(
context = this, context = this,
"Bug Report", "Bug Report",
"$ReportPrefix${dayFormat.format(Date())}", "$reportPrefix${dayFormat.format(Date())}",
CustomActivityOnCrash.getAllErrorDetailsFromIntent( CustomActivityOnCrash.getAllErrorDetailsFromIntent(
this@ErrorActivity, this@ErrorActivity,
intent intent

1
app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
View file

@ -164,6 +164,7 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
} }
private fun startOrStopSnow(isSnowFalling: Boolean) { private fun startOrStopSnow(isSnowFalling: Boolean) {
if (_binding == null) return
if (isSnowFalling && !surfaceColor().isColorLight) { if (isSnowFalling && !surfaceColor().isColorLight) {
binding.snowfallView.isVisible = true binding.snowfallView.isVisible = true
binding.snowfallView.restartFalling() binding.snowfallView.restartFalling()

6
app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
View file

@ -115,11 +115,7 @@ object MusicPlayerRemote : KoinComponent {
fun bindToService(context: Context, callback: ServiceConnection): ServiceToken? { fun bindToService(context: Context, callback: ServiceConnection): ServiceToken? {
var realActivity: Activity? = (context as Activity).parent val realActivity = (context as Activity).parent ?: context
if (realActivity == null) {
realActivity = context
}
val contextWrapper = ContextWrapper(realActivity) val contextWrapper = ContextWrapper(realActivity)
val intent = Intent(contextWrapper, MusicService::class.java) val intent = Intent(contextWrapper, MusicService::class.java)
try { try {

2
app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
View file

@ -39,7 +39,6 @@ import org.koin.core.component.inject
*/ */
class MediaSessionCallback( class MediaSessionCallback(
private val context: Context,
private val musicService: MusicService private val musicService: MusicService
) : MediaSessionCompat.Callback(), KoinComponent { ) : MediaSessionCompat.Callback(), KoinComponent {
@ -191,7 +190,6 @@ class MediaSessionCallback(
} }
TOGGLE_FAVORITE -> { TOGGLE_FAVORITE -> {
musicService.toggleFavorite() musicService.toggleFavorite()
musicService.updateMediaSessionPlaybackState()
} }
else -> { else -> {
println("Unsupported action: $action") println("Unsupported action: $action")

2
app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
View file

@ -1339,7 +1339,7 @@ class MusicService : MediaBrowserServiceCompat(),
this, this,
"RetroMusicPlayer" "RetroMusicPlayer"
) )
val mediasessionCallback = MediaSessionCallback(applicationContext, this) val mediasessionCallback = MediaSessionCallback(this)
mediaSession?.setCallback(mediasessionCallback) mediaSession?.setCallback(mediasessionCallback)
mediaSession?.isActive = true mediaSession?.isActive = true
} }