Fixed vector related crash on 4.4

Author: glodanif

app/build.gradle

@@ -1,5 +1,5 @@
-def final VERSION_CODE = 2
-def final VERSION_NAME = '1.0.0-alpha2'
+def final VERSION_CODE = 3
+def final VERSION_NAME = '1.0.0-alpha3'
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'

app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ChatActivity.kt

@@ -9,6 +9,7 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.support.v7.app.AppCompatDelegate
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
@@ -51,6 +52,7 @@ class ChatActivity : AppCompatActivity(), ChatView {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         setContentView(R.layout.activity_chat)
         toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)

app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ConversationsActivity.kt

@@ -10,6 +10,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.support.design.widget.FloatingActionButton
 import android.support.v7.app.AppCompatActivity
+import android.support.v7.app.AppCompatDelegate
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
@@ -52,6 +53,7 @@ class ConversationsActivity : AppCompatActivity(), ConversationsView {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         setContentView(R.layout.activity_conversations)
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)

app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ProfileActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.support.annotation.ColorInt
+import android.support.v7.app.AppCompatDelegate
 import android.support.v7.widget.Toolbar
 import android.view.MenuItem
 import android.view.View
@@ -39,6 +40,7 @@ class ProfileActivity : AppCompatActivity(), ProfileView {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         setContentView(R.layout.activity_profile)
 
         editMode = intent.getBooleanExtra(EXTRA_EDIT_MODE, false)

app/src/main/kotlin/com/glodanif/bluetoothchat/activity/ScanActivity.kt

@@ -14,6 +14,7 @@ import android.os.Bundle
 import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
+import android.support.v7.app.AppCompatDelegate
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
@@ -55,6 +56,7 @@ class ScanActivity : AppCompatActivity(), ScanView {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         setContentView(R.layout.activity_scan)
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)

app/src/main/kotlin/com/glodanif/bluetoothchat/activity/SplashActivity.kt

@@ -3,13 +3,15 @@ package com.glodanif.bluetoothchat.activity
 import android.os.Bundle
 import android.os.Handler
 import android.support.v7.app.AppCompatActivity
+import android.support.v7.app.AppCompatDelegate
 import com.glodanif.bluetoothchat.R
 import com.glodanif.bluetoothchat.model.SettingsManagerImpl
 
 class SplashActivity: AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         setContentView(R.layout.activity_splash)
 
         Handler().postDelayed({

app/src/main/kotlin/com/glodanif/bluetoothchat/widget/SettingsPopup.kt

@@ -38,7 +38,6 @@ class SettingsPopup(context: Context) : PopupWindow() {
     private var container: View
     private var avatar: ImageView
     private var userNameLabel: TextView
-    private var settingsButton: View
 
     private var isDismissing: Boolean = false
 
@@ -61,14 +60,13 @@ class SettingsPopup(context: Context) : PopupWindow() {
         container = rootView.findViewById(R.id.fl_container)
         avatar = rootView.findViewById<ImageView>(R.id.iv_avatar)
         userNameLabel = rootView.findViewById<TextView>(R.id.tv_username)
-        settingsButton = rootView.findViewById(R.id.tv_settings_button)
 
         rootView.findViewById<View>(R.id.ll_user_profile_container).setOnClickListener({
             dismiss()
             profileClickListener?.invoke()
         })
 
-        rootView.findViewById<View>(R.id.tv_settings_button).setOnClickListener({
+        rootView.findViewById<View>(R.id.ll_settings_button).setOnClickListener({
             dismiss()
             settingsClickListener?.invoke()
         })

app/src/main/res/layout/popup_settings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/fl_container"
     android:layout_width="wrap_content"
@@ -51,21 +52,31 @@
                 android:layout_height="1dp"
                 android:background="@color/text_dark" />
 
-            <TextView
-                android:id="@+id/tv_settings_button"
+            <LinearLayout
+                android:id="@+id/ll_settings_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
-                android:drawablePadding="8dp"
-                android:drawableStart="@drawable/ic_settings_black_24dp"
                 android:focusable="true"
                 android:gravity="center_vertical"
-                android:padding="12dp"
-                android:text="@string/conversations__settings"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:orientation="horizontal"
+                android:padding="12dp">
+
+                <ImageView
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginEnd="8dp"
+                    app:srcCompat="@drawable/ic_settings_black_24dp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/conversations__settings"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
 
+            </LinearLayout>
         </LinearLayout>
     </android.support.v7.widget.CardView>
 </FrameLayout>