diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index f37792e1..4a88c08c 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -16,7 +16,6 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.jetbrains.compose.compose
-import org.jetbrains.kotlin.kapt.cli.main
plugins {
id("com.android.application")
@@ -79,6 +78,9 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
+ packagingOptions {
+ exclude("META-INF/*")
+ }
configurations {
"implementation" {
exclude(group = "androidx.compose.animation")
@@ -92,7 +94,7 @@ android {
dependencies {
implementation(compose.material)
implementation(compose.materialIconsExtended)
- implementation(Androidx.androidxActivity)
+ implementation(deps.androidx.activity)
// Project's SubModules
implementation(project(":common:database"))
@@ -103,43 +105,40 @@ dependencies {
implementation(project(":common:core-components"))
implementation(project(":common:providers"))
- // Koin
- implementation(Koin.android)
- implementation(Koin.compose)
+ with(deps) {
- // DECOMPOSE
- implementation(Decompose.decompose)
- implementation(Decompose.extensionsCompose)
+ // Koin
+ with(koin) {
+ implementation(androidx.compose)
+ implementation(android)
+ }
- // MVI
- implementation(MVIKotlin.mvikotlin)
- implementation(MVIKotlin.mvikotlinMain)
- implementation(MVIKotlin.mvikotlinLogging)
- implementation(MVIKotlin.mvikotlinTimeTravel)
+ // DECOMPOSE
+ with(decompose) {
+ implementation(dep)
+ implementation(extensions.compose)
+ }
- // Extras
- with(Extras.Android) {
- implementation(countly)
- implementation(appUpdator)
+ implementation(countly.android)
+ implementation(android.app.notifier)
+ implementation(storage.chooser)
+
+ with(bundles) {
+ implementation(ktor)
+ implementation(mviKotlin)
+ implementation(androidx.lifecycle)
+ implementation(accompanist.inset)
+ }
+
+ // Test
+ testImplementation(junit)
+ androidTestImplementation(androidx.junit)
+ androidTestImplementation(androidx.expresso)
+
+ // Desugar
+ coreLibraryDesugaring(androidx.desugar)
+
+ // Debug
+ debugImplementation(leak.canary)
}
-
- with(Versions.androidxLifecycle) {
- implementation("androidx.lifecycle:lifecycle-service:$this")
- implementation("androidx.lifecycle:lifecycle-common-java8:$this")
- implementation("androidx.lifecycle:lifecycle-runtime-ktx:$this")
- }
-
- implementation(Extras.kermit)
- // implementation("com.jakewharton.timber:timber:4.7.1")
- implementation("dev.icerock.moko:parcelize:${Versions.mokoParcelize}")
- implementation("com.github.shabinder:storage-chooser:2.0.4.45")
- implementation("com.google.accompanist:accompanist-insets:0.16.1")
-
- // Test
- testImplementation("junit:junit:4.13.2")
- androidTestImplementation(Androidx.junit)
- androidTestImplementation(Androidx.expresso)
-
- // Desugaring
- coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
}
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 847dc6dc..00bda4ce 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
+
diff --git a/android/src/main/java/com/shabinder/spotiflyer/service/ForegroundService.kt b/android/src/main/java/com/shabinder/spotiflyer/service/ForegroundService.kt
index b66853ec..d0eb2034 100644
--- a/android/src/main/java/com/shabinder/spotiflyer/service/ForegroundService.kt
+++ b/android/src/main/java/com/shabinder/spotiflyer/service/ForegroundService.kt
@@ -43,6 +43,7 @@ import com.shabinder.common.models.event.coroutines.failure
import com.shabinder.common.providers.FetchPlatformQueryResult
import com.shabinder.common.translations.Strings
import com.shabinder.spotiflyer.R
+import io.ktor.client.HttpClient
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.flow.MutableSharedFlow
@@ -62,6 +63,7 @@ class ForegroundService : LifecycleService() {
private val fetcher: FetchPlatformQueryResult by inject()
private val logger: Kermit by inject()
private val dir: FileManager by inject()
+ private val httpClient: HttpClient by inject()
private var messageList =
java.util.Collections.synchronizedList(MutableList(5) { emptyMessage })
@@ -170,7 +172,7 @@ class ForegroundService : LifecycleService() {
trackStatusFlowMap[track.title] = DownloadStatus.Downloading()
// Enqueueing Download
- downloadFile(url).collect {
+ httpClient.downloadFile(url).collect {
when (it) {
is DownloadResult.Error -> {
logger.d(TAG) { it.message }
diff --git a/android/src/main/java/com/shabinder/spotiflyer/service/Utils.kt b/android/src/main/java/com/shabinder/spotiflyer/service/Utils.kt
index fdd75530..06b015b2 100644
--- a/android/src/main/java/com/shabinder/spotiflyer/service/Utils.kt
+++ b/android/src/main/java/com/shabinder/spotiflyer/service/Utils.kt
@@ -15,12 +15,19 @@ fun cleanFiles(dir: File) {
if (file.isDirectory) {
cleanFiles(file)
} else if (file.isFile) {
- if (file.path.toString().substringAfterLast(".") != "mp3") {
- Log.d("Files Cleaning", "Cleaning ${file.path}")
+ val filePath = file.path.toString()
+ if (filePath.substringAfterLast(".") != "mp3" || filePath.isTempFile()) {
+ Log.d("Files Cleaning", "Cleaning $filePath")
file.delete()
}
}
}
}
- } catch (e: Exception) { e.printStackTrace() }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+}
+
+private fun String.isTempFile(): Boolean {
+ return substringBeforeLast(".").takeLast(5) == ".temp"
}
diff --git a/art/SpotiFlyer.png b/art/SpotiFlyer.png
new file mode 100644
index 00000000..21c6153b
Binary files /dev/null and b/art/SpotiFlyer.png differ
diff --git a/build.gradle.kts b/build.gradle.kts
index d775fc1f..c6ff0025 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,22 +38,32 @@ allprojects {
tasks.withType>().configureEach {
dependsOn(":common:data-models:generateI18n4kFiles")
kotlinOptions {
- if(this is org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions) {
+ if (this is org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions) {
jvmTarget = "1.8"
}
freeCompilerArgs = (freeCompilerArgs + listOf("-Xopt-in=kotlin.RequiresOptIn"))
}
}
-
- afterEvaluate {
- project.extensions.findByType()?.let { kmpExt ->
- kmpExt.sourceSets.run {
- all {
- languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn")
- languageSettings.useExperimentalAnnotation("kotlinx.serialization.ExperimentalSerializationApi")
+ configurations.all {
+ resolutionStrategy {
+ eachDependency {
+ if (requested.group == "org.jetbrains.kotlin") {
+ @Suppress("UnstableApiUsage")
+ useVersion(deps.kotlin.kotlinGradlePlugin.get().versionConstraint.requiredVersion)
}
- removeAll { it.name == "androidAndroidTestRelease" }
}
}
}
+ afterEvaluate {
+ project.extensions.findByType()
+ ?.let { kmpExt ->
+ kmpExt.sourceSets.run {
+ all {
+ languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn")
+ languageSettings.useExperimentalAnnotation("kotlinx.serialization.ExperimentalSerializationApi")
+ }
+ removeAll { it.name == "androidAndroidTestRelease" }
+ }
+ }
+ }
}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 33d0caf4..7c635940 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -30,17 +30,20 @@ repositories {
}
dependencies {
- implementation(Androidx.gradlePlugin)
- implementation(JetBrains.Compose.gradlePlugin)
- implementation(JetBrains.Kotlin.gradlePlugin)
- implementation(JetBrains.Kotlin.serialization)
- implementation(SqlDelight.gradlePlugin)
- implementation(KTLint.gradlePlugin)
- implementation(Internationalization.gradlePlugin)
- implementation(Mosaic.gradlePlugin)
+ with(deps) {
+ implementation(androidx.gradle.plugin)
+ implementation(kotlin.compose.gradle)
+ implementation(ktlint.gradle)
+ implementation(mosaic.gradle)
+ implementation(kotlin.kotlinGradlePlugin)
+ implementation(sqldelight.gradle.plugin)
+ implementation(i18n4k.gradle.plugin)
+ implementation(kotlin.serialization)
+ }
}
kotlin {
// Add Deps to compilation, so it will become available in main project
sourceSets.getByName("main").kotlin.srcDir("buildSrc/src/main/kotlin")
}
+
diff --git a/buildSrc/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/buildSrc/src/main/kotlin/Versions.kt
index f837ff4b..9de83bc6 100644
--- a/buildSrc/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/buildSrc/src/main/kotlin/Versions.kt
@@ -14,11 +14,15 @@
* * along with this program. If not, see .
*/
-@file:Suppress("MayBeConstant", "SpellCheckingInspection")
+@file:Suppress("MayBeConstant", "SpellCheckingInspection", "UnstableApiUsage")
+import org.gradle.api.Project
import org.gradle.api.artifacts.ExternalModuleDependency
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.artifacts.dsl.DependencyHandler
import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo
+import org.gradle.kotlin.dsl.getByType
object Versions {
// App's Version (To be bumped at each update)
@@ -26,44 +30,10 @@ object Versions {
const val versionCode = 26
- // Kotlin
- const val kotlinVersion = "1.5.21"
-
- const val coroutinesVersion = "1.5.1"
-
- // Code Formatting
- const val ktLint = "10.1.0"
-
- // Console-App UI
- const val mosaic = "0.1.0"
-
- // DI
- const val koin = "3.1.2"
-
- // Logger
- const val kermit = "0.1.9"
-
- const val mokoParcelize = "0.7.1"
-
- // Internet
- const val ktor = "1.6.2"
-
- const val kotlinxSerialization = "1.2.2"
-
- // Database
- const val sqlDelight = "1.5.1"
-
- const val sqliteJdbcDriver = "3.34.0"
- const val slf4j = "1.7.31"
-
- // Internationalisation
- const val i18n4k = "0.1.3"
-
// Android
const val minSdkVersion = 21
- const val compileSdkVersion = 30
+ const val compileSdkVersion = 31
const val targetSdkVersion = 29
- const val androidxLifecycle = "2.4.0-alpha03"
}
object HostOS {
@@ -74,143 +44,46 @@ object HostOS {
val isLinux = hostOs.startsWith("Linux", true)
}
-object MultiPlatformSettings {
- const val dep = "com.russhwolf:multiplatform-settings-no-arg:0.7.7"
-}
+val Project.Deps: VersionCatalog get() = project.extensions.getByType().named("deps")
-object KotlinJSWrappers {
- private const val bomVersion = "0.0.1-pre.235-kotlin-1.5.21"
- val bom = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${bomVersion}"
- const val kotlinReact = "org.jetbrains.kotlin-wrappers:kotlin-react"
- const val kotlinReactDom = "org.jetbrains.kotlin-wrappers:kotlin-react-dom"
- const val kotlinStyled = "org.jetbrains.kotlin-wrappers:kotlin-styled"
-}
+val VersionCatalog.ktorBundle get() = findBundle("ktor").get()
+val VersionCatalog.statelyBundle get() = findBundle("stately").get()
+val VersionCatalog.androidXLifecycleBundle get() = findBundle("androidx-lifecycle").get()
+val VersionCatalog.androidXCommonBundle get() = findBundle("androidx-common").get()
+val VersionCatalog.kotlinTestBundle get() = findBundle("kotlin-test").get()
+val VersionCatalog.sqldelightBundle get() = findBundle("sqldelight").get()
+val VersionCatalog.mviKotlinBundle get() = findBundle("mviKotlin").get()
+val VersionCatalog.essentyBundle get() = findBundle("essenty").get()
+val VersionCatalog.koinAndroidBundle get() = findBundle("koin-android").get()
+val VersionCatalog.kotlinJSWrappers get() = findBundle("kotlin-js-wrappers").get()
-object Koin {
- val core = "io.insert-koin:koin-core:${Versions.koin}"
- val test = "io.insert-koin:koin-test:${Versions.koin}"
- val android = "io.insert-koin:koin-android:${Versions.koin}"
- val compose = "io.insert-koin:koin-androidx-compose:${Versions.koin}"
-}
+val VersionCatalog.kotlinJunitTest get() = findDependency("kotlin-kotlinTestJunit").get()
+val VersionCatalog.kotlinJSTest get() = findDependency("kotlin-kotlinTestJs").get()
+val VersionCatalog.kermit get() = findDependency("kermit").get()
+val VersionCatalog.decompose get() = findDependency("decompose-dep").get()
+val VersionCatalog.decomposeComposeExt get() = findDependency("decompose-extensions-compose").get()
+val VersionCatalog.jaffree get() = findDependency("jaffree").get()
-object Androidx {
- const val androidxActivity = "androidx.activity:activity-compose:1.3.1"
- const val core = "androidx.core:core-ktx:1.6.0"
- const val palette = "androidx.palette:palette-ktx:1.0.0"
- const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutinesVersion}"
+val VersionCatalog.ktlintGradle get() = findDependency("ktlint-gradle").get()
+val VersionCatalog.androidGradle get() = findDependency("androidx-gradle-plugin").get()
+val VersionCatalog.mosaicGradle get() = findDependency("mosaic-gradle").get()
+val VersionCatalog.kotlinComposeGradle get() = findDependency("kotlin-compose-gradle").get()
+val VersionCatalog.kotlinGradle get() = findDependency("kotlin-kotlinGradlePlugin").get()
+val VersionCatalog.i18n4kGradle get() = findDependency("i18n4k-gradle-plugin").get()
+val VersionCatalog.sqlDelightGradle get() = findDependency("sqldelight-gradle-plugin").get()
+val VersionCatalog.kotlinSerializationPlugin get() = findDependency("kotlin-serialization").get()
- const val junit = "androidx.test.ext:junit:1.1.2"
- const val expresso = "androidx.test.espresso:espresso-core:3.3.0"
+val VersionCatalog.koinCore get() = findDependency("koin-core").get()
+val VersionCatalog.kotlinCoroutines get() = findDependency("kotlin-coroutines").get()
+val VersionCatalog.kotlinxSerialization get() = findDependency("kotlinx-serialization-json").get()
+val VersionCatalog.ktorClientIOS get() = findDependency("ktor-client-ios").get()
+val VersionCatalog.ktorClientAndroid get() = findDependency("ktor-client-android").get()
+val VersionCatalog.ktorClientApache get() = findDependency("ktor-client-apache").get()
+val VersionCatalog.ktorClientJS get() = findDependency("ktor-client-js").get()
+val VersionCatalog.ktorClientCIO get() = findDependency("ktor-client-cio").get()
+val VersionCatalog.slf4j get() = findDependency("slf4j-simple").get()
- const val gradlePlugin = "com.android.tools.build:gradle:7.0.1"
-}
-
-object KTLint {
- const val gradlePlugin = "org.jlleitschuh.gradle:ktlint-gradle:${Versions.ktLint}"
-}
-
-object JetBrains {
- object Kotlin {
- const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1-native-mt"
- const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}"
- const val serialization = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlinVersion}"
- const val testCommon = "org.jetbrains.kotlin:kotlin-test-common:${Versions.kotlinVersion}"
- const val testJunit = "org.jetbrains.kotlin:kotlin-test-junit:${Versions.kotlinVersion}"
- const val testAnnotationsCommon =
- "org.jetbrains.kotlin:kotlin-test-annotations-common:${Versions.kotlinVersion}"
- }
-
- object Compose {
- // __LATEST_COMPOSE_RELEASE_VERSION__
- private const val VERSION = "1.0.0-alpha3"
- const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
- }
-}
-
-object Mosaic {
- const val gradlePlugin = "com.jakewharton.mosaic:mosaic-gradle-plugin:${Versions.mosaic}"
-}
-
-object Decompose {
- private const val VERSION = "0.3.1"
- const val decompose = "com.arkivanov.decompose:decompose:$VERSION"
- const val decomposeIosX64 = "com.arkivanov.decompose:decompose-iosx64:$VERSION"
- const val decomposeIosArm64 = "com.arkivanov.decompose:decompose-iosarm64:$VERSION"
- const val extensionsCompose = "com.arkivanov.decompose:extensions-compose-jetbrains:$VERSION"
-}
-
-object MVIKotlin {
- private const val VERSION = "2.0.4"
- const val rx = "com.arkivanov.mvikotlin:rx:$VERSION"
- const val mvikotlin = "com.arkivanov.mvikotlin:mvikotlin:$VERSION"
- const val mvikotlinMain = "com.arkivanov.mvikotlin:mvikotlin-main:$VERSION"
- const val coroutines = "com.arkivanov.mvikotlin:mvikotlin-extensions-coroutines:$VERSION"
- const val keepers = "com.arkivanov.mvikotlin:keepers:$VERSION"
- const val mvikotlinMainIosX64 = "com.arkivanov.mvikotlin:mvikotlin-main-iosx64:$VERSION"
- const val mvikotlinMainIosArm64 = "com.arkivanov.mvikotlin:mvikotlin-main-iosarm64:$VERSION"
- const val mvikotlinLogging = "com.arkivanov.mvikotlin:mvikotlin-logging:$VERSION"
- const val mvikotlinTimeTravel = "com.arkivanov.mvikotlin:mvikotlin-timetravel:$VERSION"
- const val mvikotlinExtensionsReaktive = "com.arkivanov.mvikotlin:mvikotlin-extensions-reaktive:$VERSION"
-}
-
-object Ktor {
- val clientCore = "io.ktor:ktor-client-core:${Versions.ktor}"
- val clientJson = "io.ktor:ktor-client-json:${Versions.ktor}"
- val clientLogging = "io.ktor:ktor-client-logging:${Versions.ktor}"
- val clientSerialization = "io.ktor:ktor-client-serialization:${Versions.ktor}"
-
- val auth = "io.ktor:ktor-client-auth:${Versions.ktor}"
- val clientAndroid = "io.ktor:ktor-client-android:${Versions.ktor}"
- val clientCurl = "io.ktor:ktor-client-curl:${Versions.ktor}"
- val clientApache = "io.ktor:ktor-client-apache:${Versions.ktor}"
- val slf4j = "org.slf4j:slf4j-simple:${Versions.slf4j}"
- val clientIos = "io.ktor:ktor-client-ios:${Versions.ktor}"
- val clientCio = "io.ktor:ktor-client-cio:${Versions.ktor}"
- val clientJs = "io.ktor:ktor-client-js:${Versions.ktor}"
-}
-
-object Internationalization {
- const val dep = "de.comahe.i18n4k:i18n4k-core:${Versions.i18n4k}"
- const val gradlePlugin = "de.comahe.i18n4k:i18n4k-gradle-plugin:${Versions.i18n4k}"
-}
-
-object Extras {
- const val youtubeDownloader = "io.github.shabinder:youtube-api-dl:1.3"
- const val fuzzyWuzzy = "io.github.shabinder:fuzzywuzzy:1.1"
- const val mp3agic = "com.mpatric:mp3agic:0.9.0"
- const val jaudioTagger = "com.github.Shabinder:JAudioTagger-Android:1.0"
- const val kermit = "co.touchlab:kermit:${Versions.kermit}"
-
- object Android {
- // Self Hosted Analytics & Crashlytics (FOSS)
- val countly = "ly.count.android:sdk:20.11.8"
- val appUpdator = "com.github.amitbd1508:AppUpdater:4.1.0"
- }
-
- object Desktop {
- val countly = "ly.count.sdk:java:20.11.0"
- }
-}
-
-object Serialization {
- val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinxSerialization}"
-}
-
-object SqlDelight {
- val runtime = "com.squareup.sqldelight:runtime:${Versions.sqlDelight}"
- val coroutineExtensions = "com.squareup.sqldelight:coroutines-extensions:${Versions.sqlDelight}"
-
- const val gradlePlugin = "com.squareup.sqldelight:gradle-plugin:${Versions.sqlDelight}"
- const val androidDriver = "com.squareup.sqldelight:android-driver:${Versions.sqlDelight}"
- const val sqliteDriver = "com.squareup.sqldelight:sqlite-driver:${Versions.sqlDelight}"
- const val nativeDriver = "com.squareup.sqldelight:native-driver:${Versions.sqlDelight}"
- val nativeDriverMacos = "com.squareup.sqldelight:native-driver-macosx64:${Versions.sqlDelight}"
- val jdbcDriver = "org.xerial:sqlite-jdbc:${Versions.sqliteJdbcDriver}"
-}
-
-fun DependencyHandler.`implementation`(
- dependencyNotation: String,
- dependencyConfiguration: ExternalModuleDependency.() -> Unit
-): ExternalModuleDependency = addDependencyTo(
- this, "implementation", dependencyNotation
-) { dependencyConfiguration() }
+val VersionCatalog.sqlDelightJDBC get() = findDependency("sqlite-jdbc-driver").get()
+val VersionCatalog.sqlDelightNative get() = findDependency("sqldelight-native-driver").get()
+val VersionCatalog.sqlDelightAndroid get() = findDependency("sqldelight-android-driver").get()
+val VersionCatalog.sqlDelightDriver get() = findDependency("sqldelight-driver").get()
diff --git a/buildSrc/deps.versions.toml b/buildSrc/deps.versions.toml
new file mode 100644
index 00000000..a3507216
--- /dev/null
+++ b/buildSrc/deps.versions.toml
@@ -0,0 +1,135 @@
+[versions]
+kotlin = "1.5.31"
+androidCoroutines = "1.5.1"
+ktLint = "10.1.0"
+mosaic = "0.1.0"
+koin = "3.1.2"
+kermit = "0.1.9"
+mokoParcelize = "0.7.1"
+ktor = "1.6.3"
+kotlinxSerialization = "1.3.0"
+sqlDelight = "1.5.1"
+sqliteJdbcDriver = "3.34.0"
+slf4j = "1.7.31"
+i18n4k = "0.1.3"
+essenty = "0.1.3"
+multiplatformSettings = "0.7.7"
+decompose = "0.3.1"
+mviKotlin = "2.0.4"
+accompanist = "0.18.0"
+statelyVersion = "1.1.10"
+statelyIsoVersion = "1.2.0-nmm"
+androidxLifecycle = "2.4.0-alpha03"
+
+
+[libraries]
+kotlin-kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlin-serialization = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
+kotlin-kotlinTestCommon = { group = "org.jetbrains.kotlin", name = "kotlin-test-common", version.ref = "kotlin" }
+kotlin-kotlinTestJs = { group = "org.jetbrains.kotlin", name = "kotlin-test-js", version.ref = "kotlin" }
+kotlin-kotlinTestJunit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
+kotlin-kotlinTestAnnotationsCommon = { group = "org.jetbrains.kotlin", name = "kotlin-test-annotations-common", version.ref = "kotlin" }
+kotlin-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.5.2-native-mt" }
+kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
+kotlinx-atomicfu = { group = "org.jetbrains.kotlinx", name = "atomicfu", version = "0.16.3" }
+kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.2.1" }
+
+kotlin-compose-gradle = { group = "org.jetbrains.compose", name = "compose-gradle-plugin", version = "1.0.0-alpha4-build366" }
+mosaic-gradle = { group = "com.jakewharton.mosaic", name = "mosaic-gradle-plugin", version.ref = "mosaic" }
+
+essenty-lifecycle = { group = "com.arkivanov.essenty", name = "lifecycle", version.ref = "essenty" }
+essenty-instanceKeeper = { group = "com.arkivanov.essenty", name = "instance-keeper", version.ref = "essenty" }
+
+decompose-dep = { group = "com.arkivanov.decompose", name = "decompose", version.ref = "decompose" }
+decompose-extensions-compose = { group = "com.arkivanov.decompose", name = "extensions-compose-jetbrains", version.ref = "decompose" }
+
+mviKotlin-dep = { group = "com.arkivanov.mvikotlin", name = "mvikotlin", version.ref = "mviKotlin" }
+mviKotlin-rx = { group = "com.arkivanov.mvikotlin", name = "rx", version.ref = "mviKotlin" }
+mviKotlin-main = { group = "com.arkivanov.mvikotlin", name = "mvikotlin-main", version.ref = "mviKotlin" }
+mviKotlin-coroutines = { group = "com.arkivanov.mvikotlin", name = "mvikotlin-extensions-coroutines", version.ref = "mviKotlin" }
+mviKotlin-keepers = { group = "com.arkivanov.mvikotlin", name = "keepers", version.ref = "mviKotlin" }
+mviKotlin-logging = { group = "com.arkivanov.mvikotlin", name = "mvikotlin-logging", version.ref = "mviKotlin" }
+mviKotlin-timetravel = { group = "com.arkivanov.mvikotlin", name = "mvikotlin-timetravel", version.ref = "mviKotlin" }
+mviKotlin-extensions-reaktive = { group = "com.arkivanov.mvikotlin", name = "mvikotlin-extensions-reaktive", version.ref = "mviKotlin" }
+
+ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
+ktor-client-json = { group = "io.ktor", name = "ktor-client-json", version.ref = "ktor" }
+ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
+ktor-client-serialization = { group = "io.ktor", name = "ktor-client-serialization", version.ref = "ktor" }
+ktor-client-auth = { group = "io.ktor", name = "ktor-client-auth", version.ref = "ktor" }
+ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" }
+ktor-client-curl = { group = "io.ktor", name = "ktor-client-curl", version.ref = "ktor" }
+ktor-client-apache = { group = "io.ktor", name = "ktor-client-apache", version.ref = "ktor" }
+ktor-client-ios = { group = "io.ktor", name = "ktor-client-ios", version.ref = "ktor" }
+ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
+ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
+slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
+
+i18n4k-core = { group = "de.comahe.i18n4k", name = "i18n4k-core", version.ref = "i18n4k" }
+i18n4k-gradle-plugin = { group = "de.comahe.i18n4k", name = "i18n4k-gradle-plugin", version.ref = "i18n4k" }
+
+youtube-downloader = { group = "io.github.shabinder", name = "youtube-api-dl", version = "1.3" }
+fuzzy-wuzzy = { group = "io.github.shabinder", name = "fuzzywuzzy", version = "1.1" }
+mp3agic = { group = "com.mpatric", name = "mp3agic", version = "0.9.0" }
+kermit = { group = "co.touchlab", name = "kermit", version.ref = "kermit" }
+storage-chooser = { group = "com.github.shabinder", name = "storage-chooser", version = "2.0.4.45" }
+accompanist-inset = { group = "com.google.accompanist", name = "accompanist-insets", version.ref = "accompanist" }
+android-app-notifier = { group = "com.github.amitbd1508", name = "AppUpdater", version = "4.1.0" }
+moko-parcelize = { group = "dev.icerock.moko", name = "parcelize", version.ref = "mokoParcelize" }
+jaffree = { group = "com.github.kokorin.jaffree", name = "jaffree", version = "2021.08.16" }
+multiplatform-settings = { group = "com.russhwolf", name = "multiplatform-settings-no-arg", version.ref = "multiplatformSettings" }
+
+countly-android = { group = "ly.count.android", name = "sdk", version = "20.11.8" }
+countly-desktop = { group = "ly.count.sdk", name = "java", version = "20.11.0" }
+
+stately-common = { group = "co.touchlab", name = "stately-common", version.ref = "statelyVersion" }
+stately-concurrency = { group = "co.touchlab", name = "stately-concurrency", version.ref = "statelyVersion" }
+stately-isolate = { group = "co.touchlab", name = "stately-isolate", version.ref = "statelyIsoVersion" }
+stately-iso-collections = { group = "co.touchlab", name = "stately-iso-collections", version.ref = "statelyIsoVersion" }
+
+sqldelight-runtime = { group = "com.squareup.sqldelight", name = "runtime", version.ref = "sqlDelight" }
+sqldelight-coroutines-extension = { group = "com.squareup.sqldelight", name = "coroutines-extensions", version.ref = "sqlDelight" }
+sqldelight-gradle-plugin = { group = "com.squareup.sqldelight", name = "gradle-plugin", version.ref = "sqlDelight" }
+sqldelight-driver = { group = "com.squareup.sqldelight", name = "sqlite-driver", version.ref = "sqlDelight" }
+sqldelight-android-driver = { group = "com.squareup.sqldelight", name = "android-driver", version.ref = "sqlDelight" }
+sqldelight-native-driver = { group = "com.squareup.sqldelight", name = "native-driver", version.ref = "sqlDelight" }
+sqlite-jdbc-driver = { group = "org.xerial", name = "sqlite-jdbc", version.ref = "sqliteJdbcDriver" }
+
+koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
+koin-test = { group = "io.insert-koin", name = "koin-test", version.ref = "koin" }
+koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
+koin-androidx-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" }
+
+kotlin-js-wrappers-react = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-react", version = "17.0.2-pre.251-kotlin-1.5.31" }
+kotlin-js-wrappers-reactDom = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-react-dom", version = "17.0.2-pre.251-kotlin-1.5.31" }
+kotlin-js-wrappers-styled = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-styled", version = "5.3.1-pre.250-kotlin-1.5.31" }
+kotlin-js-wrappers-ext = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-extensions", version = "1.0.1-pre.251-kotlin-1.5.31" }
+
+androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.3.1" }
+androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.6.0" }
+androidx-palette = { group = "androidx.palette", name = "palette-ktx", version = "1.0.0" }
+androidx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "androidCoroutines" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version = "1.1.2" }
+androidx-expresso = { group = "androidx.test.espresso", name = "espresso-core", version = "3.3.0" }
+androidx-gradle-plugin = { group = "com.android.tools.build", name = "gradle", version = "4.2.2" }
+androidx-lifecycle-service = { group = "androidx.lifecycle", name = "lifecycle-service", version.ref = "androidxLifecycle" }
+androidx-lifecycle-common = { group = "androidx.lifecycle", name = "lifecycle-common-java8", version.ref = "androidxLifecycle" }
+androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
+androidx-desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version = "1.1.5" }
+leak-canary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version = "2.7" }
+junit = { group = "junit", name = "junit", version = "4.13.2" }
+
+ktlint-gradle = { group = "org.jlleitschuh.gradle", name = "ktlint-gradle", version.ref = "ktLint" }
+
+[bundles]
+ktor = ["ktor-client-core","ktor-client-json","ktor-client-auth","ktor-client-logging","ktor-client-serialization"]
+stately = ["stately-common","stately-concurrency","stately-isolate","stately-iso-collections"]
+androidx-lifecycle = ["androidx-lifecycle-service","androidx-lifecycle-common","androidx-lifecycle-runtime"]
+androidx-common = ["androidx-activity","androidx-core"]
+kotlin-test = ["kotlin-kotlinTestCommon","kotlin-kotlinTestAnnotationsCommon"]
+sqldelight = ["sqldelight-runtime","sqldelight-coroutines-extension","sqldelight-driver"]
+mviKotlin = ["mviKotlin-dep","mviKotlin-main","mviKotlin-coroutines","mviKotlin-logging","mviKotlin-timetravel"]
+kotlinCommon = ["kotlin-coroutines", "kotlin-serialization", "kotlinx-serialization-json", "kotlinx-atomicfu"]
+essenty = ["essenty-lifecycle","essenty-instanceKeeper"]
+koin-android = ["koin-androidx-compose","koin-android"]
+kotlin-js-wrappers = ["kotlin-js-wrappers-react","kotlin-js-wrappers-reactDom","kotlin-js-wrappers-styled","kotlin-js-wrappers-ext"]
\ No newline at end of file
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
new file mode 100644
index 00000000..72f011b1
--- /dev/null
+++ b/buildSrc/settings.gradle.kts
@@ -0,0 +1,12 @@
+
+enableFeaturePreview("VERSION_CATALOGS")
+dependencyResolutionManagement {
+ @Suppress("UnstableApiUsage")
+ versionCatalogs {
+ create("deps") {
+ from(files("deps.versions.toml"))
+ }
+ }
+}
+
+rootProject.name = "spotiflyer-build"
diff --git a/buildSrc/src/main/kotlin/compiler-args.gradle.kts b/buildSrc/src/main/kotlin/compiler-args.gradle.kts
index 39907c63..34c5b8f5 100644
--- a/buildSrc/src/main/kotlin/compiler-args.gradle.kts
+++ b/buildSrc/src/main/kotlin/compiler-args.gradle.kts
@@ -6,10 +6,10 @@ kotlin {
sourceSets {
all {
languageSettings.apply {
- useExperimentalAnnotation("kotlin.RequiresOptIn")
- useExperimentalAnnotation("kotlin.Experimental")
- useExperimentalAnnotation("kotlin.time.ExperimentalTime")
- useExperimentalAnnotation("kotlinx.serialization.ExperimentalSerializationApi")
+ optIn("kotlin.RequiresOptIn")
+ optIn("kotlin.Experimental")
+ optIn("kotlin.time.ExperimentalTime")
+ optIn("kotlinx.serialization.ExperimentalSerializationApi")
}
}
}
diff --git a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts
index 8b324515..34dea94a 100644
--- a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts
+++ b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts
@@ -29,36 +29,23 @@ kotlin {
sourceSets {
all {
languageSettings.apply {
- useExperimentalAnnotation("androidx.compose.animation")
+ optIn("androidx.compose.animation")
}
}
named("commonMain") {
dependencies {
- // Decompose
- implementation(Decompose.decompose)
-
- // MVI
- implementation(MVIKotlin.coroutines)
- implementation(MVIKotlin.mvikotlin)
-
implementation(compose.ui)
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material)
implementation(compose.animation)
-
- implementation(Extras.kermit)
- implementation("dev.icerock.moko:parcelize:${Versions.mokoParcelize}")
- implementation(JetBrains.Kotlin.coroutines) {
- @Suppress("DEPRECATION")
- isForce = true
- }
+ implementation(Deps.kotlinCoroutines)
+ implementation(Deps.decompose)
}
}
named("androidMain") {
dependencies {
- implementation(Androidx.androidxActivity)
- implementation(Androidx.core)
+ implementation(Deps.androidXCommonBundle)
}
}
named("desktopMain") {
diff --git a/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts
index c4a4889f..8f2e8408 100644
--- a/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts
+++ b/buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts
@@ -42,23 +42,24 @@ kotlin {
sourceSets {
named("commonTest") {
dependencies {
- implementation(JetBrains.Kotlin.testCommon)
- implementation(JetBrains.Kotlin.testAnnotationsCommon)
+ implementation(Deps.kotlinTestBundle)
}
}
named("androidTest") {
dependencies {
- implementation(JetBrains.Kotlin.testJunit)
+ implementation(Deps.kotlinJunitTest)
}
}
named("desktopTest") {
dependencies {
- implementation(JetBrains.Kotlin.testJunit)
+ implementation(Deps.kotlinJunitTest)
}
}
named("jsTest") {
- dependencies {}
+ dependencies {
+ implementation(Deps.kotlinJSTest)
+ }
}
}
}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts
index 43462d25..54b92e72 100644
--- a/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts
+++ b/buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts
@@ -25,7 +25,7 @@ plugins {
kotlin {
/*IOS Target Can be only built on Mac*/
- if(HostOS.isMac){
+ if (HostOS.isMac) {
val sdkName: String? = System.getenv("SDK_NAME")
val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
if (isiOSDevice) {
@@ -50,45 +50,25 @@ kotlin {
sourceSets {
named("commonMain") {
dependencies {
- // Decompose
- implementation(Decompose.decompose)
-
- // MVI
- implementation(MVIKotlin.coroutines)
- implementation(MVIKotlin.mvikotlin)
-
- // Koin
- implementation(Koin.core)
-
- implementation(Ktor.auth)
- implementation(Ktor.clientJson)
- implementation(Ktor.clientCore)
- implementation(Ktor.clientLogging)
- implementation(Ktor.clientSerialization)
-
- // Extras
- implementation(Extras.kermit)
- implementation(Serialization.json)
- implementation("co.touchlab:stately-common:1.1.7")
- implementation("dev.icerock.moko:parcelize:${Versions.mokoParcelize}")
- implementation(JetBrains.Kotlin.coroutines) {
- @Suppress("DEPRECATION")
- isForce = true
- }
+ implementation(Deps.ktorBundle)
+ implementation(Deps.kotlinxSerialization)
+ implementation(Deps.kotlinCoroutines)
+ implementation(Deps.mviKotlinBundle)
+ implementation(Deps.decompose)
+ implementation(Deps.koinCore)
}
}
named("androidMain") {
dependencies {
- implementation(Androidx.androidxActivity)
- implementation(Androidx.core)
implementation(compose.runtime)
implementation(compose.material)
implementation(compose.foundation)
implementation(compose.materialIconsExtended)
- implementation(Decompose.extensionsCompose)
- implementation(Ktor.clientAndroid)
- implementation(Koin.android)
+ implementation(Deps.androidXCommonBundle)
+ implementation(Deps.decomposeComposeExt)
+ implementation(Deps.ktorClientAndroid)
+ implementation(Deps.koinAndroidBundle)
}
}
@@ -99,27 +79,20 @@ kotlin {
implementation(compose.material)
implementation(compose.desktop.common)
implementation(compose.materialIconsExtended)
- implementation(Decompose.extensionsCompose)
- implementation(Ktor.clientApache)
- implementation(Ktor.slf4j)
+ implementation(Deps.decomposeComposeExt)
+ implementation(Deps.ktorClientApache)
+ implementation(Deps.slf4j)
}
}
named("jsMain") {
dependencies {
- implementation(Ktor.clientJs)
-
- /*with(KotlinJSWrappers) {
- implementation(enforcedPlatform(bom))
- implementation(kotlinReact)
- implementation(kotlinReactDom)
- implementation(kotlinStyled)
- }*/
+ implementation(Deps.ktorClientJS)
}
}
- if(HostOS.isMac){
- named("iosMain"){
+ if (HostOS.isMac) {
+ named("iosMain") {
dependencies {
- implementation(Ktor.clientIos)
+ implementation(Deps.ktorClientIOS)
}
}
}
diff --git a/common/compose/build.gradle.kts b/common/compose/build.gradle.kts
index c47e194a..ed4df484 100644
--- a/common/compose/build.gradle.kts
+++ b/common/compose/build.gradle.kts
@@ -40,7 +40,7 @@ kotlin {
implementation(project(":common:database"))
implementation(project(":common:data-models"))
implementation(project(":common:dependency-injection"))
- implementation(Decompose.extensionsCompose)
+ implementation(deps.decompose.extensions.compose)
}
}
}
diff --git a/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/AndroidImages.kt b/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/AndroidImages.kt
index e56a099e..a9eb45ce 100644
--- a/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/AndroidImages.kt
+++ b/common/compose/src/androidMain/kotlin/com/shabinder/common/uikit/AndroidImages.kt
@@ -81,6 +81,9 @@ actual fun SpotifyLogo() = getCachedPainter(R.drawable.ic_spotify_logo)
@Composable
actual fun SaavnLogo() = getCachedPainter(R.drawable.ic_jio_saavn_logo)
+@Composable
+actual fun SoundCloudLogo() = getCachedPainter(R.drawable.ic_soundcloud)
+
@Composable
actual fun GaanaLogo() = getCachedPainter(R.drawable.ic_gaana)
diff --git a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ExpectImages.kt b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ExpectImages.kt
index 6be14625..557bfb49 100644
--- a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ExpectImages.kt
+++ b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/ExpectImages.kt
@@ -58,6 +58,9 @@ expect fun SpotifyLogo(): Painter
@Composable
expect fun SaavnLogo(): Painter
+@Composable
+expect fun SoundCloudLogo(): Painter
+
@Composable
expect fun YoutubeLogo(): Painter
diff --git a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt
index 670106fb..eab0877b 100644
--- a/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt
+++ b/common/compose/src/commonMain/kotlin/com/shabinder/common/uikit/screens/SpotiFlyerMainUi.kt
@@ -83,12 +83,14 @@ import com.shabinder.common.main.SpotiFlyerMain
import com.shabinder.common.main.SpotiFlyerMain.HomeCategory
import com.shabinder.common.models.DownloadRecord
import com.shabinder.common.models.Actions
+import com.shabinder.common.models.spotify.Source
import com.shabinder.common.translations.Strings
import com.shabinder.common.uikit.GaanaLogo
import com.shabinder.common.uikit.GithubLogo
import com.shabinder.common.uikit.ImageLoad
import com.shabinder.common.uikit.SaavnLogo
import com.shabinder.common.uikit.ShareImage
+import com.shabinder.common.uikit.SoundCloudLogo
import com.shabinder.common.uikit.SpotifyLogo
import com.shabinder.common.uikit.VerticalScrollbar
import com.shabinder.common.uikit.YoutubeLogo
@@ -319,6 +321,17 @@ fun AboutColumn(
)
)
}
+ Spacer(modifier = Modifier.padding(top = 8.dp))
+ Row(horizontalArrangement = Arrangement.Center, modifier = modifier.fillMaxWidth()) {
+ Icon(
+ SoundCloudLogo(),
+ "${Strings.open()} Sound Cloud",
+ tint = Color.Unspecified,
+ modifier = Modifier.clip(SpotiFlyerShapes.medium).clickable(
+ onClick = { Actions.instance.openPlatform("com.soundcloud.android", "https://soundcloud.com/") }
+ )
+ )
+ }
}
}
Spacer(modifier = Modifier.padding(top = 8.dp))
diff --git a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
index 2c4c1a91..125a1763 100644
--- a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
+++ b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopImages.kt
@@ -21,15 +21,19 @@ package com.shabinder.common.uikit
import androidx.compose.foundation.Image
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.loadXmlImageVector
-import androidx.compose.ui.res.vectorXmlResource
+import androidx.compose.ui.res.useResource
+import org.xml.sax.InputSource
@Composable
-internal actual fun imageVectorResource(id: T): ImageVector =
- vectorXmlResource(id as String)
+internal actual fun imageVectorResource(id: T): ImageVector {
+ val density = LocalDensity.current
+ return useResource(id as String) {
+ loadXmlImageVector(InputSource(it), density)
+ }
+}
@Composable
actual fun DownloadImageTick() {
@@ -82,6 +86,10 @@ actual fun SpotifyLogo() =
actual fun SaavnLogo() =
getCachedPainter("drawable/ic_jio_saavn_logo.xml")
+@Composable
+actual fun SoundCloudLogo() =
+ getCachedPainter("drawable/ic_soundcloud.xml")
+
@Composable
actual fun YoutubeLogo() =
getCachedPainter("drawable/ic_youtube.xml")
diff --git a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopScrollBar.kt b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopScrollBar.kt
index 9088ac4b..aad2af95 100644
--- a/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopScrollBar.kt
+++ b/common/compose/src/desktopMain/kotlin/com/shabinder/common/uikit/DesktopScrollBar.kt
@@ -12,7 +12,7 @@ import androidx.compose.ui.unit.dp
actual val MARGIN_SCROLLBAR: Dp = 8.dp
-actual typealias ScrollbarAdapter = androidx.compose.foundation.ScrollbarAdapter
+actual typealias ScrollbarAdapter = ScrollbarAdapter
@OptIn(ExperimentalFoundationApi::class)
@Composable
@@ -23,8 +23,6 @@ actual fun rememberScrollbarAdapter(
): ScrollbarAdapter =
androidx.compose.foundation.rememberScrollbarAdapter(
scrollState = scrollState,
- itemCount = itemCount,
- averageItemSize = averageItemSize
)
@Composable
diff --git a/common/core-components/build.gradle.kts b/common/core-components/build.gradle.kts
index 9a618a93..92592eda 100644
--- a/common/core-components/build.gradle.kts
+++ b/common/core-components/build.gradle.kts
@@ -10,29 +10,37 @@ kotlin {
dependencies {
implementation(project(":common:data-models"))
implementation(project(":common:database"))
- api("org.jetbrains.kotlinx:atomicfu:0.16.2")
- api(MultiPlatformSettings.dep)
- implementation(MVIKotlin.rx)
+ with(deps) {
+ api(multiplatform.settings)
+ api(kotlinx.atomicfu)
+ implementation(mviKotlin.rx)
+ implementation(decompose.dep)
+ }
}
}
androidMain {
dependencies {
- implementation(Extras.mp3agic)
- implementation(Extras.Android.countly)
+ with(deps) {
+ implementation(mp3agic)
+ implementation(countly.android)
+ }
implementation(project(":ffmpeg:android-ffmpeg"))
}
}
desktopMain {
dependencies {
- implementation(Extras.mp3agic)
- implementation(Extras.Desktop.countly)
- implementation("com.github.kokorin.jaffree:jaffree:2021.08.16")
+ with(deps) {
+ implementation(mp3agic)
+ implementation(countly.desktop)
+ implementation(jaffree)
+ }
}
}
jsMain {
dependencies {
implementation(npm("browser-id3-writer", "4.4.0"))
implementation(npm("file-saver", "2.0.4"))
+ implementation(deps.kotlin.js.wrappers.ext)
}
}
}
diff --git a/common/core-components/src/androidMain/kotlin/com/shabinder/common/core_components/file_manager/AndroidFileManager.kt b/common/core-components/src/androidMain/kotlin/com/shabinder/common/core_components/file_manager/AndroidFileManager.kt
index 43d87554..1b30fc38 100644
--- a/common/core-components/src/androidMain/kotlin/com/shabinder/common/core_components/file_manager/AndroidFileManager.kt
+++ b/common/core-components/src/androidMain/kotlin/com/shabinder/common/core_components/file_manager/AndroidFileManager.kt
@@ -117,7 +117,7 @@ class AndroidFileManager(
try {
// Add Mp3 Tags and Add to Library
- if(trackDetails.audioFormat != AudioFormat.MP3)
+ if (trackDetails.audioFormat != AudioFormat.MP3)
throw InvalidDataException("Audio Format is ${trackDetails.audioFormat}, Needs Conversion!")
Mp3File(File(songFile.absolutePath))
@@ -166,7 +166,7 @@ class AndroidFileManager(
override suspend fun loadImage(url: String, reqWidth: Int, reqHeight: Int): Picture =
withContext(dispatcherIO) {
- val cachePath = imageCacheDir() + getNameURL(url)
+ val cachePath = getImageCachePath(url)
Picture(
image = (loadCachedImage(cachePath, reqWidth, reqHeight) ?: freshImage(
url,
@@ -214,7 +214,7 @@ class AndroidFileManager(
// Decode and Cache Full Sized Image in Background
cacheImage(
BitmapFactory.decodeByteArray(input, 0, input.size),
- imageCacheDir() + getNameURL(url)
+ getImageCachePath(url)
)
}
bitmap // return Memory Efficient Bitmap
diff --git a/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/file_manager/FileManager.kt b/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/file_manager/FileManager.kt
index 6aedf2eb..d27662e9 100644
--- a/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/file_manager/FileManager.kt
+++ b/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/file_manager/FileManager.kt
@@ -25,10 +25,14 @@ import com.shabinder.common.models.DownloadResult
import com.shabinder.common.models.TrackDetails
import com.shabinder.common.models.event.coroutines.SuspendableEvent
import com.shabinder.common.utils.removeIllegalChars
+import com.shabinder.common.utils.requireNotNull
import com.shabinder.database.Database
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
+import io.ktor.client.HttpClient
+import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.client.request.get
+import io.ktor.client.statement.HttpStatement
+import io.ktor.http.contentLength
+import io.ktor.http.isSuccess
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.flow
@@ -80,12 +84,13 @@ fun FileManager.createDirectories() {
if (!defaultDir().contains("null${fileSeparator()}SpotiFlyer")) {
createDirectory(defaultDir())
createDirectory(imageCacheDir())
- createDirectory(defaultDir() + "Tracks/")
- createDirectory(defaultDir() + "Albums/")
- createDirectory(defaultDir() + "Playlists/")
- createDirectory(defaultDir() + "YT_Downloads/")
+ createDirectory(defaultDir() + "Tracks" + fileSeparator())
+ createDirectory(defaultDir() + "Albums" + fileSeparator())
+ createDirectory(defaultDir() + "Playlists" + fileSeparator())
+ createDirectory(defaultDir() + "YT_Downloads" + fileSeparator())
}
- } catch (ignored: Exception) { }
+ } catch (ignored: Exception) {
+ }
}
fun FileManager.finalOutputDir(
@@ -100,24 +105,50 @@ fun FileManager.finalOutputDir(
removeIllegalChars(subFolder) + this.fileSeparator()
} +
removeIllegalChars(itemName) + extension
-/*DIR Specific Operation End*/
-fun getNameURL(url: String): String {
- return url.substring(url.lastIndexOf('/', url.lastIndexOf('/') - 1) + 1, url.length)
- .replace('/', '_')
+fun FileManager.getImageCachePath(
+ url: String
+): String = imageCacheDir() + getNameFromURL(url, isImage = true)
+
+/*DIR Specific Operation End*/
+private fun getNameFromURL(url: String, isImage: Boolean = false): String {
+ val startIndex = url.lastIndexOf('/', url.lastIndexOf('/') - 1) + 1
+
+ var fileName = if (startIndex != -1)
+ url.substring(startIndex).replace('/', '_')
+ else url.substringAfterLast("/")
+
+ // Generify File Extensions
+ if (isImage) {
+ if (fileName.length - fileName.lastIndexOf(".") > 5) {
+ fileName += ".jpeg"
+ } else {
+ if (fileName.endsWith(".jpg"))
+ fileName = fileName.substringBeforeLast(".") + ".jpeg"
+ }
+ }
+
+ return fileName
}
-suspend fun downloadFile(url: String): Flow {
+suspend fun HttpClient.downloadFile(url: String) = downloadFile(url, this)
+
+suspend fun downloadFile(url: String, client: HttpClient? = null): Flow {
return flow {
- val client = createHttpClient()
- val response = client.get(url).execute()
- val data = ByteArray(response.contentLength()!!.toInt())
+ val httpClient = client ?: createHttpClient()
+ val response = httpClient.get(url).execute()
+ // Not all requests return Content Length
+ val data = kotlin.runCatching {
+ ByteArray(response.contentLength().requireNotNull().toInt())
+ }.getOrNull() ?: byteArrayOf()
var offset = 0
do {
// Set Length optimally, after how many kb you want a progress update, now it 0.25mb
val currentRead = response.content.readAvailable(data, offset, 2_50_000)
offset += currentRead
- val progress = (offset * 100f / data.size).roundToInt()
+ val progress = data.size.takeIf { it != 0 }?.let { fileSize ->
+ (offset * 100f / fileSize).roundToInt()
+ } ?: 0
emit(DownloadResult.Progress(progress))
} while (currentRead > 0)
if (response.status.isSuccess()) {
@@ -125,7 +156,10 @@ suspend fun downloadFile(url: String): Flow {
} else {
emit(DownloadResult.Error("File not downloaded"))
}
- client.close()
+
+ // Close Client if We Created One
+ if (client == null)
+ httpClient.close()
}.catch { e ->
e.printStackTrace()
emit(DownloadResult.Error(e.message ?: "File not downloaded"))
diff --git a/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/utils/NetworkingExt.kt b/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/utils/NetworkingExt.kt
index 1b7eb918..ec3e78fd 100644
--- a/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/utils/NetworkingExt.kt
+++ b/common/core-components/src/commonMain/kotlin/com.shabinder.common.core_components/utils/NetworkingExt.kt
@@ -8,6 +8,8 @@ import io.ktor.client.features.json.*
import io.ktor.client.features.json.serializer.*
import io.ktor.client.features.logging.*
import io.ktor.client.request.*
+import io.ktor.client.statement.HttpResponse
+import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import kotlin.native.concurrent.SharedImmutable
@@ -23,6 +25,18 @@ suspend fun isInternetAccessible(): Boolean {
}
}
+// If Fails returns Input Url
+suspend inline fun HttpClient.getFinalUrl(
+ url: String,
+ crossinline block: HttpRequestBuilder.() -> Unit = {}
+): String {
+ return withContext(dispatcherIO) {
+ runCatching {
+ get(url,block).call.request.url.toString()
+ }.getOrNull() ?: url
+ }
+}
+
fun createHttpClient(enableNetworkLogs: Boolean = false) = HttpClient {
// https://github.com/Kotlin/kotlinx.serialization/issues/1450
install(JsonFeature) {
diff --git a/common/core-components/src/desktopMain/kotlin/com.shabinder.common.core_components/file_manager/DesktopFileManager.kt b/common/core-components/src/desktopMain/kotlin/com.shabinder.common.core_components/file_manager/DesktopFileManager.kt
index 0f7b11a9..6ef248dd 100644
--- a/common/core-components/src/desktopMain/kotlin/com.shabinder.common.core_components/file_manager/DesktopFileManager.kt
+++ b/common/core-components/src/desktopMain/kotlin/com.shabinder.common.core_components/file_manager/DesktopFileManager.kt
@@ -30,17 +30,20 @@ import com.shabinder.common.core_components.removeAllTags
import com.shabinder.common.core_components.setId3v1Tags
import com.shabinder.common.core_components.setId3v2TagsAndSaveFile
import com.shabinder.common.database.SpotiFlyerDatabase
+import com.shabinder.common.models.Actions
import com.shabinder.common.models.DownloadStatus
import com.shabinder.common.models.TrackDetails
import com.shabinder.common.models.dispatcherIO
import com.shabinder.common.models.event.coroutines.SuspendableEvent
-import com.shabinder.common.models.event.coroutines.failure
import com.shabinder.common.models.event.coroutines.map
-import com.shabinder.common.models.Actions
import com.shabinder.database.Database
-import kotlinx.coroutines.*
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.flow.MutableSharedFlow
-import org.jetbrains.skija.Image
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.jetbrains.skia.Image
import org.koin.dsl.bind
import org.koin.dsl.module
import java.awt.image.BufferedImage
@@ -104,9 +107,11 @@ class DesktopFileManager(
override suspend fun cacheImage(image: Any, path: String): Unit = withContext(dispatcherIO) {
try {
+ val file = File(path)
+ if(!file.parentFile.exists()) createDirectories()
(image as? BufferedImage)?.let {
- ImageIO.write(it, "jpeg", File(path))
- }
+ ImageIO.write(it, "jpeg", file)
+ }
} catch (e: IOException) {
e.printStackTrace()
}
@@ -165,7 +170,7 @@ class DesktopFileManager(
}
SuspendableEvent.success(trackDetails.outputFilePath)
} catch (e: Throwable) {
- if(e is JaffreeException) Actions.instance.showPopUpMessage("No FFmpeg found at path.")
+ if (e is JaffreeException) Actions.instance.showPopUpMessage("No FFmpeg found at path.")
if (songFile.exists()) songFile.delete()
logger.e { "${songFile.absolutePath} could not be created" }
SuspendableEvent.error(e)
@@ -175,8 +180,7 @@ class DesktopFileManager(
override fun addToLibrary(path: String) {}
override suspend fun loadImage(url: String, reqWidth: Int, reqHeight: Int): Picture {
- val cachePath = imageCacheDir() + getNameURL(url)
- var picture: ImageBitmap? = loadCachedImage(cachePath, reqWidth, reqHeight)
+ var picture: ImageBitmap? = loadCachedImage(getImageCachePath(url), reqWidth, reqHeight)
if (picture == null) picture = freshImage(url, reqWidth, reqHeight)
return Picture(image = picture)
}
@@ -205,7 +209,7 @@ class DesktopFileManager(
if (result != null) {
GlobalScope.launch(Dispatchers.IO) { // TODO Refactor
- cacheImage(result, imageCacheDir() + getNameURL(url))
+ cacheImage(result, getImageCachePath(url))
}
result.toImageBitmap()
} else null
diff --git a/common/data-models/build.gradle.kts b/common/data-models/build.gradle.kts
index 9b5d0f70..0db019de 100644
--- a/common/data-models/build.gradle.kts
+++ b/common/data-models/build.gradle.kts
@@ -25,9 +25,6 @@ plugins {
id("de.comahe.i18n4k")
}
-val statelyVersion = "1.1.7"
-val statelyIsoVersion = "1.1.7-a1"
-
i18n4k {
inputDirectory = "../../translations"
packageName = "com.shabinder.common.translations"
@@ -50,11 +47,13 @@ kotlin {
}
commonMain {
dependencies {
- implementation("co.touchlab:stately-concurrency:$statelyVersion")
- implementation("co.touchlab:stately-isolate:$statelyIsoVersion")
- implementation("co.touchlab:stately-iso-collections:$statelyIsoVersion")
- implementation(Extras.youtubeDownloader)
- api(Internationalization.dep)
+ with(deps) {
+ api(bundles.stately)
+ api(i18n4k.core)
+ api(kermit)
+ api(moko.parcelize)
+ implementation(youtube.downloader)
+ }
}
}
}
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/DownloadObject.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/DownloadObject.kt
index 4267ca97..10cc35a0 100644
--- a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/DownloadObject.kt
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/DownloadObject.kt
@@ -44,7 +44,7 @@ data class TrackDetails(
var audioQuality: AudioQuality = AudioQuality.KBPS192,
var audioFormat: AudioFormat = AudioFormat.MP4,
var outputFilePath: String, // UriString in Android
- var videoID: String? = null,
+ var videoID: String? = null, // will be used for purposes like Downloadable Link || VideoID etc. based on Provider
) : Parcelable {
val outputMp3Path get() = outputFilePath.substringBeforeLast(".") + ".mp3"
}
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/SpotiFlyerException.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/SpotiFlyerException.kt
index 960baf53..3415020d 100644
--- a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/SpotiFlyerException.kt
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/SpotiFlyerException.kt
@@ -12,6 +12,11 @@ sealed class SpotiFlyerException(override val message: String) : Exception(messa
override val message: String = /*${Strings.mp3ConverterBusy()} */"CAUSE:$extraInfo"
) : SpotiFlyerException(message)
+ data class GeoLocationBlocked(
+ val extraInfo: String? = null,
+ override val message: String = "This Content is not Accessible from your Location, try using a VPN! \nCAUSE:$extraInfo"
+ ) : SpotiFlyerException(message)
+
data class UnknownReason(
val exception: Throwable? = null,
override val message: String = Strings.unknownError()
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/saavn/SaavnSong.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/saavn/SaavnSong.kt
index c4cfae65..6f2e7eb2 100644
--- a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/saavn/SaavnSong.kt
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/saavn/SaavnSong.kt
@@ -20,7 +20,7 @@ data class SaavnSong @OptIn(ExperimentalSerializationApi::class) constructor(
// val explicit_content: Int = 0,
val has_lyrics: Boolean = false,
val id: String,
- val image: String,
+ val image: String = "",
val label: String? = null,
val label_url: String? = null,
val language: String,
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Badges.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Badges.kt
new file mode 100644
index 00000000..52d0f77d
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Badges.kt
@@ -0,0 +1,13 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Badges(
+ val pro: Boolean = false,
+ @SerialName("pro_unlimited")
+ val proUnlimited: Boolean = false,
+ val verified: Boolean = false
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/CreatorSubscription.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/CreatorSubscription.kt
new file mode 100644
index 00000000..2c0fd45a
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/CreatorSubscription.kt
@@ -0,0 +1,10 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CreatorSubscription(
+ val product: Product = Product()
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Format.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Format.kt
new file mode 100644
index 00000000..13b054ac
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Format.kt
@@ -0,0 +1,14 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Format(
+ @SerialName("mime_type")
+ val mimeType: String = "",
+ val protocol: String = ""
+) {
+ val isProgressive get() = protocol == "progressive"
+}
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Media.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Media.kt
new file mode 100644
index 00000000..66ba4707
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Media.kt
@@ -0,0 +1,9 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Media(
+ val transcodings: List = emptyList()
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Product.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Product.kt
new file mode 100644
index 00000000..b82c5cf9
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Product.kt
@@ -0,0 +1,10 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Product(
+ val id: String = ""
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/PublisherMetadata.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/PublisherMetadata.kt
new file mode 100644
index 00000000..d4b51b8a
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/PublisherMetadata.kt
@@ -0,0 +1,24 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PublisherMetadata(
+ @SerialName("album_title")
+ val albumTitle: String = "",
+ val artist: String = "",
+ @SerialName("contains_music")
+ val containsMusic: Boolean = false,
+ val id: Int = 0,
+ val isrc: String = "",
+ val publisher: String = "",
+ @SerialName("release_title")
+ val releaseTitle: String = "",
+ @SerialName("upc_or_ean")
+ val upcOrEan: String = "",
+ val urn: String = "",
+ @SerialName("writer_composer")
+ val writerComposer: String = ""
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Transcoding.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Transcoding.kt
new file mode 100644
index 00000000..0bd313de
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Transcoding.kt
@@ -0,0 +1,22 @@
+package com.shabinder.common.models.soundcloud
+
+
+import com.shabinder.common.models.AudioFormat
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Transcoding(
+ val duration: Int = 0,
+ val format: Format = Format(),
+ val preset: String = "",
+ val quality: String = "", //sq == 128kbps //hq == 256kbps
+ val snipped: Boolean = false,
+ val url: String = ""
+) {
+ val audioFormat: AudioFormat = when {
+ preset.contains("mp3") -> AudioFormat.MP3
+ preset.contains("aac") || preset.contains("m4a") -> AudioFormat.MP4
+ preset.contains("flac") -> AudioFormat.FLAC
+ else -> AudioFormat.UNKNOWN
+ }
+}
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/User.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/User.kt
new file mode 100644
index 00000000..4ea07493
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/User.kt
@@ -0,0 +1,38 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class User(
+ @SerialName("avatar_url")
+ val avatarUrl: String = "",
+ val badges: Badges = Badges(),
+ val city: String = "",
+ @SerialName("country_code")
+ val countryCode: String = "",
+ @SerialName("first_name")
+ val firstName: String = "",
+ @SerialName("followers_count")
+ val followersCount: Int = 0,
+ @SerialName("full_name")
+ val fullName: String = "",
+ val id: Int = 0,
+ val kind: String = "",
+ @SerialName("last_modified")
+ val lastModified: String = "",
+ @SerialName("last_name")
+ val lastName: String = "",
+ val permalink: String = "",
+ @SerialName("permalink_url")
+ val permalinkUrl: String = "",
+ @SerialName("station_permalink")
+ val stationPermalink: String = "",
+ @SerialName("station_urn")
+ val stationUrn: String = "",
+ val uri: String = "",
+ val urn: String = "",
+ val username: String = "",
+ val verified: Boolean = false
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Visual.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Visual.kt
new file mode 100644
index 00000000..9e28aede
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Visual.kt
@@ -0,0 +1,14 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Visual(
+ @SerialName("entry_time")
+ val entryTime: Int = 0,
+ val urn: String = "",
+ @SerialName("visual_url")
+ val visualUrl: String = ""
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Visuals.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Visuals.kt
new file mode 100644
index 00000000..57ef84d2
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/Visuals.kt
@@ -0,0 +1,13 @@
+package com.shabinder.common.models.soundcloud
+
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Visuals(
+ val enabled: Boolean = false,
+ //val tracking: Any = Any(),
+ val urn: String = "",
+ val visuals: List = listOf()
+)
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/resolvemodel/SoundCloudResolveResponseBase.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/resolvemodel/SoundCloudResolveResponseBase.kt
new file mode 100644
index 00000000..ddc9c128
--- /dev/null
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/soundcloud/resolvemodel/SoundCloudResolveResponseBase.kt
@@ -0,0 +1,166 @@
+package com.shabinder.common.models.soundcloud.resolvemodel
+
+import com.shabinder.common.models.AudioFormat
+import com.shabinder.common.models.soundcloud.Media
+import com.shabinder.common.models.soundcloud.PublisherMetadata
+import com.shabinder.common.models.soundcloud.User
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonClassDiscriminator
+
+@Serializable
+@JsonClassDiscriminator("kind")
+sealed class SoundCloudResolveResponseBase {
+ abstract val kind: String
+
+ @SerialName("playlist")
+ @Serializable
+ data class SoundCloudResolveResponsePlaylist(
+ @SerialName("artwork_url")
+ val artworkUrl: String = "",
+ @SerialName("calculated_artwork_url")
+ val calculatedArtworkUrl: String = "", //t500x500, t120x120 // "https://i1.sndcdn.com/artworks-pjsabv9w0EXW3lBJ-nvjDYg-large.jpg" // https://i1.sndcdn.com/artworks-pjsabv9w0EXW3lBJ-nvjDYg-t500x500.jpg
+ @SerialName("created_at")
+ val createdAt: String = "",
+ val description: String = "",
+ @SerialName("display_date")
+ val displayDate: String = "",
+ val duration: Int = 0,
+ override val kind: String = "",
+ @SerialName("embeddable_by")
+ val embeddableBy: String = "",
+ val genre: String = "",
+ val id: Int = 0,
+ @SerialName("is_album")
+ val isAlbum: Boolean = false,
+ @SerialName("label_name")
+ val labelName: String = "",
+ @SerialName("last_modified")
+ val lastModified: String = "",
+ val license: String = "",
+ @SerialName("likes_count")
+ val likesCount: Int = 0,
+ @SerialName("managed_by_feeds")
+ val managedByFeeds: Boolean = false,
+ val permalink: String = "",
+ @SerialName("permalink_url")
+ val permalinkUrl: String = "",
+ val `public`: Boolean = false,
+ @SerialName("published_at")
+ val publishedAt: String = "",
+ @SerialName("purchase_title")
+ val purchaseTitle: String = "",
+ @SerialName("purchase_url")
+ val purchaseUrl: String = "",
+ @SerialName("release_date")
+ val releaseDate: String = "",
+ @SerialName("reposts_count")
+ val repostsCount: Int = 0,
+ @SerialName("secret_token")
+ val secretToken: String = "",
+ @SerialName("set_type")
+ val setType: String = "",
+ val sharing: String = "",
+ @SerialName("tag_list")
+ val tagList: String = "",
+ val title: String = "", //"Top 50: Hip-hop & Rap"
+ @SerialName("track_count")
+ val trackCount: Int = 0,
+ var tracks: List = emptyList(),
+ val uri: String = "",
+ val user: User = User(),
+ @SerialName("user_id")
+ val userId: Int = 0
+ ) : SoundCloudResolveResponseBase()
+
+
+ @SerialName("track")
+ @Serializable
+ data class SoundCloudResolveResponseTrack(
+ @SerialName("artwork_url")
+ val artworkUrl: String = "",
+ val caption: String = "",
+ @SerialName("comment_count")
+ val commentCount: Int = 0,
+ val commentable: Boolean = false,
+ @SerialName("created_at")
+ val createdAt: String = "",
+ val description: String = "",
+ @SerialName("display_date")
+ val displayDate: String = "",
+ @SerialName("download_count")
+ val downloadCount: Int = 0,
+ val downloadable: Boolean = false,
+ val duration: Int = 0,
+ @SerialName("embeddable_by")
+ val embeddableBy: String = "",
+ @SerialName("full_duration")
+ val fullDuration: Int = 0,
+ val genre: String = "",
+ @SerialName("has_downloads_left")
+ val hasDownloadsLeft: Boolean = false,
+ val id: Int = 0,
+ override val kind: String = "",
+ @SerialName("label_name")
+ val labelName: String = "",
+ @SerialName("last_modified")
+ val lastModified: String = "",
+ val license: String = "",
+ @SerialName("likes_count")
+ val likesCount: Int = 0,
+ val media: Media = Media(),
+ @SerialName("monetization_model")
+ val monetizationModel: String = "",
+ val permalink: String = "",
+ @SerialName("permalink_url")
+ val permalinkUrl: String = "",
+ @SerialName("playback_count")
+ val playbackCount: Int = 0,
+ val policy: String = "",
+ val `public`: Boolean = false,
+ @SerialName("publisher_metadata")
+ val publisherMetadata: PublisherMetadata = PublisherMetadata(),
+ @SerialName("purchase_title")
+ val purchaseTitle: String = "",
+ @SerialName("purchase_url")
+ val purchaseUrl: String = "",
+ @SerialName("release_date")
+ val releaseDate: String = "",
+ @SerialName("reposts_count")
+ val repostsCount: Int = 0,
+ @SerialName("secret_token")
+ val secretToken: String = "",
+ val sharing: String = "",
+ val state: String = "",
+ @SerialName("station_permalink")
+ val stationPermalink: String = "",
+ @SerialName("station_urn")
+ val stationUrn: String = "",
+ val streamable: Boolean = false,
+ @SerialName("tag_list")
+ val tagList: String = "",
+ val title: String = "",
+ @SerialName("track_authorization")
+ val trackAuthorization: String = "",
+ @SerialName("track_format")
+ val trackFormat: String = "",
+ val uri: String = "",
+ val urn: String = "",
+ val user: User = User(),
+ @SerialName("user_id")
+ val userId: Int = 0,
+ val visuals: String = "",
+ @SerialName("waveform_url")
+ val waveformUrl: String = ""
+ ) : SoundCloudResolveResponseBase() {
+ fun getDownloadableLink(): Pair? {
+ return (media.transcodings.firstOrNull {
+ it.quality == "hq" && (it.format.isProgressive || it.url.contains("progressive"))
+ } ?: media.transcodings.firstOrNull {
+ it.quality == "sq" && (it.format.isProgressive || it.url.contains("progressive"))
+ })?.let {
+ it.url to it.audioFormat
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/spotify/Source.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/spotify/Source.kt
index fbaa3f7d..b20fe1d6 100644
--- a/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/spotify/Source.kt
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/models/spotify/Source.kt
@@ -20,5 +20,6 @@ enum class Source {
Spotify,
YouTube,
Gaana,
- JioSaavn
+ JioSaavn,
+ SoundCloud
}
diff --git a/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt b/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt
index 1bbad05f..cb685184 100644
--- a/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt
+++ b/common/data-models/src/commonMain/kotlin/com/shabinder/common/utils/Utils.kt
@@ -8,6 +8,7 @@ val globalJson by lazy {
Json {
isLenient = true
ignoreUnknownKeys = true
+ coerceInputValues = true
}
}
diff --git a/common/data-models/src/main/res/drawable/ic_soundcloud.xml b/common/data-models/src/main/res/drawable/ic_soundcloud.xml
new file mode 100644
index 00000000..faaf1945
--- /dev/null
+++ b/common/data-models/src/main/res/drawable/ic_soundcloud.xml
@@ -0,0 +1,14 @@
+
+
+
+
+