PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

Handle new permission in imgly SDK activities

Browse source
This commit is contained in:
Ensar Sarajčić 2023-08-09 12:57:19 +02:00
parent 46868cf262
commit 42c6e857fb
6 changed files with 11 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
View file

@ -111,7 +111,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
override fun onResume() {
super.onResume()
if (!hasPermission(getPermissionToRequest())) {
if (!hasPermission(getRequiredPermission())) {
finish()
return
}

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt
View file

@ -244,6 +244,8 @@ const val FOLDER_STYLE_ROUNDED_CORNERS = 2
fun getPermissionToRequest() = if (isTiramisuPlus()) PERMISSION_READ_MEDIA_IMAGES else PERMISSION_WRITE_STORAGE
fun getRequiredPermission() = if (isUpsideDownCakePlus()) PERMISSION_READ_MEDIA_VISUAL_USER_SELECTED else getPermissionToRequest()
fun getPermissionsToRequest(): Collection<Int> {
val permissions = mutableListOf(getPermissionToRequest())
if (isRPlus()) {

7
app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewPhotoEditActivity.kt
View file

@ -20,6 +20,7 @@ import com.simplemobiletools.gallery.pro.extensions.config
import com.simplemobiletools.gallery.pro.extensions.fixDateTaken
import com.simplemobiletools.gallery.pro.extensions.tryDeleteFileDirItem
import com.simplemobiletools.gallery.pro.helpers.getPermissionToRequest
import com.simplemobiletools.gallery.pro.helpers.getPermissionsToRequest
import ly.img.android.pesdk.PhotoEditorSettingsList
import ly.img.android.pesdk.assets.filter.basic.FilterPackBasic
import ly.img.android.pesdk.assets.font.basic.FontPackBasic
@ -62,7 +63,7 @@ class NewPhotoEditActivity : SimpleActivity() {
return
}
handlePermission(getPermissionToRequest()) {
handlePartialMediaPermissions(getPermissionsToRequest()) {
if (it) {
initEditActivity()
} else {
@ -296,9 +297,9 @@ class NewPhotoEditActivity : SimpleActivity() {
}
val theme = if (isUsingSystemDarkTheme()) {
R.style.Theme_Imgly_NoFullscreen
ly.img.android.pesdk.ui.R.style.Theme_Imgly_NoFullscreen
} else {
R.style.Theme_Imgly_Light_NoFullscreen
ly.img.android.pesdk.ui.R.style.Theme_Imgly_Light_NoFullscreen
}
getSettingsModel(UiConfigTheme::class.java).theme = theme

7
app/src/proprietary/kotlin/com/simplemobiletools/gallery/pro/activities/NewVideoEditActivity.kt
View file

@ -17,6 +17,7 @@ import com.simplemobiletools.gallery.pro.extensions.config
import com.simplemobiletools.gallery.pro.extensions.fixDateTaken
import com.simplemobiletools.gallery.pro.extensions.tryDeleteFileDirItem
import com.simplemobiletools.gallery.pro.helpers.getPermissionToRequest
import com.simplemobiletools.gallery.pro.helpers.getPermissionsToRequest
import ly.img.android.pesdk.VideoEditorSettingsList
import ly.img.android.pesdk.assets.filter.basic.FilterPackBasic
import ly.img.android.pesdk.assets.font.basic.FontPackBasic
@ -57,7 +58,7 @@ class NewVideoEditActivity : SimpleActivity() {
return
}
handlePermission(getPermissionToRequest()) {
handlePartialMediaPermissions(getPermissionsToRequest()) {
if (it) {
initEditActivity()
} else {
@ -274,9 +275,9 @@ class NewVideoEditActivity : SimpleActivity() {
}
val theme = if (isUsingSystemDarkTheme()) {
R.style.Theme_Imgly_NoFullscreen
ly.img.android.pesdk.ui.R.style.Theme_Imgly_NoFullscreen
} else {
R.style.Theme_Imgly_Light_NoFullscreen
ly.img.android.pesdk.ui.R.style.Theme_Imgly_Light_NoFullscreen
}
getSettingsModel(UiConfigTheme::class.java).theme = theme

49
build.gradle
View file

@ -1,49 +0,0 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
// needed only if we are including commons locally from our pc, not via Jitpack
/*ext {
propCompileSdkVersion = 33
propMinSdkVersion = 23
propTargetSdkVersion = propCompileSdkVersion
propVersionCode = 1
propVersionName = '5.34.26'
}*/
ext.kotlin_version = '1.9.0'
ext.is_proprietary = gradle.startParameter.taskNames.any { task -> task.contains("Proprietary") }
repositories {
google()
jcenter()
if (is_proprietary) {
maven { url 'https://artifactory.img.ly/artifactory/imgly' }
}
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
if (is_proprietary) {
classpath 'ly.img.android.pesdk:plugin:10.7.3'
}
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
google()
jcenter()
maven { url "https://jitpack.io" }
if (is_proprietary) {
maven { url 'https://artifactory.img.ly/artifactory/imgly' }
}
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

3
settings.gradle
View file

@ -1,3 +0,0 @@
include ':app'
//include ':commons'
//project(':commons').projectDir = new File('../Simple-Commons/commons')