copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

feat: request for writing storage permission when saving pictures (Android P & below)

Browse source
This commit is contained in:
Cuong-Tran 2024-07-29 18:18:44 +07:00
parent c16ed41c2f
commit ccde68f4f8
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
3 changed files with 61 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt
View file

@ -1,7 +1,10 @@
package eu.kanade.tachiyomi.ui.manga
import android.Manifest
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Build
import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
@ -462,12 +465,31 @@ class MangaScreen(
if (it == null) return@rememberLauncherForActivityResult
sm.editCover(context, it)
}
// KMK -->
val externalStoragePermissionNotGranted = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) ==
PackageManager.PERMISSION_DENIED
val saveCoverPermissionRequester = rememberLauncherForActivityResult(
contract = ActivityResultContracts.RequestPermission(),
onResult = {
sm.saveCover(context)
},
)
// KMK <--
MangaCoverDialog(
coverDataProvider = { manga!! },
snackbarHostState = sm.snackbarHostState,
isCustomCover = remember(manga) { manga!!.hasCustomCover() },
onShareClick = { sm.shareCover(context) },
onSaveClick = { sm.saveCover(context) },
onSaveClick = {
// KMK -->
if (externalStoragePermissionNotGranted) {
saveCoverPermissionRequester.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
} else {
// KMK <--
sm.saveCover(context)
}
},
onEditClick = {
when (it) {
EditCoverAction.EDIT -> getContent.launch("image/*")

39
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -1,5 +1,6 @@
package eu.kanade.tachiyomi.ui.reader
import android.Manifest
import android.annotation.SuppressLint
import android.app.Activity
import android.app.assist.AssistContent
@ -7,6 +8,7 @@ import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.content.res.Configuration
import android.graphics.Color
import android.graphics.ColorMatrix
@ -21,6 +23,8 @@ import android.view.View
import android.view.View.LAYER_TYPE_HARDWARE
import android.view.WindowManager
import android.widget.Toast
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
@ -39,6 +43,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.core.content.getSystemService
import androidx.core.graphics.ColorUtils
@ -132,6 +137,7 @@ import tachiyomi.domain.manga.model.MangaCover
import tachiyomi.domain.manga.model.asMangaCover
import tachiyomi.domain.source.service.SourceManager
import tachiyomi.i18n.MR
import tachiyomi.i18n.kmk.KMR
import tachiyomi.i18n.sy.SYMR
import tachiyomi.presentation.core.util.collectAsState
import uy.kohesive.injekt.Injekt
@ -420,6 +426,7 @@ class ReaderActivity : BaseActivity() {
@Composable
fun dialogRootContent() {
val context = LocalContext.current
// KMK <--
val state by viewModel.state.collectAsState()
val settingsScreenModel = remember {
@ -479,6 +486,18 @@ class ReaderActivity : BaseActivity() {
}
// SY <--
// KMK -->
val externalStoragePermissionNotGranted = Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) ==
PackageManager.PERMISSION_DENIED
val permissionRequester = rememberLauncherForActivityResult(
contract = ActivityResultContracts.RequestPermission(),
onResult = {
toast(KMR.strings.permission_writing_external_storage_succeed)
},
)
// KMK <--
ReaderContentOverlay(
brightness = state.brightnessOverlayValue,
color = colorOverlay.takeIf { colorOverlayEnabled },
@ -623,9 +642,25 @@ class ReaderActivity : BaseActivity() {
onDismissRequest = onDismissRequest,
onSetAsCover = viewModel::setAsCover,
onShare = viewModel::shareImage,
onSave = viewModel::saveImage,
onSave = { extra ->
// KMK -->
if (externalStoragePermissionNotGranted) {
permissionRequester.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
} else {
// KMK <--
viewModel.saveImage(extra)
}
},
onShareCombined = viewModel::shareImages,
onSaveCombined = viewModel::saveImages,
onSaveCombined = {
// KMK -->
if (externalStoragePermissionNotGranted) {
permissionRequester.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
} else {
// KMK <--
viewModel.saveImages()
}
},
hasExtraPage = (state.dialog as? ReaderViewModel.Dialog.PageActions)?.extraPage != null,
)
}

1
i18n-kmk/src/commonMain/moko-resources/base/strings.xml
View file

@ -70,6 +70,7 @@
<string name="onboarding_permission_external_storage">Access media files permission</string>
<string name="onboarding_permission_external_storage_description">Allow using custom covers in entry's Edit Info</string>
<string name="onboarding_permission_writing_external_storage_description">Allow saving covers &amp; using custom covers in entry's Edit Info</string>
<string name="permission_writing_external_storage_succeed">Permission granted. Try action again.</string>
<!-- About section -->
<string name="whats_coming">What\'s coming (soon)</string>