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

Make outage banner color less aggressive.

Browse source
This commit is contained in:
Greyson Parrelli 2021-01-16 17:06:49 -05:00
parent 0514950333
commit fe71d6ac41
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java
View file

@ -14,6 +14,7 @@ import android.widget.TextView;
import androidx.annotation.IdRes; import androidx.annotation.IdRes;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@ -78,6 +79,7 @@ public final class ReminderView extends FrameLayout {
} }
text.setText(reminder.getText()); text.setText(reminder.getText());
text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_button_primary_text));
switch (reminder.getImportance()) { switch (reminder.getImportance()) {
case NORMAL: case NORMAL:
@ -85,6 +87,7 @@ public final class ReminderView extends FrameLayout {
break; break;
case ERROR: case ERROR:
container.setBackgroundResource(R.drawable.reminder_background_error); container.setBackgroundResource(R.drawable.reminder_background_error);
text.setTextColor(ContextCompat.getColor(getContext(), R.color.signal_text_primary));
break; break;
case TERMINAL: case TERMINAL:
container.setBackgroundResource(R.drawable.reminder_background_terminal); container.setBackgroundResource(R.drawable.reminder_background_terminal);

6
app/src/main/res/drawable/reminder_background_error.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@color/core_red_highlight" /> <item android:state_pressed="true" android:drawable="@color/reminder_background" />
<item android:state_focused="true" android:drawable="@color/core_red_highlight" /> <item android:state_focused="true" android:drawable="@color/reminder_background" />
<item android:drawable="@color/core_red" /> <item android:drawable="@color/reminder_background" />
</selector> </selector>

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

@ -16,6 +16,8 @@
<color name="core_white">#ffffff</color> <color name="core_white">#ffffff</color>
<color name="core_black">#000000</color> <color name="core_black">#000000</color>
<color name="reminder_background">#fcf0d9</color>
<color name="core_grey_02">#f6f6f6</color> <color name="core_grey_02">#f6f6f6</color>
<color name="core_grey_05">#e9e9e9</color> <color name="core_grey_05">#e9e9e9</color>
<color name="core_grey_10">#e2e2e2</color> <color name="core_grey_10">#e2e2e2</color>