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

Merge pull request #301 from metaphore/media-send-emoji-panel-fix

Browse Source 
Fix MediaSendActivity Crash
This commit is contained in:
Niels Andriesse
2020-08-27 09:32:30 +10:00
committed by GitHub
parent 22f48a22cc c8677a904c
commit a31c58a25a
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/emoji_variation_selector.xml
View File

@@ -4,6 +4,6 @@
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/emoji_variation_selector_background">
android:elevation="4dp">
</LinearLayout>

19
res/values/themes.xml
View File

@@ -27,6 +27,25 @@
<item name="colorAccent">@color/accent</item>
<item name="actionModeBackground">@color/compose_view_background</item>
<item name="windowActionModeOverlay">true</item>
<item name="emoji_tab_strip_background">@color/compose_view_background</item>
<item name="emoji_tab_indicator">@color/accent</item>
<item name="emoji_tab_underline">@color/gray78</item>
<item name="emoji_tab_seperator">@color/gray70</item>
<item name="emoji_drawer_background">@color/compose_text_view_background</item>
<item name="emoji_text_color">@color/white</item>
<item name="emoji_category_recent">@drawable/ic_recent_dark_20</item>
<item name="emoji_category_people">@drawable/ic_emoji_people_dark_20</item>
<item name="emoji_category_nature">@drawable/ic_emoji_animal_dark_20</item>
<item name="emoji_category_foods">@drawable/ic_emoji_food_dark_20</item>
<item name="emoji_category_activity">@drawable/ic_emoji_activity_dark_20</item>
<item name="emoji_category_places">@drawable/ic_emoji_travel_dark_20</item>
<item name="emoji_category_objects">@drawable/ic_emoji_object_dark_20</item>
<item name="emoji_category_symbol">@drawable/ic_emoji_symbol_dark_20</item>
<item name="emoji_category_flags">@drawable/ic_emoji_flag_dark_20</item>
<item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_dark_20</item>
<item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
</style>
<style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat">