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

Fix pending member activity background color.

Browse Source
This commit is contained in:
Alan Evans 2020-06-26 17:11:39 -03:00
parent 3380293923
commit bafd2817ee
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/layout/group_pending_member_invites_fragment.xml
View File

@ -4,8 +4,9 @@
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="match_parent" android:layout_height="match_parent"
android:background="?attr/pending_member_background" android:background="?pref_divider"
android:fillViewport="true" android:fillViewport="true"
android:paddingTop="0dp"
tools:context="org.thoughtcrime.securesms.groups.ui.pendingmemberinvites.PendingMemberInvitesFragment"> tools:context="org.thoughtcrime.securesms.groups.ui.pendingmemberinvites.PendingMemberInvitesFragment">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -17,7 +18,7 @@
android:id="@+id/cardView" android:id="@+id/cardView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardBackgroundColor="?android:attr/windowBackground" app:cardBackgroundColor="?android:windowBackground"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<LinearLayout <LinearLayout
@ -45,9 +46,9 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:text="@string/PendingMembersActivity_you_have_no_pending_invites" android:text="@string/PendingMembersActivity_you_have_no_pending_invites"
android:textColor="?android:textColorSecondary"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:visibility="visible" />
android:textColor="?pending_member_empty_text_color" />
<org.thoughtcrime.securesms.groups.ui.GroupMemberListView <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
android:id="@+id/members_you_invited" android:id="@+id/members_you_invited"
@ -62,8 +63,8 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="12dp"
app:cardBackgroundColor="?android:attr/windowBackground" app:cardBackgroundColor="?android:windowBackground"
app:layout_constraintTop_toBottomOf="@+id/cardView"> app:layout_constraintTop_toBottomOf="@+id/cardView">
<LinearLayout <LinearLayout
@ -91,9 +92,9 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:text="@string/PendingMembersActivity_no_pending_invites_by_other_group_members" android:text="@string/PendingMembersActivity_no_pending_invites_by_other_group_members"
android:textColor="?android:textColorSecondary"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:visibility="visible" />
android:textColor="?pending_member_empty_text_color" />
<org.thoughtcrime.securesms.groups.ui.GroupMemberListView <org.thoughtcrime.securesms.groups.ui.GroupMemberListView
android:id="@+id/members_others_invited" android:id="@+id/members_others_invited"

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

@ -286,9 +286,6 @@
<attr name="megaphone_reactions_shade" format="color"/> <attr name="megaphone_reactions_shade" format="color"/>
<attr name="megaphone_reactions_close_tint" format="color"/> <attr name="megaphone_reactions_close_tint" format="color"/>
<attr name="pending_member_background" format="color" />
<attr name="pending_member_empty_text_color" format="color" />
<attr name="debuglog_color_none" format="color" /> <attr name="debuglog_color_none" format="color" />
<attr name="debuglog_color_verbose" format="color" /> <attr name="debuglog_color_verbose" format="color" />
<attr name="debuglog_color_debug" format="color" /> <attr name="debuglog_color_debug" format="color" />

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

@ -430,9 +430,6 @@
<item name="shared_contact_details_titlebar">@color/grey_400</item> <item name="shared_contact_details_titlebar">@color/grey_400</item>
<item name="shared_contact_item_button_color">@color/core_grey_02</item> <item name="shared_contact_item_button_color">@color/core_grey_02</item>
<item name="pending_member_background">@color/core_grey_02</item>
<item name="pending_member_empty_text_color">@color/core_grey_60</item>
<item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_light</item> <item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_light</item>
<item name="contact_selection_invite_icon">@drawable/ic_invite_circle_light</item> <item name="contact_selection_invite_icon">@drawable/ic_invite_circle_light</item>
<item name="contact_selection_checkbox_background">@drawable/contact_selection_checkbox_light</item> <item name="contact_selection_checkbox_background">@drawable/contact_selection_checkbox_light</item>
@ -729,9 +726,6 @@
<item name="shared_contact_details_titlebar">@color/grey_900</item> <item name="shared_contact_details_titlebar">@color/grey_900</item>
<item name="shared_contact_item_button_color">@color/core_grey_85</item> <item name="shared_contact_item_button_color">@color/core_grey_85</item>
<item name="pending_member_background">@color/core_grey_80</item>
<item name="pending_member_empty_text_color">@color/core_grey_25</item>
<item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_dark</item> <item name="contact_selection_new_group_icon">@drawable/ic_new_group_circle_dark</item>
<item name="contact_selection_invite_icon">@drawable/ic_invite_circle_dark</item> <item name="contact_selection_invite_icon">@drawable/ic_invite_circle_dark</item>
<item name="contact_selection_checkbox_background">@drawable/contact_selection_checkbox_dark</item> <item name="contact_selection_checkbox_background">@drawable/contact_selection_checkbox_dark</item>