Update new story text to be a small button.
This commit is contained in:
parent
c47a724654
commit
07d9e29e7c
5 changed files with 29 additions and 16 deletions
|
@ -4,6 +4,7 @@ import android.view.View
|
|||
import android.view.ViewGroup
|
||||
import android.widget.CheckBox
|
||||
import android.widget.TextView
|
||||
import com.google.android.material.button.MaterialButton
|
||||
import org.thoughtcrime.securesms.R
|
||||
import org.thoughtcrime.securesms.badges.BadgeImageView
|
||||
import org.thoughtcrime.securesms.components.AvatarImageView
|
||||
|
@ -322,7 +323,7 @@ object ContactSearchItems {
|
|||
private class HeaderViewHolder(itemView: View) : MappingViewHolder<HeaderModel>(itemView) {
|
||||
|
||||
private val headerTextView: TextView = itemView.findViewById(R.id.section_header)
|
||||
private val headerActionView: TextView = itemView.findViewById(R.id.section_header_action)
|
||||
private val headerActionView: MaterialButton = itemView.findViewById(R.id.section_header_action)
|
||||
|
||||
override fun bind(model: HeaderModel) {
|
||||
headerTextView.setText(
|
||||
|
@ -336,7 +337,7 @@ object ContactSearchItems {
|
|||
|
||||
if (model.header.action != null) {
|
||||
headerActionView.visible = true
|
||||
headerActionView.setCompoundDrawablesRelativeWithIntrinsicBounds(model.header.action.icon, 0, 0, 0)
|
||||
headerActionView.setIconResource(model.header.action.icon)
|
||||
headerActionView.setText(model.header.action.label)
|
||||
headerActionView.setOnClickListener { model.header.action.action.run() }
|
||||
} else {
|
||||
|
|
|
@ -95,7 +95,7 @@ object Stories {
|
|||
fun getHeaderAction(onClick: () -> Unit): HeaderAction {
|
||||
return HeaderAction(
|
||||
R.string.ContactsCursorLoader_new_story,
|
||||
R.drawable.ic_plus_20,
|
||||
R.drawable.ic_plus_12,
|
||||
onClick
|
||||
)
|
||||
}
|
||||
|
|
9
app/src/main/res/drawable/ic_plus_12.xml
Normal file
9
app/src/main/res/drawable/ic_plus_12.xml
Normal file
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="12dp"
|
||||
android:height="12dp"
|
||||
android:viewportWidth="12"
|
||||
android:viewportHeight="12">
|
||||
<path
|
||||
android:pathData="M10,5.25H6.75V2H5.25V5.25H2V6.75H5.25V10H6.75V6.75H10V5.25Z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
tools:viewBindingIgnore="true"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:minHeight="48dp"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
tools:viewBindingIgnore="true">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/section_header"
|
||||
|
@ -20,20 +20,18 @@
|
|||
android:textAppearance="@style/Signal.Text.TitleSmall"
|
||||
tools:text="Section Header" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/section_header_action"
|
||||
style="@style/Widget.Signal.Button.Small"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?selectableItemBackground"
|
||||
android:drawablePadding="4dp"
|
||||
android:paddingStart="@dimen/dsl_settings_gutter"
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="@dimen/dsl_settings_gutter"
|
||||
android:paddingBottom="12dp"
|
||||
android:textAppearance="@style/Signal.Text.TitleSmall"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginEnd="@dimen/dsl_settings_gutter"
|
||||
android:visibility="gone"
|
||||
app:drawableStartCompat="@drawable/ic_plus_20"
|
||||
app:drawableTint="@color/signal_inverse_primary"
|
||||
app:icon="@drawable/ic_plus_12"
|
||||
app:iconSize="12dp"
|
||||
app:materialThemeOverlay="@style/ThemeOverlay.Signal.Button.Surface2"
|
||||
tools:text="New Story"
|
||||
tools:visibility="visible" />
|
||||
</LinearLayout>
|
||||
|
|
|
@ -106,6 +106,11 @@
|
|||
<item name="colorOnContainer">@color/signal_colorOnSurfaceVariant</item>
|
||||
<item name="colorContainer">@color/signal_colorSurface1</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.Signal.Button.Surface2" parent="ThemeOverlay.Material3.Button">
|
||||
<item name="colorOnContainer">@color/signal_colorOnSurface</item>
|
||||
<item name="colorContainer">@color/signal_colorSurface2</item>
|
||||
</style>
|
||||
|
||||
<style name="Signal.Widget.Button.Base.Secondary" parent="Widget.Material3.Button.TextButton">
|
||||
<item name="android:insetTop">0dp</item>
|
||||
|
|
Loading…
Add table
Reference in a new issue