mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Rework sizing on landing page.

fork-5.53.8
Alex Hart 2022-04-04 15:52:29 -03:00 zatwierdzone przez Cody Henthorne
rodzic 0504161b04
commit dbe186248d
7 zmienionych plików z 32 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
Wyświetl plik

@ -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() {

2
app/src/main/res/drawable/avatar_story_ring.xml
Wyświetl plik

@ -7,7 +7,7 @@
</item>
<item>
<shape android:shape="oval">
<stroke android:color="@color/signal_inverse_transparent_20" android:width="1dp" />
<stroke android:color="@color/signal_inverse_transparent_25" android:width="1dp" />
</shape>
</item>
</selector>

36
app/src/main/res/layout/stories_landing_item.xml
Wyświetl plik

@ -10,8 +10,8 @@
<org.thoughtcrime.securesms.avatar.view.AvatarView
android:id="@+id/avatar"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_width="48dp"
android:layout_height="48dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -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" />
<ImageView
android:id="@+id/icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="16dp"
android:layout_marginStart="@dimen/stories_landing_item_text_horizontal_margin"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/avatar"
@ -83,8 +83,8 @@
<org.thoughtcrime.securesms.components.ThumbnailView
android:id="@+id/story_multi"
android:layout_width="48dp"
android:layout_height="72dp"
android:layout_width="@dimen/stories_landing_item_thumb_secondary_width"
android:layout_height="@dimen/stories_landing_item_thumb_secondary_height"
android:layout_marginEnd="14dp"
android:layout_marginBottom="8dp"
android:rotation="-10.89"
@ -97,8 +97,8 @@
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/story_outline"
android:layout_width="60dp"
android:layout_height="88dp"
android:layout_width="@dimen/stories_landing_item_thumb_outline_width"
android:layout_height="@dimen/stories_landing_item_thumb_outline_height"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:src="@color/transparent"
@ -109,27 +109,27 @@
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/story"
android:layout_width="56dp"
android:layout_height="84dp"
android:layout_width="@dimen/stories_landing_item_thumb_width"
android:layout_height="@dimen/stories_landing_item_thumb_height"
android:background="@color/signal_background_primary"
android:transitionName="story"
app:layout_constraintBottom_toBottomOf="@+id/story_outline"
app:layout_constraintEnd_toEndOf="@+id/story_outline"
app:layout_constraintTop_toTopOf="@+id/story_outline"
app:layout_constraintStart_toStartOf="@+id/story_outline"
app:layout_constraintTop_toTopOf="@+id/story_outline"
app:shapeAppearance="@style/ShapeAppearanceOverlay.Signal.Story.Preview"
tools:src="@drawable/test_gradient" />
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/story_blur"
android:layout_width="56dp"
android:layout_height="84dp"
android:layout_width="@dimen/stories_landing_item_thumb_width"
android:layout_height="@dimen/stories_landing_item_thumb_height"
android:background="@color/signal_background_primary"
android:transitionName="story"
app:layout_constraintBottom_toBottomOf="@+id/story_outline"
app:layout_constraintEnd_toEndOf="@+id/story_outline"
app:layout_constraintTop_toTopOf="@+id/story_outline"
app:layout_constraintStart_toStartOf="@+id/story_outline"
app:layout_constraintTop_toTopOf="@+id/story_outline"
app:shapeAppearance="@style/ShapeAppearanceOverlay.Signal.Story.Preview"
tools:src="@drawable/test_gradient" />

1
app/src/main/res/values-night/dark_colors.xml
Wyświetl plik

@ -61,6 +61,7 @@
<color name="signal_inverse_transparent_10">@color/transparent_white_10</color>
<color name="signal_inverse_transparent_15">@color/transparent_white_15</color>
<color name="signal_inverse_transparent_20">@color/transparent_white_20</color>
<color name="signal_inverse_transparent_25">@color/transparent_white_25</color>
<color name="signal_inverse_transparent_40">@color/transparent_white_40</color>
<color name="signal_inverse_transparent_60">@color/transparent_white_60</color>
<color name="signal_inverse_transparent_80">@color/transparent_white_80</color>

1
app/src/main/res/values/colors.xml
Wyświetl plik

@ -23,6 +23,7 @@
<color name="transparent_white_10">#18ffffff</color>
<color name="transparent_white_15">#26ffffff</color>
<color name="transparent_white_20">#33ffffff</color>
<color name="transparent_white_25">#40ffffff</color>
<color name="transparent_white_30">#4Dffffff</color>
<color name="transparent_white_40">#66ffffff</color>
<color name="transparent_white_60">#99ffffff</color>

8
app/src/main/res/values/dimens.xml
Wyświetl plik

@ -217,4 +217,12 @@
<dimen name="segmentedprogressbar_default_segment_margin">8dp</dimen>
<dimen name="segmentedprogressbar_default_corner_radius">0dp</dimen>
<dimen name="segmentedprogressbar_default_segment_stroke_width">0dp</dimen>
<dimen name="stories_landing_item_thumb_width">48dp</dimen>
<dimen name="stories_landing_item_thumb_height">72dp</dimen>
<dimen name="stories_landing_item_thumb_secondary_width">36dp</dimen>
<dimen name="stories_landing_item_thumb_secondary_height">64dp</dimen>
<dimen name="stories_landing_item_thumb_outline_width">52dp</dimen>
<dimen name="stories_landing_item_thumb_outline_height">76dp</dimen>
<dimen name="stories_landing_item_text_horizontal_margin">20dp</dimen>
</resources>

1
app/src/main/res/values/light_colors.xml
Wyświetl plik

@ -61,6 +61,7 @@
<color name="signal_inverse_transparent_10">@color/transparent_black_10</color>
<color name="signal_inverse_transparent_15">@color/transparent_black_15</color>
<color name="signal_inverse_transparent_20">@color/transparent_black_20</color>
<color name="signal_inverse_transparent_25">@color/transparent_black_25</color>
<color name="signal_inverse_transparent_40">@color/transparent_black_40</color>
<color name="signal_inverse_transparent_60">@color/transparent_black_60</color>
<color name="signal_inverse_transparent_80">@color/transparent_black_80</color>