From 39d9591b26964f8ee9881a727136e9c486684b9e Mon Sep 17 00:00:00 2001
From: jonnyandrew <jonny.andrew@protonmail.com>
Date: Mon, 27 Feb 2023 09:24:56 +0000
Subject: [PATCH] [Rich text editor] Fix code appearance (#8171)

Code does not use the correct theme colour when the theme is manually
selected in the app settings.

https://github.com/vector-im/verticals-internal/issues/23
---
 changelog.d/8171.bugfix                       |  1 +
 .../src/main/res/drawable/bg_code_block.xml   | 22 ++++++++++++++++++
 .../bg_inline_code_multi_line_left.xml        | 23 +++++++++++++++++++
 .../bg_inline_code_multi_line_mid.xml         | 21 +++++++++++++++++
 .../bg_inline_code_multi_line_right.xml       | 23 +++++++++++++++++++
 .../drawable/bg_inline_code_single_line.xml   | 22 ++++++++++++++++++
 .../res/layout/composer_rich_text_layout.xml  |  5 ++++
 ..._timeline_event_text_message_rich_stub.xml |  6 +++++
 8 files changed, 123 insertions(+)
 create mode 100644 changelog.d/8171.bugfix
 create mode 100644 vector/src/main/res/drawable/bg_code_block.xml
 create mode 100644 vector/src/main/res/drawable/bg_inline_code_multi_line_left.xml
 create mode 100644 vector/src/main/res/drawable/bg_inline_code_multi_line_mid.xml
 create mode 100644 vector/src/main/res/drawable/bg_inline_code_multi_line_right.xml
 create mode 100644 vector/src/main/res/drawable/bg_inline_code_single_line.xml

diff --git a/changelog.d/8171.bugfix b/changelog.d/8171.bugfix
new file mode 100644
index 0000000000..799fecabaf
--- /dev/null
+++ b/changelog.d/8171.bugfix
@@ -0,0 +1 @@
+[Rich text editor] Fix code appearance
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/bg_code_block.xml b/vector/src/main/res/drawable/bg_code_block.xml
new file mode 100644
index 0000000000..c492ce02c2
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_code_block.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/code_block_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:radius="@dimen/code_block_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_multi_line_left.xml b/vector/src/main/res/drawable/bg_inline_code_multi_line_left.xml
new file mode 100644
index 0000000000..fa5b052562
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_multi_line_left.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:topLeftRadius="@dimen/inline_code_border_radius"
+        android:bottomLeftRadius="@dimen/inline_code_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_multi_line_mid.xml b/vector/src/main/res/drawable/bg_inline_code_multi_line_mid.xml
new file mode 100644
index 0000000000..0f55cbbbbb
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_multi_line_mid.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_multi_line_right.xml b/vector/src/main/res/drawable/bg_inline_code_multi_line_right.xml
new file mode 100644
index 0000000000..0f0d004869
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_multi_line_right.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:topRightRadius="@dimen/inline_code_border_radius"
+        android:bottomRightRadius="@dimen/inline_code_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/drawable/bg_inline_code_single_line.xml b/vector/src/main/res/drawable/bg_inline_code_single_line.xml
new file mode 100644
index 0000000000..e70625152a
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_inline_code_single_line.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2018 The Android Open Source Project
+  ~ Modifications Copyright 2022 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?vctr_system"/>
+    <stroke android:width="@dimen/inline_code_border_width" android:color="?vctr_content_quinary"/>
+    <corners android:radius="@dimen/inline_code_border_radius"/>
+</shape>
diff --git a/vector/src/main/res/layout/composer_rich_text_layout.xml b/vector/src/main/res/layout/composer_rich_text_layout.xml
index 8992b632c0..f5ad5c51db 100644
--- a/vector/src/main/res/layout/composer_rich_text_layout.xml
+++ b/vector/src/main/res/layout/composer_rich_text_layout.xml
@@ -126,6 +126,11 @@
             app:layout_constraintTop_toBottomOf="@id/composerModeBarrier"
             app:bulletRadius="4sp"
             app:bulletGap="8sp"
+            app:codeBlockBackgroundDrawable="@drawable/bg_code_block"
+            app:inlineCodeSingleLineBg="@drawable/bg_inline_code_single_line"
+            app:inlineCodeMultiLineBgLeft="@drawable/bg_inline_code_multi_line_left"
+            app:inlineCodeMultiLineBgMid="@drawable/bg_inline_code_multi_line_mid"
+            app:inlineCodeMultiLineBgRight="@drawable/bg_inline_code_multi_line_right"
             tools:text="@tools:sample/lorem/random" />
 
         <com.google.android.material.textfield.TextInputEditText
diff --git a/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml b/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
index bedff8bd4a..9878f1e7b4 100644
--- a/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
@@ -8,4 +8,10 @@
     android:layout_height="wrap_content"
     android:textAlignment="viewStart"
     android:textColor="?vctr_content_primary"
+    app:codeBlockBackgroundDrawable="@drawable/bg_code_block"
+    app:inlineCodeSingleLineBg="@drawable/bg_inline_code_single_line"
+    app:inlineCodeMultiLineBgLeft="@drawable/bg_inline_code_multi_line_left"
+    app:inlineCodeMultiLineBgMid="@drawable/bg_inline_code_multi_line_mid"
+    app:inlineCodeMultiLineBgRight="@drawable/bg_inline_code_multi_line_right"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:text="@sample/messages.json/data/message" />