Fix crash with vectors drawables in Support Library 23.4 on < Marshmallow

Paolo Rotolo · Paolo Rotolo · commit cb06de477f21 · 2016-05-22T23:10:44.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,10 +32,11 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 22
+        versionCode 23
         versionName '1.0.0'
         applicationId "org.glucosio.android"
 
+        vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
     }
 
diff --git a/app/src/main/res/layout/activity_add_cholesterol.xml b/app/src/main/res/layout/activity_add_cholesterol.xml
@@ -53,7 +53,7 @@
             android:layout_marginBottom="-32dp"
             android:layout_marginRight="20dp"
             android:onClick="onFabClicked"
-            android:src="@drawable/ic_done_black_24dp"
+            app:srcCompat="@drawable/ic_done_black_24dp"
             app:backgroundTint="@color/glucosio_accent" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_add_glucose.xml b/app/src/main/res/layout/activity_add_glucose.xml
@@ -53,7 +53,7 @@
                 android:layout_marginBottom="-32dp"
                 android:layout_marginRight="20dp"
                 android:onClick="onFabClicked"
-                android:src="@drawable/ic_done_black_24dp"
+                app:srcCompat="@drawable/ic_done_black_24dp"
                 app:backgroundTint="@color/glucosio_accent" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_add_hb1ac.xml b/app/src/main/res/layout/activity_add_hb1ac.xml
@@ -53,7 +53,7 @@
             android:layout_marginBottom="-32dp"
             android:layout_marginRight="20dp"
             android:onClick="onFabClicked"
-            android:src="@drawable/ic_done_black_24dp"
+            app:srcCompat="@drawable/ic_done_black_24dp"
             app:backgroundTint="@color/glucosio_accent" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_add_ketone.xml b/app/src/main/res/layout/activity_add_ketone.xml
@@ -53,7 +53,7 @@
             android:layout_marginBottom="-32dp"
             android:layout_marginRight="20dp"
             android:onClick="onFabClicked"
-            android:src="@drawable/ic_done_black_24dp"
+            app:srcCompat="@drawable/ic_done_black_24dp"
             app:backgroundTint="@color/glucosio_accent" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_add_pressure.xml b/app/src/main/res/layout/activity_add_pressure.xml
@@ -53,7 +53,7 @@
             android:layout_marginBottom="-32dp"
             android:layout_marginRight="20dp"
             android:onClick="onFabClicked"
-            android:src="@drawable/ic_done_black_24dp"
+            app:srcCompat="@drawable/ic_done_black_24dp"
             app:backgroundTint="@color/glucosio_accent" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_add_weight.xml b/app/src/main/res/layout/activity_add_weight.xml
@@ -53,7 +53,7 @@
             android:layout_marginBottom="-32dp"
             android:layout_marginRight="20dp"
             android:onClick="onFabClicked"
-            android:src="@drawable/ic_done_black_24dp"
+            app:srcCompat="@drawable/ic_done_black_24dp"
             app:backgroundTint="@color/glucosio_accent" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
@@ -23,6 +23,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginBottom="16dp"
     android:layout_marginTop="16dp"
     android:background="#ffffff"
@@ -193,7 +194,7 @@
                     android:layout_marginLeft="2dp"
                     android:layout_marginBottom="4dp"
                     android:onClick="onA1cInfoClicked"
-                    android:src="@drawable/ic_error_outline_black_24dp"/>
+                    app:srcCompat="@drawable/ic_error_outline_black_24dp"/>
 
                 <TextView
                     android:id="@+id/fragment_overview_hb1ac"
@@ -221,7 +222,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:background="?android:attr/selectableItemBackground"
-                    android:src="@drawable/ic_unfold_more_black_24dp" />
+                    app:srcCompat="@drawable/ic_unfold_more_black_24dp" />
             </LinearLayout>
         </LinearLayout>
 
diff --git a/wear/build.gradle b/wear/build.gradle
@@ -29,7 +29,7 @@ android {
         applicationId "org.glucosio.android"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 22
+        versionCode 23
         versionName '1.0.0'
     }
     buildTypes {

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ android {`
`29`	`29`	`applicationId "org.glucosio.android"`
`30`	`30`	`minSdkVersion 21`
`31`	`31`	`targetSdkVersion 23`
`32`		`- versionCode 22`
	`32`	`+ versionCode 23`
`33`	`33`	`versionName '1.0.0'`
`34`	`34`	`}`
`35`	`35`	`buildTypes {`