diff --git a/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java b/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java
index 32d1e5f41fd6bcb10cac464f7758beb87fd8702e..e78249a486e180889f21a77104305aaccccc852e 100644
--- a/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java
+++ b/app/src/main/java/com/nynja/mobile/communicator/ui/activities/calls/CallActivity.java
@@ -201,8 +201,10 @@ public class CallActivity extends BaseActivity implements CallView, ICameraEvent
videoViewLayout.setVisibility(View.GONE);
videoIncomeLayout.setVisibility(View.GONE);
videoOutgoingLayout.setVisibility(View.GONE);
- audioIncomeLayout.setVisibility(View.VISIBLE);
- name.setVisibility(View.VISIBLE);
+// if (!activeCall.mCall.isVideoEnabled()) {
+ audioIncomeLayout.setVisibility(View.VISIBLE);
+ name.setVisibility(View.VISIBLE);
+// }
});
}
@@ -218,6 +220,7 @@ public class CallActivity extends BaseActivity implements CallView, ICameraEvent
videoViewLayout.setVisibility(View.VISIBLE);
videoRemote.setVisibility(View.VISIBLE);
} else {
+ audioIncomeLayout.setVisibility(View.GONE);
videoOutgoingLayout.setVisibility(View.VISIBLE);
videoViewLayout.setVisibility(View.GONE);
}
@@ -250,7 +253,7 @@ public class CallActivity extends BaseActivity implements CallView, ICameraEvent
private void initCall(ActiveCall activeCall) {
if (!activeCall.isOwnStreamActive || !activeCall.isRemoteStreamActive) {
- audioCall(activeCall);
+// audioCall(activeCall);
audioSpeaker.setChecked(activeCall.isSpeakerOn);
audioMute.setChecked(activeCall.isMuted);
setMuteText(activeCall.isMuted);
diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml
index 621c4bfc29ad9a48aefbc6c476df416a018889eb..263ad020e56c36212e54427af4c7bb6d3f17cf94 100644
--- a/app/src/main/res/layout/activity_call.xml
+++ b/app/src/main/res/layout/activity_call.xml
@@ -25,28 +25,29 @@
android:layout_gravity="bottom"
app:layout_constraintBottom_toBottomOf="@+id/call_active_user_photo"/>
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+ android:layout_height="match_parent"
+ android:minHeight="205dp">
-
+ app:layout_constraintTop_toTopOf="parent"/>
-
@@ -53,7 +39,7 @@
app:layout_constraintEnd_toStartOf="@+id/audio_active_mute"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/audio_active_duration"
+ app:layout_constraintTop_toBottomOf="@+id/center_view"
app:layout_constraintVertical_bias="0.8"
app:layout_constraintVertical_chainStyle="packed"
app:srcCompat="@drawable/v_port_out"/>
@@ -89,10 +75,10 @@
android:layout_height="68dp"
android:layout_marginBottom="16dp"
android:scaleType="fitCenter"
- app:srcCompat="@drawable/button_hangup"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:srcCompat="@drawable/button_hangup"/>
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/video_active_layout_income">
+
+
+
+
+