Fixed back button exiting from app in full screen mode
This commit is contained in:
parent
a750dbbb00
commit
559c831d08
@ -8,6 +8,7 @@ import androidx.appcompat.app.AppCompatActivity;
|
|||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
import androidx.navigation.NavController;
|
import androidx.navigation.NavController;
|
||||||
import androidx.navigation.Navigation;
|
import androidx.navigation.Navigation;
|
||||||
|
|
||||||
@ -21,6 +22,7 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
private ActivityMainBinding binding;
|
private ActivityMainBinding binding;
|
||||||
private NavController navController;
|
private NavController navController;
|
||||||
private boolean rotationEnabledSetting;
|
private boolean rotationEnabledSetting;
|
||||||
|
private OnBackButtonPressedListener onBackButtonPressedListener;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
@ -49,6 +51,17 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setOnBackButtonPressedListener(OnBackButtonPressedListener onBackButtonPressedListener) {
|
||||||
|
this.onBackButtonPressedListener = onBackButtonPressedListener;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
if (this.onBackButtonPressedListener != null && this.onBackButtonPressedListener.onBackPressed())
|
||||||
|
return;
|
||||||
|
super.onBackPressed();
|
||||||
|
}
|
||||||
|
|
||||||
public void navigateToFragment(int actionId) {
|
public void navigateToFragment(int actionId) {
|
||||||
navigateToFragment(actionId, null);
|
navigateToFragment(actionId, null);
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
package it.danieleverducci.ojo.ui;
|
||||||
|
|
||||||
|
public interface OnBackButtonPressedListener {
|
||||||
|
public boolean onBackPressed();
|
||||||
|
}
|
@ -80,7 +80,6 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
|
|
||||||
binding = FragmentSurveillanceBinding.inflate(inflater, container, false);
|
binding = FragmentSurveillanceBinding.inflate(inflater, container, false);
|
||||||
return binding.getRoot();
|
return binding.getRoot();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -106,12 +105,26 @@ public class SurveillanceFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fullscreenCameraView = false;
|
||||||
addAllCameras();
|
addAllCameras();
|
||||||
|
|
||||||
// Start playback for all streams
|
// Start playback for all streams
|
||||||
for (CameraView cv : cameraViews) {
|
for (CameraView cv : cameraViews) {
|
||||||
cv.startPlayback();
|
cv.startPlayback();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Register for back pressed events
|
||||||
|
((MainActivity)getActivity()).setOnBackButtonPressedListener(new OnBackButtonPressedListener() {
|
||||||
|
@Override
|
||||||
|
public boolean onBackPressed() {
|
||||||
|
if(fullscreenCameraView && cameraViews.size() > 1) {
|
||||||
|
fullscreenCameraView = false;
|
||||||
|
showAllCameras();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user