From bcaa7affd12347f84a0eaf89cdd1d4f37599ffeb Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Wed, 18 May 2016 08:50:52 +0800
Subject: [PATCH] improved hide/show card actions

---
 .../twidere/adapter/BaseRecyclerViewAdapter.java   |  7 +++++++
 .../twidere/adapter/ParcelableStatusesAdapter.java | 14 +++++++++-----
 .../mariotaku/twidere/fragment/UserFragment.java   |  5 ++---
 .../org/mariotaku/twidere/util/IntentUtils.java    |  1 +
 .../org/mariotaku/twidere/util/ThemeUtils.java     |  5 +++++
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.java
index a3900c96e..289160858 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseRecyclerViewAdapter.java
@@ -97,4 +97,11 @@ public abstract class BaseRecyclerViewAdapter<VH extends RecyclerView.ViewHolder
     public final BidiFormatter getBidiFormatter() {
         return mBidiFormatter;
     }
+
+    public int findPositionByItemId(long itemId) {
+        for (int i = 0, j = getItemCount(); i < j; i++) {
+            if (getItemId(i) == itemId) return i;
+        }
+        return RecyclerView.NO_POSITION;
+    }
 }
diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java
index 5c0d3e6c5..1f88d08fd 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java
@@ -81,7 +81,7 @@ public abstract class ParcelableStatusesAdapter extends LoadMoreSupportAdapter<R
     private boolean mShowInReplyTo;
     private boolean mShowAccountsColor;
     private List<ParcelableStatus> mData;
-    private int mShowingActionCardPosition = RecyclerView.NO_POSITION;
+    private long mShowingActionCardId = RecyclerView.NO_ID;
     private boolean mLastItemFiltered;
 
     public ParcelableStatusesAdapter(Context context, boolean compact) {
@@ -302,15 +302,19 @@ public abstract class ParcelableStatusesAdapter extends LoadMoreSupportAdapter<R
     @Override
     public boolean isCardActionsShown(int position) {
         if (position == RecyclerView.NO_POSITION) return mShowCardActions;
-        return mShowCardActions || mShowingActionCardPosition == position;
+        return mShowCardActions || mShowingActionCardId == getItemId(position);
     }
 
     @Override
     public void showCardActions(int position) {
-        if (mShowingActionCardPosition != RecyclerView.NO_POSITION) {
-            notifyItemChanged(mShowingActionCardPosition);
+        if (mShowingActionCardId != RecyclerView.NO_ID) {
+            final int pos = findPositionByItemId(mShowingActionCardId);
+            if (pos != RecyclerView.NO_POSITION) {
+                notifyItemChanged(pos);
+            }
+
         }
-        mShowingActionCardPosition = position;
+        mShowingActionCardId = getItemId(position);
         if (position != RecyclerView.NO_POSITION) {
             notifyItemChanged(position);
         }
diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java
index 833f82e92..3d07daaaf 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/UserFragment.java
@@ -82,7 +82,6 @@ import android.widget.TextView;
 
 import com.afollestad.appthemeengine.ATEActivity;
 import com.afollestad.appthemeengine.Config;
-import com.afollestad.appthemeengine.util.ATEUtil;
 import com.squareup.otto.Subscribe;
 
 import org.apache.commons.lang3.ObjectUtils;
@@ -1482,7 +1481,7 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
         final BaseActivity activity = (BaseActivity) getActivity();
         if (Config.coloredActionBar(activity, activity.getATEKey())) {
             mPrimaryColor = color;
-            mPrimaryColorDark = ATEUtil.darkenColor(color);
+            mPrimaryColorDark = ThemeUtils.computeDarkColor(color);
         } else {
             mPrimaryColor = Config.primaryColor(activity, activity.getATEKey());
             mPrimaryColorDark = Color.BLACK;
@@ -1574,7 +1573,7 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
 
 
         final int statusBarColor = (int) sArgbEvaluator.evaluate(factor, 0xA0000000,
-                ATEUtil.darkenColor(mPrimaryColorDark));
+                ThemeUtils.computeDarkColor(mPrimaryColorDark));
         final Window window = activity.getWindow();
         mTintedStatusFrameLayout.setStatusBarColor(statusBarColor);
         ThemeUtils.setLightStatusBar(window, ThemeUtils.isLightColor(statusBarColor));
diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/IntentUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/IntentUtils.java
index 58f9f2d0c..5dd0faa86 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/IntentUtils.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/IntentUtils.java
@@ -216,6 +216,7 @@ public class IntentUtils implements Constants {
 
         final ComponentName componentName = intent.resolveActivity(context.getPackageManager());
         if (componentName == null || componentName.getClassName() == null) return null;
+        if (TextUtils.equals("android", componentName.getPackageName())) return null;
         return componentName.getPackageName();
     }
 
diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java
index 84d8a5ad7..7dfe783e2 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java
@@ -52,6 +52,7 @@ import android.view.WindowManager;
 import android.widget.FrameLayout;
 
 import com.afollestad.appthemeengine.Config;
+import com.afollestad.appthemeengine.util.ATEUtil;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.mariotaku.twidere.Constants;
@@ -626,4 +627,8 @@ public class ThemeUtils implements Constants {
         return getOptimalAccentColor(themeColor, getContrastColor(themeColor, Color.BLACK,
                 Color.WHITE));
     }
+
+    public static int computeDarkColor(int color) {
+        return ATEUtil.darkenColor(color);
+    }
 }