jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove spaces feedback from left panel (#5686)

This commit is contained in:
fedrunov 2022-04-19 09:27:17 +02:00 committed by GitHub
parent 948566c625
commit 48680c3e2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5486.misc Normal file
View File

@ -0,0 +1 @@
Spaces feedback section is removed from left panel

17
vector/src/main/java/im/vector/app/features/spaces/SpaceBetaHeaderItem.kt
View File

@ -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()
}

3
vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
View File

@ -109,9 +109,6 @@ class SpaceSummaryController @Inject constructor(
val host = this
spaceBetaHeaderItem {
id("beta_header")
clickAction {
host.callback?.sendFeedBack()
}
}
// show invites on top

14
vector/src/main/res/drawable/ic_feedback.xml
View File

@ -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>

15
vector/src/main/res/layout/item_space_beta_header.xml
View File

@ -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>

3
vector/src/main/res/values/strings.xml
View File

@ -1660,7 +1660,8 @@
<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>
<string name="give_feedback">Give Feedback</string>
<!-- TODO TO BE REMOVED -->
<string name="give_feedback" tools:ignore="UnusedResources">Give Feedback</string>
<string name="give_feedback_threads">Give Feedback</string>
<string name="send_feedback_threads_title">Threads Beta feedback</string>
<string name="send_feedback_threads_info">Threads are a work in progress with new, exciting upcoming features, such as improved notifications. We’d love to hear your feedback!</string>