diff --git a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
index 8e3e61fdd..fb4104f46 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/ActiveCallFragment.kt
@@ -274,8 +274,6 @@ class ActiveCallFragment : GenericCallFragment() {
override fun onSlide(bottomSheet: View, slideOffset: Float) {}
})
-
- binding.bottomBar.chat.isEnabled = false // TODO FIXME : remove later when chat will be available
}
@SuppressLint("ClickableViewAccessibility")
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
index 44338c1ee..76fdfaa25 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/fragment/ContactFragment.kt
@@ -209,9 +209,6 @@ class ContactFragment : GenericFragment() {
goBack()
}
}
-
- // TODO: remove later
- binding.chat.isEnabled = false
}
override fun onPause() {
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt
index 8ec940adf..fe1b8752a 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt
@@ -128,9 +128,6 @@ class HistoryContactFragment : GenericFragment() {
goBack() // TODO FIXME : issue with tablet when pane can't be closed
}
}
-
- // TODO: remove later
- binding.chat.isEnabled = false
}
private fun copyNumberOrAddressToClipboard(value: String) {
diff --git a/app/src/main/res/drawable/notebook.xml b/app/src/main/res/drawable/notebook.xml
new file mode 100644
index 000000000..826e46274
--- /dev/null
+++ b/app/src/main/res/drawable/notebook.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/screencast.xml b/app/src/main/res/drawable/screencast.xml
new file mode 100644
index 000000000..03c3f515b
--- /dev/null
+++ b/app/src/main/res/drawable/screencast.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/shape_squircle_main2_400_background.xml b/app/src/main/res/drawable/shape_squircle_main2_400_background.xml
new file mode 100644
index 000000000..3c6394fc4
--- /dev/null
+++ b/app/src/main/res/drawable/shape_squircle_main2_400_background.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/call_extra_actions.xml b/app/src/main/res/layout-land/call_extra_actions.xml
index 7bea59ccb..461bf50e3 100644
--- a/app/src/main/res/layout-land/call_extra_actions.xml
+++ b/app/src/main/res/layout-land/call_extra_actions.xml
@@ -104,7 +104,7 @@
app:layout_constraintEnd_toEndOf="@id/calls_list"/>
@@ -198,13 +198,13 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_go_to_calls_list"
- app:layout_constraintEnd_toStartOf="@id/dialer_label"
+ app:layout_constraintEnd_toStartOf="@id/layout_label"
app:layout_constraintStart_toEndOf="@id/new_call_label"
app:layout_constraintTop_toBottomOf="@id/calls_list"/>
+
+
-
@@ -104,7 +101,7 @@
app:layout_constraintEnd_toEndOf="@id/calls_list"/>
+ app:layout_constraintEnd_toStartOf="@id/layout_label" />
diff --git a/app/src/main/res/layout/call_extra_conference_actions.xml b/app/src/main/res/layout/call_extra_conference_actions.xml
new file mode 100644
index 000000000..41b393914
--- /dev/null
+++ b/app/src/main/res/layout/call_extra_conference_actions.xml
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc1bec21d..67cdd6c43 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -411,6 +411,7 @@
Resume
Record
Hang up
+ Layout
In progress
Ringing
Incoming
@@ -428,7 +429,10 @@
%s calls
%s paused calls
+ Share invitation
Waiting for other participants…
+ Screen share
+ Participants
Account connection error