Skip to content

Commit

Permalink
[Fix,Dependency] Update a-navigator to v0.0.61 and implement orientat…
Browse files Browse the repository at this point in the history
…ion API
  • Loading branch information
rh-id committed Sep 27, 2022
1 parent a3377f4 commit 6f6c6e0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,14 @@
import m.co.rh.id.anavigator.NavRoute;
import m.co.rh.id.anavigator.StatefulView;
import m.co.rh.id.anavigator.component.INavigator;
import m.co.rh.id.anavigator.component.NavActivity;
import m.co.rh.id.anavigator.component.NavActivityLifecycle;
import m.co.rh.id.anavigator.component.NavOnRequestPermissionResult;
import m.co.rh.id.anavigator.component.RequireNavigator;
import m.co.rh.id.aprovider.Provider;

@SuppressWarnings("deprecation")
class ScanBarcodePage extends StatefulView<Activity> implements RequireNavigator, NavActivityLifecycle<Activity>, NavOnRequestPermissionResult<Activity>, View.OnClickListener {
class ScanBarcodePage extends StatefulView<Activity> implements RequireNavigator, NavActivityLifecycle<Activity>, NavOnRequestPermissionResult<Activity>, NavActivity.RequestOrientation, View.OnClickListener {
private static final int REQUEST_CODE_PERMISSION_ACCESS_CAMERA = 1;
private static final String TAG = ScanBarcodePage.class.getName();

Expand All @@ -53,7 +54,6 @@ class ScanBarcodePage extends StatefulView<Activity> implements RequireNavigator
@Override
public void provideNavigator(INavigator navigator) {
Activity activity = navigator.getActivity();
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
Provider provider = BaseApplication.of(activity).getProvider();
mNavigator = navigator;
mSvProvider = provider.get(IStatefulViewProvider.class);
Expand Down Expand Up @@ -122,14 +122,18 @@ private void initScanBarcodePreview() {
.subscribe(result -> mBarcodeResult.onNext(result)));
}

@Override
public int getRequestedOrientation() {
return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
}

@Override
public void dispose(Activity activity) {
super.dispose(activity);
if (mScanBarcodePreview != null) {
mScanBarcodePreview.dispose();
mScanBarcodePreview = null;
}
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}

@Override
Expand Down Expand Up @@ -168,13 +172,11 @@ public void onNavActivityResumed(Activity activity) {
} else {
mCanAccessCamera.onNext(canAccessCamera);
}
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
}

@Override
public void onNavActivityPaused(Activity activity) {
mCanAccessCamera.onNext(false);
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ task clean(type: Delete) {
}
ext{
room_version = "2.4.2"
nav_version = "v0.0.60"
nav_version = "v0.0.61"
}

0 comments on commit 6f6c6e0

Please sign in to comment.