From 704bcbf36ae3d28fa908b708d621f206dbd65789 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Thu, 26 Mar 2020 17:19:00 +0300
Subject: [PATCH] nocamerabutton: don't also hide send button

---
 patches/nocamerabutton/1078.patch | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/patches/nocamerabutton/1078.patch b/patches/nocamerabutton/1078.patch
index e3130c9..3a80207 100644
--- a/patches/nocamerabutton/1078.patch
+++ b/patches/nocamerabutton/1078.patch
@@ -2,9 +2,9 @@ Only in com.discord-1078: build
 Only in com.discord-1078: dist
 diff -crB com.discord-1078-base/res/layout/flex_input_widget.xml com.discord-1078/res/layout/flex_input_widget.xml
 *** com.discord-1078-base/res/layout/flex_input_widget.xml	2020-03-26 10:35:48.218868000 +0300
---- com.discord-1078/res/layout/flex_input_widget.xml	2020-03-26 15:58:15.494674786 +0300
+--- com.discord-1078/res/layout/flex_input_widget.xml	2020-03-26 17:16:45.636811844 +0300
 ***************
-*** 8,14 ****
+*** 8,23 ****
       <RelativeLayout android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
           <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
               <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_carot_right_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/expand_buttons" style="@style/FlexInput.Input" />
@@ -12,7 +12,17 @@ diff -crB com.discord-1078-base/res/layout/flex_input_widget.xml com.discord-107
               <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
           </LinearLayout>
           <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
---- 8,14 ----
+              <com.lytefast.flexinput.widget.FlexEditText android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@android:color/transparent" android:focusable="true" android:focusableInTouchMode="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:hint="@string/send_a_message" android:maxLines="5" android:layout_weight="1.0" android:inputType="textAutoComplete|textMultiLine|textShortMessage" />
+              <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:tint="?colorInteractiveNormal" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" style="@style/UiKit.ImageButton" />
+          </LinearLayout>
+!         <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:visibility="gone" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:foreground="?selectableItemBackgroundBorderless" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send" android:backgroundTint="?chat_send_btn_bg">
+              <ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:tint="?chat_send_btn" android:importantForAccessibility="no" />
+          </FrameLayout>
+      </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>
+\ No newline at end of file
+--- 8,23 ----
       <RelativeLayout android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup">
           <LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
               <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_carot_right_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/expand_buttons" style="@style/FlexInput.Input" />
@@ -20,21 +30,18 @@ diff -crB com.discord-1078-base/res/layout/flex_input_widget.xml com.discord-107
               <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/FlexInput.Input" />
           </LinearLayout>
           <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-***************
-*** 20,23 ****
-          </FrameLayout>
-      </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>
-\ No newline at end of file
---- 20,23 ----
+              <com.lytefast.flexinput.widget.FlexEditText android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@android:color/transparent" android:focusable="true" android:focusableInTouchMode="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:hint="@string/send_a_message" android:maxLines="5" android:layout_weight="1.0" android:inputType="textAutoComplete|textMultiLine|textShortMessage" />
+              <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:tint="?colorInteractiveNormal" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" style="@style/UiKit.ImageButton" />
+          </LinearLayout>
+!         <FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:foreground="?selectableItemBackgroundBorderless" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send" android:backgroundTint="?chat_send_btn_bg">
+              <ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:tint="?chat_send_btn" android:importantForAccessibility="no" />
           </FrameLayout>
       </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-1078-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$f.smali com.discord-1078/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$f.smali
 *** com.discord-1078-base/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$f.smali	2020-03-26 10:35:58.538920667 +0300
---- com.discord-1078/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$f.smali	2020-03-26 16:31:07.078498968 +0300
+--- com.discord-1078/smali_classes2/com/lytefast/flexinput/fragment/FlexInputFragment$f.smali	2020-03-26 17:14:32.959391991 +0300
 ***************
 *** 35,146 ****