Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed presence led background in dark mode + reduced background padding a bit

Browse source
This commit is contained in:
Sylvain Berfini 2023-03-27 11:02:42 +02:00
parent b467569308
commit 7136a991b3
17 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable/led_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="oval">
<solid android:color="@color/white_color"/>
<solid android:color="?attr/backgroundColor"/>
<size android:width="20dp" android:height="20dp"/>
</shape>

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

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

@ -47,7 +47,7 @@
android:layout_marginStart="25dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{data.presenceStatus}"
android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -46,7 +46,7 @@
android:layout_marginStart="25dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{data.presenceStatus}"
android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.view.View"/>
@ -34,7 +35,7 @@
android:layout_marginStart="25dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{data.presenceStatus}"
android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -57,7 +57,7 @@
android:layout_marginStart="25dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{data.presenceStatus}"
android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
app:layout_constraintStart_toStartOf="@id/avatar"

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

@ -103,7 +103,7 @@
android:layout_marginStart="70dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_big_badge_padding"
app:presenceIcon="@{viewModel.presenceStatus}"
android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -52,7 +52,7 @@
android:layout_marginStart="25dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{viewModel.presenceStatus}"
android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -50,7 +50,7 @@
android:layout_marginStart="25dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{data.presenceStatus}"
android:visibility="@{data.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -105,7 +105,7 @@
android:layout_marginStart="70dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_big_badge_padding"
app:presenceIcon="@{viewModel.presenceStatus}"
android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -101,7 +101,7 @@
android:layout_marginStart="25dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{viewModel.presenceStatus}"
android:visibility="@{viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />

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

@ -17,7 +17,7 @@
<ImageView
android:id="@+id/led"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
android:src="@{data.iconResource, default=@drawable/led_not_registered}"
android:contentDescription="@{data.iconContentDescription}"
android:layout_width="wrap_content"

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

@ -35,7 +35,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/settings_margin"
android:padding="2dp" />
android:padding="@dimen/contact_presence_badge_padding" />
<View
android:layout_width="match_parent"

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

@ -79,7 +79,7 @@
android:layout_marginStart="45dp"
android:adjustViewBounds="true"
android:background="@drawable/led_background"
android:padding="2dp"
android:padding="@dimen/contact_presence_badge_padding"
app:presenceIcon="@{viewModel.presenceStatus}"
android:visibility="@{!viewModel.defaultAccountFound || viewModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}" />
@ -128,7 +128,7 @@
android:layout_alignParentRight="true"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:padding="2dp" />
android:padding="@dimen/contact_presence_badge_padding" />
<View
android:layout_width="match_parent"

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

@ -33,7 +33,7 @@
<ImageView
android:id="@+id/status_led"
android:background="@drawable/led_background"
android:background="@drawable/status_led_background"
android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
android:onClick="@{refreshClickListener}"
android:contentDescription="@{viewModel.registrationStatusText}"

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

@ -30,7 +30,7 @@
<ImageView
android:id="@+id/status_led"
android:background="@drawable/led_background"
android:background="@drawable/status_led_background"
android:src="@{viewModel.registrationStatusDrawable, default=@drawable/led_not_registered}"
android:onClick="@{refreshClickListener}"
android:contentDescription="@{viewModel.registrationStatusText}"

2
app/src/main/res/values/dimen.xml
View file

@ -84,4 +84,6 @@
<dimen name="chat_message_sending_icons_margin">5dp</dimen>
<dimen name="contact_presence_badge_size">12dp</dimen>
<dimen name="contact_presence_big_badge_size">25dp</dimen>
<dimen name="contact_presence_badge_padding">1dp</dimen>
<dimen name="contact_presence_big_badge_padding">2dp</dimen>
</resources>