TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 03:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix API 19 crash by using different resource.

Browse Source
This commit is contained in:
Alex Hart 2020-06-09 01:33:38 -03:00 committed by GitHub
parent b6314597fe
commit 65608a51b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/drawable-v21/group_candidate_item_background_dark.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="?attr/colorControlHighlight" />
</shape>
</item>
<item android:state_selected="false">
<ripple android:color="?attr/colorControlHighlight">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<solid android:color="@color/core_grey_95" />
</shape>
</item>
</ripple>
</item>
</selector>

17
app/src/main/res/drawable-v21/group_candidate_item_background_light.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="?attr/colorControlHighlight" />
</shape>
</item>
<item android:state_selected="false">
<ripple android:color="?attr/colorControlHighlight">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<solid android:color="@color/core_white" />
</shape>
</item>
</ripple>
</item>
</selector>

9
app/src/main/res/drawable/group_candidate_item_background_dark.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/core_ultramarine_light" />
</shape>
</item>
<item android:state_selected="false" android:drawable="@null" />
</selector>

9
app/src/main/res/drawable/group_candidate_item_background_light.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<solid android:color="@color/core_ultramarine" />
</shape>
</item>
<item android:state_selected="false" android:drawable="@null" />
</selector>

2
app/src/main/res/layout/group_new_candidate_recipient_list_item.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="64dp"
android:background="?attr/group_candidate_item_background" android:background="?selectableItemBackground"
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">

1
app/src/main/res/values/attrs.xml
View File

@ -233,7 +233,6 @@
<attr name="custom_pref_toggle" format="string"/> <attr name="custom_pref_toggle" format="string"/>
</declare-styleable> </declare-styleable>
<attr name="group_candidate_item_background" format="reference" />
<attr name="group_members_dialog_icon" format="reference"/> <attr name="group_members_dialog_icon" format="reference"/>
<attr name="manage_group_add_members_icon" format="reference"/> <attr name="manage_group_add_members_icon" format="reference"/>
<attr name="manage_group_view_all_icon" format="reference"/> <attr name="manage_group_view_all_icon" format="reference"/>

4
app/src/main/res/values/themes.xml
View File

@ -190,8 +190,6 @@
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item> <item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
<!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>--> <!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
<item name="group_candidate_item_background">@drawable/group_candidate_item_background_light</item>
<item name="kbs_splash_image">@drawable/ic_kbs_splash_light_svg</item> <item name="kbs_splash_image">@drawable/ic_kbs_splash_light_svg</item>
<item name="attachment_type_selector_background">@color/white</item> <item name="attachment_type_selector_background">@color/white</item>
@ -486,8 +484,6 @@
<item name="homeAsUpIndicator">@drawable/ic_arrow_left_24</item> <item name="homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item> <item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_24</item>
<item name="group_candidate_item_background">@drawable/group_candidate_item_background_dark</item>
<item name="tinted_circle_background">@drawable/tinted_circle_dark</item> <item name="tinted_circle_background">@drawable/tinted_circle_dark</item>
<item name="kbs_splash_image">@drawable/ic_kbs_splash_dark_svg</item> <item name="kbs_splash_image">@drawable/ic_kbs_splash_dark_svg</item>