|
@@ -986,92 +986,80 @@ public class CallActivity extends CallBaseActivity {
|
|
duration = 1000;
|
|
duration = 1000;
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callControls != null) {
|
|
|
|
- binding.callControls.setEnabled(false);
|
|
|
|
- binding.callControls.animate()
|
|
|
|
- .translationY(0)
|
|
|
|
- .alpha(alpha)
|
|
|
|
- .setDuration(duration)
|
|
|
|
- .setStartDelay(startDelay)
|
|
|
|
- .setListener(new AnimatorListenerAdapter() {
|
|
|
|
- @Override
|
|
|
|
- public void onAnimationEnd(Animator animation) {
|
|
|
|
- super.onAnimationEnd(animation);
|
|
|
|
- if (binding.callControls != null) {
|
|
|
|
- if (!show) {
|
|
|
|
- binding.callControls.setVisibility(View.GONE);
|
|
|
|
- if (spotlightView != null && spotlightView.getVisibility() != View.GONE) {
|
|
|
|
- spotlightView.setVisibility(View.GONE);
|
|
|
|
|
|
+ binding.callControls.setEnabled(false);
|
|
|
|
+ binding.callControls.animate()
|
|
|
|
+ .translationY(0)
|
|
|
|
+ .alpha(alpha)
|
|
|
|
+ .setDuration(duration)
|
|
|
|
+ .setStartDelay(startDelay)
|
|
|
|
+ .setListener(new AnimatorListenerAdapter() {
|
|
|
|
+ @Override
|
|
|
|
+ public void onAnimationEnd(Animator animation) {
|
|
|
|
+ super.onAnimationEnd(animation);
|
|
|
|
+ if (!show) {
|
|
|
|
+ binding.callControls.setVisibility(View.GONE);
|
|
|
|
+ if (spotlightView != null && spotlightView.getVisibility() != View.GONE) {
|
|
|
|
+ spotlightView.setVisibility(View.GONE);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ callControlHandler.postDelayed(new Runnable() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ if (!isPTTActive) {
|
|
|
|
+ animateCallControls(false, 0);
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- callControlHandler.postDelayed(new Runnable() {
|
|
|
|
- @Override
|
|
|
|
- public void run() {
|
|
|
|
- if (!isPTTActive) {
|
|
|
|
- animateCallControls(false, 0);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }, 7500);
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
- binding.callControls.setEnabled(true);
|
|
|
|
- }
|
|
|
|
|
|
+ }, 7500);
|
|
}
|
|
}
|
|
- });
|
|
|
|
- }
|
|
|
|
|
|
|
|
- if (binding.callInfosLinearLayout != null) {
|
|
|
|
- binding.callInfosLinearLayout.setEnabled(false);
|
|
|
|
- binding.callInfosLinearLayout.animate()
|
|
|
|
- .translationY(0)
|
|
|
|
- .alpha(alpha)
|
|
|
|
- .setDuration(duration)
|
|
|
|
- .setStartDelay(startDelay)
|
|
|
|
- .setListener(new AnimatorListenerAdapter() {
|
|
|
|
- @Override
|
|
|
|
- public void onAnimationEnd(Animator animation) {
|
|
|
|
- super.onAnimationEnd(animation);
|
|
|
|
- if (binding.callInfosLinearLayout != null) {
|
|
|
|
- if (!show) {
|
|
|
|
- binding.callInfosLinearLayout.setVisibility(View.GONE);
|
|
|
|
- } else {
|
|
|
|
- callInfosHandler.postDelayed(new Runnable() {
|
|
|
|
- @Override
|
|
|
|
- public void run() {
|
|
|
|
- if (!isPTTActive) {
|
|
|
|
- animateCallControls(false, 0);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }, 7500);
|
|
|
|
- }
|
|
|
|
|
|
+ binding.callControls.setEnabled(true);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
|
|
- binding.callInfosLinearLayout.setEnabled(true);
|
|
|
|
- }
|
|
|
|
|
|
+ binding.callInfosLinearLayout.setEnabled(false);
|
|
|
|
+ binding.callInfosLinearLayout.animate()
|
|
|
|
+ .translationY(0)
|
|
|
|
+ .alpha(alpha)
|
|
|
|
+ .setDuration(duration)
|
|
|
|
+ .setStartDelay(startDelay)
|
|
|
|
+ .setListener(new AnimatorListenerAdapter() {
|
|
|
|
+ @Override
|
|
|
|
+ public void onAnimationEnd(Animator animation) {
|
|
|
|
+ super.onAnimationEnd(animation);
|
|
|
|
+ if (!show) {
|
|
|
|
+ binding.callInfosLinearLayout.setVisibility(View.GONE);
|
|
|
|
+ } else {
|
|
|
|
+ callInfosHandler.postDelayed(new Runnable() {
|
|
|
|
+ @Override
|
|
|
|
+ public void run() {
|
|
|
|
+ if (!isPTTActive) {
|
|
|
|
+ animateCallControls(false, 0);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }, 7500);
|
|
}
|
|
}
|
|
- });
|
|
|
|
- }
|
|
|
|
|
|
|
|
- if (binding.switchSelfVideoButton != null) {
|
|
|
|
- binding.switchSelfVideoButton.setEnabled(false);
|
|
|
|
- binding.switchSelfVideoButton.animate()
|
|
|
|
- .translationY(0)
|
|
|
|
- .alpha(alpha)
|
|
|
|
- .setDuration(duration)
|
|
|
|
- .setStartDelay(startDelay)
|
|
|
|
- .setListener(new AnimatorListenerAdapter() {
|
|
|
|
- @Override
|
|
|
|
- public void onAnimationEnd(Animator animation) {
|
|
|
|
- super.onAnimationEnd(animation);
|
|
|
|
- if (binding.switchSelfVideoButton != null) {
|
|
|
|
- if (!show) {
|
|
|
|
- binding.switchSelfVideoButton.setVisibility(View.GONE);
|
|
|
|
- }
|
|
|
|
|
|
+ binding.callInfosLinearLayout.setEnabled(true);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
|
|
- binding.switchSelfVideoButton.setEnabled(true);
|
|
|
|
- }
|
|
|
|
|
|
+ binding.switchSelfVideoButton.setEnabled(false);
|
|
|
|
+ binding.switchSelfVideoButton.animate()
|
|
|
|
+ .translationY(0)
|
|
|
|
+ .alpha(alpha)
|
|
|
|
+ .setDuration(duration)
|
|
|
|
+ .setStartDelay(startDelay)
|
|
|
|
+ .setListener(new AnimatorListenerAdapter() {
|
|
|
|
+ @Override
|
|
|
|
+ public void onAnimationEnd(Animator animation) {
|
|
|
|
+ super.onAnimationEnd(animation);
|
|
|
|
+ if (!show) {
|
|
|
|
+ binding.switchSelfVideoButton.setVisibility(View.GONE);
|
|
}
|
|
}
|
|
- });
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ binding.switchSelfVideoButton.setEnabled(true);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -2225,33 +2213,25 @@ public class CallActivity extends CallBaseActivity {
|
|
handler.postDelayed(() -> setCallState(CallStatus.CALLING_TIMEOUT), 45000);
|
|
handler.postDelayed(() -> setCallState(CallStatus.CALLING_TIMEOUT), 45000);
|
|
handler.post(() -> {
|
|
handler.post(() -> {
|
|
binding.callModeTextView.setText(getDescriptionForCallType());
|
|
binding.callModeTextView.setText(getDescriptionForCallType());
|
|
- if (binding.callStates.callStateRelativeLayout != null) {
|
|
|
|
- if (isIncomingCallFromNotification) {
|
|
|
|
- binding.callStates.callStateTextView.setText(R.string.nc_call_incoming);
|
|
|
|
- } else {
|
|
|
|
- binding.callStates.callStateTextView.setText(R.string.nc_call_ringing);
|
|
|
|
- }
|
|
|
|
- if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
|
|
|
|
- binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (isIncomingCallFromNotification) {
|
|
|
|
+ binding.callStates.callStateTextView.setText(R.string.nc_call_incoming);
|
|
|
|
+ } else {
|
|
|
|
+ binding.callStates.callStateTextView.setText(R.string.nc_call_ringing);
|
|
|
|
+ }
|
|
|
|
+ if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
|
|
|
|
+ binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callStates.callStateProgressBar != null) {
|
|
|
|
- if (binding.callStates.callStateProgressBar.getVisibility() != View.VISIBLE) {
|
|
|
|
- binding.callStates.callStateProgressBar.setVisibility(View.VISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.callStates.callStateProgressBar.getVisibility() != View.VISIBLE) {
|
|
|
|
+ binding.callStates.callStateProgressBar.setVisibility(View.VISIBLE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.gridview != null) {
|
|
|
|
- if (binding.gridview.getVisibility() != View.INVISIBLE) {
|
|
|
|
- binding.gridview.setVisibility(View.INVISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.gridview.getVisibility() != View.INVISIBLE) {
|
|
|
|
+ binding.gridview.setVisibility(View.INVISIBLE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callStates.errorImageView != null) {
|
|
|
|
- if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
|
|
|
|
- binding.callStates.errorImageView.setVisibility(View.GONE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
|
|
|
|
+ binding.callStates.errorImageView.setVisibility(View.GONE);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
break;
|
|
break;
|
|
@@ -2268,28 +2248,20 @@ public class CallActivity extends CallBaseActivity {
|
|
animateCallControls(false, 5000);
|
|
animateCallControls(false, 5000);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callStates.callStateRelativeLayout != null) {
|
|
|
|
- if (binding.callStates.callStateRelativeLayout.getVisibility() != View.INVISIBLE) {
|
|
|
|
- binding.callStates.callStateRelativeLayout.setVisibility(View.INVISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.callStates.callStateRelativeLayout.getVisibility() != View.INVISIBLE) {
|
|
|
|
+ binding.callStates.callStateRelativeLayout.setVisibility(View.INVISIBLE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callStates.callStateProgressBar != null) {
|
|
|
|
- if (binding.callStates.callStateProgressBar.getVisibility() != View.GONE) {
|
|
|
|
- binding.callStates.callStateProgressBar.setVisibility(View.GONE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.callStates.callStateProgressBar.getVisibility() != View.GONE) {
|
|
|
|
+ binding.callStates.callStateProgressBar.setVisibility(View.GONE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.gridview != null) {
|
|
|
|
- if (binding.gridview.getVisibility() != View.VISIBLE) {
|
|
|
|
- binding.gridview.setVisibility(View.VISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.gridview.getVisibility() != View.VISIBLE) {
|
|
|
|
+ binding.gridview.setVisibility(View.VISIBLE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callStates.errorImageView != null) {
|
|
|
|
- if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
|
|
|
|
- binding.callStates.errorImageView.setVisibility(View.GONE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.callStates.errorImageView.getVisibility() != View.GONE) {
|
|
|
|
+ binding.callStates.errorImageView.setVisibility(View.GONE);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
break;
|
|
break;
|
|
@@ -2297,32 +2269,24 @@ public class CallActivity extends CallBaseActivity {
|
|
handler.post(() -> {
|
|
handler.post(() -> {
|
|
stopCallingSound();
|
|
stopCallingSound();
|
|
|
|
|
|
- if (binding.callStates.callStateTextView != null) {
|
|
|
|
- binding.callStates.callStateTextView.setText(R.string.nc_offline);
|
|
|
|
|
|
+ binding.callStates.callStateTextView.setText(R.string.nc_offline);
|
|
|
|
|
|
- if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
|
|
|
|
- binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.callStates.callStateRelativeLayout.getVisibility() != View.VISIBLE) {
|
|
|
|
+ binding.callStates.callStateRelativeLayout.setVisibility(View.VISIBLE);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (binding.gridview != null) {
|
|
|
|
- if (binding.gridview.getVisibility() != View.INVISIBLE) {
|
|
|
|
- binding.gridview.setVisibility(View.INVISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.gridview.getVisibility() != View.INVISIBLE) {
|
|
|
|
+ binding.gridview.setVisibility(View.INVISIBLE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callStates.callStateProgressBar != null) {
|
|
|
|
- if (binding.callStates.callStateProgressBar.getVisibility() != View.GONE) {
|
|
|
|
- binding.callStates.callStateProgressBar.setVisibility(View.GONE);
|
|
|
|
- }
|
|
|
|
|
|
+ if (binding.callStates.callStateProgressBar.getVisibility() != View.GONE) {
|
|
|
|
+ binding.callStates.callStateProgressBar.setVisibility(View.GONE);
|
|
}
|
|
}
|
|
|
|
|
|
- if (binding.callStates.errorImageView != null) {
|
|
|
|
- binding.callStates.errorImageView.setImageResource(R.drawable.ic_signal_wifi_off_white_24dp);
|
|
|
|
- if (binding.callStates.errorImageView.getVisibility() != View.VISIBLE) {
|
|
|
|
- binding.callStates.errorImageView.setVisibility(View.VISIBLE);
|
|
|
|
- }
|
|
|
|
|
|
+ binding.callStates.errorImageView.setImageResource(R.drawable.ic_signal_wifi_off_white_24dp);
|
|
|
|
+ if (binding.callStates.errorImageView.getVisibility() != View.VISIBLE) {
|
|
|
|
+ binding.callStates.errorImageView.setVisibility(View.VISIBLE);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
break;
|
|
break;
|