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

Fix edit profile theming issue and mute until issue.

Browse source
This commit is contained in:
Alex Hart 2021-06-30 11:11:35 -03:00
parent 62ee411901
commit 838e318200
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/SoundsAndNotificationsSettingsViewModel.kt
View file

@ -22,7 +22,7 @@ class SoundsAndNotificationsSettingsViewModel(
store.update(Recipient.live(recipientId).liveData) { recipient, state ->
state.copy(
recipientId = recipientId,
muteUntil = recipient.muteUntil,
muteUntil = if (recipient.isMuted) recipient.muteUntil else 0L,
mentionSetting = recipient.mentionSetting,
hasMentionsSupport = recipient.isPushV2Group,
hasCustomNotificationSettings = recipient.notificationChannel != null || !NotificationChannels.supported()

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

@ -13,7 +13,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_x"
app:navigationIcon="@drawable/ic_x_tinted"
app:title="@string/EditProfileNameFragment_your_name"
app:titleTextAppearance="@style/Signal.Text.Title" />
@ -25,6 +25,7 @@
android:layout_gravity="center"
android:hint="@string/EditProfileNameFragment_first_name"
android:minHeight="56dp"
android:theme="@style/ThemeOverlay.Signal.EditProfileInput"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar">
@ -46,6 +47,7 @@
android:layout_marginTop="20dp"
android:hint="@string/EditProfileNameFragment_last_name_optional"
android:minHeight="56dp"
android:theme="@style/ThemeOverlay.Signal.EditProfileInput"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/edit_profile_given_name_wrapper">

2
app/src/main/res/values/styles.xml
View file

@ -533,7 +533,7 @@
<item name="boxCornerRadiusTopStart">10dp</item>
<item name="boxStrokeWidth">0dp</item>
<item name="boxStrokeWidthFocused">0dp</item>
<item name="hintTextAppearance">@style/Signal.Text.Caption</item>
<item name="hintTextColor">@color/signal_accent_primary</item>
<item name="android:textColorHint">@color/signal_text_hint</item>
</style>
</resources>

1
app/src/main/res/values/text_styles.xml
View file

@ -50,7 +50,6 @@
<item name="android:letterSpacing" tools:ignore="NewApi">0.03</item>
</style>
<style name="Signal.Text.Caption.MessageSent">
<item name="android:textColor">@color/signal_text_secondary</item>
<item name="android:shadowRadius">0</item>

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

@ -456,5 +456,12 @@
<item name="chipBackgroundColor">@color/core_grey_05</item>
<item name="closeIconTint">@color/core_grey_60</item>
</style>
<style name="ThemeOverlay.Signal.EditProfileInput" parent="ThemeOverlay.MaterialComponents">
<item name="colorAccent">@color/signal_accent_primary</item>
<item name="colorControlNormal">@color/signal_accent_primary</item>
<item name="colorControlHighlight">@color/signal_accent_primary</item>
<item name="colorControlActivated">@color/signal_accent_primary</item>
</style>
</resources>