TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 23:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ui

Browse Source
This commit is contained in:
nielsandriesse
2020-09-17 10:06:30 +10:00
parent 655d971727 c660acc3e7
commit 3f83cc9450
30 changed files with 318 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values-notnight-v21/colors.xml
View File

@@ -31,6 +31,6 @@
<color name="app_icon_background">#333132</color>
<color name="progress_bar_background">#0A000000</color>
<color name="quote_not_found_background">#99FFFFFF</color>
<color name="quote_not_found_background">#8000E97B</color>
</resources>

5
res/values-notnight-v21/styles.xml
View File

@@ -23,4 +23,9 @@
<item name="android:elevation">4dp</item>
</style>
<style name="Widget.Session.Button.Dialog.Destructive">
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/destructive</item>
</style>
</resources>

1
res/values-notnight-v21/themes.xml
View File

@@ -33,7 +33,6 @@
</style>
<!-- Session light theme (these values overlays their dark theme counterparts from Theme.TextSecure) -->
<style name="Theme.TextSecure.DayNight" parent="Base.Theme.TextSecure">