TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 11:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bookkeeping in CameraXFragment.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-06-28 18:57:04 -04:00
parent 84fd1a9140
commit 93856ed8cf
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
View File

@ -21,6 +21,7 @@ import androidx.camera.core.CameraX;
import androidx.camera.core.ImageCapture; import androidx.camera.core.ImageCapture;
import androidx.camera.core.ImageProxy; import androidx.camera.core.ImageProxy;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProviders;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
@ -41,9 +42,10 @@ public class CameraXFragment extends Fragment implements CameraFragment {
private static final String TAG = Log.tag(CameraXFragment.class); private static final String TAG = Log.tag(CameraXFragment.class);
private CameraXView camera; private CameraXView camera;
private ViewGroup controlsContainer; private ViewGroup controlsContainer;
private Controller controller; private Controller controller;
private MediaSendViewModel viewModel;
public static CameraXFragment newInstance() { public static CameraXFragment newInstance() {
return new CameraXFragment(); return new CameraXFragment();
@ -60,6 +62,12 @@ public class CameraXFragment extends Fragment implements CameraFragment {
this.controller = (Controller) getActivity(); this.controller = (Controller) getActivity();
} }
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
viewModel = ViewModelProviders.of(requireActivity(), new MediaSendViewModel.Factory(requireActivity().getApplication(), new MediaRepository()))
.get(MediaSendViewModel.class);
}
@Override @Override
public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@ -82,6 +90,7 @@ public class CameraXFragment extends Fragment implements CameraFragment {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
viewModel.onCameraStarted();
requireActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN); requireActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
} }