Fix multiple modal orientation issue (#1236)

Orientation was reverted to the app orientation each time modal was dismissed.

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -14,7 +14,6 @@ import com.reactnativenavigation.R;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.ModalScreenLayout;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
-import com.reactnativenavigation.params.AppStyle;
 import com.reactnativenavigation.params.ContextualMenuParams;
 import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.Orientation;
@@ -190,11 +189,11 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
             return;
         }
         destroy();
-        setOrientation(AppStyle.appStyle.orientation);
         onModalDismissedListener.onModalDismissed(this);
     }
 
     void onModalDismissed() {
+        setOrientation(screenParams.styleParams.orientation);
         layout.onModalDismissed();
     }
 

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -413,6 +413,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     private void handleModalDismissedEvent() {
         if (!modalController.isShowing()) {
             layout.onModalDismissed();
+            OrientationHelper.setOrientation(this, AppStyle.appStyle.orientation);
         }
     }