mirror of
https://github.com/element-hq/element-android
synced 2024-11-27 20:06:51 +03:00
Fix / theme update after rebase was displaying emojis grayed out
This commit is contained in:
parent
71e50b1bb9
commit
44d1d063e9
4 changed files with 19 additions and 14 deletions
|
@ -15,6 +15,7 @@
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
|
android:textColor="@color/black"
|
||||||
android:textSize="30sp"
|
android:textSize="30sp"
|
||||||
app:autoSizeTextType="uniform"
|
app:autoSizeTextType="uniform"
|
||||||
app:layout_constraintBottom_toTopOf="@id/quick_react_agree_text"
|
app:layout_constraintBottom_toTopOf="@id/quick_react_agree_text"
|
||||||
|
@ -34,10 +35,10 @@
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
|
android:textColor="@color/black"
|
||||||
android:textSize="30sp"
|
android:textSize="30sp"
|
||||||
app:autoSizeTextType="uniform"
|
app:autoSizeTextType="uniform"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/quick_react_1_text"
|
app:layout_constraintBottom_toBottomOf="@id/quick_react_1_text"
|
||||||
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/center_guideline"
|
app:layout_constraintEnd_toStartOf="@id/center_guideline"
|
||||||
app:layout_constraintStart_toEndOf="@id/quick_react_1_text"
|
app:layout_constraintStart_toEndOf="@id/quick_react_1_text"
|
||||||
app:layout_constraintTop_toTopOf="@id/quick_react_1_text"
|
app:layout_constraintTop_toTopOf="@id/quick_react_1_text"
|
||||||
|
@ -73,6 +74,7 @@
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
|
android:textColor="@color/black"
|
||||||
android:textSize="30sp"
|
android:textSize="30sp"
|
||||||
app:autoSizeTextType="uniform"
|
app:autoSizeTextType="uniform"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/quick_react_1_text"
|
app:layout_constraintBottom_toBottomOf="@+id/quick_react_1_text"
|
||||||
|
@ -91,6 +93,7 @@
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:clickable="true"
|
android:clickable="true"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
|
android:textColor="@color/black"
|
||||||
android:textSize="30sp"
|
android:textSize="30sp"
|
||||||
app:autoSizeTextType="uniform"
|
app:autoSizeTextType="uniform"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/quick_react_3_text"
|
app:layout_constraintBottom_toBottomOf="@id/quick_react_3_text"
|
||||||
|
|
|
@ -85,6 +85,8 @@
|
||||||
android:id="@+id/messageContentRedactedStub"
|
android:id="@+id/messageContentRedactedStub"
|
||||||
style="@style/TimelineContentStubLayoutParams"
|
style="@style/TimelineContentStubLayoutParams"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
|
android:layout_marginEnd="56dp"
|
||||||
|
android:layout_marginRight="56dp"
|
||||||
android:layout="@layout/item_timeline_event_redacted_stub"
|
android:layout="@layout/item_timeline_event_redacted_stub"
|
||||||
tools:ignore="MissingConstraints" />
|
tools:ignore="MissingConstraints" />
|
||||||
|
|
||||||
|
@ -92,16 +94,16 @@
|
||||||
<!-- TODO: For now we show 8 reactions maximum, this will need rework when needed-->
|
<!-- TODO: For now we show 8 reactions maximum, this will need rework when needed-->
|
||||||
<ViewStub
|
<ViewStub
|
||||||
android:id="@+id/messageBottomInfo"
|
android:id="@+id/messageBottomInfo"
|
||||||
android:inflatedId="@+id/messageBottomInfo"
|
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="4dp"
|
||||||
|
android:inflatedId="@+id/messageBottomInfo"
|
||||||
android:layout="@layout/item_timeline_event_bottom_reactions_stub"
|
android:layout="@layout/item_timeline_event_bottom_reactions_stub"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@id/messageStartGuideline"
|
app:layout_constraintStart_toEndOf="@id/messageStartGuideline"
|
||||||
app:layout_constraintVertical_chainStyle="packed"
|
app:layout_constraintVertical_chainStyle="packed"
|
||||||
android:layout_marginBottom="4dp"
|
|
||||||
tools:visibility="visible">
|
tools:visibility="visible">
|
||||||
|
|
||||||
</ViewStub>
|
</ViewStub>
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
<View xmlns:android="http://schemas.android.com/apk/res/android"
|
<View xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="20dp"
|
android:layout_height="20dp"
|
||||||
android:background="@drawable/redacted_background"
|
android:background="@drawable/redacted_background" />
|
||||||
/>
|
|
|
@ -2,9 +2,9 @@
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:clipChildren="false"
|
|
||||||
android:layout_width="44dp"
|
android:layout_width="44dp"
|
||||||
android:layout_height="26dp">
|
android:layout_height="26dp"
|
||||||
|
android:clipChildren="false">
|
||||||
|
|
||||||
|
|
||||||
<View
|
<View
|
||||||
|
@ -16,21 +16,21 @@
|
||||||
<im.vector.riotredesign.features.reactions.widget.DotsView
|
<im.vector.riotredesign.features.reactions.widget.DotsView
|
||||||
android:id="@+id/dots"
|
android:id="@+id/dots"
|
||||||
android:layout_width="30dp"
|
android:layout_width="30dp"
|
||||||
android:clipChildren="false"
|
|
||||||
android:layout_height="30dp"
|
android:layout_height="30dp"
|
||||||
|
android:clipChildren="false"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/reactionText"
|
app:layout_constraintBottom_toBottomOf="@+id/reactionText"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/reactionText"
|
||||||
app:layout_constraintStart_toStartOf="@+id/reactionText"
|
app:layout_constraintStart_toStartOf="@+id/reactionText"
|
||||||
app:layout_constraintTop_toTopOf="@+id/reactionText"
|
app:layout_constraintTop_toTopOf="@+id/reactionText" />
|
||||||
app:layout_constraintEnd_toEndOf="@+id/reactionText"/>
|
|
||||||
|
|
||||||
<im.vector.riotredesign.features.reactions.widget.CircleView
|
<im.vector.riotredesign.features.reactions.widget.CircleView
|
||||||
android:id="@+id/circle"
|
android:id="@+id/circle"
|
||||||
android:layout_width="14dp"
|
android:layout_width="14dp"
|
||||||
android:layout_height="14dp"
|
android:layout_height="14dp"
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/reactionText"
|
app:layout_constraintBottom_toBottomOf="@+id/reactionText"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/reactionText"
|
||||||
app:layout_constraintStart_toStartOf="@+id/reactionText"
|
app:layout_constraintStart_toStartOf="@+id/reactionText"
|
||||||
app:layout_constraintTop_toTopOf="@+id/reactionText"
|
app:layout_constraintTop_toTopOf="@+id/reactionText" />
|
||||||
app:layout_constraintEnd_toEndOf="@+id/reactionText"/>
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/reactionText"
|
android:id="@+id/reactionText"
|
||||||
|
@ -40,11 +40,12 @@
|
||||||
android:layout_marginStart="6dp"
|
android:layout_marginStart="6dp"
|
||||||
android:layout_marginLeft="6dp"
|
android:layout_marginLeft="6dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
tools:text="👍"
|
android:textColor="@color/black"
|
||||||
android:textSize="13sp"
|
android:textSize="13sp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"/>
|
tools:text="👍" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/reactionCount"
|
android:id="@+id/reactionCount"
|
||||||
|
|
Loading…
Reference in a new issue