适配低版本

5 files changed, 24 insertions, 10 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 2efa213..827c4ed 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,11 +5,12 @@ android {
     buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "top.trumeet.snippet.aospanimation"
-        minSdkVersion 21
+        minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -25,4 +26,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:0.5'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
+    implementation 'com.android.support:appcompat-v7:26.0.0-beta1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d715a07..874160c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.AppCompat.Light">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/top/trumeet/snippet/aospanimation/MainActivity.java b/app/src/main/java/top/trumeet/snippet/aospanimation/MainActivity.java
index 661b2da..eb83625 100644
--- a/app/src/main/java/top/trumeet/snippet/aospanimation/MainActivity.java
+++ b/app/src/main/java/top/trumeet/snippet/aospanimation/MainActivity.java
@@ -1,8 +1,13 @@
 package top.trumeet.snippet.aospanimation;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.support.graphics.drawable.AnimatedVectorDrawableCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.content.res.AppCompatResources;
+import android.support.v7.widget.AppCompatImageView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
@@ -14,15 +19,19 @@ import top.trumeet.snippet.aospanimation.library.drawables.LoopAnimatedVectorDra
  * Demo activity
  */
 
-public class MainActivity extends Activity {
+public class MainActivity extends AppCompatActivity {
     private LoopAnimatedVectorDrawableCompat mFingerprintAnimator;
+    @SuppressLint("RestrictedApi")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ImageView fingerprintIsolated = findViewById(R.id.fingerprint_animator);
+        AppCompatImageView fingerprintIsolated = findViewById(R.id.fingerprint_animator);
         mFingerprintAnimator = new LoopAnimatedVectorDrawableCompat(AnimatedVectorDrawableCompat.create(this,
                 R.drawable.enrollment_fingerprint_isolated_animation));
+        fingerprintIsolated.setBackgroundDrawable(AppCompatResources.getDrawable(this, top.trumeet.snippet.aospanimation.library.R.drawable.fp_illustration_enrollment));
+        fingerprintIsolated.setSupportBackgroundTintList(ColorStateList.valueOf(getResources().getColor(top.trumeet.snippet.aospanimation.library.R.color.fingerprint_indicator_background_resting)));
+
         fingerprintIsolated.setImageDrawable(mFingerprintAnimator.getDrawable());
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1cf0dc6..8a157d8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <LinearLayout
@@ -7,11 +8,12 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <ImageView
+        <android.support.v7.widget.AppCompatImageView
             android:id="@+id/fingerprint_animator"
             android:layout_width="@dimen/fingerprint_animation_size"
             android:layout_height="@dimen/fingerprint_animation_size"
-            android:background="@drawable/fp_illustration_enrollment"
-            android:backgroundTint="@color/fingerprint_indicator_background_resting" />
+            app:background="@drawable/fp_illustration_enrollment"
+            app:backgroundTint="@color/fingerprint_indicator_background_resting"
+            />
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/library/build.gradle b/library/build.gradle
index 8d8d745..a752f5e 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -8,11 +8,11 @@ android {
 
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
-
+        vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
     }
@@ -26,8 +26,9 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:animated-vector-drawable:26.0.0'
+    compile 'com.android.support:animated-vector-drawable:26.0.0-beta1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:0.5'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
+    implementation 'com.android.support:appcompat-v7:26.0.0-beta1'
 }