anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-1602 Self-hosting | Yml type + update texts (#669)

Browse source
This commit is contained in:
Konstantin Ivanov 2023-12-11 10:46:59 +01:00 • committed by GitHub
parent 7dcfe0191f
commit cb22b0b01a
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/anytypeio/anytype/ui/settings/system/PreferenceFragment.kt
View file

@ -119,7 +119,7 @@ class PreferenceFragment : PreferenceFragmentCompat() {
}
private fun openFilePicker() {
pickerDelegate.openFilePicker(Mimetype.MIME_TEXT_PLAIN, REQUEST_NETWORK_MODE_CODE)
pickerDelegate.openFilePicker(Mimetype.MIME_YAML, REQUEST_NETWORK_MODE_CODE)
}
override fun onDestroyView() {

11
core-utils/src/main/java/com/anytypeio/anytype/core_utils/const/MimeTypes.kt
View file

@ -105,4 +105,15 @@ object MimeTypes {
PRESENTATION.contains(mime) -> Category.PRESENTATION
else -> Category.OTHER
}
val MIME_EXTRA_YAML = arrayOf(
"application/yaml",
"application/yml",
"text/yaml",
"text/yml",
"text/x-yaml",
"application/zip",
"application/x-zip",
"application/octet-stream"
)
}

8
core-utils/src/main/java/com/anytypeio/anytype/core_utils/ext/AndroidExtension.kt
View file

@ -1,12 +1,10 @@
package com.anytypeio.anytype.core_utils.ext
import android.Manifest
import android.app.Activity
import android.content.ActivityNotFoundException
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.content.res.Resources
import android.graphics.Point
import android.graphics.Rect
@ -34,8 +32,6 @@ import androidx.activity.result.contract.ActivityResultContract
import androidx.annotation.DimenRes
import androidx.annotation.IdRes
import androidx.annotation.StringRes
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.core.graphics.BlendModeColorFilterCompat
import androidx.core.graphics.BlendModeCompat
import androidx.core.view.updateLayoutParams
@ -45,6 +41,7 @@ import androidx.navigation.NavDirections
import androidx.recyclerview.widget.RecyclerView
import com.anytypeio.anytype.core_utils.const.FileConstants.REQUEST_FILE_SAF_CODE
import com.anytypeio.anytype.core_utils.const.FileConstants.REQUEST_MEDIA_CODE
import com.anytypeio.anytype.core_utils.const.MimeTypes.MIME_EXTRA_YAML
import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetComposeFragment
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog
@ -286,6 +283,9 @@ fun Fragment.startFilePicker(mime: Mimetype, requestCode: Int? = null) {
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
addCategory(Intent.CATEGORY_OPENABLE)
type = mime.value
if (mime == Mimetype.MIME_YAML) {
putExtra(Intent.EXTRA_MIME_TYPES, MIME_EXTRA_YAML)
}
}
val code = if (mime == Mimetype.MIME_FILE_ALL) {
REQUEST_FILE_SAF_CODE

4
core-utils/src/main/java/com/anytypeio/anytype/core_utils/ext/FilePickerUtils.kt
View file

@ -14,7 +14,7 @@ object FilePickerUtils {
Mimetype.MIME_VIDEO_ALL -> context.isPermissionGranted(getPermissionToRequestForVideos())
Mimetype.MIME_IMAGE_ALL -> context.isPermissionGranted(getPermissionToRequestForImages())
Mimetype.MIME_IMAGE_AND_VIDEO -> context.isPermissionGranted(getPermissionToRequestForImagesAndVideos())
Mimetype.MIME_FILE_ALL, Mimetype.MIME_TEXT_PLAIN -> {
Mimetype.MIME_FILE_ALL, Mimetype.MIME_YAML -> {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
true
} else {
@ -36,7 +36,7 @@ object FilePickerUtils {
Mimetype.MIME_IMAGE_ALL -> getPermissionToRequestForImages()
Mimetype.MIME_FILE_ALL -> getPermissionToRequestForFiles()
Mimetype.MIME_IMAGE_AND_VIDEO -> getPermissionToRequestForImagesAndVideos()
Mimetype.MIME_TEXT_PLAIN -> getPermissionToRequestForFiles()
Mimetype.MIME_YAML -> getPermissionToRequestForFiles()
}
}

2
core-utils/src/main/java/com/anytypeio/anytype/core_utils/ext/Mimetype.kt
View file

@ -5,5 +5,5 @@ enum class Mimetype(val value: String) {
MIME_IMAGE_ALL("image/*"),
MIME_FILE_ALL("*/*"),
MIME_IMAGE_AND_VIDEO("image/*,video/*"),
MIME_TEXT_PLAIN("text/plain"),
MIME_YAML("application/zip")
}

8
localization/src/main/res/values/strings.xml
View file

@ -827,13 +827,13 @@
<string name="trouble_mode">trouble_mode</string>
<string name="settings_screen">Settings</string>
<string name="settings_network_mode">Network mode</string>
<string name="settings_network_configuration_file">Network Configuration File</string>
<string name="settings_network_configuration_file">Self-hosted Configuration</string>
<string name="settings_network_configuration_file_choose">Choose file</string>
<string-array name="settings_networks_entries">
<item>Default</item>
<item>Local-only Mode</item>
<item>Custom</item>
<item>Anytype</item>
<item>Local-only</item>
<item>Self-hosted</item>
</string-array>
<array name="settings_networks_entries_values">