Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-03 15:11:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix theming on invite friends Activity.

Browse Source
This commit is contained in:
Lucio Maciel
2021-08-25 16:05:20 -03:00
committed by GitHub
parent ba4d1c9844
commit c92f3b5dfd
7 changed files with 47 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/color/signal_button_primary_inverse_text_selector.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/signal_text_secondary" android:state_enabled="false" />
<item android:color="@color/signal_inverse_primary" />
</selector>

2
app/src/main/res/drawable/ic_search_conversation_24.xml
View File

@@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/signal_text_toolbar_subtitle"
android:fillColor="@color/signal_inverse_primary"
android:pathData="M17.257,16.2 L15.9,15.385a8.022,8.022 0,1 0,-0.519 0.519l0.812,1.353L20.439,21.5 21.5,20.439ZM10,16.5A6.5,6.5 0,1 1,16.5 10,6.508 6.508,0 0,1 10,16.5Z"/>
</vector>

36
app/src/main/res/layout/invite_activity.xml
View File

@@ -23,7 +23,8 @@
android:fillViewport="true"
android:clickable="false"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintBottom_toBottomOf="parent"
tools:visibility="gone">
<LinearLayout android:layout_gravity="center"
android:layout_height="wrap_content"
@@ -100,19 +101,8 @@
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar">
<org.thoughtcrime.securesms.util.views.DarkOverflowToolbar
android:id="@+id/sms_send_frame_toolbar"
android:layout_width="match_parent"
android:layout_height="56dp"
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:title="@string/InviteActivity_invite_to_signal"
app:titleTextAppearance="@style/Signal.Text.Title" />
app:layout_constraintTop_toBottomOf="@id/toolbar"
tools:visibility="visible">
<org.thoughtcrime.securesms.components.ContactFilterView
android:id="@+id/contact_filter_edit_text"
@@ -133,22 +123,24 @@
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:gravity="center_horizontal"
android:padding="10dp"
android:orientation="horizontal">
<Button android:id="@+id/cancel_sms_button"
style="@style/Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Signal.Widget.Button.Large.Primary.Inverse"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/InviteActivity_cancel" />
<Button android:id="@+id/send_sms_button"
style="@style/Button.Borderless"
style="@style/Signal.Widget.Button.Large.Primary.Inverse"
android:enabled="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Send to 0 friends"/>
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
tools:text="Send SMS (0)"/>
</LinearLayout>
</LinearLayout>

3
app/src/main/res/navigation/app_settings.xml
View File

@@ -372,7 +372,8 @@
<activity
android:id="@+id/inviteActivity"
android:name="org.thoughtcrime.securesms.InviteActivity"
android:label="invite_activity" />
android:label="invite_activity"
tools:layout="@layout/invite_activity" />
<!-- region Direct-To-Page actions -->

6
app/src/main/res/values/signal_styles.xml
View File

@@ -18,6 +18,12 @@
<item name="android:minHeight">48dp</item>
</style>
<style name="Signal.Widget.Button.Large.Primary.Inverse" parent="@style/Signal.Widget.Button.Large.Primary">
<item name="android:minHeight">48dp</item>
<item name="android:textColor">@color/signal_button_primary_inverse_text_selector</item>
<item name="background">?attr/selectableItemBackground</item>
</style>
<style name="Signal.Widget.Button.Large.Danger" parent="@style/Signal.Widget.Button.Large.Primary">
<item name="backgroundTint">@color/signal_alert_primary</item>
</style>

5
app/src/main/res/values/strings.xml
View File

@@ -882,10 +882,7 @@
<string name="InviteActivity_sending">Sending…</string>
<string name="InviteActivity_invitations_sent">Invitations sent!</string>
<string name="InviteActivity_invite_to_signal">Invite to Signal</string>
<plurals name="InviteActivity_send_sms_to_friends">
<item quantity="one">SEND SMS TO %d FRIEND</item>
<item quantity="other">SEND SMS TO %d FRIENDS</item>
</plurals>
<string name="InviteActivity_send_sms">Send SMS (%d)</string>
<plurals name="InviteActivity_send_sms_invites">
<item quantity="one">Send %d SMS invite?</item>
<item quantity="other">Send %d SMS invites?</item>