Toolbar icon color fixes.

This commit is contained in:
casey langen 2019-04-02 18:14:36 -07:00
parent b5127df351
commit e8223d22ad
4 changed files with 11 additions and 7 deletions

View File

@ -10,6 +10,7 @@ import android.os.Handler
import android.view.*
import android.widget.*
import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat
import androidx.fragment.app.DialogFragment
import com.wooplr.spotlight.SpotlightView
import io.casey.musikcube.remote.R
@ -29,10 +30,7 @@ import io.casey.musikcube.remote.ui.settings.activity.RemoteSettingsActivity
import io.casey.musikcube.remote.ui.settings.activity.SettingsActivity
import io.casey.musikcube.remote.ui.settings.constants.Prefs
import io.casey.musikcube.remote.ui.shared.activity.BaseActivity
import io.casey.musikcube.remote.ui.shared.extension.getColorCompat
import io.casey.musikcube.remote.ui.shared.extension.setCheckWithoutEvent
import io.casey.musikcube.remote.ui.shared.extension.showSnackbar
import io.casey.musikcube.remote.ui.shared.extension.toolbar
import io.casey.musikcube.remote.ui.shared.extension.*
import io.casey.musikcube.remote.ui.shared.mixin.DataProviderMixin
import io.casey.musikcube.remote.ui.shared.mixin.PlaybackMixin
import io.casey.musikcube.remote.ui.shared.util.Duration
@ -116,10 +114,15 @@ class MainActivity : BaseActivity() {
val remoteToggle = menu.findItem(R.id.action_remote_toggle)
remoteToggle.actionView?.findViewById<ImageView>(R.id.icon)?.setImageResource(
val drawable = getDrawable(
if (streaming) R.drawable.ic_toolbar_streaming
else R.drawable.ic_toolbar_remote)
drawable?.setTint(ContextCompat.getColor(this, R.color.theme_foreground))
remoteToggle.actionView?.findViewById<ImageView>(R.id.icon)?.setImageDrawable(drawable)
remoteToggle.actionView?.setOnClickListener {
togglePlaybackService()
}

View File

@ -7,6 +7,7 @@ import android.content.SharedPreferences
import android.content.res.Resources
import android.os.Bundle
import android.text.TextUtils
import android.util.TypedValue
import android.view.Menu
import android.view.View
import android.view.inputmethod.InputMethodManager

View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="?attr/colorControlNormal" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
<path android:fillColor="@color/theme_foreground" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>

View File

@ -1,5 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="?attr/colorControlNormal" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
<path android:fillColor="@color/theme_foreground" android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
</vector>