lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix plugin sdk visibility modifiers

Browse Source
This commit is contained in:
MM20 2024-02-04 21:25:23 +01:00
parent 2de3ca552b
commit 6c4e068fac
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
13 changed files with 68 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/base/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt Normal file
View File

@ -0,0 +1,23 @@
package de.mm20.launcher2.plugin.config
import android.os.Bundle
fun SearchPluginConfig(bundle: Bundle): SearchPluginConfig? {
return SearchPluginConfig(
storageStrategy = valueOfOrElse(
bundle.getString(
"storageStrategy",
StorageStrategy.StoreCopy.name
),
StorageStrategy.StoreCopy,
)
)
}
private fun valueOfOrElse(value: String, default: StorageStrategy): StorageStrategy {
return try {
StorageStrategy.valueOf(value)
} catch (e: IllegalArgumentException) {
default
}
}

12
core/base/src/main/java/de/mm20/launcher2/plugin/config/WeatherPluginConfig.kt Normal file
View File

@ -0,0 +1,12 @@
package de.mm20.launcher2.plugin.config
import android.os.Bundle
fun WeatherPluginConfig(bundle: Bundle): WeatherPluginConfig {
return WeatherPluginConfig(
minUpdateInterval = bundle.getLong(
"minUpdateInterval",
60 * 60 * 1000L
),
)
}

1
core/shared/build.gradle.kts
View File

@ -1,6 +1,7 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.dokka)
`maven-publish`
}

22
core/shared/src/main/java/de/mm20/launcher2/plugin/config/SearchPluginConfig.kt
View File

@ -9,24 +9,4 @@ data class SearchPluginConfig(
* @see [StorageStrategy]
*/
val storageStrategy: StorageStrategy = StorageStrategy.StoreCopy,
) {
fun toBundle(): Bundle {
return Bundle().apply {
putString("storageStrategy", storageStrategy.name)
}
}
companion object {
operator fun invoke(bundle: Bundle): SearchPluginConfig? {
return SearchPluginConfig(
storageStrategy = StorageStrategy.valueOfOrElse(
bundle.getString(
"storageStrategy",
StorageStrategy.StoreCopy.name
),
StorageStrategy.StoreCopy,
)
)
}
}
}
)

9
core/shared/src/main/java/de/mm20/launcher2/plugin/config/StorageStrategy.kt
View File

@ -22,13 +22,4 @@ enum class StorageStrategy {
* results and if you don't want to implement a cache for search results.
*/
StoreCopy;
companion object {
fun valueOfOrElse(value: String, default: StorageStrategy): StorageStrategy {
return try {
valueOf(value)
} catch (e: IllegalArgumentException) {
default
}
}
}
}

20
core/shared/src/main/java/de/mm20/launcher2/plugin/config/WeatherPluginConfig.kt
View File

@ -9,22 +9,4 @@ data class WeatherPluginConfig(
* or weather provider.
*/
val minUpdateInterval: Long = 60 * 60 * 1000L,
) {
fun toBundle(): Bundle {
return Bundle().apply {
putLong("minUpdateInterval", minUpdateInterval)
}
}
companion object {
operator fun invoke(bundle: Bundle): WeatherPluginConfig {
return WeatherPluginConfig(
minUpdateInterval = bundle.getLong(
"minUpdateInterval",
60 * 60 * 1000L
),
)
}
}
}
)

1
plugins/sdk/src/main/java/de/mm20/launcher2/sdk/base/SearchPluginProvider.kt
View File

@ -8,6 +8,7 @@ import android.os.Bundle
import android.os.CancellationSignal
import de.mm20.launcher2.plugin.config.SearchPluginConfig
import de.mm20.launcher2.plugin.contracts.SearchPluginContract
import de.mm20.launcher2.sdk.config.toBundle
import de.mm20.launcher2.sdk.utils.launchWithCancellationSignal
import kotlinx.coroutines.runBlocking

10
plugins/sdk/src/main/java/de/mm20/launcher2/sdk/config/SearchPluginConfig.kt Normal file
View File

@ -0,0 +1,10 @@
package de.mm20.launcher2.sdk.config
import android.os.Bundle
import de.mm20.launcher2.plugin.config.SearchPluginConfig
internal fun SearchPluginConfig.toBundle(): Bundle {
return Bundle().apply {
putString("storageStrategy", storageStrategy.name)
}
}

10
plugins/sdk/src/main/java/de/mm20/launcher2/sdk/config/WeatherPluginConfig.kt Normal file
View File

@ -0,0 +1,10 @@
package de.mm20.launcher2.sdk.config
import android.os.Bundle
import de.mm20.launcher2.plugin.config.WeatherPluginConfig
internal fun WeatherPluginConfig.toBundle(): Bundle {
return Bundle().apply {
putLong("minUpdateInterval", minUpdateInterval)
}
}

2
plugins/sdk/src/main/java/de/mm20/launcher2/sdk/permissions/PermissionData.kt
View File

@ -3,6 +3,6 @@ package de.mm20.launcher2.sdk.permissions
import kotlinx.serialization.Serializable
@Serializable
data class PermissionData(
internal data class PermissionData(
val granted: Set<String> = emptySet(),
)

2
plugins/sdk/src/main/java/de/mm20/launcher2/sdk/permissions/RequestPermissionActivity.kt
View File

@ -10,7 +10,7 @@ import de.mm20.launcher2.sdk.databinding.ActivityRequestPermissionBinding
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
class RequestPermissionActivity: Activity() {
internal class RequestPermissionActivity: Activity() {
private lateinit var binding: ActivityRequestPermissionBinding

2
plugins/sdk/src/main/java/de/mm20/launcher2/sdk/utils/Coroutines.kt
View File

@ -5,7 +5,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.async
import kotlinx.coroutines.runBlocking
fun <T> launchWithCancellationSignal(
internal fun <T> launchWithCancellationSignal(
cancellationSignal: CancellationSignal?,
block: suspend CoroutineScope.() -> T
): T {

7
plugins/sdk/src/main/java/de/mm20/launcher2/sdk/weather/WeatherProvider.kt
View File

@ -12,6 +12,7 @@ import de.mm20.launcher2.plugin.PluginType
import de.mm20.launcher2.plugin.config.WeatherPluginConfig
import de.mm20.launcher2.plugin.contracts.WeatherPluginContract
import de.mm20.launcher2.sdk.base.BasePluginProvider
import de.mm20.launcher2.sdk.config.toBundle
import de.mm20.launcher2.sdk.ktx.formatToString
import de.mm20.launcher2.sdk.utils.launchWithCancellationSignal
import kotlinx.coroutines.Dispatchers
@ -22,7 +23,7 @@ import kotlin.math.absoluteValue
import kotlin.math.roundToInt
abstract class WeatherProvider(
val config: WeatherPluginConfig,
private val config: WeatherPluginConfig,
) : BasePluginProvider() {
override fun getPluginType(): PluginType {
return PluginType.Weather
@ -32,6 +33,10 @@ abstract class WeatherProvider(
return true
}
override fun getPluginConfig(): Bundle {
return config.toBundle()
}
override fun query(
uri: Uri,
projection: Array<out String>?,