diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
index 7225ab6ab..e91c97ee3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
@@ -19,7 +19,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.provider.MediaStore
-import android.util.DisplayMetrics
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -74,11 +73,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     private var mMediaFiles = ArrayList<Medium>()
     private var mFavoritePaths = ArrayList<String>()
 
-    companion object {
-        var screenWidth = 0
-        var screenHeight = 0
-    }
-
     @TargetApi(Build.VERSION_CODES.P)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -225,7 +219,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     }
 
     private fun initViewPager() {
-        measureScreen()
         val uri = intent.data
         if (uri != null) {
             var cursor: Cursor? = null
@@ -1005,17 +998,9 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
     override fun onConfigurationChanged(newConfig: Configuration?) {
         super.onConfigurationChanged(newConfig)
-        measureScreen()
         initBottomActionsLayout()
     }
 
-    private fun measureScreen() {
-        val metrics = DisplayMetrics()
-        windowManager.defaultDisplay.getRealMetrics(metrics)
-        screenWidth = metrics.widthPixels
-        screenHeight = metrics.heightPixels
-    }
-
     private fun refreshViewPager() {
         if (config.getFileSorting(mDirectory) and SORT_BY_RANDOM == 0) {
             GetMediaAsynctask(applicationContext, mDirectory, false, false, mShowAll) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt
index 847d5f95a..910039de2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt
@@ -34,7 +34,6 @@ import com.simplemobiletools.commons.helpers.OTG_PATH
 import com.simplemobiletools.gallery.pro.R
 import com.simplemobiletools.gallery.pro.activities.PanoramaPhotoActivity
 import com.simplemobiletools.gallery.pro.activities.PhotoActivity
-import com.simplemobiletools.gallery.pro.activities.ViewPagerActivity
 import com.simplemobiletools.gallery.pro.extensions.*
 import com.simplemobiletools.gallery.pro.helpers.MEDIUM
 import com.simplemobiletools.gallery.pro.helpers.PATH
@@ -69,14 +68,16 @@ class PhotoFragment : ViewPagerFragment() {
     private var isPanorama = false
     private var isSubsamplingVisible = false    // checking view.visibility is unreliable, use an extra variable for it
     private var imageOrientation = -1
+    private var mOriginalSubsamplingScale = 0f
     private var loadZoomableViewHandler = Handler()
+    private var mScreenWidth = 0
+    private var mScreenHeight = 0
 
     private var storedShowExtendedDetails = false
     private var storedHideExtendedDetails = false
     private var storedAllowDeepZoomableImages = false
     private var storedShowHighestQuality = false
     private var storedAllowOneFingerZoom = false
-    private var mOriginalSubsamplingScale = 0f
     private var storedExtendedDetails = 0
 
     lateinit var view: ViewGroup
@@ -225,7 +226,7 @@ class PhotoFragment : ViewPagerFragment() {
     }
 
     private fun checkScreenDimensions() {
-        if (ViewPagerActivity.screenWidth == 0 || ViewPagerActivity.screenHeight == 0) {
+        if (mScreenWidth == 0 || mScreenHeight == 0) {
             measureScreen()
         }
     }
@@ -233,8 +234,8 @@ class PhotoFragment : ViewPagerFragment() {
     private fun measureScreen() {
         val metrics = DisplayMetrics()
         activity!!.windowManager.defaultDisplay.getRealMetrics(metrics)
-        ViewPagerActivity.screenWidth = metrics.widthPixels
-        ViewPagerActivity.screenHeight = metrics.heightPixels
+        mScreenWidth = metrics.widthPixels
+        mScreenHeight = metrics.heightPixels
     }
 
     private fun photoFragmentVisibilityChanged(isVisible: Boolean) {
@@ -308,7 +309,7 @@ class PhotoFragment : ViewPagerFragment() {
             val picasso = Picasso.get()
                     .load(pathToLoad)
                     .centerInside()
-                    .resize(ViewPagerActivity.screenWidth, ViewPagerActivity.screenHeight)
+                    .resize(mScreenWidth, mScreenHeight)
 
             if (degrees != 0) {
                 picasso.rotate(degrees.toFloat())
@@ -333,8 +334,8 @@ class PhotoFragment : ViewPagerFragment() {
     }
 
     private fun tryLoadingWithGlide() {
-        var targetWidth = if (ViewPagerActivity.screenWidth == 0) com.bumptech.glide.request.target.Target.SIZE_ORIGINAL else ViewPagerActivity.screenWidth
-        var targetHeight = if (ViewPagerActivity.screenHeight == 0) com.bumptech.glide.request.target.Target.SIZE_ORIGINAL else ViewPagerActivity.screenHeight
+        var targetWidth = if (mScreenWidth == 0) com.bumptech.glide.request.target.Target.SIZE_ORIGINAL else mScreenWidth
+        var targetHeight = if (mScreenHeight == 0) com.bumptech.glide.request.target.Target.SIZE_ORIGINAL else mScreenHeight
 
         if (imageOrientation == ORIENTATION_ROTATE_90) {
             targetWidth = targetHeight
@@ -489,18 +490,18 @@ class PhotoFragment : ViewPagerFragment() {
 
     private fun getDoubleTapZoomScale(width: Int, height: Int): Float {
         val bitmapAspectRatio = height / width.toFloat()
-        val screenAspectRatio = ViewPagerActivity.screenHeight / ViewPagerActivity.screenWidth.toFloat()
+        val screenAspectRatio = mScreenHeight / mScreenWidth.toFloat()
 
         return if (context == null || bitmapAspectRatio == screenAspectRatio) {
             DEFAULT_DOUBLE_TAP_ZOOM
         } else if (context!!.portrait && bitmapAspectRatio <= screenAspectRatio) {
-            ViewPagerActivity.screenHeight / height.toFloat()
+            mScreenHeight / height.toFloat()
         } else if (context!!.portrait && bitmapAspectRatio > screenAspectRatio) {
-            ViewPagerActivity.screenWidth / width.toFloat()
+            mScreenWidth / width.toFloat()
         } else if (!context!!.portrait && bitmapAspectRatio >= screenAspectRatio) {
-            ViewPagerActivity.screenWidth / width.toFloat()
+            mScreenWidth / width.toFloat()
         } else if (!context!!.portrait && bitmapAspectRatio < screenAspectRatio) {
-            ViewPagerActivity.screenHeight / height.toFloat()
+            mScreenHeight / height.toFloat()
         } else {
             DEFAULT_DOUBLE_TAP_ZOOM
         }