Update verify safety number display fragment.
This commit is contained in:
parent
8b5c630303
commit
b8a7748dc1
4 changed files with 19 additions and 12 deletions
|
@ -2,5 +2,5 @@
|
|||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="@color/core_grey_02" />
|
||||
<solid android:color="@color/qr_card_color" />
|
||||
</shape>
|
|
@ -10,14 +10,15 @@
|
|||
<org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="56dp"
|
||||
android:layout_height="@dimen/signal_m3_toolbar_height"
|
||||
android:minHeight="@dimen/signal_m3_toolbar_height"
|
||||
android:theme="?attr/settingsToolbarStyle"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:navigationIcon="@drawable/ic_arrow_left_24"
|
||||
app:titleTextAppearance="@style/Signal.Text.Title"
|
||||
app:navigationContentDescription="@string/DSLSettingsToolbar__navigate_up"
|
||||
app:navigationIcon="@drawable/ic_arrow_left_24"
|
||||
app:titleTextAppearance="@style/Signal.Text.TitleLarge"
|
||||
tools:title="@string/AndroidManifest__verify_safety_number" />
|
||||
|
||||
<ScrollView
|
||||
|
@ -92,22 +93,20 @@
|
|||
android:outAnimation="@android:anim/fade_out">
|
||||
|
||||
<TextView
|
||||
style="@style/Signal.Text.Preview"
|
||||
style="@style/Signal.Text.BodyMedium"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|center_horizontal"
|
||||
android:text="@string/verify_display_fragment__tap_to_scan"
|
||||
android:textColor="@color/core_grey_50"
|
||||
android:textSize="11sp" />
|
||||
android:textColor="@color/qr_card_text_color" />
|
||||
|
||||
<TextView
|
||||
style="@style/Signal.Text.Preview"
|
||||
style="@style/Signal.Text.BodyMedium"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|center_horizontal"
|
||||
android:text="@string/verify_display_fragment__successful_match"
|
||||
android:textColor="@color/core_grey_50"
|
||||
android:textSize="11sp" />
|
||||
android:textColor="@color/qr_card_text_color" />
|
||||
|
||||
</TextSwitcher>
|
||||
|
||||
|
@ -229,7 +228,7 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/description"
|
||||
style="@style/TextAppearance.Signal.Body2"
|
||||
style="@style/Signal.Text.BodyMedium"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="30dp"
|
||||
|
@ -237,7 +236,9 @@
|
|||
android:layout_marginEnd="30dp"
|
||||
android:gravity="center"
|
||||
android:lineSpacingExtra="3sp"
|
||||
android:text="@string/verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s" />
|
||||
android:text="@string/verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"
|
||||
android:textColor="@color/signal_colorOnSurfaceVariant"
|
||||
android:textColorLink="@color/signal_colorPrimary" />
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
||||
|
|
|
@ -77,6 +77,9 @@
|
|||
<color name="insight_body_2">@color/core_grey_25</color>
|
||||
<color name="insight_progress_background">@color/core_grey_60</color>
|
||||
|
||||
<color name="qr_card_color">@color/signal_light_colorOnPrimary</color>
|
||||
<color name="qr_card_text_color">@color/signal_colorSurfaceVariant</color>
|
||||
|
||||
<color name="conversation_item_sent_text_primary_color">@color/transparent_white_90</color>
|
||||
<color name="conversation_item_sent_text_secondary_color">@color/transparent_white_60</color>
|
||||
<color name="conversation_item_update_text_color">@color/signal_colorOnSurfaceVariant</color>
|
||||
|
|
|
@ -78,6 +78,9 @@
|
|||
<color name="insight_body_2">@color/core_grey_60</color>
|
||||
<color name="insight_progress_background">@color/core_grey_15</color>
|
||||
|
||||
<color name="qr_card_color">@color/signal_colorSurface1</color>
|
||||
<color name="qr_card_text_color">@color/signal_colorOnSurfaceVariant</color>
|
||||
|
||||
<color name="conversation_item_sent_text_primary_color">@color/core_white</color>
|
||||
<color name="conversation_item_sent_text_secondary_color">@color/transparent_white_80</color>
|
||||
<color name="conversation_item_update_text_color">@color/signal_colorOnSurfaceVariant</color>
|
||||
|
|
Loading…
Add table
Reference in a new issue