Change the way of hiding the action bar

Change the library version
dev-labs-bg · Jan 29, 2018 · 19b6794 · 19b6794
1 parent b9e3f83
commit 19b6794
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/library/release.gradle b/library/release.gradle
@@ -5,7 +5,7 @@ apply from: 'keystore.gradle'
 ext {
     publishedGroupId = 'bg.devlabs.fullscreenvideoview'
     artifactId = 'library'
-    libraryVersion = '0.0.5'
+    libraryVersion = '0.0.6'
 }
 
 version = libraryVersion

diff --git a/library/src/main/java/bg/devlabs/fullscreenvideoview/orientation/OrientationHelper.java b/library/src/main/java/bg/devlabs/fullscreenvideoview/orientation/OrientationHelper.java
@@ -70,7 +70,7 @@ public void activateFullscreen() {
         updateLayoutParams();
 
         // Hiding the supportToolbar
-        hideActionBar();
+        toggleActionBarVisibility(false);
 
         // Hide status bar
         toggleSystemUiVisibility(activity.getWindow());
@@ -105,15 +105,14 @@ public void exitFullscreen() {
         Activity activity = (Activity) videoView.getContext();
         setOrientation(portraitOrientation.getValue());
 
-
         UiUtils.showOtherViews(getParent());
 
         ViewGroup.LayoutParams params = videoView.getLayoutParams();
         params.width = originalWidth;
         params.height = originalHeight;
         videoView.setLayoutParams(params);
 
-        showActionBar();
+        toggleActionBarVisibility(true);
         toggleSystemUiVisibility(activity.getWindow());
     }
 
@@ -131,33 +130,23 @@ private static void toggleSystemUiVisibility(Window activityWindow) {
         activityWindow.getDecorView().setSystemUiVisibility(newUiOptions);
     }
 
-    private void showActionBar() {
-        if (videoView.getContext() instanceof AppCompatActivity) {
-            ActionBar supportActionBar = ((AppCompatActivity) videoView.getContext())
-                    .getSupportActionBar();
+    private void toggleActionBarVisibility(boolean visible) {
+        // AppCompatActivity support action bar
+        ActionBar supportActionBar = ((AppCompatActivity) videoView.getContext())
+                .getSupportActionBar();
+        // Activity action bar
+        android.app.ActionBar actionBar = ((Activity) videoView.getContext()).getActionBar();
+        if (visible) {
             if (supportActionBar != null) {
                 supportActionBar.show();
             }
-        }
-        if (videoView.getContext() instanceof Activity) {
-            android.app.ActionBar actionBar = ((Activity) videoView.getContext()).getActionBar();
             if (actionBar != null) {
                 actionBar.show();
             }
-        }
-    }
-
-    private void hideActionBar() {
-        if (videoView.getContext() instanceof AppCompatActivity) {
-            ActionBar supportActionBar = ((AppCompatActivity) videoView.getContext())
-                    .getSupportActionBar();
+        } else {
             if (supportActionBar != null) {
                 supportActionBar.hide();
             }
-        }
-
-        if (videoView.getContext() instanceof Activity) {
-            android.app.ActionBar actionBar = ((Activity) videoView.getContext()).getActionBar();
             if (actionBar != null) {
                 actionBar.hide();
             }
@@ -228,7 +217,8 @@ public void onOrientationChanged(int orientation) {
      * @return true or false according to whether the rotation is enabled or disabled
      */
     private static boolean isRotationEnabled(ContentResolver contentResolver) {
-        return Settings.System.getInt(contentResolver, Settings.System.ACCELEROMETER_ROTATION, 0) == 1;
+        return Settings.System.getInt(contentResolver, Settings.System.ACCELEROMETER_ROTATION,
+                0) == 1;
     }
 
     public boolean isLandscape() {