Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class AllPermissionsExplanationActivity : AnkiActivity() {
return
}
super.onCreate(savedInstanceState)
setContentView(R.layout.all_permissions_explanation_activity)
setContentView(R.layout.activity_all_permissions_explanation)
setTransparentStatusBar()

supportFragmentManager.commit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.RequiresApi
import androidx.core.view.isVisible
import com.ichi2.anki.R
import com.ichi2.anki.databinding.FragmentAllPermissionsExplanationBinding
import com.ichi2.anki.settings.Prefs
import com.ichi2.utils.Permissions
import com.ichi2.utils.Permissions.requestPermissionThroughDialogOrSettings
import dev.androidbroadcast.vbpd.viewBinding
import timber.log.Timber

/**
Expand All @@ -36,7 +38,9 @@ import timber.log.Timber
* See [the docs](https://developer.android.com/training/permissions/explaining-access#privacy-dashboard).
*/
@RequiresApi(Build.VERSION_CODES.S)
class AllPermissionsExplanationFragment : PermissionsFragment(R.layout.all_permissions_explanation_fragment) {
class AllPermissionsExplanationFragment : PermissionsFragment(R.layout.fragment_all_permissions_explanation) {
private val binding by viewBinding(FragmentAllPermissionsExplanationBinding::bind)

/**
* Attempts to open the dialog for granting permissions. Falls back to opening the OS settings if the dialog fails to
* show up or if the permissions are rejected by the user. The dialog may fail to show up if the user has previously denied the
Expand All @@ -61,21 +65,17 @@ class AllPermissionsExplanationFragment : PermissionsFragment(R.layout.all_permi
) {
super.onViewCreated(view, savedInstanceState)

val externalStoragePermission = view.findViewById<PermissionsItem>(R.id.manage_external_storage_permission_item)
val notificationPermission = view.findViewById<PermissionsItem>(R.id.post_notification_permission_item)
val recordAudioPermission = view.findViewById<PermissionsItem>(R.id.record_audio_permission_item)

val shouldRequestExternalStorage = Permissions.canManageExternalStorage(requireContext())
if (shouldRequestExternalStorage) {
externalStoragePermission.apply {
binding.manageExternalStoragePermissionItem.apply {
isVisible = true
requestExternalStorageOnClick(accessAllFilesLauncher)
}
}
view.findViewById<View>(R.id.heading_required_permissions).isVisible = shouldRequestExternalStorage
binding.headingRequiredPermissions.isVisible = shouldRequestExternalStorage

Permissions.postNotification?.let {
notificationPermission.apply {
binding.postNotificationPermissionItem.apply {
isVisible = true
// If it's already granted, offer to revoke it on click; otherwise, request it
revokeIfGrantedOnClickElse {
Expand All @@ -89,7 +89,7 @@ class AllPermissionsExplanationFragment : PermissionsFragment(R.layout.all_permi
}
}

recordAudioPermission.apply {
binding.recordAudioPermissionItem.apply {
isVisible = true
// If it's already granted, offer to revoke it on click; otherwise, request it
revokeIfGrantedOnClickElse {
Expand Down
Loading