mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed file viewer hover color

Browse source
This commit is contained in:
Sylvain Berfini 2026-01-13 10:20:52 +01:00
parent 3df3c8d741
commit b574bf420c
7 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/color/file_viewer_main2_500.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:color="@color/gray_main2_200" />
<item android:state_hovered="true" android:color="@color/gray_main2_200" />
<item android:color="@color/gray_main2_500"/>
</selector>

9
app/src/main/res/drawable/circle_transparent_light_button_background.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/shape_circle_light_pressed_background" />
<item android:state_hovered="true"
android:drawable="@drawable/shape_circle_light_pressed_background" />
<item
android:drawable="@drawable/shape_circle_transparent_background" />
</selector>

5
app/src/main/res/drawable/shape_circle_light_pressed_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">
<size android:width="44dp" android:height="44dp" />
<solid android:color="@color/gray_main2_300"/>
</shape>

7
app/src/main/res/layout/file_media_viewer_activity.xml
View file

@ -62,6 +62,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/caret_left" android:src="@drawable/caret_left"
android:background="@drawable/circle_transparent_light_button_background"
android:contentDescription="@string/content_description_go_back_icon" android:contentDescription="@string/content_description_go_back_icon"
app:tint="?attr/color_main1_500" app:tint="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -111,8 +112,9 @@
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/share_network" android:src="@drawable/share_network"
android:contentDescription="@string/content_description_share_file" android:contentDescription="@string/content_description_share_file"
android:background="@drawable/circle_transparent_light_button_background"
android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}" android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/file_viewer_main2_500" app:tint="@color/gray_main2_600"
app:layout_constraintEnd_toStartOf="@id/save" app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
@ -124,9 +126,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/download_simple" android:src="@drawable/download_simple"
android:background="@drawable/circle_transparent_light_button_background"
android:contentDescription="@string/content_description_save_file" android:contentDescription="@string/content_description_save_file"
android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}" android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/file_viewer_main2_500" app:tint="@color/gray_main2_600"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />

7
app/src/main/res/layout/file_viewer_activity.xml
View file

@ -100,6 +100,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/caret_left" android:src="@drawable/caret_left"
android:background="@drawable/circle_transparent_light_button_background"
android:contentDescription="@string/content_description_go_back_icon" android:contentDescription="@string/content_description_go_back_icon"
app:tint="?attr/color_main1_500" app:tint="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -148,9 +149,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/share_network" android:src="@drawable/share_network"
android:background="@drawable/circle_transparent_light_button_background"
android:contentDescription="@string/content_description_share_file" android:contentDescription="@string/content_description_share_file"
android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}" android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/file_viewer_main2_500" app:tint="@color/gray_main2_600"
app:layout_constraintEnd_toStartOf="@id/save" app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" /> app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" />
@ -162,9 +164,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/download_simple" android:src="@drawable/download_simple"
android:background="@drawable/circle_transparent_light_button_background"
android:contentDescription="@string/content_description_save_file" android:contentDescription="@string/content_description_save_file"
android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}" android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
app:tint="@color/file_viewer_main2_500" app:tint="@color/gray_main2_600"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" /> app:layout_constraintBottom_toBottomOf="@id/top_bar_barrier" />

5
app/src/main/res/layout/meeting_fragment.xml
View file

@ -114,6 +114,7 @@
android:text="@{viewModel.subject, default=`Broadcast about agility in software development`}" android:text="@{viewModel.subject, default=`Broadcast about agility in software development`}"
android:textSize="20sp" android:textSize="20sp"
android:textColor="?attr/color_main2_600" android:textColor="?attr/color_main2_600"
android:includeFontPadding="false"
android:maxLines="2" android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
android:drawableStart="@{viewModel.isBroadcast ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}" android:drawableStart="@{viewModel.isBroadcast ? @drawable/slideshow : @drawable/video_conference, default=@drawable/video_conference}"
@ -147,6 +148,7 @@
android:text="@{viewModel.sipUri, default=`linphone.com/wjre.fr`}" android:text="@{viewModel.sipUri, default=`linphone.com/wjre.fr`}"
android:textSize="14sp" android:textSize="14sp"
android:textColor="?attr/color_main2_600" android:textColor="?attr/color_main2_600"
android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:drawableStart="@drawable/video_camera" android:drawableStart="@drawable/video_camera"
@ -169,6 +171,7 @@
android:text="@{viewModel.dateTime, default=`October 11th, 2023 | 17:00 - 18:00`}" android:text="@{viewModel.dateTime, default=`October 11th, 2023 | 17:00 - 18:00`}"
android:textSize="14sp" android:textSize="14sp"
android:textColor="?attr/color_main2_600" android:textColor="?attr/color_main2_600"
android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:drawableStart="@drawable/clock" android:drawableStart="@drawable/clock"
@ -189,6 +192,7 @@
android:text="@{viewModel.timezone, default=@string/meeting_schedule_timezone_title}" android:text="@{viewModel.timezone, default=@string/meeting_schedule_timezone_title}"
android:textSize="14sp" android:textSize="14sp"
android:textColor="?attr/color_main2_600" android:textColor="?attr/color_main2_600"
android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:drawableStart="@drawable/globe_hemisphere_west" android:drawableStart="@drawable/globe_hemisphere_west"
@ -220,6 +224,7 @@
android:text="@{viewModel.description, default=`Lorem ipsum dolor sit amet`}" android:text="@{viewModel.description, default=`Lorem ipsum dolor sit amet`}"
android:textSize="14sp" android:textSize="14sp"
android:textColor="?attr/color_main2_600" android:textColor="?attr/color_main2_600"
android:includeFontPadding="false"
android:maxLines="3" android:maxLines="3"
android:ellipsize="end" android:ellipsize="end"
android:drawableStart="@drawable/file_text" android:drawableStart="@drawable/file_text"

7
app/src/main/res/layout/recording_player_fragment.xml
View file

@ -118,6 +118,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/caret_left" android:src="@drawable/caret_left"
android:background="@drawable/circle_transparent_light_button_background"
android:contentDescription="@string/content_description_go_back_icon" android:contentDescription="@string/content_description_go_back_icon"
app:tint="?attr/color_main1_500" app:tint="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -167,8 +168,9 @@
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/share_network" android:src="@drawable/share_network"
android:contentDescription="@string/content_description_share_file" android:contentDescription="@string/content_description_share_file"
android:background="@drawable/circle_transparent_light_button_background"
android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}" android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
app:tint="@color/file_viewer_main2_500" app:tint="@color/gray_main2_600"
app:layout_constraintEnd_toStartOf="@id/save" app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />
@ -180,9 +182,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/download_simple" android:src="@drawable/download_simple"
android:background="@drawable/circle_transparent_light_button_background"
android:contentDescription="@string/content_description_save_file" android:contentDescription="@string/content_description_save_file"
android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}" android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
app:tint="@color/file_viewer_main2_500" app:tint="@color/gray_main2_600"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/top_bar_background" /> app:layout_constraintBottom_toBottomOf="@id/top_bar_background" />