mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Some fixes related to recent color/layout changes
This commit is contained in:
parent
41081f565a
commit
b6e36272f7
16 changed files with 37 additions and 9 deletions
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
|
||||
<corners android:radius="16dp" />
|
||||
<solid android:color="?attr/color_grey_200"/>
|
||||
<solid android:color="?attr/color_chat_bubble_reply"/>
|
||||
</shape>
|
||||
|
|
@ -54,6 +54,7 @@
|
|||
android:layout_marginEnd="@dimen/spinner_caret_end_margin"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/transport_spinner"
|
||||
app:layout_constraintBottom_toBottomOf="@id/transport_spinner"
|
||||
app:layout_constraintEnd_toEndOf="@id/transport_spinner"/>
|
||||
|
|
|
|||
|
|
@ -139,6 +139,7 @@
|
|||
android:textSize="14sp"
|
||||
android:drawableStart="@drawable/pencil_simple"
|
||||
android:drawablePadding="3dp"
|
||||
android:drawableTint="?attr/color_main2_600"
|
||||
android:visibility="@{viewModel.accountModel.picturePath.length() == 0 ? View.GONE : View.VISIBLE}"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintTop_toBottomOf="@id/avatar"
|
||||
|
|
@ -157,6 +158,7 @@
|
|||
android:textSize="14sp"
|
||||
android:drawableStart="@drawable/trash_simple"
|
||||
android:drawablePadding="3dp"
|
||||
android:drawableTint="?attr/color_main2_600"
|
||||
android:visibility="@{viewModel.accountModel.picturePath.length() == 0 ? View.GONE : View.VISIBLE}"
|
||||
app:layout_constraintTop_toBottomOf="@id/avatar"
|
||||
app:layout_constraintStart_toEndOf="@id/edit_picture_label"
|
||||
|
|
@ -297,7 +299,6 @@
|
|||
android:paddingEnd="20dp"
|
||||
android:text="@={viewModel.displayName, default=`John Doe`}"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/gray_main2_600"
|
||||
android:maxLines="1"
|
||||
android:background="@drawable/edit_text_background"
|
||||
android:inputType="text|textPersonName|textCapSentences"
|
||||
|
|
@ -361,6 +362,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/prefix"
|
||||
app:layout_constraintBottom_toBottomOf="@id/prefix"
|
||||
app:layout_constraintEnd_toEndOf="@id/prefix"/>
|
||||
|
|
@ -430,7 +432,7 @@
|
|||
android:text="@string/manage_account_devices_title"
|
||||
android:visibility="@{viewModel.isOnDefaultDomain ? View.VISIBLE : View.GONE, default=gone}"
|
||||
android:drawableEnd="@{viewModel.expandDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
|
||||
android:drawableTint="@color/gray_main2_600"
|
||||
android:drawableTint="?attr/color_main2_600"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/connection_background"/>
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/prefix"
|
||||
app:layout_constraintBottom_toBottomOf="@id/prefix"
|
||||
app:layout_constraintEnd_toEndOf="@id/prefix"/>
|
||||
|
|
|
|||
|
|
@ -272,6 +272,7 @@
|
|||
android:layout_marginEnd="20dp"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/transport"
|
||||
app:layout_constraintBottom_toBottomOf="@id/transport"
|
||||
app:layout_constraintEnd_toEndOf="@id/transport"/>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,13 @@
|
|||
app:constraint_referenced_ids="cancel_search, search, search_up, search_down"
|
||||
android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/background_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="back, cancel_search" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/back"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -271,7 +278,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/back" />
|
||||
app:layout_constraintTop_toBottomOf="@id/background_barrier" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/events_list"
|
||||
|
|
|
|||
|
|
@ -199,6 +199,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/timezone_picker"
|
||||
app:layout_constraintBottom_toBottomOf="@id/timezone_picker"
|
||||
app:layout_constraintEnd_toEndOf="@id/timezone_picker"/>
|
||||
|
|
|
|||
|
|
@ -338,6 +338,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/timezone_picker"
|
||||
app:layout_constraintBottom_toBottomOf="@id/timezone_picker"
|
||||
app:layout_constraintEnd_toEndOf="@id/timezone_picker"/>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,13 @@
|
|||
android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}"
|
||||
app:constraint_referenced_ids="cancel_search, search, clear_field" />
|
||||
|
||||
<androidx.constraintlayout.widget.Barrier
|
||||
android:id="@+id/background_barrier"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:barrierDirection="bottom"
|
||||
app:constraint_referenced_ids="back, cancel_search" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/back"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -87,8 +94,8 @@
|
|||
app:tint="?attr/color_main2_500" />
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/search"
|
||||
style="?attr/textInputFilledStyle"
|
||||
android:id="@+id/search"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/top_bar_height"
|
||||
android:gravity="center_vertical"
|
||||
|
|
@ -137,7 +144,7 @@
|
|||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/back" />
|
||||
app:layout_constraintTop_toBottomOf="@id/background_barrier" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/no_recording_image"
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/media_encryption"
|
||||
app:layout_constraintBottom_toBottomOf="@id/media_encryption"
|
||||
app:layout_constraintEnd_toEndOf="@id/media_encryption"/>
|
||||
|
|
@ -211,7 +212,6 @@
|
|||
android:paddingEnd="20dp"
|
||||
android:text="@={viewModel.deviceName}"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/gray_main2_600"
|
||||
android:maxLines="1"
|
||||
android:background="@drawable/edit_text_background"
|
||||
android:inputType="text|textUri"
|
||||
|
|
@ -245,7 +245,6 @@
|
|||
android:paddingEnd="20dp"
|
||||
android:text="@={viewModel.fileSharingServerUrl}"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/gray_main2_600"
|
||||
android:maxLines="1"
|
||||
android:background="@drawable/edit_text_background"
|
||||
android:inputType="text|textUri"
|
||||
|
|
@ -279,7 +278,6 @@
|
|||
android:paddingEnd="20dp"
|
||||
android:text="@={viewModel.remoteProvisioningUrl}"
|
||||
android:textSize="14sp"
|
||||
android:textColor="@color/gray_main2_600"
|
||||
android:maxLines="1"
|
||||
android:background="@drawable/edit_text_background"
|
||||
android:inputType="text|textUri"
|
||||
|
|
@ -386,6 +384,7 @@
|
|||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/input_audio_device"
|
||||
app:layout_constraintBottom_toBottomOf="@id/input_audio_device"
|
||||
app:layout_constraintEnd_toEndOf="@id/input_audio_device"/>
|
||||
|
|
@ -433,6 +432,7 @@
|
|||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/output_audio_device"
|
||||
app:layout_constraintBottom_toBottomOf="@id/output_audio_device"
|
||||
app:layout_constraintEnd_toEndOf="@id/output_audio_device"/>
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@
|
|||
android:layout_marginEnd="@dimen/spinner_caret_end_margin"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@string/content_description_spinner_caret"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/layout_spinner"
|
||||
app:layout_constraintBottom_toBottomOf="@id/layout_spinner"
|
||||
app:layout_constraintEnd_toEndOf="@id/layout_spinner"/>
|
||||
|
|
|
|||
|
|
@ -224,6 +224,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@null"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/tunnel_mode_spinner"
|
||||
app:layout_constraintBottom_toBottomOf="@id/tunnel_mode_spinner"
|
||||
app:layout_constraintEnd_toEndOf="@id/tunnel_mode_spinner"/>
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
android:layout_marginEnd="@dimen/spinner_caret_end_margin"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@string/content_description_spinner_caret"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/theme_spinner"
|
||||
app:layout_constraintBottom_toBottomOf="@id/theme_spinner"
|
||||
app:layout_constraintEnd_toEndOf="@id/theme_spinner"/>
|
||||
|
|
@ -108,6 +109,7 @@
|
|||
android:layout_marginEnd="@dimen/spinner_caret_end_margin"
|
||||
android:src="@drawable/caret_down"
|
||||
android:contentDescription="@string/content_description_spinner_caret"
|
||||
app:tint="?attr/color_main2_600"
|
||||
app:layout_constraintTop_toTopOf="@id/color_spinner"
|
||||
app:layout_constraintBottom_toBottomOf="@id/color_spinner"
|
||||
app:layout_constraintEnd_toEndOf="@id/color_spinner"/>
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@
|
|||
<item name="color_avatar_text">@color/gray_main2_300</item>
|
||||
<item name="color_chat_bubble_incoming">@color/background_color_alt_dark_mode</item>
|
||||
<item name="color_chat_bubble_outgoing">@color/text_field_background_color_dark_mode</item>
|
||||
<item name="color_chat_bubble_reply">@color/gray_500</item>
|
||||
|
||||
<item name="color_gradient_start">@color/background_color_alt_dark_mode</item>
|
||||
<item name="color_gradient_end">@color/background_color_alt_dark_mode</item>
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
<attr name="color_avatar_text" format="color"/>
|
||||
<attr name="color_chat_bubble_incoming" format="color"/>
|
||||
<attr name="color_chat_bubble_outgoing" format="color"/>
|
||||
<attr name="color_chat_bubble_reply" format="color"/>
|
||||
|
||||
<attr name="color_gradient_start" format="color"/>
|
||||
<attr name="color_gradient_end" format="color"/>
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@
|
|||
<item name="color_avatar_text">@color/gray_main2_600</item>
|
||||
<item name="color_chat_bubble_incoming">@color/gray_main2_100</item>
|
||||
<item name="color_chat_bubble_outgoing">@color/orange_main_100</item>
|
||||
<item name="color_chat_bubble_reply">@color/gray_200</item>
|
||||
|
||||
<item name="color_gradient_start">@color/gray_main2_100</item>
|
||||
<item name="color_gradient_end">@color/bc_white</item>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue