sync toolbar elements' color

lhn200835 · May 10, 2017 · 557e79d · 557e79d
1 parent 4d74422
commit 557e79d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java b/matisse/src/main/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java
@@ -16,7 +16,10 @@
 package com.zhihu.matisse.internal.ui.widget;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.database.Cursor;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.ListPopupWindow;
@@ -95,6 +98,15 @@ public void setAdapter(CursorAdapter adapter) {
 
     public void setSelectedTextView(TextView textView) {
         mSelected = textView;
+        // tint dropdown arrow icon
+        Drawable[] drawables = mSelected.getCompoundDrawables();
+        Drawable right = drawables[2];
+        TypedArray ta = mSelected.getContext().getTheme().obtainStyledAttributes(
+                new int[]{R.attr.album_element_color});
+        int color = ta.getColor(0, 0);
+        ta.recycle();
+        right.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+
         mSelected.setVisibility(View.GONE);
         mSelected.setOnClickListener(new View.OnClickListener() {
 

diff --git a/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java b/matisse/src/main/java/com/zhihu/matisse/ui/MatisseActivity.java
@@ -17,7 +17,10 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.database.Cursor;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -93,10 +96,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             mMediaStoreCompat.setCaptureStrategy(spec.captureStrategy);
         }
 
-        setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayShowTitleEnabled(false);
         actionBar.setDisplayHomeAsUpEnabled(true);
+        Drawable navigationIcon = toolbar.getNavigationIcon();
+        TypedArray ta = getTheme().obtainStyledAttributes(new int[]{R.attr.album_element_color});
+        int color = ta.getColor(0, 0);
+        ta.recycle();
+        navigationIcon.setColorFilter(color, PorterDuff.Mode.SRC_IN);
 
         mButtonPreview = (TextView) findViewById(R.id.button_preview);
         mButtonApply = (TextView) findViewById(R.id.button_apply);

diff --git a/matisse/src/main/res/layout/activity_matisse.xml b/matisse/src/main/res/layout/activity_matisse.xml
@@ -37,7 +37,7 @@
             android:drawableRight="@drawable/ic_arrow_drop_down_white_24dp"
             android:foreground="?selectableItemBackground"
             android:gravity="center"
-            android:textColor="?attr/album.selected.title.color"
+            android:textColor="?attr/album.element.color"
             android:textSize="20sp"/>
     </android.support.v7.widget.Toolbar>
 

diff --git a/matisse/src/main/res/values/attrs.xml b/matisse/src/main/res/values/attrs.xml
@@ -18,7 +18,7 @@
     <attr name="toolbar" format="reference"/>
     <attr name="album.dropdown.title.color" format="reference|color"/>
     <attr name="album.dropdown.count.color" format="reference|color"/>
-    <attr name="album.selected.title.color" format="reference|color"/>
+    <attr name="album.element.color" format="reference|color"/>
     <attr name="album.thumbnail.placeholder" format="reference|color"/>
     <attr name="album.emptyView" format="reference"/>
     <attr name="album.emptyView.textColor" format="reference|color"/>

diff --git a/matisse/src/main/res/values/styles.xml b/matisse/src/main/res/values/styles.xml
@@ -24,7 +24,7 @@
         <item name="toolbar">@style/Toolbar.Zhihu</item>
         <item name="album.dropdown.title.color">@color/zhihu_album_dropdown_title_text</item>
         <item name="album.dropdown.count.color">@color/zhihu_album_dropdown_count_text</item>
-        <item name="album.selected.title.color">@android:color/white</item>
+        <item name="album.element.color">@android:color/white</item>
         <item name="album.thumbnail.placeholder">@color/zhihu_album_dropdown_thumbnail_placeholder</item>
         <item name="album.emptyView">@drawable/ic_empty_zhihu</item>
         <item name="album.emptyView.textColor">@color/zhihu_album_empty_view</item>
@@ -53,7 +53,7 @@
         <item name="toolbar">@style/Toolbar.Dracula</item>
         <item name="album.dropdown.title.color">@color/dracula_album_dropdown_title_text</item>
         <item name="album.dropdown.count.color">@color/dracula_album_dropdown_count_text</item>
-        <item name="album.selected.title.color">@android:color/white</item>
+        <item name="album.element.color">@android:color/white</item>
         <item name="album.thumbnail.placeholder">@color/dracula_album_dropdown_thumbnail_placeholder</item>
         <item name="album.emptyView">@drawable/ic_empty_dracula</item>
         <item name="album.emptyView.textColor">@color/dracula_album_empty_view</item>