From 2b7fd2db8b98a8cfea4cfe2d3724899093f4acba Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Sun, 17 May 2020 18:34:23 +0300
Subject: [PATCH] nocamerabutton/noemojibutton: fix

---
 patches/nocamerabutton/1144.patch | 29 ++++++++++++++++++++++++++---
 patches/noemojibutton/1144.patch  | 27 +++++++--------------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/patches/nocamerabutton/1144.patch b/patches/nocamerabutton/1144.patch
index d8ad31a..4ff51e3 100644
--- a/patches/nocamerabutton/1144.patch
+++ b/patches/nocamerabutton/1144.patch
@@ -1,6 +1,8 @@
-diff -crB from/res/layout/flex_input_widget.xml to/res/layout/flex_input_widget.xml
-*** from/res/layout/flex_input_widget.xml	2020-04-17 13:03:23.985050793 +0100
---- to/res/layout/flex_input_widget.xml	2020-04-17 13:06:38.725266211 +0100
+Only in com.discord-1144: build
+Only in com.discord-1144: dist
+diff -crB com.discord-1144-base/res/layout/flex_input_widget.xml com.discord-1144/res/layout/flex_input_widget.xml
+*** com.discord-1144-base/res/layout/flex_input_widget.xml	2020-05-17 16:38:23.695244181 +0300
+--- com.discord-1144/res/layout/flex_input_widget.xml	2020-05-17 17:01:51.533974516 +0300
 ***************
 *** 8,14 ****
       <RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
@@ -30,3 +32,24 @@ diff -crB from/res/layout/flex_input_widget.xml to/res/layout/flex_input_widget.
       </RelativeLayout>
       <FrameLayout android:orientation="vertical" android:id="@id/flex_input_emoji_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
 ! </LinearLayout>
+diff -crB com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+*** com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-05-17 16:38:28.831942620 +0300
+--- com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-05-17 18:34:07.081308249 +0300
+***************
+*** 810,816 ****
+  
+      if-eqz v4, :cond_5
+  
+!     const/4 v10, 0x0
+  
+      goto :goto_2
+  
+--- 810,816 ----
+  
+      if-eqz v4, :cond_5
+  
+!     const/16 v10, 0x8
+  
+      goto :goto_2
+  
+
diff --git a/patches/noemojibutton/1144.patch b/patches/noemojibutton/1144.patch
index ebafd1e..666d51f 100644
--- a/patches/noemojibutton/1144.patch
+++ b/patches/noemojibutton/1144.patch
@@ -1,6 +1,8 @@
-diff -crB from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
-*** from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-05-08 14:20:54.623603611 +0100
---- to/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-05-08 14:21:04.153505306 +0100
+Only in com.discord-1144: build
+Only in com.discord-1144: dist
+diff -crB com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali
+*** com.discord-1144-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-05-17 16:38:28.831942620 +0300
+--- com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.smali	2020-05-17 16:58:44.766148240 +0300
 ***************
 *** 365,371 ****
   
@@ -18,20 +20,5 @@ diff -crB from/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment.
   
       invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setVisibility(I)V
   
-***************
-*** 1554,1560 ****
-      .line 2
-      iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->v:[Lf/b/a/b/a$b;
-  
-!     const/4 v1, 0x0
-  
-      const-string v2, "pageSuppliers"
-  
---- 1554,1560 ----
-      .line 2
-      iget-object v0, p0, Lcom/lytefast/flexinput/fragment/FlexInputFragment;->v:[Lf/b/a/b/a$b;
-  
-!     const/16 v1, 0x8
-  
-      const-string v2, "pageSuppliers"
-  
+Only in com.discord-1144/smali_classes2/com/lytefast/flexinput/fragment: FlexInputFragment.smali.orig
+