From c41db7daa471a0573338fd269da520aaa4626a02 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 24 Aug 2023 09:54:14 +0200
Subject: [PATCH 1/4] Move the file pull_request_template.md to the parent
 folder to make it the default template.

---
 .github/{PULL_REQUEST_TEMPLATE => }/pull_request_template.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/{PULL_REQUEST_TEMPLATE => }/pull_request_template.md (100%)

diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/pull_request_template.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
rename to .github/pull_request_template.md

From 6b96a3adf2c4cabdc3ba88e68b2010ea80c40da0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 24 Aug 2023 09:55:29 +0200
Subject: [PATCH 2/4] Element X

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d83826f9f1..11e6aeba19 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Element Android
+# Contributing to Element X Android
 
 <!--- TOC -->
 

From 94007bac941c169e547374efe9b73df509799494 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 24 Aug 2023 10:07:10 +0200
Subject: [PATCH 3/4] Update pull request template for Element X.

---
 .github/pull_request_template.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 431c018fdd..aec678857c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
  
 ## Type of change
 
@@ -17,13 +17,17 @@
 
 ## Screenshots / GIFs
 
-<!-- Only if UI have been changed
+<!--
+We have screenshot test in the project, so adding screenshots is not mandatory, as far as there
+is a Composable Preview covering the changes. In this case, the change will appear in the file diff.
+Note that all the UI composable should be covered by a Composable Preview.
+
+Providing a video of the change is still very useful for the reviewer and for the history of the project.
+
 You can use a table like this to show screenshots comparison.
 Uncomment this markdown table below and edit the last line `|||`:
 |copy screenshot of before here|copy screenshot of after here|
--->
 
-<!--
 |Before|After|
 |-|-|
 |||
@@ -47,11 +51,11 @@ Uncomment this markdown table below and edit the last line `|||`:
 
 <!-- Depending on the Pull Request content, it can be acceptable if some of the following checkboxes stay unchecked. -->
 
-- [ ] Changes has been tested on an Android device or Android emulator with API 21
+- [ ] Changes has been tested on an Android device or Android emulator with API 23
 - [ ] UI change has been tested on both light and dark themes
-- [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#accessibility
+- [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
 - [ ] Pull request is based on the develop branch
-- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog
+- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#changelog
 - [ ] Pull request includes screenshots or videos if containing UI changes
 - [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
 - [ ] You've made a self review of your PR

From 5c6ecd832756f2eccdc9787d8e73208b01506bb1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 24 Aug 2023 11:15:37 +0200
Subject: [PATCH 4/4] Fix grammar

---
 .github/pull_request_template.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index aec678857c..7aabcb77aa 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -18,9 +18,9 @@
 ## Screenshots / GIFs
 
 <!--
-We have screenshot test in the project, so adding screenshots is not mandatory, as far as there
+We have screenshot tests in the project, so attaching screenshots to a PR is not mandatory, as far as there
 is a Composable Preview covering the changes. In this case, the change will appear in the file diff.
-Note that all the UI composable should be covered by a Composable Preview.
+Note that all the UI composables should be covered by a Composable Preview.
 
 Providing a video of the change is still very useful for the reviewer and for the history of the project.
 
@@ -51,7 +51,7 @@ Uncomment this markdown table below and edit the last line `|||`:
 
 <!-- Depending on the Pull Request content, it can be acceptable if some of the following checkboxes stay unchecked. -->
 
-- [ ] Changes has been tested on an Android device or Android emulator with API 23
+- [ ] Changes have been tested on an Android device or Android emulator with API 23
 - [ ] UI change has been tested on both light and dark themes
 - [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
 - [ ] Pull request is based on the develop branch