From 391e952fbde009d5469aafd85e4c6a3ea916dcd2 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 12 May 2021 12:23:14 +0200 Subject: [PATCH] Review + design update --- .../app/core/ui/list/GenericItemHeader.kt | 11 +++++++ .../features/rageshake/BugReportActivity.kt | 9 ++++-- .../features/spaces/SpaceSummaryController.kt | 8 ++--- vector/src/main/res/drawable/ic_feedback.xml | 4 +-- .../res/layout/item_space_beta_header.xml | 29 ++++++++----------- vector/src/main/res/values/strings.xml | 4 ++- 6 files changed, 38 insertions(+), 27 deletions(-) diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt index d0c65aff95..bc5446e836 100644 --- a/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt @@ -16,12 +16,14 @@ package im.vector.app.core.ui.list import android.widget.TextView +import androidx.annotation.ColorInt import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.themes.ThemeUtils /** * A generic list item header left aligned with notice color. @@ -32,9 +34,18 @@ abstract class GenericItemHeader : VectorEpoxyModel() @EpoxyAttribute var text: String? = null + @EpoxyAttribute + @ColorInt + var textColor: Int? = null + override fun bind(holder: Holder) { super.bind(holder) holder.text.setTextOrHide(text) + if (textColor != null) { + holder.text.setTextColor(textColor!!) + } else { + holder.text.setTextColor(ThemeUtils.getColor(holder.view.context, R.attr.vctr_notice_text_color)) + } } class Holder : VectorEpoxyHolder() { diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt index d6d80673b0..27adefd50f 100755 --- a/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt @@ -172,7 +172,10 @@ class BugReportActivity : VectorBaseActivity() { Toast.makeText(this@BugReportActivity, getString(R.string.send_bug_report_failed, reason), Toast.LENGTH_LONG).show() } - ReportType.SUGGESTION, + ReportType.SUGGESTION -> { + Toast.makeText(this@BugReportActivity, + getString(R.string.send_suggestion_failed, reason), Toast.LENGTH_LONG).show() + } ReportType.SPACE_BETA_FEEDBACK -> { Toast.makeText(this@BugReportActivity, getString(R.string.feedback_failed, reason), Toast.LENGTH_LONG).show() @@ -208,7 +211,9 @@ class BugReportActivity : VectorBaseActivity() { ReportType.BUG_REPORT -> { Toast.makeText(this@BugReportActivity, R.string.send_bug_report_sent, Toast.LENGTH_LONG).show() } - ReportType.SUGGESTION, + ReportType.SUGGESTION -> { + Toast.makeText(this@BugReportActivity, R.string.send_suggestion_sent, Toast.LENGTH_LONG).show() + } ReportType.SPACE_BETA_FEEDBACK -> { Toast.makeText(this@BugReportActivity, R.string.feedback_sent, Toast.LENGTH_LONG).show() } 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 0d5d26ceb3..8f48c3c2f1 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 @@ -20,6 +20,7 @@ import android.view.View import com.airbnb.epoxy.EpoxyController import im.vector.app.R import im.vector.app.RoomGroupingMethod +import im.vector.app.core.resources.ColorProvider import im.vector.app.core.resources.StringProvider import im.vector.app.core.ui.list.genericFooterItem import im.vector.app.core.ui.list.genericItemHeader @@ -39,6 +40,7 @@ import javax.inject.Inject class SpaceSummaryController @Inject constructor( private val avatarRenderer: AvatarRenderer, + private val colorProvider: ColorProvider, private val stringProvider: StringProvider) : EpoxyController() { var callback: Callback? = null @@ -73,6 +75,7 @@ class SpaceSummaryController @Inject constructor( genericItemHeader { id("legacy_groups") text(stringProvider.getString(R.string.groups_header)) + textColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary)) } // add home for communities @@ -105,11 +108,6 @@ class SpaceSummaryController @Inject constructor( rootSpaces: List?, expandedStates: Map, homeCount: RoomAggregateNotificationCount) { - genericItemHeader { - id("spaces") - text(stringProvider.getString(R.string.spaces_header)) - } - spaceBetaHeaderItem { id("beta_header") clickAction(View.OnClickListener { diff --git a/vector/src/main/res/drawable/ic_feedback.xml b/vector/src/main/res/drawable/ic_feedback.xml index b9f5584177..e774a8ab5c 100644 --- a/vector/src/main/res/drawable/ic_feedback.xml +++ b/vector/src/main/res/drawable/ic_feedback.xml @@ -5,10 +5,10 @@ android:viewportHeight="16"> 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 1827c691d4..9df9e26386 100644 --- a/vector/src/main/res/layout/item_space_beta_header.xml +++ b/vector/src/main/res/layout/item_space_beta_header.xml @@ -1,14 +1,14 @@ + android:paddingStart="16dp" + android:paddingEnd="16dp"> + android:layout_height="wrap_content"> - - + android:textStyle="bold" + app:drawableEndCompat="@drawable/ic_beta_pill" /> @@ -44,14 +39,14 @@ android:id="@+id/spaceBetaFeedbackAction" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:drawablePadding="8dp" android:paddingTop="4dp" android:paddingBottom="4dp" - android:layout_marginBottom="4dp" android:text="@string/give_feedback" - android:drawableStart="@drawable/ic_feedback" - android:drawablePadding="8dp" android:textColor="@color/vector_info_color" - android:textSize="15sp" /> + android:textSize="15sp" + app:drawableStartCompat="@drawable/ic_feedback" /> diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 48e53419d9..3cac228c6b 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -2164,6 +2164,8 @@ Make a suggestion Please write your suggestion below. Describe your suggestion here + Thanks, the suggestion has been successfully sent + The suggestion failed to be sent (%s) Spaces feedback Feedback @@ -3353,7 +3355,7 @@ Add existing rooms and space Welcome to Spaces! - Spaces are ways to group rooms and people for work, fun or just yourself. + Spaces are a new way to group rooms and people. You are invited