From a833dbd2bb10accafb093d990dc9d430a50c156c Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Thu, 31 Jan 2019 10:44:04 +0300
Subject: [PATCH] brnading, compact, customtheme, customversion: ported to
 8.3.6g

---
 patches/branding/836.patch      |  67 +++++++++
 patches/branding/README.md      |   1 +
 patches/compact/836.patch       |  84 +++++++++++
 patches/compact/README.md       |   1 +
 patches/customtheme/836.patch   | 252 ++++++++++++++++++++++++++++++++
 patches/customtheme/README.md   |   1 +
 patches/customversion/836.patch |  21 +++
 patches/customversion/README.md |   1 +
 8 files changed, 428 insertions(+)
 create mode 100644 patches/branding/836.patch
 create mode 100644 patches/compact/836.patch
 create mode 100644 patches/customtheme/836.patch
 create mode 100644 patches/customversion/836.patch

diff --git a/patches/branding/836.patch b/patches/branding/836.patch
new file mode 100644
index 0000000..57a14d9
--- /dev/null
+++ b/patches/branding/836.patch
@@ -0,0 +1,67 @@
+diff -crB -x dist -x build com.discord-836-testing/AndroidManifest.xml com.discord-836/AndroidManifest.xml
+*** com.discord-836-testing/AndroidManifest.xml 2019-01-31 10:40:04.315947911 +0300
+--- com.discord-836/AndroidManifest.xml 2019-01-31 10:40:29.299378550 +0300
+***************
+*** 1,4 ****
+! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="836" platformBuildVersionName="8.3.6g">
+      <uses-feature android:name="android.hardware.camera" android:required="false"/>
+      <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+      <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
+--- 1,4 ----
+! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.cutthecord.CTCBRANCH" platformBuildVersionCode="836CTCBUILD" platformBuildVersionName="8.3.6g-cutthecord-CTCBUILD">
+      <uses-feature android:name="android.hardware.camera" android:required="false"/>
+      <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+      <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
+diff -crB -x dist -x build com.discord-836-testing/apktool.yml com.discord-836/apktool.yml
+*** com.discord-836-testing/apktool.yml 2019-01-31 10:40:04.319281258 +0300
+--- com.discord-836/apktool.yml 2019-01-31 10:40:29.299378550 +0300
+***************
+*** 345,349 ****
+    tag: null
+  version: 2.4.0-896569-SNAPSHOT
+  versionInfo:
+!   versionCode: '836'
+!   versionName: 8.3.6g
+--- 345,349 ----
+    tag: null
+  version: 2.4.0-896569-SNAPSHOT
+  versionInfo:
+!   versionCode: '836CTCBUILD'
+!   versionName: 8.3.6g-cutthecord-CTCBUILD
+diff -crB -x dist -x build com.discord-836-testing/res/values/strings.xml com.discord-836/res/values/strings.xml
+*** com.discord-836-testing/res/values/strings.xml  2019-01-31 10:40:04.482615227 +0300
+--- com.discord-836/res/values/strings.xml  2019-01-31 10:40:29.299378550 +0300
+***************
+*** 1144,1150 ****
+      <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
+      <string name="disconnect_account_title">Disconnect %1$s</string>
+      <string name="disconnect_from_voice">Disconnect from Voice</string>
+!     <string name="discord">Discord</string>
+      <string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
+      <string name="discord_desc_short">Team voice &amp; text chat</string>
+      <string name="discord_gg">discord.gg/</string>
+--- 1144,1150 ----
+      <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
+      <string name="disconnect_account_title">Disconnect %1$s</string>
+      <string name="disconnect_from_voice">Disconnect from Voice</string>
+!     <string name="discord">CTCNAME</string>
+      <string name="discord_desc_long">Free and secure chat for gamers, works on both your desktop and your phone.</string>
+      <string name="discord_desc_short">Team voice &amp; text chat</string>
+      <string name="discord_gg">discord.gg/</string>
+***************
+*** 2698,2704 ****
+      <string name="notification_reply_failed">Failed to reply to %1$s</string>
+      <string name="notification_reply_success">Replied to %1$s</string>
+      <string name="notification_settings">Notification Settings</string>
+!     <string name="notification_title_discord">Discord</string>
+      <string name="notification_title_start_game">"Somebody Playin'"</string>
+      <string name="notifications">Notifications</string>
+      <string name="nsfw_accept">Continue</string>
+--- 2698,2704 ----
+      <string name="notification_reply_failed">Failed to reply to %1$s</string>
+      <string name="notification_reply_success">Replied to %1$s</string>
+      <string name="notification_settings">Notification Settings</string>
+!     <string name="notification_title_discord">CTCNAME</string>
+      <string name="notification_title_start_game">"Somebody Playin'"</string>
+      <string name="notifications">Notifications</string>
+      <string name="nsfw_accept">Continue</string>
diff --git a/patches/branding/README.md b/patches/branding/README.md
index e40426c..fe6786b 100644
--- a/patches/branding/README.md
+++ b/patches/branding/README.md
@@ -12,4 +12,5 @@ Running customicon.sh (while on root of the extracted folder) will also change t
 - 8.3.3
 - 8.3.4g
 - 8.3.5g
+- 8.3.6g
 
diff --git a/patches/compact/836.patch b/patches/compact/836.patch
new file mode 100644
index 0000000..cebe0ed
--- /dev/null
+++ b/patches/compact/836.patch
@@ -0,0 +1,84 @@
+diff -crB -x dist -x build com.discord-836-testing/res/layout/widget_chat_list_adapter_item_text.xml com.discord-836/res/layout/widget_chat_list_adapter_item_text.xml
+*** com.discord-836-testing/res/layout/widget_chat_list_adapter_item_text.xml	2019-01-31 10:40:04.405948262 +0300
+--- com.discord-836/res/layout/widget_chat_list_adapter_item_text.xml	2019-01-31 10:41:29.889614538 +0300
+***************
+*** 2,12 ****
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+-     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+-     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+--- 2,11 ----
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
++         <com.discord.utilities.view.text.LinkifiedTextView  android:id="@id/chat_list_adapter_item_text" app:layout_constrainedWidth="true" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:layout_marginStart="6.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Chat.Text" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+diff -crB -x dist -x build com.discord-836-testing/res/layout-v17/widget_chat_list_adapter_item_text.xml com.discord-836/res/layout-v17/widget_chat_list_adapter_item_text.xml
+*** com.discord-836-testing/res/layout-v17/widget_chat_list_adapter_item_text.xml	2019-01-31 10:40:04.452615110 +0300
+--- com.discord-836/res/layout-v17/widget_chat_list_adapter_item_text.xml	2019-01-31 10:41:29.889614538 +0300
+***************
+*** 2,12 ****
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+-     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+-     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+--- 2,14 ----
+  <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
+    xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+      <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
+      <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
+          <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
++ 
+          <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
++ 
+          <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
++ 
++         <com.discord.utilities.view.text.LinkifiedTextView  android:id="@id/chat_list_adapter_item_text" app:layout_constrainedWidth="true" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:layout_marginStart="6.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Chat.Text" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
+\ No newline at end of file
+diff -crB -x dist -x build com.discord-836-testing/res/values/dimens.xml com.discord-836/res/values/dimens.xml
+*** com.discord-836-testing/res/values/dimens.xml	2019-01-31 10:40:04.482615227 +0300
+--- com.discord-836/res/values/dimens.xml	2019-01-31 10:41:29.889614538 +0300
+***************
+*** 330,337 ****
+      <dimen name="uikit_btn_padding_vertical">4.0dip</dimen>
+      <dimen name="uikit_btn_stroke_width">0.75dip</dimen>
+      <dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
+!     <dimen name="uikit_guideline_chat">58.0dip</dimen>
+!     <dimen name="uikit_guideline_chat_embed">62.0dip</dimen>
+      <dimen name="uikit_guideline_item_row">48.0dip</dimen>
+      <dimen name="uikit_guideline_sheet">72.0dip</dimen>
+      <dimen name="uikit_image_border_size">3.0dip</dimen>
+--- 330,337 ----
+      <dimen name="uikit_btn_padding_vertical">4.0dip</dimen>
+      <dimen name="uikit_btn_stroke_width">0.75dip</dimen>
+      <dimen name="uikit_btn_wrapped_min_width">96.0dip</dimen>
+!     <dimen name="uikit_guideline_chat">20.0dip</dimen>
+!     <dimen name="uikit_guideline_chat_embed">24.0dip</dimen>
+      <dimen name="uikit_guideline_item_row">48.0dip</dimen>
+      <dimen name="uikit_guideline_sheet">72.0dip</dimen>
+      <dimen name="uikit_image_border_size">3.0dip</dimen>
+
diff --git a/patches/compact/README.md b/patches/compact/README.md
index 1ae6782..3fdd4b8 100644
--- a/patches/compact/README.md
+++ b/patches/compact/README.md
@@ -6,4 +6,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t
 
 #### Available and tested on:
 - 8.3.5g
+- 8.3.6g
 
diff --git a/patches/customtheme/836.patch b/patches/customtheme/836.patch
new file mode 100644
index 0000000..0df2a71
--- /dev/null
+++ b/patches/customtheme/836.patch
@@ -0,0 +1,252 @@
+diff -crB -x dist -x build com.discord-834-base/res/values/colors.xml com.discord-834/res/values/colors.xml
+*** com.discord-834-base/res/values/colors.xml  2019-01-23 23:17:41.424486642 +0300
+--- com.discord-834/res/values/colors.xml 2019-01-23 23:21:28.489048909 +0300
+***************
+*** 61,68 ****
+      <color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
+      <color name="common_google_signin_btn_text_light_focused">#90000000</color>
+      <color name="common_google_signin_btn_text_light_pressed">#de000000</color>
+!     <color name="dark_grey_2">#ff36393e</color>
+!     <color name="dark_grey_2_alpha_10">#ff303337</color>
+      <color name="design_bottom_navigation_shadow_color">#14000000</color>
+      <color name="design_default_color_primary">#ff3f51b5</color>
+      <color name="design_default_color_primary_dark">#ff303f9f</color>
+--- 61,68 ----
+      <color name="common_google_signin_btn_text_light_disabled">#1f000000</color>
+      <color name="common_google_signin_btn_text_light_focused">#90000000</color>
+      <color name="common_google_signin_btn_text_light_pressed">#de000000</color>
+!     <color name="dark_grey_2">#ff000000</color>
+!     <color name="dark_grey_2_alpha_10">#ff000000</color>
+      <color name="design_bottom_navigation_shadow_color">#14000000</color>
+      <color name="design_default_color_primary">#ff3f51b5</color>
+      <color name="design_default_color_primary_dark">#ff303f9f</color>
+***************
+*** 98,106 ****
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+      <color name="grey_6_alpha_30">#4d4f545c</color>
+      <color name="grey_6_alpha_60">#994f545c</color>
+!     <color name="grey_account">#ff282b30</color>
+!     <color name="grey_channels">#ff2e3136</color>
+!     <color name="grey_guilds">#ff1e2124</color>
+      <color name="grey_unread">#ff8a8e94</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+--- 98,106 ----
+      <color name="grey_6_alpha_05">#0d4f545c</color>
+      <color name="grey_6_alpha_30">#4d4f545c</color>
+      <color name="grey_6_alpha_60">#994f545c</color>
+!     <color name="grey_account">#ff000000</color>
+!     <color name="grey_channels">#ff000000</color>
+!     <color name="grey_guilds">#ff000000</color>
+      <color name="grey_unread">#ff8a8e94</color>
+      <color name="highlighted_text_material_dark">#6680cbc4</color>
+      <color name="highlighted_text_material_light">#66009688</color>
+***************
+*** 109,123 ****
+      <color name="hypesquad_house3">#ff45ddc0</color>
+      <color name="icon_color_light">#ff93a5af</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link_100">#fff2fbfe</color>
+!     <color name="link_200">#ffcceffd</color>
+!     <color name="link_300">#ff99dffb</color>
+!     <color name="link_400">#ff33c0f6</color>
+!     <color name="link_500">#ff00b0f4</color>
+!     <color name="link_600">#ff0078a6</color>
+!     <color name="link_700">#ff004662</color>
+!     <color name="link_800">#ff003549</color>
+!     <color name="link_900">#ff00090c</color>
+      <color name="material_blue_grey_800">#ff37474f</color>
+      <color name="material_blue_grey_900">#ff263238</color>
+      <color name="material_blue_grey_950">#ff21272b</color>
+--- 109,123 ----
+      <color name="hypesquad_house3">#ff45ddc0</color>
+      <color name="icon_color_light">#ff93a5af</color>
+      <color name="league_of_legends">#ff021f25</color>
+!     <color name="link_100">#ff8cf687</color>
+!     <color name="link_200">#ff7df577</color>
+!     <color name="link_300">#ff6ef368</color>
+!     <color name="link_400">#ff5ff258</color>
+!     <color name="link_500">#ff50f148</color>
+!     <color name="link_600">#ff41f038</color>
+!     <color name="link_700">#ff32ef28</color>
+!     <color name="link_800">#ff23ed19</color>
+!     <color name="link_900">#ff1be411</color>
+      <color name="material_blue_grey_800">#ff37474f</color>
+      <color name="material_blue_grey_900">#ff263238</color>
+      <color name="material_blue_grey_950">#ff21272b</color>
+***************
+*** 159,176 ****
+      <color name="primary_400_alpha_30">#4d7d8187</color>
+      <color name="primary_400_alpha_60">#997d8187</color>
+      <color name="primary_400_alpha_90">#e67d8187</color>
+!     <color name="primary_500">#ff4f545c</color>
+!     <color name="primary_500_alpha_30">#4d4f545c</color>
+!     <color name="primary_500_alpha_60">#994f545c</color>
+!     <color name="primary_500_alpha_90">#e64f545c</color>
+!     <color name="primary_600">#ff36393f</color>
+!     <color name="primary_600_alpha_30">#4d36393f</color>
+!     <color name="primary_600_alpha_60">#9936393f</color>
+!     <color name="primary_600_alpha_90">#e636393f</color>
+!     <color name="primary_630">#ff2f3136</color>
+!     <color name="primary_630_alpha_30">#4d2f3136</color>
+!     <color name="primary_630_alpha_60">#992f3136</color>
+!     <color name="primary_630_alpha_90">#e62f3136</color>
+      <color name="primary_700">#ff202225</color>
+      <color name="primary_700_alpha_30">#4d202225</color>
+      <color name="primary_700_alpha_60">#99202225</color>
+--- 159,176 ----
+      <color name="primary_400_alpha_30">#4d7d8187</color>
+      <color name="primary_400_alpha_60">#997d8187</color>
+      <color name="primary_400_alpha_90">#e67d8187</color>
+!     <color name="primary_500">#ff0f0f0f</color>
+!     <color name="primary_500_alpha_30">#4d0f0f0f</color>
+!     <color name="primary_500_alpha_60">#990f0f0f</color>
+!     <color name="primary_500_alpha_90">#e60f0f0f</color>
+!     <color name="primary_600">#ff000000</color>
+!     <color name="primary_600_alpha_30">#4d000000</color>
+!     <color name="primary_600_alpha_60">#99000000</color>
+!     <color name="primary_600_alpha_90">#e6000000</color>
+!     <color name="primary_630">#ff000000</color>
+!     <color name="primary_630_alpha_30">#4d000000</color>
+!     <color name="primary_630_alpha_60">#99000000</color>
+!     <color name="primary_630_alpha_90">#e6000000</color>
+      <color name="primary_700">#ff202225</color>
+      <color name="primary_700_alpha_30">#4d202225</color>
+      <color name="primary_700_alpha_60">#99202225</color>
+***************
+*** 191,198 ****
+      <color name="primary_text_default_material_light">#de000000</color>
+      <color name="primary_text_disabled_material_dark">#4dffffff</color>
+      <color name="primary_text_disabled_material_light">#39000000</color>
+!     <color name="purple_brand">#ff738bd7</color>
+!     <color name="purple_brand_alpha_10">#1a738bd7</color>
+      <color name="purple_brand_dark">#ff697ec4</color>
+      <color name="purple_brand_hint">#ffc9d2f0</color>
+      <color name="purple_brand_notification">#ff5161ff</color>
+--- 191,198 ----
+      <color name="primary_text_default_material_light">#de000000</color>
+      <color name="primary_text_disabled_material_dark">#4dffffff</color>
+      <color name="primary_text_disabled_material_light">#39000000</color>
+!     <color name="purple_brand">#ff9c4249</color>
+!     <color name="purple_brand_alpha_10">#1a9c4249</color>
+      <color name="purple_brand_dark">#ff697ec4</color>
+      <color name="purple_brand_hint">#ffc9d2f0</color>
+      <color name="purple_brand_notification">#ff5161ff</color>
+diff -crB -x dist -x build com.discord-834-base/res/values/styles.xml com.discord-834/res/values/styles.xml
+*** com.discord-834-base/res/values/styles.xml  2019-01-23 23:17:41.631154248 +0300
+--- com.discord-834/res/values/styles.xml 2019-01-23 23:21:28.489048909 +0300
+***************
+*** 116,122 ****
+          <item name="colorPrimary">@color/primary_600</item>
+          <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
+          <item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+          <item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
+          <item name="colorPrimaryTabs">@color/black_alpha_05</item>
+          <item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
+--- 116,122 ----
+          <item name="colorPrimary">@color/primary_600</item>
+          <item name="colorPrimaryBg">@drawable/drawable_uikit_primary_600_bg_dark</item>
+          <item name="colorPrimaryCircle">@drawable/drawable_uikit_primary_600_circle</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+          <item name="colorPrimaryDivider">@color/primary_500_alpha_60</item>
+          <item name="colorPrimaryTabs">@color/black_alpha_05</item>
+          <item name="dialogTheme">@style/AppTheme.Dark.Notice</item>
+***************
+*** 322,328 ****
+          <item name="tabSelectedTextColor">@color/white</item>
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
+!         <item name="theme_chat_blocked_bg">#ff34373c</item>
+          <item name="theme_chat_blocked_text">@color/grey_unread</item>
+          <item name="theme_chat_code">@color/grey_channels</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+--- 322,328 ----
+          <item name="tabSelectedTextColor">@color/white</item>
+          <item name="tabTextColor">@color/white_alpha_40</item>
+          <item name="theme_backspace_icon">@drawable/ic_backspace_white_24dp</item>
+!         <item name="theme_chat_blocked_bg">@color/primary_500</item>
+          <item name="theme_chat_blocked_text">@color/grey_unread</item>
+          <item name="theme_chat_code">@color/grey_channels</item>
+          <item name="theme_chat_codeblock_border">@color/grey_account</item>
+***************
+*** 336,347 ****
+          <item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
+          <item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
+          <item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
+!         <item name="theme_chat_input_edit">#ff3e4145</item>
+          <item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
+          <item name="theme_chat_input_text">@color/white_alpha_70</item>
+          <item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
+          <item name="theme_chat_loading_spinner_color">@color/white</item>
+!         <item name="theme_chat_mentioned_me">#1afaa61a</item>
+          <item name="theme_chat_name">@color/white</item>
+          <item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
+          <item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
+--- 336,347 ----
+          <item name="theme_chat_input_button_tint_colors">@color/chat_input_button_tint_colors_dark</item>
+          <item name="theme_chat_input_content_tab_bg">@drawable/drawable_rect_rounded_dark</item>
+          <item name="theme_chat_input_divider">@color/dark_grey_2_alpha_10</item>
+!         <item name="theme_chat_input_edit">@color/primary_600</item>
+          <item name="theme_chat_input_photo_selection_icon">@drawable/ic_img_selected_dark_theme</item>
+          <item name="theme_chat_input_text">@color/white_alpha_70</item>
+          <item name="theme_chat_input_text_placeholder">@color/white_alpha_20</item>
+          <item name="theme_chat_loading_spinner_color">@color/white</item>
+!         <item name="theme_chat_mentioned_me">@color/purple_brand_alpha_10</item>
+          <item name="theme_chat_name">@color/white</item>
+          <item name="theme_chat_reaction_background">@drawable/drawable_bg_reaction_dark</item>
+          <item name="theme_chat_reaction_text_color">@drawable/drawable_reaction_text_color_dark</item>
+***************
+*** 406,412 ****
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+      </style>
+      <style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
+          <item name="colorAccent">@color/brand_600</item>
+--- 406,412 ----
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+      </style>
+      <style name="AppTheme.Dark.Evil" parent="@style/AppTheme.Dark">
+          <item name="colorAccent">@color/brand_600</item>
+***************
+*** 438,444 ****
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">#ff2b2e31</item>
+      </style>
+      <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
+          <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
+--- 438,444 ----
+          <item name="colorControlActivated">@color/brand_500</item>
+          <item name="colorControlNormal">@color/primary_100</item>
+          <item name="colorPrimary">@color/primary_600</item>
+!         <item name="colorPrimaryDark">@color/primary_630</item>
+      </style>
+      <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
+          <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
+diff -crB -x dist -x build com.discord-834-base/smali/com/discord/app/AppActivity$e.smali com.discord-834/smali/com/discord/app/AppActivity$e.smali
+*** com.discord-834-base/smali/com/discord/app/AppActivity$e.smali      2019-01-23 23:17:43.004493819 +0300
+--- com.discord-834/smali/com/discord/app/AppActivity$e.smali     2019-01-23 23:21:28.489048909 +0300
+***************
+*** 123,129 ****
+  
+      check-cast v0, Landroid/app/Activity;
+  
+!     const v1, 0x7f060136
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
+  
+--- 123,129 ----
+  
+      check-cast v0, Landroid/app/Activity;
+  
+!     const v1, 0x7f0600d3
+  
+      invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
+  
diff --git a/patches/customtheme/README.md b/patches/customtheme/README.md
index 7011dfd..03ee92c 100644
--- a/patches/customtheme/README.md
+++ b/patches/customtheme/README.md
@@ -14,6 +14,7 @@ Run `fixsplash.sh <full path of asset_loading.png>` to fix the splash.
 - 8.3.3
 - 8.3.4g
 - 8.3.5g
+- 8.3.6g
 
 #### Value reference
 
diff --git a/patches/customversion/836.patch b/patches/customversion/836.patch
new file mode 100644
index 0000000..67d24b9
--- /dev/null
+++ b/patches/customversion/836.patch
@@ -0,0 +1,21 @@
+diff -crB -x dist -x build com.discord-836-testing/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-836/smali/com/discord/widgets/settings/WidgetSettings.smali
+*** com.discord-836-testing/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-01-31 10:40:04.892616823 +0300
+--- com.discord-836/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-01-31 10:43:43.703480351 +0300
+***************
+*** 1323,1329 ****
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v0, " - 8.3.6g (836)"
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+--- 1323,1329 ----
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string v0, " - 8.3.6g (836), with Cutthecord patches"
+  
+      invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+
diff --git a/patches/customversion/README.md b/patches/customversion/README.md
index 2f114fd..2e9bf28 100644
--- a/patches/customversion/README.md
+++ b/patches/customversion/README.md
@@ -9,4 +9,5 @@ This patch replaces version string and adds mention of cutthecord in the user se
 - 8.3.3
 - 8.3.4g
 - 8.3.5g
+- 8.3.6g