Changes of com.discord v1315

com.discord/res/drawable-anydpi-v24/ic_expression_icon_cutout_24dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M0,10C0,4.477 4.477,0 10,0C15.523,0 20,4.477 20,10C20,11.1264 19.8137,12.2093 19.4703,13.2197C19.0054,13.0769 18.5117,13 18,13C17.1511,13 16.3516,13.2116 15.6513,13.5848C15.876,13.0796 16,12.5449 16,12V11H4V12C4,14.617 6.86,17 10,17C11.2278,17 12.4128,16.6356 13.4007,16.0354C13.1428,16.6385 13,17.3026 13,18C13,18.5117 13.0769,19.0054 13.2197,19.4703C12.2094,19.8137 11.1264,20 10,20C4.477,20 0,15.522 0,10ZM8,6C8,4.896 7.104,4 6,4C4.896,4 4,4.896 4,6C4,7.105 4.896,8 6,8C7.104,8 8,7.105 8,6ZM12,6C12,7.105 12.896,8 14,8C15.104,8 16,7.105 16,6C16,4.896 15.104,4 14,4C12.896,4 12,4.896 12,6Z" android:fillType="evenOdd" />
+</vector>

com.discord/res/layout-v22/flex_input_widget.xml

@@ -13,7 +13,10 @@
         </LinearLayout>
         <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView" />
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
+            <FrameLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content">
+                <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_expression_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
+                <ImageView android:layout_gravity="bottom|center|right" android:id="@id/flex_input_expression_btn_badge" android:visibility="gone" android:layout_width="7.0dip" android:layout_height="7.0dip" android:layout_marginRight="10.0dip" android:layout_marginBottom="10.0dip" android:src="@drawable/drawable_circle_red" android:importantForAccessibility="no" app:tint="@color/status_red_500" />
+            </FrameLayout>
         </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="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
             <ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:importantForAccessibility="no" app:tint="?chat_send_btn" />

com.discord/res/layout/flex_input_widget.xml

@@ -13,7 +13,10 @@
         </LinearLayout>
         <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView" />
-            <androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
+            <FrameLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content">
+                <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_expression_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
+                <ImageView android:layout_gravity="bottom|center|right" android:id="@id/flex_input_expression_btn_badge" android:visibility="gone" android:layout_width="7.0dip" android:layout_height="7.0dip" android:layout_marginRight="10.0dip" android:layout_marginBottom="10.0dip" android:src="@drawable/drawable_circle_red" android:importantForAccessibility="no" app:tint="@color/status_red_500" />
+            </FrameLayout>
         </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="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
             <ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:importantForAccessibility="no" app:tint="?chat_send_btn" />

com.discord/res/layout/widget_enable_mfa_steps.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
+<FrameLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.discord.views.steps.StepsView android:id="@id/enable_mfa_stepsview" android:layout_width="fill_parent" android:layout_height="fill_parent" />
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</FrameLayout>

com.discord/res/values/colors.xml

@@ -97,7 +97,6 @@
     <color name="cardview_light_background">#ffffffff</color>
     <color name="cardview_shadow_end_color">#03000000</color>
     <color name="cardview_shadow_start_color">#37000000</color>
-    <color name="code">#ff657b83</color>
     <color name="color_clicked_darker">#33000000</color>
     <color name="color_clicked_lighter">#40ffffff</color>
     <color name="common_google_signin_btn_text_dark_default">@android:color/white</color>

com.discord/res/values/ids.xml

@@ -929,8 +929,9 @@
     <item type="id" name="flex_input_cannot_send_text" />
     <item type="id" name="flex_input_container" />
     <item type="id" name="flex_input_default_window_insets_handler" />
-    <item type="id" name="flex_input_emoji_btn" />
     <item type="id" name="flex_input_expand_btn" />
+    <item type="id" name="flex_input_expression_btn" />
+    <item type="id" name="flex_input_expression_btn_badge" />
     <item type="id" name="flex_input_expression_tray_container" />
     <item type="id" name="flex_input_gallery_btn" />
     <item type="id" name="flex_input_left_btns_container" />

com.discord/res/values/strings.xml

@@ -1206,7 +1206,7 @@ We’re here to make a good impression."</string>
     <string name="color_picker_presets">Presets</string>
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
-    <string name="com.crashlytics.android.build_id">886f9e290bdc405285ea71b121299480</string>
+    <string name="com.crashlytics.android.build_id">d88cadc86e0a4703b65b82199715b222</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_giphy_query_description">Text to search for</string>
@@ -4162,6 +4162,7 @@ Want to know more about Discord?"</string>
     <string name="message_too_long_header">Your message is too long.</string>
     <string name="message_tts">%1$s said %2$s</string>
     <string name="message_tts_deleted_role">Deleted Role</string>
+    <string name="message_tts_reply">%1$s replied to %2$s %3$s</string>
     <string name="message_unpinned">Message unpinned.</string>
     <string name="message_utilities_a11y_label">Message Actions</string>
     <string name="messages">Messages</string>

com.discord/res/values/styles.xml

@@ -2572,6 +2572,32 @@
         <item name="singleLine">true</item>
         <item name="text_color">?colorInteractiveNormal</item>
     </style>
+    <style name="Code.TextAppearance" parent="">
+        <item name="android:typeface">monospace</item>
+        <item name="android:textColor">?colorHeaderSecondary</item>
+        <item name="android:fontFamily">@font/sourcecodepro_semibold</item>
+    </style>
+    <style name="Code.TextAppearance.Comment" parent="">
+        <item name="android:textColor">?colorInteractiveMuted</item>
+    </style>
+    <style name="Code.TextAppearance.Generics" parent="">
+        <item name="android:textColor">#ff63afef</item>
+    </style>
+    <style name="Code.TextAppearance.Identifier" parent="">
+        <item name="android:textColor">#fff3cb51</item>
+    </style>
+    <style name="Code.TextAppearance.Keyword" parent="">
+        <item name="android:textColor">#ffe06c75</item>
+    </style>
+    <style name="Code.TextAppearance.Literal" parent="">
+        <item name="android:textColor">#ff009688</item>
+    </style>
+    <style name="Code.TextAppearance.Params" parent="">
+        <item name="android:textColor">#ffc3aeea</item>
+    </style>
+    <style name="Code.TextAppearance.Types" parent="">
+        <item name="android:textColor">#ffaed581</item>
+    </style>
     <style name="Connections.Switch" parent="@style/UiKit.ListItem.Switch">
         <item name="android:padding">16.0dip</item>
         <item name="android:layout_width">fill_parent</item>