Change root snackbar element to “view”, upgrade to 25.1.0

Blankj · Jan 5, 2017 · 148b47d · 148b47d
1 parent 169a063
commit 148b47d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 61 deletions.
diff --git a/config.gradle b/config.gradle
@@ -6,16 +6,16 @@ ext {
     ]
 
     android = [
-            compileSdkVersion : 24,
+            compileSdkVersion : 25,
-            buildToolsVersion : "24.0.3",
+            buildToolsVersion : "25.0.2",
             minSdkVersion     : 11,
-            targetSdkVersion  : 24,
+            targetSdkVersion  : 25,
             versionCode       : 14,
             versionName       : "1.3.5"
     ]
 
     depsVersion = [
-            support : "24.0.0"
+            support : "25.1.0"
     ]
 
     deps = [
@@ -37,4 +37,4 @@ ext {
             truth       : 'com.google.truth:truth:0.29',
             robolectric : 'org.robolectric:robolectric:3.1.2'
     ]
-}
+}
diff --git a/utilcode/build.gradle b/utilcode/build.gradle
@@ -21,9 +21,10 @@ android {
 dependencies {
     provided rootProject.ext.deps.design
     provided rootProject.ext.deps.supportV4
+    provided rootProject.ext.deps.appcompatV7
     testCompile rootProject.ext.deps.junit
     testCompile rootProject.ext.deps.truth
     testCompile rootProject.ext.deps.robolectric
 }
 apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
-//gradlew bintrayUpload
+//gradlew bintrayUpload
diff --git a/utilcode/src/main/java/com/blankj/utilcode/utils/SnackbarUtils.java b/utilcode/src/main/java/com/blankj/utilcode/utils/SnackbarUtils.java
@@ -6,9 +6,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.blankj.utilcode.R;
 
 import java.lang.ref.WeakReference;
 
@@ -140,8 +137,9 @@ private static void showSnackbar(View parent, CharSequence text, int duration, @
             case Snackbar.LENGTH_INDEFINITE:
                 snackbarWeakReference = new WeakReference<>(Snackbar.make(parent, text, Snackbar.LENGTH_INDEFINITE).setDuration(duration));
         }
-        View view = snackbarWeakReference.get().getView();
+        Snackbar snackbar = snackbarWeakReference.get();
-        ((TextView) view.findViewById(R.id.snackbar_text)).setTextColor(textColor);
+        View view = snackbar.getView();
+        snackbar.setActionTextColor(textColor);
         view.setBackgroundColor(bgColor);
         if (actionText != null && actionText.length() > 0 && listener != null) {
             snackbarWeakReference.get().setActionTextColor(actionTextColor);
@@ -180,4 +178,4 @@ public static void dismissSnackbar() {
             snackbarWeakReference = null;
         }
     }
-}
+}
diff --git a/utilcode/src/main/res/layout/design_layout_snackbar_include.xml b/utilcode/src/main/res/layout/design_layout_snackbar_include.xml