Update to release 1.5.2

danimahardhika · web-flow · commit 39927c24c4e1 · 2017-01-13T19:44:39.000+07:00
- Fixed [#12](#12) - Fixed [#13](#13)
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarMainActivity.java b/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarMainActivity.java
@@ -480,7 +480,7 @@ public void OnWallpapersChecked(@Nullable Intent intent) {
 
                     ViewCompat.setBackground(counter, DrawableHelper.getTintedDrawable(this,
                             R.drawable.ic_toolbar_circle, accent));
-                    counter.setTextColor(ColorHelper.getTitleTextColor(this, accent));
+                    counter.setTextColor(ColorHelper.getTitleTextColor(accent));
                     int newItem = (size - offlineSize);
                     counter.setText(String.valueOf(newItem > 99 ? "99+" : newItem));
                     container.setVisibility(View.VISIBLE);
@@ -680,8 +680,8 @@ private void initHomeImage() {
     }
 
     private void initRateReviewFab() {
-        int color = ColorHelper.getTitleTextColor(this,
-                ColorHelper.getAttributeColor(this, R.attr.colorAccent));
+        int color = ColorHelper.getTitleTextColor(ColorHelper
+                .getAttributeColor(this, R.attr.colorAccent));
         Drawable icon = DrawableHelper.getTintedDrawable(this,
                 R.drawable.ic_fab_star, color);
         mFab.setImageDrawable(icon);
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarSplashActivity.java b/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarSplashActivity.java
@@ -40,8 +40,8 @@ public void initSplashActivity(Bundle savedInstanceState, Class<?> mainActivity,
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash);
 
-        int titleColor = ColorHelper.getTitleTextColor(this,
-                ContextCompat.getColor(this, R.color.splashColor));
+        int titleColor = ColorHelper.getTitleTextColor(ContextCompat
+                .getColor(this, R.color.splashColor));
         TextView splashTitle = (TextView) findViewById(R.id.splash_title);
         splashTitle.setTextColor(ColorHelper.setColorAlpha(titleColor, 0.6f ));
 
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarWallpaperActivity.java b/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarWallpaperActivity.java
@@ -180,6 +180,8 @@ public void onTransitionResume(Transition transition) {
         mRunnable = () -> {
             toolbar.setVisibility(View.VISIBLE);
             loadWallpaper(mUrl);
+            mRunnable = null;
+            mHandler = null;
         };
         mHandler = new Handler();
         mHandler.postDelayed(mRunnable, 700);
@@ -286,7 +288,7 @@ public void onLoadingStarted(String imageUri, View view) {
             @Override
             public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
                 super.onLoadingFailed(imageUri, view, failReason);
-                int text = ColorHelper.getTitleTextColor(CandyBarWallpaperActivity.this, mColor);
+                int text = ColorHelper.getTitleTextColor(mColor);
                 OnWallpaperLoaded(text);
 
                 int color = ColorHelper.getAttributeColor(CandyBarWallpaperActivity.this, R.attr.main_background);
@@ -311,7 +313,7 @@ public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
                                 CandyBarWallpaperActivity.this, R.attr.colorAccent);
                         int color = palette.getVibrantColor(accent);
                         mColor = color;
-                        int text = ColorHelper.getTitleTextColor(CandyBarWallpaperActivity.this, color);
+                        int text = ColorHelper.getTitleTextColor(color);
                         mFab.setBackgroundTintList(ColorHelper.getColorStateList(
                                 android.R.attr.state_pressed,
                                 color, ColorHelper.getDarkerColor(color, 0.9f)));
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/adapters/LauncherAdapter.java b/core/src/main/java/com/dm/material/dashboard/candybar/adapters/LauncherAdapter.java
@@ -10,6 +10,7 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.dm.material.dashboard.candybar.R;
 import com.dm.material.dashboard.candybar.helpers.LauncherHelper;
@@ -84,9 +85,17 @@ public void onClick(View view) {
             int position = getAdapterPosition();
             if (id == R.id.container) {
                 if (position < 0 || position > mLaunchers.size()) return;
-                LauncherHelper.apply(mContext,
-                        mLaunchers.get(position).getPackageName(),
-                        mLaunchers.get(position).getTitle());
+                try {
+                    LauncherHelper.apply(mContext,
+                            mLaunchers.get(position).getPackageName(),
+                            mLaunchers.get(position).getTitle());
+                } catch (SecurityException e) {
+                    Toast.makeText(mContext, mContext.getResources().getString(R.string.unable_launch)
+                                    + " " +mLaunchers.get(position).getTitle()+ " " +
+                                    mContext.getResources().getString(R.string.unable_launch2),
+                            Toast.LENGTH_LONG).show();
+                }
+
             }
         }
     }
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/adapters/WallpapersAdapter.java b/core/src/main/java/com/dm/material/dashboard/candybar/adapters/WallpapersAdapter.java
@@ -130,7 +130,7 @@ public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
                                     if (color == vibrant)
                                         color = palette.getMutedColor(vibrant);
                                     holder.card.setCardBackgroundColor(color);
-                                    int text = ColorHelper.getTitleTextColor(mContext, color);
+                                    int text = ColorHelper.getTitleTextColor(color);
                                     holder.name.setTextColor(text);
                                     holder.author.setTextColor(text);
                                 });
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/fragments/ApplyFragment.java b/core/src/main/java/com/dm/material/dashboard/candybar/fragments/ApplyFragment.java
@@ -134,7 +134,7 @@ private void initApplyTipsFab() {
         if (!Preferences.getPreferences(getActivity()).isShowApplyTips()) return;
 
         int accent = ColorHelper.getAttributeColor(getActivity(), R.attr.colorAccent);
-        int textColor = ColorHelper.getTitleTextColor(getActivity(), accent);
+        int textColor = ColorHelper.getTitleTextColor(accent);
         FloatingActionButton fab = (FloatingActionButton) getActivity()
                 .findViewById(R.id.apply_tips_fab);
         fab.setImageDrawable(DrawableHelper.getTintedDrawable(getActivity(),
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/fragments/IconsSearchFragment.java b/core/src/main/java/com/dm/material/dashboard/candybar/fragments/IconsSearchFragment.java
@@ -185,6 +185,9 @@ protected Boolean doInBackground(Void... voids) {
                 while (!isCancelled()) {
                     try {
                         Thread.sleep(1);
+                        if (!getActivity().getResources().getBoolean(R.bool.enable_icons_sort))
+                            return true;
+
                         Collections.sort(mIcons, new AlphanumComparator() {
                             @Override
                             public int compare(Object o1, Object o2) {
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/fragments/RequestFragment.java b/core/src/main/java/com/dm/material/dashboard/candybar/fragments/RequestFragment.java
@@ -124,8 +124,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
                 ColorHelper.getAttributeColor(getActivity(), R.attr.colorAccent),
                 PorterDuff.Mode.SRC_IN);
 
-        int color = ColorHelper.getTitleTextColor(getActivity(),
-                ColorHelper.getAttributeColor(getActivity(), R.attr.colorAccent));
+        int color = ColorHelper.getTitleTextColor(ColorHelper
+                .getAttributeColor(getActivity(), R.attr.colorAccent));
         mFab.setImageDrawable(DrawableHelper.getTintedDrawable(
                 getActivity(), R.drawable.ic_fab_send, color));
         mFab.setOnClickListener(this);
@@ -250,7 +250,7 @@ private void initPremiumRequest() {
         if (premiumRequest) {
             int accent = ColorHelper.getAttributeColor(getActivity(), R.attr.colorAccent);
             AppCompatButton buy = (AppCompatButton) getActivity().findViewById(R.id.premium_request_buy);
-            buy.setTextColor(ColorHelper.getTitleTextColor(getActivity(), accent));
+            buy.setTextColor(ColorHelper.getTitleTextColor(accent));
             buy.setOnClickListener(this);
 
             int toolbarIcon = ColorHelper.getAttributeColor(getActivity(), R.attr.toolbar_icon);
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/fragments/WallpapersFragment.java b/core/src/main/java/com/dm/material/dashboard/candybar/fragments/WallpapersFragment.java
@@ -179,7 +179,7 @@ private void initWallpaperTipsFab() {
         if (!Preferences.getPreferences(getActivity()).isShowWallpaperTips()) return;
 
         int accent = ColorHelper.getAttributeColor(getActivity(), R.attr.colorAccent);
-        int textColor = ColorHelper.getTitleTextColor(getActivity(), accent);
+        int textColor = ColorHelper.getTitleTextColor(accent);
         FloatingActionButton fab = (FloatingActionButton) getActivity()
                 .findViewById(R.id.wallpaper_tips_fab);
         fab.setImageDrawable(DrawableHelper.getTintedDrawable(getActivity(),
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/ColorHelper.java b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/ColorHelper.java
@@ -71,10 +71,9 @@ public static int getAttributeColor(@NonNull Context context, int attr) {
         return typedValue.data;
     }
 
-    public static int getTitleTextColor(@NonNull Context context, @ColorInt int color) {
+    public static int getTitleTextColor(@ColorInt int color) {
         double darkness = 1-(0.299*Color.red(color) + 0.587*Color.green(color) + 0.114*Color.blue(color))/255;
-        return (darkness < 0.35) ? getDarkerColor(color, 0.25f) :
-                ContextCompat.getColor(context, android.R.color.white);
+        return (darkness < 0.35) ? getDarkerColor(color, 0.25f) : Color.WHITE;
     }
 
     public static int setColorAlpha(@ColorInt int color, float alpha) {
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/WallpaperHelper.java b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/WallpaperHelper.java
@@ -196,11 +196,13 @@ protected void onPostExecute(Boolean aBoolean) {
                                     downloaded +" "+ file.toString(), 6000)
                                     .setAction(context.getResources().getString(R.string.open), view -> {
                                         try {
+                                            Uri uri = FileHelper.getUriFromFile(context, context.getPackageName(), file);
+                                            if (uri == null) return;
+
                                             context.startActivity(new Intent()
                                                     .setAction(Intent.ACTION_VIEW)
-                                                    .setDataAndType(Uri.fromFile(
-                                                            new File(file.toString())),
-                                                            "image/*"));
+                                                    .setDataAndType(uri, "image/*")
+                                                    .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION));
                                         } catch (ActivityNotFoundException e) {
                                             Toast.makeText(context,
                                                     context.getResources().getString(R.string.wallpaper_noapp),
diff --git a/core/src/main/res/xml/file_provider_paths.xml b/core/src/main/res/xml/file_provider_paths.xml
@@ -3,4 +3,7 @@
     <cache-path
         name="cache"
         path="/" />
+    <external-path
+        name="external_files"
+        path="."/>
 </paths>

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,9 @@ public static int getAttributeColor(@NonNull Context context, int attr) {`
`71`	`71`	`return typedValue.data;`
`72`	`72`	`}`
`73`	`73`
`74`		`- public static int getTitleTextColor(@NonNull Context context, @ColorInt int color) {`
	`74`	`+ public static int getTitleTextColor(@ColorInt int color) {`
`75`	`75`	`double darkness = 1-(0.299Color.red(color) + 0.587Color.green(color) + 0.114*Color.blue(color))/255;`
`76`		`- return (darkness < 0.35) ? getDarkerColor(color, 0.25f) :`
`77`		`- ContextCompat.getColor(context, android.R.color.white);`
	`76`	`+ return (darkness < 0.35) ? getDarkerColor(color, 0.25f) : Color.WHITE;`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`public static int setColorAlpha(@ColorInt int color, float alpha) {`