fix issue #9

lguipeng · Dec 6, 2015 · e8d5a04 · e8d5a04
1 parent 06a35ce
commit e8d5a04
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/apk/notes_v2.0.0_201509181346.apk b/apk/notes_v2.0.0_201509181346.apk
diff --git a/app/src/main/java/com/lguipeng/notes/ui/BaseActivity.java b/app/src/main/java/com/lguipeng/notes/ui/BaseActivity.java
@@ -40,9 +40,12 @@ private void initTheme(){
         ThemeUtils.changTheme(this, theme);
     }
 
-    public int getColor(@ColorRes int res){
+    public int getCompactColor(@ColorRes int res){
         if (res <= 0)
             throw new IllegalArgumentException("resource id can not be less 0");
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+            getColor(res);
+        }
         return getResources().getColor(res);
     }
 

diff --git a/app/src/main/java/com/lguipeng/notes/ui/MainActivity.java b/app/src/main/java/com/lguipeng/notes/ui/MainActivity.java
@@ -149,7 +149,7 @@ public void onDrawerClosed(View drawerView) {
         };
         mDrawerToggle.setDrawerIndicatorEnabled(true);
         mDrawerLayout.setDrawerListener(mDrawerToggle);
-        mDrawerLayout.setScrimColor(getColor(R.color.drawer_scrim_color));
+        mDrawerLayout.setScrimColor(getCompactColor(R.color.drawer_scrim_color));
     }
 
     @Override

diff --git a/app/src/main/java/com/lguipeng/notes/utils/ToolbarUtils.java b/app/src/main/java/com/lguipeng/notes/utils/ToolbarUtils.java
@@ -15,7 +15,7 @@ public static void initToolbar(Toolbar toolbar, BaseActivity activity){
             return;
         toolbar.setBackgroundColor(activity.getColorPrimary());
         toolbar.setTitle(R.string.app_name);
-        toolbar.setTitleTextColor(activity.getColor(R.color.action_bar_title_color));
+        toolbar.setTitleTextColor(activity.getCompactColor(R.color.action_bar_title_color));
         toolbar.collapseActionView();
         activity.setSupportActionBar(toolbar);
         if (activity.getSupportActionBar() != null){