diff --git a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml index a1f42b973..37ea330b5 100644 --- a/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml +++ b/app/src/main/res/drawable/shape_call_bottom_sheet_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/call_active_conference_fragment.xml b/app/src/main/res/layout/call_active_conference_fragment.xml index ad7be5f68..2f29e79a9 100644 --- a/app/src/main/res/layout/call_active_conference_fragment.xml +++ b/app/src/main/res/layout/call_active_conference_fragment.xml @@ -47,7 +47,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginTop="@dimen/call_top_bar_info_height" - android:layout_marginBottom="@dimen/call_main_actions_menu_height" + android:layout_marginBottom="@dimen/call_main_actions_menu_margin" android:visibility="@{conferenceViewModel.participantDevices.size() > 1 || viewModel.pipMode ? View.GONE : View.VISIBLE}" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -99,7 +99,7 @@ android:id="@+id/grid_box_layout" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode ? @dimen/zero : @dimen/call_main_actions_menu_height, default=@dimen/call_main_actions_menu_height}" + android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode ? @dimen/zero : @dimen/call_main_actions_menu_margin, default=@dimen/call_main_actions_menu_margin}" android:layout_marginTop="@{viewModel.fullScreenMode || viewModel.pipMode ? @dimen/zero : @dimen/call_top_bar_info_height, default=@dimen/call_top_bar_info_height}" android:onClick="@{() -> viewModel.toggleFullScreen()}" android:visibility="@{conferenceViewModel.participantDevices.size() > 1 ? View.VISIBLE : View.GONE, default=gone}" diff --git a/app/src/main/res/layout/call_active_fragment.xml b/app/src/main/res/layout/call_active_fragment.xml index 89b175813..78159657f 100644 --- a/app/src/main/res/layout/call_active_fragment.xml +++ b/app/src/main/res/layout/call_active_fragment.xml @@ -54,7 +54,7 @@ android:layout_height="0dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" - android:layout_marginBottom="@dimen/call_main_actions_menu_height" + android:layout_marginBottom="@dimen/call_main_actions_menu_margin" app:layout_constraintTop_toBottomOf="@id/call_direction_label" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -117,7 +117,7 @@ android:id="@+id/remote_video_surface" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_main_actions_menu_height, default=@dimen/call_main_actions_menu_height}" + android:layout_marginBottom="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_main_actions_menu_margin, default=@dimen/call_main_actions_menu_margin}" android:layout_marginTop="@{viewModel.fullScreenMode || viewModel.pipMode || viewModel.halfOpenedFolded ? @dimen/zero : @dimen/call_top_bar_info_height, default=@dimen/call_top_bar_info_height}" android:onClick="@{() -> viewModel.toggleFullScreen()}" android:visibility="@{viewModel.isVideoEnabled ? View.VISIBLE : View.GONE}" diff --git a/app/src/main/res/layout/call_ended_fragment.xml b/app/src/main/res/layout/call_ended_fragment.xml index 67aa15516..4e07509c6 100644 --- a/app/src/main/res/layout/call_ended_fragment.xml +++ b/app/src/main/res/layout/call_ended_fragment.xml @@ -123,6 +123,7 @@ android:layout_marginStart="12dp" android:layout_marginEnd="12dp" android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" app:layout_constraintTop_toBottomOf="@id/separator" app:layout_constraintBottom_toTopOf="@id/bottom_bar" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/call_incoming_fragment.xml b/app/src/main/res/layout/call_incoming_fragment.xml index 092a4f0f5..891b8882c 100644 --- a/app/src/main/res/layout/call_incoming_fragment.xml +++ b/app/src/main/res/layout/call_incoming_fragment.xml @@ -58,6 +58,7 @@ android:layout_height="0dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" + android:layout_marginBottom="10dp" app:layout_constraintTop_toBottomOf="@id/call_direction_label" app:layout_constraintBottom_toTopOf="@id/bottom_bar" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/call_outgoing_fragment.xml b/app/src/main/res/layout/call_outgoing_fragment.xml index 42e97fd2c..3138aea26 100644 --- a/app/src/main/res/layout/call_outgoing_fragment.xml +++ b/app/src/main/res/layout/call_outgoing_fragment.xml @@ -72,6 +72,7 @@ android:layout_height="0dp" android:layout_marginStart="12dp" android:layout_marginEnd="12dp" + android:layout_marginBottom="10dp" app:layout_constraintTop_toBottomOf="@id/call_direction_label" app:layout_constraintBottom_toTopOf="@id/bottom_bar" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 18418cd49..205d1b895 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -25,6 +25,7 @@ #949494 #4E4E4E #2E3030 + #0F0F0F #070707 #F5CCBE diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index 0455ad951..6ad67a65a 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -45,6 +45,7 @@ 110dp 235dp 345dp + 120dp 20dp 55dp 15dp