From 936a4278e7d1ced501b58083f84ded40edff9ecb Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Mon, 4 Apr 2022 09:28:49 +0200
Subject: [PATCH 1/3] remove spaces feedback from left panel

---
 .../app/features/spaces/SpaceBetaHeaderItem.kt  | 17 +----------------
 .../features/spaces/SpaceSummaryController.kt   |  3 ---
 .../main/res/layout/item_space_beta_header.xml  | 15 +--------------
 vector/src/main/res/values/strings.xml          |  1 +
 4 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
index abe7e8d2a8b..667f895d4d5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
@@ -16,27 +16,12 @@
 
 package im.vector.app.features.spaces
 
-import android.view.View
-import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
-import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import im.vector.app.core.epoxy.onClick
 
 @EpoxyModelClass(layout = R.layout.item_space_beta_header)
 abstract class SpaceBetaHeaderItem : VectorEpoxyModel<SpaceBetaHeaderItem.Holder>() {
-
-    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
-    var clickAction: ClickListener? = null
-
-    override fun bind(holder: Holder) {
-        super.bind(holder)
-        holder.feedBackAction.onClick(clickAction)
-    }
-
-    class Holder : VectorEpoxyHolder() {
-        val feedBackAction by bind<View>(R.id.spaceBetaFeedbackAction)
-    }
+    class Holder : VectorEpoxyHolder()
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
index 95e4405da55..e88af192630 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
@@ -109,9 +109,6 @@ class SpaceSummaryController @Inject constructor(
         val host = this
         spaceBetaHeaderItem {
             id("beta_header")
-            clickAction {
-                host.callback?.sendFeedBack()
-            }
         }
 
         // show invites on top
diff --git a/vector/src/main/res/layout/item_space_beta_header.xml b/vector/src/main/res/layout/item_space_beta_header.xml
index 943b5671ffe..3ccc5413716 100644
--- a/vector/src/main/res/layout/item_space_beta_header.xml
+++ b/vector/src/main/res/layout/item_space_beta_header.xml
@@ -8,6 +8,7 @@
     android:paddingStart="16dp"
     android:paddingTop="8dp"
     android:paddingEnd="16dp"
+    android:paddingBottom="16dp"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -27,18 +28,4 @@
         android:text="@string/spaces_beta_welcome_to_spaces_desc"
         android:textColor="?vctr_content_secondary" />
 
-    <TextView
-        android:id="@+id/spaceBetaFeedbackAction"
-        style="@style/Widget.Vector.TextView.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:drawablePadding="8dp"
-        android:paddingStart="0dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="8dp"
-        android:text="@string/give_feedback"
-        android:textColor="@color/vector_info_color"
-        app:drawableStartCompat="@drawable/ic_feedback" />
-
 </LinearLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 9bdbb291a52..94a6d0a173f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1649,6 +1649,7 @@
     <string name="you_may_contact_me">You may contact me if you have any follow up questions</string>
     <string name="feedback_sent">Thanks, your feedback has been successfully sent</string>
     <string name="feedback_failed">The feedback failed to be sent (%s)</string>
+    <!-- TODO TO BE REMOVED -->
     <string name="give_feedback">Give Feedback</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>

From 69260836cab5837e83834a23f37c18f4200706b6 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Thu, 7 Apr 2022 17:20:14 +0200
Subject: [PATCH 2/3] code review changes

---
 changelog.d/5486.misc                        |  1 +
 vector/src/main/res/drawable/ic_feedback.xml | 14 --------------
 2 files changed, 1 insertion(+), 14 deletions(-)
 create mode 100644 changelog.d/5486.misc
 delete mode 100644 vector/src/main/res/drawable/ic_feedback.xml

diff --git a/changelog.d/5486.misc b/changelog.d/5486.misc
new file mode 100644
index 00000000000..82571af37bc
--- /dev/null
+++ b/changelog.d/5486.misc
@@ -0,0 +1 @@
+Spaces feedback section is removed from left panel
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_feedback.xml b/vector/src/main/res/drawable/ic_feedback.xml
deleted file mode 100644
index e774a8ab5c5..00000000000
--- a/vector/src/main/res/drawable/ic_feedback.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M6.2887,10.748C8.7036,10.748 10.6612,8.7897 10.6612,6.374C10.6612,3.9583 8.7036,2 6.2887,2C3.8739,2 1.9163,3.9583 1.9163,6.374C1.9163,7.038 2.0642,7.6674 2.3288,8.2311L1.6,9.7683C1.2011,10.6099 2.0682,11.492 2.9165,11.1074L4.5258,10.378C5.0651,10.6159 5.6615,10.748 6.2887,10.748Z"
-      android:fillColor="#368BD6"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M12.6608,7.3739C12.6608,9.7896 10.7032,11.7479 8.2883,11.7479C7.8421,11.7479 7.4114,11.681 7.0059,11.5568C7.7732,12.2953 8.8076,12.7479 9.9456,12.7479C10.5605,12.7479 11.1451,12.6158 11.6737,12.3778L13.211,13.0887C14.0564,13.4796 14.9301,12.6043 14.5376,11.7597L13.8272,10.2308C14.0865,9.6672 14.2315,9.0378 14.2315,8.3739C14.2315,6.4535 13.0188,4.8221 11.3323,4.2339C12.1516,5.0289 12.6608,6.1419 12.6608,7.3739Z"
-      android:fillColor="#368BD6"
-      android:fillType="evenOdd"/>
-</vector>

From a3653336cbde26a30e9129c34da8641d3f257940 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Tue, 12 Apr 2022 15:50:18 +0200
Subject: [PATCH 3/3] linter error ignored

---
 vector/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 94a6d0a173f..8b9e658b100 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1650,7 +1650,7 @@
     <string name="feedback_sent">Thanks, your feedback has been successfully sent</string>
     <string name="feedback_failed">The feedback failed to be sent (%s)</string>
     <!-- TODO TO BE REMOVED -->
-    <string name="give_feedback">Give Feedback</string>
+    <string name="give_feedback" tools:ignore="UnusedResources">Give Feedback</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">"Show complete history in encrypted rooms"</string>