home emoji bug fixed, minor fixes

dev-ritik · Sep 4, 2018 · 07aa16c · 07aa16c
1 parent 9f6c7f6
commit 07aa16c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -3,6 +3,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
+        <item name="cardViewStyle">@style/CardView</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -14,6 +15,7 @@
     <style name="MyMaterialTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
+        <item name="cardViewStyle">@style/CardView</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>

diff --git a/emojireactionlibrary/src/main/java/com/ritik/emojireactionlibrary/EmojiReactionView.java b/emojireactionlibrary/src/main/java/com/ritik/emojireactionlibrary/EmojiReactionView.java
@@ -710,7 +710,9 @@ public boolean onTouchEvent(MotionEvent event) {
             // prepare for new gesture
             wasSwiping = false;
             emojiClicked = false;
-            if (panelAnimWorking) {
+            if (homeEmojiVisible && homeRect.contains((int) event.getX(), (int) event.getY())) {
+                emojiClicked = true;
+            } else if (panelAnimWorking) {
                 for (int i = numberOfEmojis - 1; i >= 0; i--) {
                     if (clickedOnEmojiReact(i, event.getX(), event.getY())) {
                         emojiClicked = true;