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

Do not use color state resource for background (crashes on Android 9), use drawable instead + use direct color attribute when possible

Browse source
This commit is contained in:
Sylvain Berfini 2024-07-29 18:57:46 +02:00
parent e29d64a02b
commit ae59911f0a
45 changed files with 70 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/color/grey_300.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/color_grey_300"/>
</selector>

4
app/src/main/res/drawable/color_black.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/black" />
</shape>

4
app/src/main/res/drawable/color_danger_500.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/color_danger_500" />
</shape>

4
app/src/main/res/drawable/color_main1_500.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/color_main1_500" />
</shape>

4
app/src/main/res/drawable/color_main2_000.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/color_main2_000" />
</shape>

4
app/src/main/res/drawable/color_main2_100.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/color_main2_100" />
</shape>

4
app/src/main/res/drawable/color_main2_500.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/color_main2_500" />
</shape>

4
app/src/main/res/drawable/color_success_500.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="?attr/color_success_500" />
</shape>

6
app/src/main/res/drawable/primary_cell_background.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@color/main2_100" />
android:drawable="@drawable/color_main2_100" />
<item android:state_pressed="true"
android:drawable="@color/main2_100" />
android:drawable="@drawable/color_main2_100" />
<item
android:drawable="@color/main2_000" />
android:drawable="@drawable/color_main2_000" />
</selector>

4
app/src/main/res/drawable/secondary_cell_background.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true"
android:drawable="@color/main2_100" />
android:drawable="@drawable/color_main2_100" />
<item android:state_pressed="true"
android:drawable="@color/main2_100" />
android:drawable="@drawable/color_main2_100" />
<item
android:drawable="@color/transparent_color" />
</selector>

2
app/src/main/res/layout-land/call_actions_bottom_sheet.xml
View file

@ -143,7 +143,7 @@
android:layout_height="0dp"
android:indeterminate="true"
android:visibility="@{viewModel.operationInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/chat"

2
app/src/main/res/layout-land/chat_list_fragment.xml
View file

@ -104,7 +104,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout-land/contacts_list_fragment.xml
View file

@ -142,7 +142,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout-land/history_list_fragment.xml
View file

@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
View file

@ -34,7 +34,7 @@
android:padding="15dp"
android:src="@drawable/caret_left"
android:contentDescription="@string/content_description_go_back_icon"
app:tint="@color/main1_500"
app:tint="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout-land/meetings_list_fragment.xml
View file

@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout-land/welcome_page_1.xml
View file

@ -21,7 +21,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"

2
app/src/main/res/layout-land/welcome_page_2.xml
View file

@ -21,7 +21,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"

2
app/src/main/res/layout-land/welcome_page_3.xml
View file

@ -21,7 +21,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"

2
app/src/main/res/layout/account_list_cell.xml
View file

@ -16,7 +16,7 @@
android:onClick="@{() -> model.setAsDefault()}"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@{model.isDefault ? @color/main2_100 : @color/main2_000, default=@color/main2_100}">
android:background="@{model.isDefault ? @drawable/color_main2_100 : @drawable/color_main2_000, default=@drawable/color_main2_100}">
<androidx.constraintlayout.widget.Barrier
android:id="@+id/end_barrier"

2
app/src/main/res/layout/assistant_landing_fragment.xml
View file

@ -61,7 +61,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="@color/main1_500" />
app:tint="?attr/color_main1_500" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"

2
app/src/main/res/layout/assistant_permissions_fragment.xml
View file

@ -63,7 +63,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"

2
app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
View file

@ -46,7 +46,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"

2
app/src/main/res/layout/assistant_register_fragment.xml
View file

@ -62,7 +62,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"

2
app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
View file

@ -48,7 +48,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"

2
app/src/main/res/layout/call_actions_bottom_sheet.xml
View file

@ -143,7 +143,7 @@
android:layout_height="0dp"
android:indeterminate="true"
android:visibility="@{viewModel.operationInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/chat"

2
app/src/main/res/layout/call_active_conference_fragment.xml
View file

@ -144,7 +144,7 @@
android:src="@drawable/pause"
android:contentDescription="@string/content_description_paused_call"
android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; conferenceViewModel.isPaused ? View.VISIBLE : View.GONE, default=gone}"
app:tint="@color/main1_500"
app:tint="?attr/color_main1_500"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintEnd_toStartOf="@id/stats" />

2
app/src/main/res/layout/call_active_fragment.xml
View file

@ -211,7 +211,7 @@
android:src="@drawable/pause"
android:contentDescription="@string/content_description_paused_call"
android:visibility="@{!viewModel.fullScreenMode &amp;&amp; !viewModel.pipMode &amp;&amp; (viewModel.isPaused || viewModel.isPausedByRemote) ? View.VISIBLE : View.GONE, default=gone}"
app:tint="@color/main1_500"
app:tint="?attr/color_main1_500"
app:layout_constraintTop_toTopOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/back"
app:layout_constraintEnd_toStartOf="@id/stats" />

2
app/src/main/res/layout/call_activity_other_calls_top_bar.xml
View file

@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="40dp"
android:background="@{viewModel.callsCount > 1 || viewModel.showTopBar ? @color/success_500 : @color/black, default=@color/black}"
android:background="@{viewModel.callsCount > 1 || viewModel.showTopBar ? @drawable/color_success_500 : @drawable/color_black, default=@drawable/color_black}"
android:onClick="@{() -> viewModel.topBarClicked()}">
<ImageView

4
app/src/main/res/layout/chat_bubble_meeting_invite_content.xml
View file

@ -42,7 +42,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/conversation_message_meeting_updated_label"
android:textColor="@color/warning_600"
android:textColor="@color/orange_warning_600"
android:textSize="12sp"
android:maxLines="1"
android:ellipsize="end"
@ -60,7 +60,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/conversation_message_meeting_cancelled_label"
android:textColor="@color/danger_500"
android:textColor="@color/red_danger_500"
android:textSize="12sp"
android:maxLines="1"
android:ellipsize="end"

2
app/src/main/res/layout/chat_conversation_e2e_details_bottom_sheet.xml
View file

@ -69,7 +69,7 @@
android:text="@string/conversation_end_to_end_encrypted_bottom_sheet_link"
android:textSize="12sp"
android:textStyle="bold"
android:textColor="@color/main1_500"
android:textColor="?attr/color_main1_500"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

4
app/src/main/res/layout/chat_conversation_fragment.xml
View file

@ -131,7 +131,7 @@
app:layout_constraintEnd_toStartOf="@id/ephemeral_enabled"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<ImageView
android:id="@+id/ephemeral_enabled"
@ -144,7 +144,7 @@
app:layout_constraintStart_toEndOf="@id/muted"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintBottom_toBottomOf="@id/avatar"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<ImageView
android:id="@+id/show_menu"

2
app/src/main/res/layout/chat_list_fragment.xml
View file

@ -95,7 +95,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/contacts_list_fragment.xml
View file

@ -134,7 +134,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/drawer_menu.xml
View file

@ -36,7 +36,7 @@
android:contentDescription="@string/app_name"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:tint="@color/main1_500" />
app:tint="?attr/color_main1_500" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"

2
app/src/main/res/layout/history_list_fragment.xml
View file

@ -105,7 +105,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/main_activity_notification_top_bar.xml
View file

@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="40dp"
android:background="@{viewModel.maxAlertLevel >= 20 ? @color/success_500 : viewModel.maxAlertLevel >= 10 ? @color/danger_500 : viewModel.maxAlertLevel > 0 ? @color/main2_500 : @color/main1_500, default=@color/main1_500}"
android:background="@{viewModel.maxAlertLevel >= 20 ? @drawable/color_success_500 : viewModel.maxAlertLevel >= 10 ? @drawable/color_danger_500 : viewModel.maxAlertLevel > 0 ? @drawable/color_main2_500 : @drawable/color_main1_500, default=@drawable/color_main1_500}"
android:onClick="@{() -> viewModel.onTopBarClicked()}">
<ImageView

2
app/src/main/res/layout/meeting_list_today_indicator.xml
View file

@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{model.dayNumber, default=`19`}"
android:textColor="@color/main2_000"
android:textColor="?attr/color_main2_000"
android:textSize="20sp"
android:paddingBottom="4dp"
app:layout_constraintStart_toStartOf="@id/today_background"

2
app/src/main/res/layout/meeting_waiting_room_fragment.xml
View file

@ -27,7 +27,7 @@
android:padding="15dp"
android:src="@drawable/caret_left"
android:contentDescription="@string/content_description_go_back_icon"
app:tint="@color/main1_500"
app:tint="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/meetings_list_fragment.xml
View file

@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/recordings_list_fragment.xml
View file

@ -171,7 +171,7 @@
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="@{viewModel.fetchInProgress ? View.VISIBLE : View.GONE}"
app:indicatorColor="@color/main1_500"
app:indicatorColor="?attr/color_main1_500"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/single_sign_on_fragment.xml
View file

@ -43,7 +43,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/back"
app:layout_constraintBottom_toBottomOf="@id/title"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/assistant_page_title_style"

2
app/src/main/res/layout/welcome_page_1.xml
View file

@ -21,7 +21,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"

2
app/src/main/res/layout/welcome_page_2.xml
View file

@ -21,7 +21,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"

2
app/src/main/res/layout/welcome_page_3.xml
View file

@ -21,7 +21,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/title_second_line"
app:tint="@color/main1_500"/>
app:tint="?attr/color_main1_500"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"