Merge pull request #3033 from Bnyro/master

Open audio player from three dot menu
This commit is contained in:
Bnyro 2023-02-12 12:35:22 +01:00 committed by GitHub
commit 04c7979c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions

View File

@ -27,12 +27,14 @@ import com.github.libretube.constants.IntentData
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.databinding.ActivityMainBinding import com.github.libretube.databinding.ActivityMainBinding
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.helpers.BackgroundHelper
import com.github.libretube.helpers.NavBarHelper import com.github.libretube.helpers.NavBarHelper
import com.github.libretube.helpers.NavigationHelper import com.github.libretube.helpers.NavigationHelper
import com.github.libretube.helpers.NetworkHelper import com.github.libretube.helpers.NetworkHelper
import com.github.libretube.helpers.PreferenceHelper import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.helpers.ThemeHelper import com.github.libretube.helpers.ThemeHelper
import com.github.libretube.helpers.WindowHelper import com.github.libretube.helpers.WindowHelper
import com.github.libretube.services.BackgroundMode
import com.github.libretube.services.ClosingService import com.github.libretube.services.ClosingService
import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.base.BaseActivity
import com.github.libretube.ui.dialogs.ErrorDialog import com.github.libretube.ui.dialogs.ErrorDialog
@ -254,6 +256,12 @@ class MainActivity : BaseActivity() {
searchView.onActionViewCollapsed() searchView.onActionViewCollapsed()
} }
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
menu?.findItem(R.id.action_audio)?.isVisible = BackgroundHelper
.isServiceRunning(this, BackgroundMode::class.java)
return super.onPrepareOptionsMenu(menu)
}
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
// Inflate the menu; this adds items to the action bar if it is present. // Inflate the menu; this adds items to the action bar if it is present.
menuInflater.inflate(R.menu.action_bar, menu) menuInflater.inflate(R.menu.action_bar, menu)
@ -355,6 +363,10 @@ class MainActivity : BaseActivity() {
startActivity(helpIntent) startActivity(helpIntent)
true true
} }
R.id.action_audio -> {
navController.navigate(R.id.audioPlayerFragment)
true
}
else -> super.onOptionsItemSelected(item) else -> super.onOptionsItemSelected(item)
} }
} }

View File

@ -25,4 +25,10 @@
android:title="@string/about" android:title="@string/about"
app:showAsAction="never" /> app:showAsAction="never" />
<item
android:visible="false"
android:id="@+id/action_audio"
android:title="@string/audio_player"
app:showAsAction="never" />
</menu> </menu>