empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update several story ui elements for Material3.

Browse source
This commit is contained in:
Alex Hart 2022-06-17 16:43:58 -03:00 • committed by Cody Henthorne
parent 9c7a5e3cc8
commit 4d1e8b8f75
12 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/drawable/avatar_story_ring.xml
View file

@ -2,12 +2,12 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true">
<shape android:shape="oval">
<stroke android:color="@color/signal_accent_primary" android:width="2.5dp" />
<stroke android:color="@color/signal_colorPrimary" android:width="2.5dp" />
</shape>
</item>
<item>
<shape android:shape="oval">
<stroke android:color="@color/signal_inverse_transparent_25" android:width="1dp" />
<stroke android:color="@color/signal_inverse_transparent_25" android:width="1.5dp" />
</shape>
</item>
</selector>

4
app/src/main/res/layout/stories_landing_fragment.xml
View file

@ -66,8 +66,8 @@
android:layout_marginEnd="68dp"
android:gravity="center"
android:text="@string/StoriesLandingFragment__no_recent_updates_to_show_right_now_tap_plus_to_add_to_your_story"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/signal_text_secondary"
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOutline"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

11
app/src/main/res/layout/stories_landing_item.xml
View file

@ -32,7 +32,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/stories_landing_item_text_horizontal_margin"
android:layout_marginEnd="@dimen/stories_landing_item_text_horizontal_margin"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOnSurface"
app:layout_constraintBottom_toTopOf="@id/date"
app:layout_constraintEnd_toStartOf="@id/story"
app:layout_constraintStart_toEndOf="@id/avatar"
@ -51,7 +52,7 @@
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="@id/date"
app:srcCompat="@drawable/ic_error_outline_24"
app:tint="@color/signal_alert_primary"
app:tint="@color/signal_colorError"
tools:visibility="visible" />
<TextView
@ -60,8 +61,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="7dp"
android:layout_marginEnd="@dimen/stories_landing_item_text_horizontal_margin"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintBottom_toTopOf="@id/icon"
app:layout_constraintEnd_toStartOf="@id/story"
app:layout_constraintStart_toEndOf="@id/error_indicator"
@ -80,7 +81,7 @@
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toBottomOf="@id/date"
app:srcCompat="@drawable/ic_messages_solid_20"
app:tint="@color/signal_text_primary_disabled" />
app:tint="@color/signal_colorOnSurfaceVariant" />
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/story_multi"

11
app/src/main/res/layout/stories_landing_item_my_stories.xml
View file

@ -31,7 +31,8 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/StoriesLandingFragment__my_stories"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOnSurface"
app:layout_constraintBottom_toTopOf="@id/date"
app:layout_constraintEnd_toStartOf="@id/story"
app:layout_constraintStart_toEndOf="@id/avatar"
@ -45,8 +46,8 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/StoriesLandingFragment__add_a_story"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_colorOnSurfaceVariant"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/story"
app:layout_constraintStart_toEndOf="@id/avatar"
@ -59,13 +60,13 @@
android:layout_marginTop="12dp"
android:layout_marginEnd="2dp"
android:layout_marginBottom="12dp"
android:background="@color/signal_background_secondary"
android:background="@color/signal_colorSurfaceVariant"
android:scaleType="centerInside"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearance="@style/ShapeAppearanceOverlay.Signal.Story.Preview"
app:srcCompat="@drawable/ic_plus_24"
app:tint="@color/signal_inverse_primary" />
app:tint="@color/signal_colorOnSurface" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/stories_my_stories_fragment.xml
View file

@ -14,8 +14,8 @@
android:layout_marginHorizontal="68dp"
android:gravity="center"
android:text="@string/MyStoriesFragment__updates_to_your_story_will_show_up_here"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/signal_text_secondary"
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOutline"
android:visibility="gone"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"

14
app/src/main/res/layout/stories_my_stories_item.xml
View file

@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textAppearance="@style/Signal.Text.BodyLarge"
app:layout_constraintBottom_toTopOf="@id/date"
app:layout_constraintStart_toEndOf="@+id/error_indicator"
app:layout_constraintTop_toTopOf="parent"
@ -59,14 +59,14 @@
app:layout_constraintStart_toEndOf="@id/story"
app:layout_constraintTop_toTopOf="@+id/view_count"
app:srcCompat="@drawable/ic_error_outline_24"
app:tint="@color/signal_alert_primary"
app:tint="@color/signal_colorError"
tools:visibility="visible" />
<TextView
android:id="@+id/date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textAppearance="@style/Signal.Text.BodyMedium"
android:textColor="@color/signal_text_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/view_count"
@ -101,12 +101,12 @@
android:layout_marginEnd="24dp"
android:background="@drawable/circle_tintable"
android:scaleType="centerInside"
app:backgroundTint="@color/signal_background_secondary"
app:backgroundTint="@color/signal_colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/more"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_download_24"
app:tint="@color/signal_icon_tint_primary" />
app:tint="@color/signal_colorOnSecondaryContainer" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/more"
@ -114,11 +114,11 @@
android:layout_height="32dp"
android:background="@drawable/circle_tintable"
android:scaleType="centerInside"
app:backgroundTint="@color/signal_background_secondary"
app:backgroundTint="@color/signal_colorSecondaryContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_more_vert_24"
app:tint="@color/signal_icon_tint_primary" />
app:tint="@color/signal_colorOnSecondaryContainer" />
</androidx.constraintlayout.widget.ConstraintLayout>

7
app/src/main/res/layout/stories_private_story_add_viewer_item.xml
View file

@ -16,9 +16,9 @@
android:background="@drawable/circle_tintable"
android:importantForAccessibility="no"
android:scaleType="centerInside"
app:backgroundTint="@color/signal_background_secondary"
app:backgroundTint="@color/signal_colorSurfaceVariant"
app:srcCompat="@drawable/ic_add_members_20"
app:tint="@color/signal_icon_tint_primary" />
app:tint="@color/signal_colorOnSurfaceVariant" />
<TextView
android:id="@+id/label"
@ -28,6 +28,7 @@
android:layout_marginStart="16dp"
android:layout_weight="1"
android:text="@string/PrivateStorySettingsFragment__add_viewer"
android:textAppearance="@style/Signal.Text.Body" />
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOnSurface" />
</LinearLayout>

7
app/src/main/res/layout/stories_private_story_item.xml
View file

@ -17,9 +17,9 @@
android:background="@drawable/circle_tintable"
android:importantForAccessibility="no"
android:scaleType="centerInside"
app:backgroundTint="@color/signal_background_secondary"
app:backgroundTint="@color/signal_colorSurfaceVariant"
app:srcCompat="@drawable/ic_lock_24"
app:tint="@color/signal_icon_tint_primary" />
app:tint="@color/signal_colorOnSurfaceVariant" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/label"
@ -28,7 +28,8 @@
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:layout_weight="1"
android:textAppearance="@style/Signal.Text.Body"
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOnSurface"
tools:text="@string/StorySettingsFragment__new_private_story" />
</LinearLayout>

7
app/src/main/res/layout/stories_private_story_new_item.xml
View file

@ -16,9 +16,9 @@
android:background="@drawable/circle_tintable"
android:importantForAccessibility="no"
android:scaleType="centerInside"
app:backgroundTint="@color/signal_background_secondary"
app:backgroundTint="@color/signal_colorSurfaceVariant"
app:srcCompat="@drawable/ic_add_members_20"
app:tint="@color/signal_icon_tint_primary" />
app:tint="@color/signal_colorOnSurfaceVariant" />
<TextView
android:id="@+id/label"
@ -28,6 +28,7 @@
android:layout_marginStart="16dp"
android:layout_weight="1"
android:text="@string/StorySettingsFragment__new_private_story"
android:textAppearance="@style/Signal.Text.Body" />
android:textAppearance="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOnSurface" />
</LinearLayout>

4
app/src/main/res/layout/stories_private_story_recipient_item.xml
View file

@ -8,7 +8,6 @@
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dsl_settings_gutter">
<!-- TODO - Final art asset -->
<org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/avatar"
android:layout_width="40dp"
@ -16,7 +15,6 @@
android:layout_gravity="center_vertical"
android:importantForAccessibility="no"
android:scaleType="centerInside"
app:backgroundTint="@color/signal_background_secondary"
app:fallbackImageSize="small" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@ -27,6 +25,6 @@
android:layout_marginStart="16dp"
android:layout_weight="1"
android:text="@string/MyStorySettingsFragment__my_story"
android:textAppearance="@style/Signal.Text.Body" />
android:textAppearance="@style/Signal.Text.BodyLarge" />
</LinearLayout>

2
app/src/main/res/layout/stories_recipient_item.xml
View file

@ -32,7 +32,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Preview"
android:textAppearance="@style/Signal.Text.BodyLarge"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/recipient_view_avatar"

8
app/src/main/res/values/themes.xml
View file

@ -495,10 +495,10 @@
<style name="ShapeAppearanceOverlay.Signal.Story.Preview" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeTopRight">12dp</item>
<item name="cornerSizeTopLeft">12dp</item>
<item name="cornerSizeBottomLeft">12dp</item>
<item name="cornerSizeBottomRight">12dp</item>
<item name="cornerSizeTopRight">10dp</item>
<item name="cornerSizeTopLeft">10dp</item>
<item name="cornerSizeBottomLeft">10dp</item>
<item name="cornerSizeBottomRight">10dp</item>
</style>
<style name="ShapeAppearanceOverlay.Signal.Story.Text" parent="">