mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-28 04:34:21 +01:00
Add chat filter animation.
This commit is contained in:
committed by
Greyson Parrelli
parent
a13599ae2a
commit
d79c4775b6
@@ -4,24 +4,30 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:parentTag="android.widget.FrameLayout">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_marginStart="@dimen/dsl_settings_gutter"
|
||||
android:layout_marginBottom="11dp"
|
||||
android:text="@string/ConversationListFilterPullView__pull_down_to_filter"
|
||||
android:textAppearance="@style/Signal.Text.LabelLarge" />
|
||||
<org.thoughtcrime.securesms.conversationlist.chatfilter.FilterCircleView
|
||||
android:id="@+id/filter_circle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/arrow"
|
||||
<com.google.android.material.chip.Chip
|
||||
android:id="@+id/filter_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|center_horizontal"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:importantForAccessibility="no"
|
||||
app:srcCompat="@drawable/ic_arrow_down"
|
||||
app:tint="@color/signal_colorOnSurface" />
|
||||
android:layout_height="32dp"
|
||||
android:layout_gravity="center_horizontal|bottom"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:enabled="false"
|
||||
android:text="@string/ChatFilter__filtered_by_unread"
|
||||
android:textAppearance="@style/Signal.Text.LabelLarge"
|
||||
android:textColor="@color/signal_colorOnSurface"
|
||||
android:visibility="invisible"
|
||||
app:chipBackgroundColor="@color/signal_colorSecondaryContainer"
|
||||
app:chipCornerRadius="8dp"
|
||||
app:chipMinHeight="32dp"
|
||||
app:closeIcon="@drawable/ic_x_20"
|
||||
app:closeIconEnabled="true"
|
||||
app:closeIconSize="18dp"
|
||||
app:ensureMinTouchTargetSize="false"
|
||||
app:icon="@drawable/ic_x_20"
|
||||
app:iconTint="@color/signal_colorOnSurface" />
|
||||
|
||||
</merge>
|
||||
@@ -50,16 +50,24 @@
|
||||
android:id="@+id/recycler_coordinator_app_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
app:elevation="0dp"
|
||||
app:expanded="false"
|
||||
app:layout_behavior="org.thoughtcrime.securesms.conversationlist.ConversationFilterBehavior">
|
||||
|
||||
<org.thoughtcrime.securesms.conversationlist.ConversationListFilterPullView
|
||||
android:id="@+id/pull_view"
|
||||
<com.google.android.material.appbar.CollapsingToolbarLayout
|
||||
android:id="@+id/collapsing_toolbar"
|
||||
app:layout_scrollFlags="scroll|enterAlwaysCollapsed|exitUntilCollapsed"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="80dp"
|
||||
android:background="@color/signal_colorSurface1"
|
||||
app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
|
||||
app:layout_scrollInterpolator="@android:anim/decelerate_interpolator" />
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.thoughtcrime.securesms.conversationlist.chatfilter.ConversationListFilterPullView
|
||||
android:id="@+id/pull_view"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="100dp"
|
||||
android:background="@color/signal_colorBackground"
|
||||
app:layout_scrollInterpolator="@android:anim/linear_interpolator" />
|
||||
|
||||
</com.google.android.material.appbar.CollapsingToolbarLayout>
|
||||
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
|
||||
|
||||
@@ -5453,4 +5453,8 @@
|
||||
<string name="PaypalCompleteOrderBottomSheet__donate">Donate</string>
|
||||
<string name="PaypalCompleteOrderBottomSheet__payment">Payment</string>
|
||||
|
||||
<!-- ChatFilter -->
|
||||
<!-- Displayed in a pill at the top of the chat list when it is filtered by unread messages -->
|
||||
<string name="ChatFilter__filtered_by_unread">Filtered by unread</string>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user