Skip to content
Snippets Groups Projects
Commit ba1aec82 authored by Pierre Nicolas's avatar Pierre Nicolas :joy: Committed by Vitalii Nikitchyn
Browse files

androidtv: fix conversation text color 

Text color was not adapted in darkmode.
GitLab: #1701

Change-Id: I353374425a299772b812a736472c755094644735
parent a53df038
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 27 deletions
jami-android/app/src/main/res/drawable/baseline_pause_24.xml
+ 2
− 1
View file @ ba1aec82
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/colorControlNormal"
android:fillColor="@android:color/white"
android:pathData="M14.429,22v-20h5.714v20ZM3,22v-20h5.714v20Z" />
</vector>
jami-android/app/src/main/res/drawable/baseline_play_arrow_24.xml
+ 2
− 1
View file @ ba1aec82
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?attr/colorControlNormal"
android:fillColor="@android:color/white"
android:pathData="M4,22v-20l15.714,10Z" />
</vector>
\ No newline at end of file
jami-android/app/src/main/res/layout/frag_conversation_tv.xml
+ 1
− 1
View file @ ba1aec82
......@@ -70,7 +70,7 @@
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textColor="@color/colorOnPrimary"
android:textColor="@color/text_color_primary_dark"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:gravity="center" />
......
jami-android/app/src/main/res/layout/item_conv_audio_me_tv.xml
+ 6
− 4
View file @ ba1aec82
......@@ -54,7 +54,7 @@
android:layout_marginTop="5dp"
android:layout_marginEnd="@dimen/message_details_margin"
android:maxWidth="200dp"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="12sp"
tools:text="1 mo - 12 mars" />
......@@ -77,16 +77,18 @@
android:layout_height="32dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp"
android:padding="4dp"
android:alpha="0.75"
android:contentDescription="@string/lb_playback_controls_play"
android:src="@drawable/baseline_play_arrow_24"
app:tint="@color/black" />
android:tint="@color/colorOnSurface"
tools:ignore="UseAppTint" />
<TextView
android:id="@+id/msg_txt"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginEnd="4dp"
android:ellipsize="middle"
android:gravity="center_horizontal"
android:scrollHorizontally="true"
......@@ -104,7 +106,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
jami-android/app/src/main/res/layout/item_conv_audio_peer_tv.xml
+ 6
− 4
View file @ ba1aec82
......@@ -53,7 +53,7 @@
android:layout_alignStart="@+id/audioInfoLayout"
android:layout_marginStart="@dimen/message_details_margin"
android:layout_marginTop="5dp"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="12sp"
tools:text="1 mo - 12 mars" />
......@@ -77,13 +77,15 @@
android:alpha="0.75"
android:contentDescription="@string/lb_playback_controls_play"
android:src="@drawable/baseline_play_arrow_24"
app:tint="@color/black" />
android:tint="@color/black"
tools:ignore="UseAppTint"
android:padding="4dp"/>
<TextView
android:id="@+id/msg_txt"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginEnd="4dp"
android:ellipsize="middle"
android:gravity="center_horizontal"
android:scrollHorizontally="true"
......@@ -101,7 +103,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
jami-android/app/src/main/res/layout/item_conv_contact_tv.xml
+ 2
− 2
View file @ ba1aec82
......@@ -57,7 +57,7 @@ along with this program; if not, write to the Free Software
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="false"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
tools:text="@string/hist_contact_added" />
......@@ -65,7 +65,7 @@ along with this program; if not, write to the Free Software
android:id="@+id/contact_event_details_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="12sp"
tools:text="Adrien - 12 mars" />
......
jami-android/app/src/main/res/layout/item_conv_file_me_tv.xml
+ 1
− 1
View file @ ba1aec82
......@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
......
jami-android/app/src/main/res/layout/item_conv_file_peer_tv.xml
+ 1
− 1
View file @ ba1aec82
......@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
......
jami-android/app/src/main/res/layout/item_conv_image_me_tv.xml
+ 2
− 2
View file @ ba1aec82
......@@ -71,7 +71,7 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="@dimen/conversation_message_radius"
android:singleLine="true"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="12sp"
tools:text="Tue" />
......@@ -107,7 +107,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
jami-android/app/src/main/res/layout/item_conv_image_peer_tv.xml
+ 2
− 2
View file @ ba1aec82
......@@ -52,7 +52,7 @@
android:layout_alignStart="@+id/imageLayout"
android:layout_marginStart="@dimen/message_details_margin"
android:layout_marginTop="10dp"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="12sp"
tools:text="@string/time_just_now" />
......@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
jami-android/app/src/main/res/layout/item_conv_msg_me_tv.xml
+ 2
− 2
View file @ ba1aec82
......@@ -75,7 +75,7 @@ along with this program; if not, write to the Free Software
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......@@ -87,7 +87,7 @@ along with this program; if not, write to the Free Software
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_xsmall"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
jami-android/app/src/main/res/layout/item_conv_msg_peer_tv.xml
+ 2
− 2
View file @ ba1aec82
......@@ -86,7 +86,7 @@ along with this program; if not, write to the Free Software
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......@@ -98,7 +98,7 @@ along with this program; if not, write to the Free Software
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_xsmall"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
jami-android/app/src/main/res/layout/item_conv_video_me_tv.xml
+ 2
− 2
View file @ ba1aec82
......@@ -74,7 +74,7 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="@dimen/message_details_margin"
android:singleLine="true"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="12sp"
tools:text="@string/time_just_now" />
......@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
jami-android/app/src/main/res/layout/item_conv_video_peer_tv.xml
+ 2
− 2
View file @ ba1aec82
......@@ -74,7 +74,7 @@
android:layout_marginStart="@dimen/message_details_margin"
android:layout_marginTop="10dp"
android:singleLine="true"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="12sp"
tools:text="@string/time_just_now" />
......@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="@dimen/padding_small"
android:textColor="@color/conversation_secondary_background"
android:textColor="@color/text_color_primary_dark"
android:textSize="14sp"
android:visibility="gone"
tools:text="@string/time_just_now"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment