Merge pull request #112 from spacecowboy/srccompat

Use `srcCompat` for vector drawables
spacecowboy · Sep 30, 2016 · 6d1bfec · 6d1bfec
2 parents e4167c3 + f460071
commit 6d1bfec
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -10,6 +10,7 @@ android {
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {

diff --git a/library/build.gradle b/library/build.gradle
@@ -22,6 +22,7 @@ android {
         targetSdkVersion 23
         versionCode gitCommitCount
         versionName gitTag
+        vectorDrawables.useSupportLibrary = true
     }
 }
 

diff --git a/library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml b/library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml
@@ -6,6 +6,7 @@
   ~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
   -->
 <LinearLayout 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/nnf_item_container"
     android:layout_width="match_parent"
@@ -25,7 +26,7 @@
         android:layout_height="?android:listPreferredItemHeight"
         android:adjustViewBounds="true"
         android:scaleType="center"
-        android:src="@drawable/nnf_ic_folder_black_48dp"
+        app:srcCompat="@drawable/nnf_ic_folder_black_48dp"
         android:tint="?attr/nnf_dir_icon_color"
         android:visibility="visible"
         tools:ignore="ContentDescription" />
@@ -53,4 +54,4 @@
         android:paddingRight="8dp"
         tools:ignore="RtlSymmetry" />
 
-</LinearLayout>
+</LinearLayout>
diff --git a/library/src/main/res/layout/nnf_filepicker_listitem_dir.xml b/library/src/main/res/layout/nnf_filepicker_listitem_dir.xml
@@ -6,6 +6,7 @@
   ~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
   -->
 <LinearLayout 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/nnf_item_container"
     android:layout_width="match_parent"
@@ -24,7 +25,7 @@
         android:layout_height="?android:listPreferredItemHeight"
         android:adjustViewBounds="true"
         android:scaleType="center"
-        android:src="@drawable/nnf_ic_folder_black_48dp"
+        app:srcCompat="@drawable/nnf_ic_folder_black_48dp"
         android:tint="?attr/nnf_dir_icon_color"
         android:visibility="visible"
         tools:ignore="ContentDescription" />
@@ -41,4 +42,4 @@
         android:padding="8dp"
         android:singleLine="true"
         android:text="@string/nnf_name" />
-</LinearLayout>
+</LinearLayout>
diff --git a/library/src/main/res/layout/nnf_fragment_filepicker.xml b/library/src/main/res/layout/nnf_fragment_filepicker.xml
@@ -10,6 +10,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"
     tools:context=".FilePickerActivity">
 
     <android.support.v7.widget.Toolbar
@@ -92,7 +93,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:hint="@android:string/ok"
-                android:src="@drawable/nnf_ic_save_black_24dp"
+                app:srcCompat="@drawable/nnf_ic_save_black_24dp"
                 android:tint="?attr/nnf_save_icon_color"/>
 
         </LinearLayout>
@@ -104,4 +105,4 @@
         android:layout_height="1dp"
         android:layout_above="@id/nnf_buttons_container"
         android:background="?nnf_separator_color"/>
-</RelativeLayout>
+</RelativeLayout>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -30,6 +30,7 @@ android {
         versionName gitTag
         archivesBaseName = "nononsensefilepicker-sample-${gitTag}".toString()
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        vectorDrawables.useSupportLibrary = true
     }
 
     buildTypes {

diff --git a/sample/src/main/res/layout/fragment_fastscrollerfilepicker.xml b/sample/src/main/res/layout/fragment_fastscrollerfilepicker.xml
@@ -96,7 +96,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:hint="@android:string/ok"
-                android:src="@drawable/nnf_ic_save_black_24dp"
+                app:srcCompat="@drawable/nnf_ic_save_black_24dp"
                 android:tint="?attr/nnf_save_icon_color"/>
 
         </LinearLayout>
@@ -108,4 +108,4 @@
         android:layout_height="1dp"
         android:layout_above="@id/nnf_buttons_container"
         android:background="?nnf_separator_color"/>
-</RelativeLayout>
+</RelativeLayout>
diff --git a/sample/src/main/res/layout/fragment_loading_filepicker.xml b/sample/src/main/res/layout/fragment_loading_filepicker.xml
@@ -9,6 +9,7 @@
 <!-- This file is just a copy of the normal nnf_fragment_filepicker, with an added progress bar -->
 
 <RelativeLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -103,7 +104,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:hint="@android:string/ok"
-                android:src="@drawable/nnf_ic_save_black_24dp"
+                app:srcCompat="@drawable/nnf_ic_save_black_24dp"
                 android:tint="?attr/nnf_save_icon_color"/>
 
         </LinearLayout>
@@ -113,6 +114,6 @@
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_above="@id/nnf_button_container"
+        android:layout_above="@id/nnf_buttons_container"
         android:background="?nnf_separator_color"/>
-</RelativeLayout>
+</RelativeLayout>