diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..f6770c9a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,114 @@
+/fuzzywuzzy/app/build/
+/desktop/build/classes/kotlin/jvm/main/META-INF/desktop.kotlin_module
+/desktop/build/classes/kotlin/jvm/main/ComposableSingletons$MainKt$lambda-1$1$1.class
+/desktop/build/classes/kotlin/jvm/main/ComposableSingletons$MainKt$lambda-1$1.class
+/desktop/build/classes/kotlin/jvm/main/ComposableSingletons$MainKt$lambda-2$1.class
+/desktop/build/classes/kotlin/jvm/main/ComposableSingletons$MainKt$lambda-3$1.class
+/desktop/build/classes/kotlin/jvm/main/ComposableSingletons$MainKt.class
+/desktop/build/classes/kotlin/jvm/main/MainKt$spotiFlyerRoot$1.class
+/desktop/build/classes/kotlin/jvm/main/MainKt.class
+/desktop/build/processedResources/jvm/main/drawable/ic_arrow.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_download_arrow.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_error.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_gaana.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_github.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_heart.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_history.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_instagram.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_linkedin.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_mug.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_musicplaceholder.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_refreshgradient.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_round_cancel_24.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_share_open.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_song_placeholder.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_spotiflyer_logo.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_spotify_logo.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_tick.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_youtube.xml
+/desktop/build/processedResources/jvm/main/drawable/ic_youtube_music_logo.xml
+/desktop/build/processedResources/jvm/main/drawable/music.xml
+/desktop/build/compose/tmp/createRuntimeImage.args.txt
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/inputs/source-to-output.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/inputs/source-to-output.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/inputs/source-to-output.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/inputs/source-to-output.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/inputs/source-to-output.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/inputs/source-to-output.tab_i
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/inputs/source-to-output.tab_i.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/internal-name-to-source.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/package-parts.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/package-parts.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/package-parts.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/package-parts.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/package-parts.tab_i
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/package-parts.tab_i.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/proto.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/proto.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/proto.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/proto.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/proto.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/proto.tab_i
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/proto.tab_i.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/source-to-classes.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/source-to-classes.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/source-to-classes.tab_i
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/counters.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/file-to-id.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/file-to-id.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/file-to-id.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/file-to-id.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/file-to-id.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/file-to-id.tab_i
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/file-to-id.tab_i.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/id-to-file.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/id-to-file.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/id-to-file.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/id-to-file.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/id-to-file.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/lookups.tab
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/lookups.tab.keystream
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/lookups.tab.keystream.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/lookups.tab.len
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/lookups.tab.values.at
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/lookups.tab_i
+/desktop/build/kotlin/compileKotlinJvm/caches-jvm/lookups/lookups.tab_i.len
+/desktop/build/kotlin/compileKotlinJvm/build-history.bin
+/desktop/build/kotlin/compileKotlinJvm/last-build.bin
+/desktop/build/libs/desktop-jvm-2.2.jar
+/desktop/build/libs/desktop-metadata-2.2.jar
+/desktop/build/libs/desktop-metadata-2.2-sources.jar
+/desktop/build/tmp/jvmJar/MANIFEST.MF
+/desktop/build/tmp/metadataJar/MANIFEST.MF
+/desktop/build/tmp/metadataSourcesJar/MANIFEST.MF
+/desktop/build/tmp/packageUberJarForCurrentOS/MANIFEST.MF
+/common/dependency-injection/build/classes/kotlin/desktop/main/
+/common/dependency-injection/build/
+/common/database/build/generated/sqldelight/code/Database/com/shabinder/
+/.gradle/
+/.idea/
+/local.properties
+/android/build/
+/buildSrc/build/pluginUnderTestMetadata/
+/common/compose-ui/build/classes/kotlin/desktop/main/
+/common/data-models/build/classes/kotlin/desktop/main/
+/common/data-models/build/
+/common/database/build/classes/kotlin/desktop/main/
+/common/database/build/
+/build/
+/common/compose-ui/build/
+/buildSrc/.gradle/
+/buildSrc/build/
+/buildSrc/buildSrc/.gradle/
+/buildSrc/buildSrc/build/
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 47355ca1..313a7033 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -46,20 +46,10 @@ android {
exclude(group = "androidx.compose.ui")
}
}
- // Remove After upgrading dependency
- configurations.all {
- resolutionStrategy.eachDependency {
- if (requested.group.contains("org.jetbrains.compose")) {
- useVersion("0.3.0-build146")
- because("wait for decompose to upgrade too")
- }
- }
- }
packagingOptions {
exclude("META-INF/*")
}
- /*
- buildFeatures {
+ /*buildFeatures {
compose = true
}
kotlinOptions {
@@ -70,15 +60,12 @@ android {
dependencies {
implementation(compose.material)
implementation(compose.materialIconsExtended)
+ implementation(Androidx.androidxActivity)
implementation(project(":common:database"))
implementation(project(":common:compose-ui"))
implementation(project(":common:dependency-injection"))
implementation(project(":common:data-models"))
- implementation(Androidx.appCompat)
-
- //Compose-Navigation
- //implementation(Androidx.composeNavigation)
implementation(Koin.android)
implementation(Koin.androidViewModel)
@@ -87,10 +74,6 @@ dependencies {
implementation(Decompose.decompose)
implementation(Decompose.extensionsCompose)
/*
- implementation(Androidx.coroutines)
- implementation(Androidx.core)
- implementation(Androidx.palette)
-
//Lifecycle
Versions.androidLifecycle.let{
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$it")
diff --git a/android/src/main/java/com/shabinder/android/MainActivity.kt b/android/src/main/java/com/shabinder/android/MainActivity.kt
index feddfa53..8c8a80bf 100644
--- a/android/src/main/java/com/shabinder/android/MainActivity.kt
+++ b/android/src/main/java/com/shabinder/android/MainActivity.kt
@@ -7,8 +7,8 @@ import android.os.Build
import android.os.Bundle
import android.os.PowerManager
import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
import com.arkivanov.decompose.ComponentContext
-import androidx.compose.ui.platform.setContent
import com.arkivanov.decompose.extensions.compose.jetbrains.rootComponent
import com.arkivanov.mvikotlin.logging.store.LoggingStoreFactory
import com.arkivanov.mvikotlin.main.store.DefaultStoreFactory
diff --git a/buildSrc/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/buildSrc/src/main/kotlin/Versions.kt
index e21e6698..c0fdf6c3 100644
--- a/buildSrc/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/buildSrc/src/main/kotlin/Versions.kt
@@ -2,10 +2,11 @@
object Versions {
const val versionName = "2.2"
- const val kotlinVersion = "1.4.21-2"
+ const val kotlinVersion = "1.4.30"
const val coroutinesVersion = "1.4.2"
- //const val compose = "1.0.0-alpha11"
+ //const val compose = "1.0.0-alpha12"
+
const val coilVersion = "0.4.1"
//DI
const val koin = "3.0.0-alpha-4"
@@ -16,7 +17,7 @@ object Versions {
//Internet
const val ktor = "1.5.1"
- const val kotlinxSerialization = "1.0.1"
+ const val kotlinxSerialization = "1.1.0-RC"
//Database
const val sqlDelight = "1.4.4"
@@ -37,10 +38,9 @@ object Koin {
val androidViewModel = "org.koin:koin-androidx-viewmodel:${Versions.koin}"
}
object Androidx{
- const val appCompat = "androidx.appcompat:appcompat:1.2.0"
+ const val androidxActivity = "androidx.activity:activity-compose:1.3.0-alpha02"
const val core = "androidx.core:core-ktx:1.3.2"
const val palette = "androidx.palette:palette-ktx:1.0.0"
- const val composeNavigation = "androidx.navigation:navigation-compose:1.0.0-alpha06"
const val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.coroutinesVersion}"
const val junit = "androidx.test.ext:junit:1.1.2"
@@ -67,12 +67,12 @@ object JetBrains {
object Compose {
// __LATEST_COMPOSE_RELEASE_VERSION__
- private const val VERSION = "0.3.0-build146"
+ const val VERSION = "0.3.0-build150"
const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION"
}
}
object Decompose {
- private const val VERSION = "0.1.7"
+ private const val VERSION = "0.1.8"
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"
@@ -117,10 +117,9 @@ object Ktor {
}
object Extras {
- const val youtubeDownloader = "com.github.sealedtx:java-youtube-downloader:2.4.6"
+ const val youtubeDownloader = "com.github.sealedtx:java-youtube-downloader:2.5.0"
const val fuzzyWuzzy = "me.xdrop:fuzzywuzzy:1.3.1"
const val mp3agic = "com.mpatric:mp3agic:0.9.1"
- const val jsonKlaxon = "com.beust:klaxon:5.4"
const val kermit = "co.touchlab:kermit:${Versions.kermit}"
object Android {
val razorpay = "com.razorpay:checkout:1.6.4"
diff --git a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts
index 73261337..2a41b16d 100644
--- a/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts
+++ b/buildSrc/src/main/kotlin/multiplatform-compose-setup.gradle.kts
@@ -9,26 +9,36 @@ plugins {
kotlin {
jvm("desktop")
android()
-
+ // Remove After upgrading dependency
+ /*configurations.all {
+ resolutionStrategy.eachDependency {
+ if (requested.group.contains("org.jetbrains.compose")) {
+ useVersion(JetBrains.Compose.VERSION)
+ }
+ if (requested.group.contains("androidx.compose")) {
+ useVersion(Versions.compose)
+ }
+ }
+ }*/
sourceSets {
named("commonMain") {
dependencies {
- implementation(compose.runtime)
- implementation(compose.foundation)
- implementation(compose.material)
+ api(compose.runtime)
+ api(compose.foundation)
+ api(compose.material)
}
}
named("androidMain") {
dependencies {
- implementation(Androidx.appCompat)
- implementation(Androidx.core)
+ api("androidx.appcompat:appcompat:1.2.0")
+ api(Androidx.core)
}
}
named("desktopMain") {
dependencies {
- implementation(compose.desktop.common)
+ api(compose.desktop.common)
}
}
}
diff --git a/common/compose-ui/build.gradle.kts b/common/compose-ui/build.gradle.kts
index f4693654..2be19d62 100644
--- a/common/compose-ui/build.gradle.kts
+++ b/common/compose-ui/build.gradle.kts
@@ -11,9 +11,8 @@ kotlin {
commonMain {
dependencies {
implementation(compose.materialIconsExtended)
- //implementation("org.jetbrains.compose.material:material-icons-extended:0.3.0-build150")
implementation(project(":common:dependency-injection"))
- //implementation("com.alialbaali.kamel:kamel-image:0.0.7")
+ implementation("com.alialbaali.kamel:kamel-image:0.0.7")
implementation(project(":common:data-models"))
implementation(project(":common:database"))
implementation(SqlDelight.coroutineExtensions)
@@ -21,12 +20,6 @@ kotlin {
implementation(MVIKotlin.mvikotlin)
implementation(Decompose.decompose)
implementation(Decompose.extensionsCompose)
-
- //Coil-Image Loading
- /*Versions.coilVersion.let{
- implementation("dev.chrisbanes.accompanist:accompanist-coil:$it")
- implementation("dev.chrisbanes.accompanist:accompanist-insets:$it")
- }*/
}
}
}
diff --git a/common/compose-ui/src/androidMain/kotlin/com/shabinder/common/ui/AndroidImages.kt b/common/compose-ui/src/androidMain/kotlin/com/shabinder/common/ui/AndroidImages.kt
index 0a3efacc..1b4d8971 100644
--- a/common/compose-ui/src/androidMain/kotlin/com/shabinder/common/ui/AndroidImages.kt
+++ b/common/compose-ui/src/androidMain/kotlin/com/shabinder/common/ui/AndroidImages.kt
@@ -7,6 +7,21 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+
+actual fun montserratFont() = FontFamily(
+ Font(R.font.montserrat_light, FontWeight.Light),
+ Font(R.font.montserrat_regular, FontWeight.Normal),
+ Font(R.font.montserrat_medium, FontWeight.Medium),
+ Font(R.font.montserrat_semibold, FontWeight.SemiBold),
+)
+
+actual fun pristineFont() = FontFamily(
+ Font(R.font.pristine_script, FontWeight.Bold)
+)
+
@Composable
actual fun DownloadImageTick(){
diff --git a/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/root/SpotiFlyerRootUi.kt b/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/root/SpotiFlyerRootUi.kt
index 074419b4..7ddee810 100644
--- a/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/root/SpotiFlyerRootUi.kt
+++ b/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/root/SpotiFlyerRootUi.kt
@@ -59,7 +59,7 @@ fun AppBar(
Image(
imageVector = SpotiFlyerLogo(),
"SpotiFlyer Logo",
- Modifier.preferredSize(32.dp)
+ Modifier.preferredSize(32.dp),
)
Spacer(Modifier.padding(horizontal = 4.dp))
Text(
diff --git a/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/ui/Type.kt b/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/ui/Type.kt
index 52045321..46cd3f96 100644
--- a/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/ui/Type.kt
+++ b/common/compose-ui/src/commonMain/kotlin/com/shabinder/common/ui/Type.kt
@@ -23,48 +23,45 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
-/*private val Montserrat = fontFamily(
- font(R.font.montserrat_light, FontWeight.Light),
- font(R.font.montserrat_regular, FontWeight.Normal),
- font(R.font.montserrat_medium, FontWeight.Medium),
- font(R.font.montserrat_semibold, FontWeight.SemiBold),
-)*/
+
+expect fun montserratFont():FontFamily
+expect fun pristineFont():FontFamily
val SpotiFlyerTypography = Typography(
h1 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 96.sp,
fontWeight = FontWeight.Light,
lineHeight = 117.sp,
letterSpacing = (-1.5).sp
),
h2 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 60.sp,
fontWeight = FontWeight.Light,
lineHeight = 73.sp,
letterSpacing = (-0.5).sp
),
h3 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 48.sp,
fontWeight = FontWeight.Normal,
lineHeight = 59.sp
),
h4 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 30.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 37.sp
),
h5 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 24.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 29.sp
),
h6 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 18.sp,
fontWeight = FontWeight.Medium,
lineHeight = 26.sp,
@@ -72,49 +69,49 @@ val SpotiFlyerTypography = Typography(
),
subtitle1 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 20.sp,
letterSpacing = 0.5.sp
),
subtitle2 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 14.sp,
fontWeight = FontWeight.Medium,
lineHeight = 17.sp,
letterSpacing = 0.1.sp
),
body1 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 16.sp,
fontWeight = FontWeight.Medium,
lineHeight = 20.sp,
letterSpacing = 0.15.sp,
),
body2 = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 14.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 20.sp,
letterSpacing = 0.25.sp
),
button = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 14.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 16.sp,
letterSpacing = 1.25.sp
),
caption = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 12.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 16.sp,
letterSpacing = 0.sp
),
overline = TextStyle(
- //fontFamily = Montserrat,
+ fontFamily = montserratFont(),
fontSize = 12.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 16.sp,
@@ -123,10 +120,10 @@ val SpotiFlyerTypography = Typography(
)
val appNameStyle = TextStyle(
- fontFamily = FontFamily.Cursive,
+ fontFamily = pristineFont(),
fontSize = 40.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 42.sp,
letterSpacing = (1.5).sp,
color = Color(0xFFECECEC)
-)
+)
\ No newline at end of file
diff --git a/common/compose-ui/src/desktopMain/kotlin/com/shabinder/common/ui/DesktopImages.kt b/common/compose-ui/src/desktopMain/kotlin/com/shabinder/common/ui/DesktopImages.kt
index 4fac2d0b..13e0d0b5 100644
--- a/common/compose-ui/src/desktopMain/kotlin/com/shabinder/common/ui/DesktopImages.kt
+++ b/common/compose-ui/src/desktopMain/kotlin/com/shabinder/common/ui/DesktopImages.kt
@@ -6,6 +6,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.vectorXmlResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.platform.Font
@Composable
actual fun DownloadImageTick(){
@@ -15,6 +18,17 @@ actual fun DownloadImageTick(){
)
}
+actual fun montserratFont() = FontFamily(
+ Font("font/montserrat_light.ttf", FontWeight.Light),
+ Font("font/montserrat_regular.ttf", FontWeight.Normal),
+ Font("font/montserrat_medium.ttf", FontWeight.Medium),
+ Font("font/montserrat_semibold.ttf", FontWeight.SemiBold),
+)
+
+actual fun pristineFont() = FontFamily(
+ Font("font/pristine_script.ttf", FontWeight.Bold)
+)
+
@Composable
actual fun DownloadImageError(){
Image(
diff --git a/common/compose-ui/src/main/res/drawable/ic_instagram.xml b/common/compose-ui/src/main/res/drawable/ic_instagram.xml
new file mode 100644
index 00000000..1cd9bc2d
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_instagram.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/compose-ui/src/main/res/drawable/ic_linkedin.xml b/common/compose-ui/src/main/res/drawable/ic_linkedin.xml
new file mode 100644
index 00000000..8b177562
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_linkedin.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/compose-ui/src/main/res/drawable/ic_mug.xml b/common/compose-ui/src/main/res/drawable/ic_mug.xml
new file mode 100644
index 00000000..c8260781
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_mug.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/compose-ui/src/main/res/drawable/ic_musicplaceholder.xml b/common/compose-ui/src/main/res/drawable/ic_musicplaceholder.xml
new file mode 100644
index 00000000..7d304388
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_musicplaceholder.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/compose-ui/src/main/res/drawable/ic_refreshgradient.xml b/common/compose-ui/src/main/res/drawable/ic_refreshgradient.xml
new file mode 100644
index 00000000..47805ea8
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_refreshgradient.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/common/compose-ui/src/main/res/drawable/ic_round_cancel_24.xml b/common/compose-ui/src/main/res/drawable/ic_round_cancel_24.xml
new file mode 100644
index 00000000..a5eacb39
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_round_cancel_24.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
diff --git a/common/compose-ui/src/main/res/drawable/ic_share_open.xml b/common/compose-ui/src/main/res/drawable/ic_share_open.xml
new file mode 100644
index 00000000..dbd7c1a4
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_share_open.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/common/compose-ui/src/main/res/drawable/ic_song_placeholder.xml b/common/compose-ui/src/main/res/drawable/ic_song_placeholder.xml
new file mode 100644
index 00000000..04a9c803
--- /dev/null
+++ b/common/compose-ui/src/main/res/drawable/ic_song_placeholder.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/common/database/build.gradle.kts b/common/database/build.gradle.kts
index 41c593ca..51e15003 100644
--- a/common/database/build.gradle.kts
+++ b/common/database/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
commonMain {
dependencies {
implementation(project(":common:data-models"))
- implementation(Badoo.Reaktive.reaktive)
+ //implementation(Badoo.Reaktive.reaktive)
// SQL Delight
implementation(SqlDelight.runtime)
implementation(SqlDelight.coroutineExtensions)
diff --git a/desktop/build/processedResources/jvm/main/font/montserrat_light.ttf b/desktop/build/processedResources/jvm/main/font/montserrat_light.ttf
new file mode 100644
index 00000000..990857de
Binary files /dev/null and b/desktop/build/processedResources/jvm/main/font/montserrat_light.ttf differ
diff --git a/desktop/build/processedResources/jvm/main/font/montserrat_medium.ttf b/desktop/build/processedResources/jvm/main/font/montserrat_medium.ttf
new file mode 100644
index 00000000..6e079f69
Binary files /dev/null and b/desktop/build/processedResources/jvm/main/font/montserrat_medium.ttf differ
diff --git a/desktop/build/processedResources/jvm/main/font/montserrat_regular.ttf b/desktop/build/processedResources/jvm/main/font/montserrat_regular.ttf
new file mode 100644
index 00000000..8d443d5d
Binary files /dev/null and b/desktop/build/processedResources/jvm/main/font/montserrat_regular.ttf differ
diff --git a/desktop/build/processedResources/jvm/main/font/montserrat_semibold.ttf b/desktop/build/processedResources/jvm/main/font/montserrat_semibold.ttf
new file mode 100644
index 00000000..f8a43f2b
Binary files /dev/null and b/desktop/build/processedResources/jvm/main/font/montserrat_semibold.ttf differ
diff --git a/desktop/build/processedResources/jvm/main/font/pristine_script.ttf b/desktop/build/processedResources/jvm/main/font/pristine_script.ttf
new file mode 100644
index 00000000..e8d3e494
Binary files /dev/null and b/desktop/build/processedResources/jvm/main/font/pristine_script.ttf differ
diff --git a/desktop/src/jvmMain/kotlin/Main.kt b/desktop/src/jvmMain/kotlin/Main.kt
index 6eb5d30c..71fa0f9a 100644
--- a/desktop/src/jvmMain/kotlin/Main.kt
+++ b/desktop/src/jvmMain/kotlin/Main.kt
@@ -3,6 +3,7 @@ import androidx.compose.desktop.Window
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.Surface
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import com.arkivanov.decompose.ComponentContext
import com.arkivanov.decompose.extensions.compose.jetbrains.rootComponent
import com.arkivanov.mvikotlin.core.lifecycle.LifecycleRegistry
@@ -26,11 +27,14 @@ fun main(){
lifecycle.resume()
Window("SpotiFlyer") {
- Surface(modifier = Modifier.fillMaxSize()) {
+ Surface(
+ modifier = Modifier.fillMaxSize(),
+ color = Color.Black
+ ) {
DesktopMaterialTheme(
-// colors = SpotiFlyerColors,
-// typography = SpotiFlyerTypography,
-// shapes = SpotiFlyerShapes
+ colors = SpotiFlyerColors,
+ typography = SpotiFlyerTypography,
+ shapes = SpotiFlyerShapes
) {
SpotiFlyerRootContent(rootComponent(factory = ::spotiFlyerRoot))
}
diff --git a/desktop/src/jvmMain/resources/drawable/ic_history.xml b/desktop/src/jvmMain/resources/drawable/ic_history.xml
deleted file mode 100644
index 177c461f..00000000
--- a/desktop/src/jvmMain/resources/drawable/ic_history.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/desktop/src/jvmMain/resources/font/montserrat_light.ttf b/desktop/src/jvmMain/resources/font/montserrat_light.ttf
new file mode 100644
index 00000000..990857de
Binary files /dev/null and b/desktop/src/jvmMain/resources/font/montserrat_light.ttf differ
diff --git a/desktop/src/jvmMain/resources/font/montserrat_medium.ttf b/desktop/src/jvmMain/resources/font/montserrat_medium.ttf
new file mode 100644
index 00000000..6e079f69
Binary files /dev/null and b/desktop/src/jvmMain/resources/font/montserrat_medium.ttf differ
diff --git a/desktop/src/jvmMain/resources/font/montserrat_regular.ttf b/desktop/src/jvmMain/resources/font/montserrat_regular.ttf
new file mode 100644
index 00000000..8d443d5d
Binary files /dev/null and b/desktop/src/jvmMain/resources/font/montserrat_regular.ttf differ
diff --git a/desktop/src/jvmMain/resources/font/montserrat_semibold.ttf b/desktop/src/jvmMain/resources/font/montserrat_semibold.ttf
new file mode 100644
index 00000000..f8a43f2b
Binary files /dev/null and b/desktop/src/jvmMain/resources/font/montserrat_semibold.ttf differ
diff --git a/desktop/src/jvmMain/resources/font/pristine_script.ttf b/desktop/src/jvmMain/resources/font/pristine_script.ttf
new file mode 100644
index 00000000..e8d3e494
Binary files /dev/null and b/desktop/src/jvmMain/resources/font/pristine_script.ttf differ