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

Updated some colors, no longer need to block material components version to an old release

Browse source
This commit is contained in:
Sylvain Berfini 2024-12-12 10:39:44 +01:00
parent 821986b6a9
commit 7bfed48b23
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable/shape_tertiary_button_background.xml
View file

@ -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="48dp" />
<solid android:color="@color/orange_main_100"/>
<solid android:color="?attr/color_main1_100"/>
</shape>

10
app/src/main/res/layout/chat_info_fragment.xml
View file

@ -419,7 +419,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
app:layout_constraintEnd_toEndOf="@id/action_media"
app:layout_constraintStart_toStartOf="@id/action_media"
app:layout_constraintTop_toBottomOf="@id/action_media" />
@ -523,7 +523,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
android:visibility="@{!viewModel.isGroup &amp;&amp; !viewModel.friendAvailable ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintEnd_toEndOf="@id/action_add_to_contacts"
app:layout_constraintStart_toStartOf="@id/action_add_to_contacts"
@ -534,7 +534,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
android:visibility="@{!viewModel.isGroup &amp;&amp; viewModel.friendAvailable ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintEnd_toEndOf="@id/action_see_contact"
app:layout_constraintStart_toStartOf="@id/action_see_contact"
@ -545,7 +545,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
android:visibility="@{viewModel.isEndToEndEncrypted &amp;&amp; !viewModel.isReadOnly ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/action_ephemeral_messages"
app:layout_constraintStart_toStartOf="@id/action_ephemeral_messages"
@ -556,7 +556,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
android:visibility="@{viewModel.isGroup &amp;&amp; !viewModel.isReadOnly ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintEnd_toEndOf="@id/action_leave_group"
app:layout_constraintStart_toStartOf="@id/action_leave_group"

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

@ -434,6 +434,7 @@
app:trackThickness="22dp"
app:trackColor="@color/transparent_color"
app:indicatorColor="?attr/color_trust_track"
app:trackStopIndicatorSize="0dp"
app:layout_constraintStart_toStartOf="@id/trusted_devices_progress_background"
app:layout_constraintEnd_toEndOf="@id/trusted_devices_progress_background"
app:layout_constraintTop_toTopOf="@id/trusted_devices_progress_background"
@ -568,7 +569,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
android:visibility="@{viewModel.isStored ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/action_edit"
app:layout_constraintStart_toStartOf="@id/action_edit"
@ -579,7 +580,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
android:visibility="@{viewModel.isStored ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/action_favorite"
app:layout_constraintStart_toStartOf="@id/action_favorite"
@ -590,7 +591,7 @@
android:layout_height="1dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray_main2_200"
android:background="?attr/color_separator"
android:visibility="@{viewModel.isStored ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="@id/action_share"
app:layout_constraintStart_toStartOf="@id/action_share"

2
app/src/main/res/values-night/themes.xml
View file

@ -53,7 +53,7 @@
<item name="color_on_main">@color/bc_white</item>
<item name="color_background_contrast_in_dark_mode">@color/background_color_alt_dark_mode</item>
<item name="color_separator">@color/gray_main2_200</item>
<item name="color_separator">@color/gray_main2_400</item>
<item name="color_text">@color/gray_main2_100</item>
<item name="color_hint_text">@color/gray_main2_300</item>

3
gradle/libs.versions.toml
View file

@ -23,8 +23,7 @@ navigation = "2.8.5"
emoji2 = "1.5.0"
car = "1.7.0-beta03"
flexbox = "3.0.0"
#noinspection GradleDependency
material = "1.11.0"
material = "1.12.0"
protobuf = "3.25.5"
coil = "3.0.4"
dotsIndicator = "5.1.0"