Skip to content
Snippets Groups Projects
Commit e508930b authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Avoids crashes on Android 4.4 or older

parent 49603205
Branches
Tags
No related merge requests found
......@@ -219,9 +219,9 @@ class BufferListAdapter(
itemView.isSelected = state.selected
if (state.networkExpanded) {
status.setImageDrawable(itemView.context.getDrawableCompat(R.drawable.ic_chevron_up))
status.setImageResource(R.drawable.ic_chevron_up)
} else {
status.setImageDrawable(itemView.context.getDrawableCompat(R.drawable.ic_chevron_down))
status.setImageResource(R.drawable.ic_chevron_down)
}
}
}
......@@ -268,8 +268,8 @@ class BufferListAdapter(
}
}
online = itemView.context.getDrawableCompat(R.drawable.ic_status)?.mutate()
offline = itemView.context.getDrawableCompat(R.drawable.ic_status_offline)?.mutate()
online = itemView.context.getVectorDrawableCompat(R.drawable.ic_status)?.mutate()
offline = itemView.context.getVectorDrawableCompat(R.drawable.ic_status_offline)?.mutate()
itemView.context.theme.styledAttributes(
R.attr.colorAccent, R.attr.colorAway,
......@@ -356,8 +356,8 @@ class BufferListAdapter(
}
}
online = itemView.context.getDrawableCompat(R.drawable.ic_status_channel)?.mutate()
offline = itemView.context.getDrawableCompat(R.drawable.ic_status_channel_offline)?.mutate()
online = itemView.context.getVectorDrawableCompat(R.drawable.ic_status_channel)?.mutate()
offline = itemView.context.getVectorDrawableCompat(R.drawable.ic_status_channel_offline)?.mutate()
itemView.context.theme.styledAttributes(
R.attr.colorAccent, R.attr.colorAway,
......@@ -445,9 +445,9 @@ class BufferListAdapter(
}
}
online = itemView.context.getDrawableCompat(R.drawable.ic_status)?.mutate()
away = itemView.context.getDrawableCompat(R.drawable.ic_status)?.mutate()
offline = itemView.context.getDrawableCompat(R.drawable.ic_status_offline)?.mutate()
online = itemView.context.getVectorDrawableCompat(R.drawable.ic_status)?.mutate()
away = itemView.context.getVectorDrawableCompat(R.drawable.ic_status)?.mutate()
offline = itemView.context.getVectorDrawableCompat(R.drawable.ic_status_offline)?.mutate()
itemView.context.theme.styledAttributes(
R.attr.colorAccent, R.attr.colorAway,
......
......@@ -69,7 +69,7 @@ class QuasseldroidNotificationManager(private val context: Context) {
.setContentIntent(pendingIntentOpen)
.addAction(0, context.getString(R.string.label_open), pendingIntentOpen)
.addAction(0, context.getString(R.string.label_disconnect), pendingIntentDisconnect)
.setSmallIcon(R.drawable.ic_logo)
.setSmallIcon(R.mipmap.ic_logo)
.setColor(context.getColorCompat(R.color.colorPrimary))
.setPriority(NotificationCompat.PRIORITY_MIN)
return Handle(BACKGROUND_NOTIFICATION_ID, notification)
......
......@@ -7,6 +7,7 @@ import android.preference.PreferenceManager
import android.support.annotation.ColorInt
import android.support.annotation.ColorRes
import android.support.annotation.DrawableRes
import android.support.graphics.drawable.VectorDrawableCompat
import android.support.v4.content.ContextCompat
inline fun <reified T> Context.systemService(): T =
......@@ -18,6 +19,9 @@ inline fun <reified T> Context.systemService(): T =
fun Context.getDrawableCompat(@DrawableRes id: Int) = ContextCompat.getDrawable(this, id)
fun Context.getVectorDrawableCompat(@DrawableRes id: Int) =
VectorDrawableCompat.create(this.resources, id, this.theme)
@ColorInt
fun Context.getColorCompat(@ColorRes id: Int) = ContextCompat.getColor(this, id)
......
......@@ -10,7 +10,7 @@
android:paddingRight="16dp"
android:paddingTop="8dp">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/status"
android:layout_width="24dp"
android:layout_height="24dp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment