From 7ae4a4be97112ec741bc8a0cb77edd6c8d450a35 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 17 Apr 2019 20:11:46 +0200
Subject: [PATCH] Fix crashes

---
 .../kuschku/quasseldroid/util/ui/view/BannerView.kt  | 12 +++++++++++-
 app/src/main/res/layout/widget_banner.xml            |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/view/BannerView.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/view/BannerView.kt
index 49ab369a7..842f8ac8e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/view/BannerView.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/view/BannerView.kt
@@ -20,6 +20,7 @@
 package de.kuschku.quasseldroid.util.ui.view
 
 import android.content.Context
+import android.graphics.drawable.LayerDrawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
@@ -29,6 +30,7 @@ import androidx.appcompat.widget.AppCompatImageView
 import butterknife.BindView
 import butterknife.ButterKnife
 import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.util.helper.styledAttributes
 import de.kuschku.quasseldroid.util.helper.use
 
 class BannerView : FrameLayout {
@@ -50,9 +52,17 @@ class BannerView : FrameLayout {
   constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
     super(context, attrs, defStyleAttr) {
 
-    LayoutInflater.from(context).inflate(R.layout.widget_banner, this, true)
+    val content = LayoutInflater.from(context).inflate(R.layout.widget_banner, this, true)
     ButterKnife.bind(this)
 
+    context.theme.styledAttributes(R.attr.colorBackgroundSnackbar,
+                                   R.attr.selectableItemBackground) {
+      content.background = LayerDrawable(arrayOf(
+        getDrawable(0),
+        getDrawable(1)
+      ))
+    }
+
     context.theme.obtainStyledAttributes(attrs, R.styleable.BannerView, 0, 0).use {
       if (it.hasValue(R.styleable.BannerView_icon))
         icon.setImageResource(it.getResourceId(R.styleable.BannerView_icon, 0))
diff --git a/app/src/main/res/layout/widget_banner.xml b/app/src/main/res/layout/widget_banner.xml
index dd024f255..902e0adc6 100644
--- a/app/src/main/res/layout/widget_banner.xml
+++ b/app/src/main/res/layout/widget_banner.xml
@@ -22,9 +22,9 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="@drawable/bg_banner"
   android:baselineAligned="false"
   android:clipToPadding="false"
+  android:id="@android:id/content"
   android:focusable="true"
   android:orientation="vertical"
   android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
-- 
GitLab