diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt index 07e862d97..cc190feaa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt @@ -40,8 +40,8 @@ class AvatarView @JvmOverloads constructor( storyRing.visible = true storyRing.isActivated = hasUnreadStory - avatar.scaleX = 0.82f - avatar.scaleY = 0.82f + avatar.scaleX = 0.8f + avatar.scaleY = 0.8f } private fun hideStoryRing() { diff --git a/app/src/main/res/drawable/avatar_story_ring.xml b/app/src/main/res/drawable/avatar_story_ring.xml index f21aea3ef..280d33702 100644 --- a/app/src/main/res/drawable/avatar_story_ring.xml +++ b/app/src/main/res/drawable/avatar_story_ring.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/stories_landing_item.xml b/app/src/main/res/layout/stories_landing_item.xml index 635e58607..163a4f04a 100644 --- a/app/src/main/res/layout/stories_landing_item.xml +++ b/app/src/main/res/layout/stories_landing_item.xml @@ -10,8 +10,8 @@ @@ -30,8 +30,8 @@ android:id="@+id/sender" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" + 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" app:layout_constraintBottom_toTopOf="@id/date" app:layout_constraintEnd_toStartOf="@id/story" @@ -44,7 +44,7 @@ android:id="@+id/error_indicator" android:layout_width="14dp" android:layout_height="14dp" - android:layout_marginStart="16dp" + android:layout_marginStart="@dimen/stories_landing_item_text_horizontal_margin" android:importantForAccessibility="no" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/date" @@ -59,21 +59,21 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="7dp" - android:layout_marginEnd="16dp" + android:layout_marginEnd="@dimen/stories_landing_item_text_horizontal_margin" android:textAppearance="@style/TextAppearance.Signal.Body2" android:textColor="@color/signal_text_secondary" app:layout_constraintBottom_toTopOf="@id/icon" app:layout_constraintEnd_toStartOf="@id/story" app:layout_constraintStart_toEndOf="@id/error_indicator" app:layout_constraintTop_toBottomOf="@id/sender" - app:layout_goneMarginStart="16dp" + app:layout_goneMarginStart="@dimen/stories_landing_item_text_horizontal_margin" tools:text="10m" /> diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml index cf042203e..17c56bf25 100644 --- a/app/src/main/res/values-night/dark_colors.xml +++ b/app/src/main/res/values-night/dark_colors.xml @@ -61,6 +61,7 @@ @color/transparent_white_10 @color/transparent_white_15 @color/transparent_white_20 + @color/transparent_white_25 @color/transparent_white_40 @color/transparent_white_60 @color/transparent_white_80 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7b84cf410..46aaef573 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -23,6 +23,7 @@ #18ffffff #26ffffff #33ffffff + #40ffffff #4Dffffff #66ffffff #99ffffff diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index decf417b3..b5e5ef9cb 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -217,4 +217,12 @@ 8dp 0dp 0dp + + 48dp + 72dp + 36dp + 64dp + 52dp + 76dp + 20dp diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml index 1312be28a..566a03cd4 100644 --- a/app/src/main/res/values/light_colors.xml +++ b/app/src/main/res/values/light_colors.xml @@ -61,6 +61,7 @@ @color/transparent_black_10 @color/transparent_black_15 @color/transparent_black_20 + @color/transparent_black_25 @color/transparent_black_40 @color/transparent_black_60 @color/transparent_black_80