jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix / placeholder in dark time

This commit is contained in:
Valere 2021-04-28 09:26:32 +02:00
parent 7d3d080603
commit 70476b912f
6 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relationship/RoomChildRelationInfo.kt
View File

@ -24,7 +24,6 @@ import org.matrix.android.sdk.api.session.space.model.SpaceParentContent
import org.matrix.android.sdk.internal.database.mapper.ContentMapper
import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntity
import org.matrix.android.sdk.internal.database.query.whereType
import timber.log.Timber
/**
* Relationship between rooms and spaces
@ -66,7 +65,7 @@ internal class RoomChildRelationInfo(
// }
.mapNotNull {
ContentMapper.map(it.root?.content).toModel<SpaceChildContent>()?.let { scc ->
Timber.v("## Space child desc state event $scc")
// Timber.v("## Space child desc state event $scc")
// Children where via is not present are ignored.
scc.via?.let { via ->
SpaceChildInfo(

5
vector/src/main/res/drawable/placeholder_round_background.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="?riotx_reaction_background_off" />
</shape>

11
vector/src/main/res/drawable/placeholder_shape_8.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="40dp" android:height="40dp"/>
<solid android:color="?riotx_reaction_background_off" />
<corners android:radius="8dp" />
</shape>

2
vector/src/main/res/layout/item_editable_avatar.xml
View File

@ -13,7 +13,7 @@
android:id="@+id/itemEditableAvatarImageContainer"
android:layout_width="128dp"
android:layout_height="128dp"
android:background="@drawable/header_panel_round_background"
android:background="@drawable/placeholder_round_background"
android:contentDescription="@string/a11y_change_avatar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/item_editable_square_avatar.xml
View File

@ -13,7 +13,7 @@
android:id="@+id/itemEditableAvatarImageContainer"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/rounded_rect_shape_16"
android:background="@drawable/placeholder_shape_8"
android:contentDescription="@string/a11y_change_avatar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

6
vector/src/main/res/layout/item_room_placeholder.xml
View File

@ -25,7 +25,7 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:importantForAccessibility="no"
android:src="@drawable/header_panel_round_background" />
android:src="@drawable/placeholder_round_background" />
</FrameLayout>
@ -46,7 +46,7 @@
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="12dp"
android:layout_marginEnd="70dp"
android:background="@drawable/rounded_rect_shape_8"
android:background="@drawable/placeholder_shape_8"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@ -61,7 +61,7 @@
android:layout_height="30dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="20dp"
android:background="@drawable/rounded_rect_shape_8"
android:background="@drawable/placeholder_shape_8"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/roomNameView"
app:layout_constraintTop_toBottomOf="@+id/roomNameView" />