Merge pull request #52 from h4h13/kotlin

Added bug report
RetroMusicPlayer · Dec 6, 2018 · f1929e4 · f1929e4
2 parents 746afcc + d47aecc
commit f1929e4
Show file tree

Hide file tree

Showing 53 changed files with 1,137 additions and 229 deletions.
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -122,9 +122,6 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-gson:2.4.0"
     implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0"
 
-    implementation "com.jakewharton:butterknife:$butterKnife"
-    kapt "com.jakewharton:butterknife-compiler:$butterKnife"
-
     implementation "com.afollestad.material-dialogs:core:$materialDialog"
     implementation "com.afollestad.material-dialogs:commons:$materialDialog"
     implementation 'com.afollestad:material-cab:0.1.12'
@@ -151,6 +148,8 @@ dependencies {
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+    implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
+
 }
 repositories {
     mavenCentral()

diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
@@ -24,7 +24,7 @@ class SongShareDialog : RoundedBottomSheetDialogFragment() {
         super.onViewCreated(view, savedInstanceState)
         val song = arguments!!.getParcelable<Song>("song")!!
 
-        audioFile.text = getString(R.string.currently_listening_to_x_by_x, song.title, song.artistName)
+        audioText.text = getString(R.string.currently_listening_to_x_by_x, song.title, song.artistName)
         audioFile.setTextColor(ThemeStore.textColorSecondary(context!!))
         audioText.setTextColor(ThemeStore.textColorSecondary(context!!))
         title.setTextColor(ThemeStore.textColorPrimary(context!!))

diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt
@@ -26,6 +26,7 @@ import code.name.monkey.retromusic.loaders.ArtistLoader
 import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.ui.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.ui.activities.bugreport.BugReportActivity
 import code.name.monkey.retromusic.ui.fragments.mainactivity.LibraryFragment
 import code.name.monkey.retromusic.ui.fragments.mainactivity.folders.FoldersFragment
 import code.name.monkey.retromusic.ui.fragments.mainactivity.home.BannerHomeFragment
@@ -308,7 +309,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
     }
 
     private fun prepareBugReport() {
-
+        startActivity(Intent(this, BugReportActivity::class.java))
     }
 
     private fun shareApp() {

diff --git a/.../main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt b/.../main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -3,15 +3,13 @@ package code.name.monkey.retromusic.ui.activities.base
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.annotation.SuppressLint
-import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import androidx.annotation.FloatRange
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
@@ -170,8 +168,6 @@ abstract class AbsSlidingMusicPanelActivity protected constructor() : AbsMusicSe
     override fun onPanelSlide(panel: View?, slideOffset: Float) {
         bottomNavigationView.translationY = slideOffset * 400
         setMiniPlayerAlphaProgress(slideOffset)
-        //if (navigationBarColorAnimator != null) navigationBarColorAnimator.cancel();
-        //super.setNavigationbarColor((int) argbEvaluator.evaluate(slideOffset, navigationbarColor, Color.TRANSPARENT));
     }
 
     override fun onPanelStateChanged(panel: View, previousState: PanelState, newState: PanelState) {
@@ -230,7 +226,7 @@ abstract class AbsSlidingMusicPanelActivity protected constructor() : AbsMusicSe
             NowPlayingScreen.PLAIN -> PlainPlayerFragment()
             NowPlayingScreen.SIMPLE -> SimplePlayerFragment()
             NowPlayingScreen.MATERIAL -> MaterialFragment()
-            NowPlayingScreen.COLOR->ColorFragment()
+            NowPlayingScreen.COLOR -> ColorFragment()
             else -> PlayerFragment()
         } // must implement AbsPlayerFragment
         supportFragmentManager.beginTransaction().replace(R.id.player_fragment_container, fragment).commit()
@@ -261,16 +257,17 @@ abstract class AbsSlidingMusicPanelActivity protected constructor() : AbsMusicSe
     override fun onPaletteColorChanged() {
         if (panelState == PanelState.EXPANDED) {
             val paletteColor = playerFragment!!.paletteColor
-            ColorUtil.isColorLight(paletteColor)
             super.setTaskDescriptionColor(paletteColor)
-            if (currentNowPlayingScreen == NowPlayingScreen.BLUR) {
+
+            val isColorLight = ColorUtil.isColorLight(paletteColor)
+            if (PreferenceUtil.getInstance().adaptiveColor &&
+                    (currentNowPlayingScreen == NowPlayingScreen.NORMAL || currentNowPlayingScreen == NowPlayingScreen.FLAT)) {
+                super.setLightNavigationBar(true)
+                super.setLightStatusbar(isColorLight)
+            } else if (currentNowPlayingScreen == NowPlayingScreen.FULL || currentNowPlayingScreen == NowPlayingScreen.CARD ||
+                    currentNowPlayingScreen == NowPlayingScreen.BLUR || currentNowPlayingScreen == NowPlayingScreen.BLUR_CARD) {
                 super.setLightStatusbar(false)
                 super.setLightNavigationBar(true)
-            } else {
-                val isTheme = isOneOfTheseThemes && ColorUtil.isColorLight(ThemeStore.primaryColor(this))
-                super.setStatusbarColor(Color.TRANSPARENT)
-                super.setLightStatusbar(isTheme)
-                super.setLightNavigationBar(isTheme)
             }
         }
     }