fixing the glitch with bottom actionbar being at the top
This commit is contained in:
parent
38aea1cdeb
commit
f9d581925b
4 changed files with 10 additions and 8 deletions
|
@ -58,8 +58,8 @@ android {
|
||||||
|
|
||||||
flavorDimensions "licensing"
|
flavorDimensions "licensing"
|
||||||
productFlavors {
|
productFlavors {
|
||||||
proprietary { }
|
proprietary {}
|
||||||
foss { }
|
foss {}
|
||||||
}
|
}
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
|
@ -78,7 +78,7 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.simplemobiletools:commons:5.26.15'
|
implementation 'com.simplemobiletools:commons:5.26.18'
|
||||||
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
|
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
|
||||||
implementation 'androidx.multidex:multidex:2.0.1'
|
implementation 'androidx.multidex:multidex:2.0.1'
|
||||||
implementation 'it.sephiroth.android.exif:library:1.0.1'
|
implementation 'it.sephiroth.android.exif:library:1.0.1'
|
||||||
|
|
|
@ -762,8 +762,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun initBottomActionsLayout() {
|
private fun initBottomActionsLayout() {
|
||||||
val useNavigationBarHeight = if (navigationBarBottom) navigationBarHeight else 0
|
bottom_actions.layoutParams.height = resources.getDimension(R.dimen.bottom_actions_height).toInt() + navigationBarHeight
|
||||||
bottom_actions.layoutParams.height = resources.getDimension(R.dimen.bottom_actions_height).toInt() + useNavigationBarHeight
|
|
||||||
if (config.bottomActions) {
|
if (config.bottomActions) {
|
||||||
bottom_actions.beVisible()
|
bottom_actions.beVisible()
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -28,7 +28,10 @@ import com.simplemobiletools.commons.helpers.ensureBackgroundThread
|
||||||
import com.simplemobiletools.gallery.pro.R
|
import com.simplemobiletools.gallery.pro.R
|
||||||
import com.simplemobiletools.gallery.pro.activities.PanoramaVideoActivity
|
import com.simplemobiletools.gallery.pro.activities.PanoramaVideoActivity
|
||||||
import com.simplemobiletools.gallery.pro.activities.VideoActivity
|
import com.simplemobiletools.gallery.pro.activities.VideoActivity
|
||||||
import com.simplemobiletools.gallery.pro.extensions.*
|
import com.simplemobiletools.gallery.pro.extensions.config
|
||||||
|
import com.simplemobiletools.gallery.pro.extensions.getVideoDuration
|
||||||
|
import com.simplemobiletools.gallery.pro.extensions.hasNavBar
|
||||||
|
import com.simplemobiletools.gallery.pro.extensions.parseFileChannel
|
||||||
import com.simplemobiletools.gallery.pro.helpers.*
|
import com.simplemobiletools.gallery.pro.helpers.*
|
||||||
import com.simplemobiletools.gallery.pro.models.Medium
|
import com.simplemobiletools.gallery.pro.models.Medium
|
||||||
import com.simplemobiletools.gallery.pro.views.MediaSideScroll
|
import com.simplemobiletools.gallery.pro.views.MediaSideScroll
|
||||||
|
@ -457,7 +460,7 @@ class VideoFragment : ViewPagerFragment(), TextureView.SurfaceTextureListener, S
|
||||||
|
|
||||||
private fun initTimeHolder() {
|
private fun initTimeHolder() {
|
||||||
var right = 0
|
var right = 0
|
||||||
var bottom = if (context!!.navigationBarBottom) context!!.navigationBarHeight else 0
|
var bottom = context!!.navigationBarHeight
|
||||||
if (mConfig.bottomActions) {
|
if (mConfig.bottomActions) {
|
||||||
bottom += resources.getDimension(R.dimen.bottom_actions_height).toInt()
|
bottom += resources.getDimension(R.dimen.bottom_actions_height).toInt()
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.6.2'
|
classpath 'com.android.tools.build:gradle:3.6.3'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
if (is_proprietary) {
|
if (is_proprietary) {
|
||||||
classpath 'ly.img.android.pesdk:plugin:7.2.0'
|
classpath 'ly.img.android.pesdk:plugin:7.2.0'
|
||||||
|
|
Loading…
Reference in a new issue