ff8dd37855
* Replace "warn"-filtered posts in timelines and thread view with placeholders * Adapt hashtag muting interface * Rework filter UI * Add icon for account preferences * Clean up UI * WIP: Use chips instead of a list. Adjust padding * Scroll the filter edit activity Nested scrolling views (e.g., an activity that scrolls with an embedded list that also scrolls) can be difficult UI. Since the list of contexts is fixed, replace it with a fixed collection of switches, so there's no need to scroll the list. Since the list of actions is only two (warn, hide), and are mutually exclusive, replace the spinner with two radio buttons. Use the accent colour and title styles on the different heading titles in the layout, to match the presentation in Preferences. Add an explicit "Cancel" button. The layout is a straightforward LinearLayout, so use that instead of ConstraintLayout, and remove some unncessary IDs. Update EditFilterActivity to handle the new layout. * Cleanup * Add more information to the filter list view * First pass on code review comments * Add view model to filters activity * Add view model to edit filters activity * Only use the status wrapper for filtered statuses * Relint --------- Co-authored-by: Nik Clayton <nik@ngo.org.uk>
405 lines
17 KiB
XML
405 lines
17 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:sparkbutton="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:id="@+id/status_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:focusable="true">
|
|
|
|
<TextView
|
|
android:id="@+id/status_info"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="14dp"
|
|
android:layout_marginTop="@dimen/status_reblogged_bar_padding_top"
|
|
android:layout_marginEnd="14dp"
|
|
android:drawableStart="@drawable/ic_reblog_18dp"
|
|
android:drawablePadding="6dp"
|
|
android:gravity="center_vertical"
|
|
android:importantForAccessibility="no"
|
|
android:paddingStart="38dp"
|
|
android:textColor="?android:textColorTertiary"
|
|
android:textSize="?attr/status_text_medium"
|
|
app:layout_constraintLeft_toRightOf="parent"
|
|
app:layout_constraintRight_toLeftOf="parent"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
tools:ignore="RtlSymmetry"
|
|
tools:text="ConnyDuck boosted"
|
|
tools:visibility="visible" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_avatar"
|
|
android:layout_width="48dp"
|
|
android:layout_height="48dp"
|
|
android:layout_marginStart="14dp"
|
|
android:layout_marginTop="14dp"
|
|
android:contentDescription="@string/action_view_profile"
|
|
android:importantForAccessibility="no"
|
|
android:scaleType="centerCrop"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintTop_toBottomOf="@id/status_info"
|
|
tools:src="@drawable/avatar_default" />
|
|
|
|
<ImageView
|
|
android:id="@+id/status_avatar_inset"
|
|
android:layout_width="24dp"
|
|
android:layout_height="24dp"
|
|
android:contentDescription="@null"
|
|
android:importantForAccessibility="no"
|
|
android:visibility="gone"
|
|
app:layout_constraintBottom_toBottomOf="@id/status_avatar"
|
|
app:layout_constraintEnd_toEndOf="@id/status_avatar"
|
|
tools:src="#000"
|
|
tools:visibility="visible" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_display_name"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="14dp"
|
|
android:layout_marginTop="10dp"
|
|
android:ellipsize="end"
|
|
android:importantForAccessibility="no"
|
|
android:maxLines="1"
|
|
android:paddingEnd="@dimen/status_display_name_padding_end"
|
|
android:textColor="?android:textColorPrimary"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:textStyle="normal|bold"
|
|
app:layout_constrainedWidth="true"
|
|
app:layout_constraintEnd_toStartOf="@id/status_meta_info"
|
|
app:layout_constraintHorizontal_bias="0"
|
|
app:layout_constraintStart_toEndOf="@id/status_avatar"
|
|
app:layout_constraintTop_toBottomOf="@id/status_info"
|
|
tools:text="Ente r the void you foooooo" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_username"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:ellipsize="end"
|
|
android:importantForAccessibility="no"
|
|
android:maxLines="1"
|
|
android:textColor="?android:textColorSecondary"
|
|
android:textSize="?attr/status_text_medium"
|
|
app:layout_constraintEnd_toStartOf="@id/status_meta_info"
|
|
app:layout_constraintStart_toEndOf="@id/status_display_name"
|
|
app:layout_constraintTop_toTopOf="@id/status_display_name"
|
|
tools:text="\@Entenhausen@birbsarecooooooooooool.site" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_meta_info"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="4dp"
|
|
android:layout_marginEnd="14dp"
|
|
android:importantForAccessibility="no"
|
|
android:textColor="?android:textColorSecondary"
|
|
android:textSize="?attr/status_text_medium"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintTop_toTopOf="@id/status_display_name"
|
|
tools:text="13:37" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_content_warning_description"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginEnd="14dp"
|
|
android:hyphenationFrequency="full"
|
|
android:importantForAccessibility="no"
|
|
android:lineSpacingMultiplier="1.1"
|
|
android:textColor="?android:textColorPrimary"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:visibility="gone"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_display_name"
|
|
tools:text="content warning which is very long and it doesn't fit"
|
|
tools:visibility="visible" />
|
|
|
|
<Button
|
|
android:id="@+id/status_content_warning_button"
|
|
style="@style/TuskyButton.Outlined"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_marginBottom="4dp"
|
|
android:importantForAccessibility="no"
|
|
android:minWidth="150dp"
|
|
android:minHeight="0dp"
|
|
android:paddingLeft="16dp"
|
|
android:paddingTop="4dp"
|
|
android:paddingRight="16dp"
|
|
android:paddingBottom="4dp"
|
|
android:textAllCaps="true"
|
|
android:textOff="@string/post_content_warning_show_more"
|
|
android:textOn="@string/post_content_warning_show_less"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:visibility="gone"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_content_warning_description"
|
|
tools:text="@string/post_content_warning_show_more"
|
|
tools:visibility="visible" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_content"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginEnd="14dp"
|
|
android:focusable="true"
|
|
android:hyphenationFrequency="full"
|
|
android:importantForAccessibility="no"
|
|
android:lineSpacingMultiplier="1.1"
|
|
android:textColor="?android:textColorPrimary"
|
|
android:textSize="?attr/status_text_medium"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="@id/status_content_warning_button"
|
|
app:layout_constraintTop_toBottomOf="@id/status_content_warning_button"
|
|
tools:text="This is a status" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/status_card_view"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_marginEnd="14dp"
|
|
android:background="@drawable/card_frame"
|
|
android:clipChildren="true"
|
|
android:foreground="?attr/selectableItemBackground"
|
|
android:minHeight="80dp"
|
|
android:orientation="vertical"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@+id/button_toggle_content"
|
|
tools:visibility="gone">
|
|
|
|
<com.google.android.material.imageview.ShapeableImageView
|
|
android:id="@+id/card_image"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="300dp"
|
|
android:layout_margin="1dp"
|
|
android:background="?attr/colorBackgroundAccent"
|
|
android:importantForAccessibility="no"
|
|
android:scaleType="center" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/card_info"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:paddingLeft="6dp"
|
|
android:paddingTop="6dp"
|
|
android:paddingRight="6dp"
|
|
android:paddingBottom="6dp">
|
|
|
|
<TextView
|
|
android:id="@+id/card_title"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="4dp"
|
|
android:ellipsize="end"
|
|
android:fontFamily="sans-serif-medium"
|
|
android:lines="1"
|
|
android:textColor="?android:textColorSecondary"
|
|
android:textSize="?attr/status_text_medium" />
|
|
|
|
<TextView
|
|
android:id="@+id/card_description"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="4dp"
|
|
android:ellipsize="end"
|
|
android:lineSpacingMultiplier="1.1"
|
|
android:maxLines="2"
|
|
android:textColor="?android:textColorSecondary"
|
|
android:textSize="?attr/status_text_medium" />
|
|
|
|
<TextView
|
|
android:id="@+id/card_link"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:ellipsize="end"
|
|
android:lines="1"
|
|
android:textColor="?android:textColorTertiary"
|
|
android:textSize="?attr/status_text_medium" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<Button
|
|
android:id="@+id/button_toggle_content"
|
|
style="@style/TuskyButton.Outlined"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_marginBottom="4dp"
|
|
android:importantForAccessibility="no"
|
|
android:minWidth="150dp"
|
|
android:minHeight="0dp"
|
|
android:paddingLeft="16dp"
|
|
android:paddingTop="4dp"
|
|
android:paddingRight="16dp"
|
|
android:paddingBottom="4dp"
|
|
android:textAllCaps="true"
|
|
android:textSize="?attr/status_text_medium"
|
|
android:visibility="gone"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_content"
|
|
tools:text="@string/post_content_show_less"
|
|
tools:visibility="visible" />
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
android:id="@+id/status_media_preview_container"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="@dimen/status_media_preview_margin_top"
|
|
android:layout_marginEnd="14dp"
|
|
android:background="@drawable/media_preview_outline"
|
|
android:importantForAccessibility="noHideDescendants"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_card_view"
|
|
tools:visibility="visible">
|
|
|
|
<include layout="@layout/item_media_preview" />
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
<androidx.recyclerview.widget.RecyclerView
|
|
android:id="@+id/status_poll_options"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_marginEnd="14dp"
|
|
android:layout_marginBottom="4dp"
|
|
android:nestedScrollingEnabled="false"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />
|
|
|
|
<Button
|
|
android:id="@+id/status_poll_button"
|
|
style="@style/TuskyButton.Outlined"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="4dp"
|
|
android:gravity="center"
|
|
android:minWidth="150dp"
|
|
android:minHeight="0dp"
|
|
android:paddingLeft="16dp"
|
|
android:paddingTop="4dp"
|
|
android:paddingRight="16dp"
|
|
android:paddingBottom="4dp"
|
|
android:text="@string/poll_vote"
|
|
android:textSize="?attr/status_text_medium"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_poll_description"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="6dp"
|
|
android:layout_marginEnd="14dp"
|
|
android:textSize="?attr/status_text_medium"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_poll_button"
|
|
tools:text="7 votes • 7 hours remaining" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/status_reply"
|
|
style="@style/TuskyImageButton"
|
|
android:layout_width="52dp"
|
|
android:layout_height="48dp"
|
|
android:layout_marginStart="-14dp"
|
|
android:contentDescription="@string/action_reply"
|
|
android:importantForAccessibility="no"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toStartOf="@id/status_inset"
|
|
app:layout_constraintHorizontal_chainStyle="spread_inside"
|
|
app:layout_constraintStart_toStartOf="@id/status_display_name"
|
|
app:layout_constraintTop_toBottomOf="@id/status_poll_description"
|
|
app:srcCompat="@drawable/ic_reply_24dp" />
|
|
|
|
<TextView
|
|
android:id="@+id/status_replies"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="40dp"
|
|
android:textSize="?attr/status_text_medium"
|
|
app:layout_constraintBottom_toBottomOf="@id/status_reply"
|
|
app:layout_constraintStart_toStartOf="@id/status_reply"
|
|
app:layout_constraintTop_toTopOf="@id/status_reply"
|
|
tools:text="1+" />
|
|
|
|
<at.connyduck.sparkbutton.SparkButton
|
|
android:id="@+id/status_inset"
|
|
android:layout_width="52dp"
|
|
android:layout_height="48dp"
|
|
android:clipToPadding="false"
|
|
android:contentDescription="@string/action_reblog"
|
|
android:importantForAccessibility="no"
|
|
android:padding="4dp"
|
|
app:layout_constraintEnd_toStartOf="@id/status_favourite"
|
|
app:layout_constraintStart_toEndOf="@id/status_reply"
|
|
app:layout_constraintTop_toTopOf="@id/status_reply"
|
|
sparkbutton:activeImage="@drawable/ic_reblog_active_24dp"
|
|
sparkbutton:iconSize="28dp"
|
|
sparkbutton:inactiveImage="@drawable/ic_reblog_24dp"
|
|
sparkbutton:primaryColor="@color/tusky_blue"
|
|
sparkbutton:secondaryColor="@color/tusky_blue_light" />
|
|
|
|
<at.connyduck.sparkbutton.SparkButton
|
|
android:id="@+id/status_favourite"
|
|
android:layout_width="52dp"
|
|
android:layout_height="48dp"
|
|
android:clipToPadding="false"
|
|
android:contentDescription="@string/action_favourite"
|
|
android:importantForAccessibility="no"
|
|
android:padding="4dp"
|
|
app:layout_constraintEnd_toStartOf="@id/status_bookmark"
|
|
app:layout_constraintStart_toEndOf="@id/status_inset"
|
|
app:layout_constraintTop_toTopOf="@id/status_inset"
|
|
sparkbutton:activeImage="@drawable/ic_favourite_active_24dp"
|
|
sparkbutton:iconSize="28dp"
|
|
sparkbutton:inactiveImage="@drawable/ic_favourite_24dp"
|
|
sparkbutton:primaryColor="@color/tusky_orange"
|
|
sparkbutton:secondaryColor="@color/tusky_orange_light" />
|
|
|
|
<at.connyduck.sparkbutton.SparkButton
|
|
android:id="@+id/status_bookmark"
|
|
android:layout_width="52dp"
|
|
android:layout_height="48dp"
|
|
android:clipToPadding="false"
|
|
android:contentDescription="@string/action_bookmark"
|
|
android:importantForAccessibility="no"
|
|
android:padding="4dp"
|
|
app:layout_constraintEnd_toStartOf="@id/status_more"
|
|
app:layout_constraintStart_toEndOf="@id/status_favourite"
|
|
app:layout_constraintTop_toTopOf="@id/status_reply"
|
|
sparkbutton:activeImage="@drawable/ic_bookmark_active_24dp"
|
|
sparkbutton:iconSize="28dp"
|
|
sparkbutton:inactiveImage="@drawable/ic_bookmark_24dp"
|
|
sparkbutton:primaryColor="@color/tusky_green"
|
|
sparkbutton:secondaryColor="@color/tusky_green_light" />
|
|
|
|
<ImageButton
|
|
android:id="@+id/status_more"
|
|
style="@style/TuskyImageButton"
|
|
android:layout_width="52dp"
|
|
android:layout_height="48dp"
|
|
android:layout_gravity="end"
|
|
android:contentDescription="@string/action_more"
|
|
android:importantForAccessibility="no"
|
|
app:layout_constraintBottom_toBottomOf="@id/status_reply"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toEndOf="@id/status_bookmark"
|
|
app:layout_constraintTop_toTopOf="@id/status_reply"
|
|
app:srcCompat="@drawable/ic_more_horiz_24dp" />
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|