Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
115 commits
Select commit Hold shift + click to select a range
5efb5e9
[ISSUE-1] - add ktor in the .toml and update gradle
rviannaoliveira Dec 2, 2024
057c4b2
[ISSUE-1] - implementing httpclient ktor
rviannaoliveira Dec 3, 2024
4359f0e
[ISSUE-1] - bugs fixes
rviannaoliveira Dec 3, 2024
cf1103f
[ISSUE-1] - bugs fixes
rviannaoliveira Dec 3, 2024
e6f9658
[ISSUE-1] - improvements
rviannaoliveira Dec 3, 2024
3a1efac
[ISSUE-1] - improvements
rviannaoliveira Dec 3, 2024
19e9d55
[ISSUE-1] - improvements
rviannaoliveira Dec 3, 2024
4a06ea7
[ISSUE-1] - apply suggestions
rviannaoliveira Dec 9, 2024
a1a9434
Merge pull request #2 from CodandoTV/improvement/retroft-ktor-1
rviannaoliveira Dec 9, 2024
a647227
[ISSUE-2] - 🔥 migrating android para KMP module list
rviannaoliveira Dec 10, 2024
41cb6a2
[ISSUE-2] - 🔥 migrating android para KMP module list / koin
rviannaoliveira Dec 12, 2024
ece7a9d
[ISSUE-2] - 🔥 migrating android para KMP module list
rviannaoliveira Dec 13, 2024
f3d19ca
[ISSUE-2] - 🔥 migrating android para KMP module list
rviannaoliveira Dec 13, 2024
84ce65a
[ISSUE-2] - 🔥 migrating android para KMP module list
rviannaoliveira Dec 17, 2024
8d38d07
[ISSUE-2] - 🔥 migrating detail to kmp module
rviannaoliveira Dec 18, 2024
9e7e880
[ISSUE-2] - 🔥 migrating detail to kmp module
rviannaoliveira Dec 18, 2024
b8ba5fc
[ISSUE-2] - 🔥 migrating detail to kmp module
rviannaoliveira Dec 18, 2024
4c70844
[ISSUE-2] - 🔥 migrating detail to kmp module
rviannaoliveira Dec 18, 2024
3a2584b
[ISSUE-2] - 🔥 migrating search to kmp module
rviannaoliveira Dec 18, 2024
b0dbb54
[ISSUE-2] - 🔥 migrating search to kmp module
rviannaoliveira Dec 18, 2024
00746e6
[ISSUE-2] - PRs suggestions
rviannaoliveira Dec 23, 2024
c05cdd6
[ISSUE-2] - PRs suggestions
rviannaoliveira Dec 23, 2024
22c90d0
[ISSUE-2] - PRs suggestions
rviannaoliveira Dec 23, 2024
7536be3
Merge pull request #4 from CodandoTV/improvement/module-android-to-kmp
rviannaoliveira Dec 24, 2024
c3c02d4
[ISSUE-2] - removing block unnecessary
rviannaoliveira Dec 31, 2024
a58631c
[ISSUE-3] - core-shared-ui to androidMain
rviannaoliveira Jan 15, 2025
23ffc5b
[ISSUE-3] - core-shared to androidMain
rviannaoliveira Jan 15, 2025
5cf3d80
[ISSUE-3] - core-networking to androidMain
rviannaoliveira Jan 15, 2025
a9563f8
[ISSUE-3] - core-navigation to androidMain
rviannaoliveira Jan 16, 2025
29822f7
[ISSUE-3] - core-localstorage to androidMain
rviannaoliveira Jan 18, 2025
0d26e1a
[ISSUE-3] - feature-profile to androidMain
rviannaoliveira Jan 18, 2025
d2678f7
[ISSUE-3] - feature-profile to androidMain
rviannaoliveira Jan 18, 2025
22d31c8
[ISSUE-3] - remove feature-favorite because havent nothing and remove…
rviannaoliveira Jan 18, 2025
28a5262
[ISSUE-3] - module app to kmp
rviannaoliveira Jan 19, 2025
8e76edf
[ISSUE-3] - module app to composeApp
rviannaoliveira Jan 19, 2025
c42fd53
[ISSUE-3] - test to commonTest
rviannaoliveira Jan 19, 2025
f6f7f44
Merge pull request #5 from CodandoTV/improvement/issue-3-android-kmp
gabrielbmoro Jan 20, 2025
77a30eb
[ISSUE-6] - detail and profile androidMain to CommonMain
rviannaoliveira Jan 27, 2025
65cb719
[ISSUE-6] - search and app AndroidMain to commonMain
rviannaoliveira Jan 27, 2025
2c703a1
Migrate paging library to KMP
gabrielbmoro Jan 28, 2025
077cad6
Using existing commonMain block
gabrielbmoro Jan 28, 2025
19d05a3
[ISSUE-6] - commonMain AndroidMain to commonMain
rviannaoliveira Jan 28, 2025
e3a4801
[ISSUE-6] - networking AndroidMain to commonMain
rviannaoliveira Jan 29, 2025
d3d419e
Merge pull request #7 from CodandoTV/feature/paging-migration
rviannaoliveira Jan 30, 2025
5f33c4b
Migrate paging library to KMP
gabrielbmoro Jan 28, 2025
b202343
Using existing commonMain block
gabrielbmoro Jan 28, 2025
a681aaa
[ISSUE-6] - list AndroidMain to commonMain and create plugin to ksp
rviannaoliveira Jan 30, 2025
eaa33fb
[ISSUE-6] - local-storage and navigation AndroidMain to commonMain
rviannaoliveira Jan 30, 2025
eafbd19
[ISSUE-6] - remove ksp
rviannaoliveira Jan 30, 2025
1e493fb
Merge remote-tracking branch 'origin/master' into issue-6/androidMain…
rviannaoliveira Jan 30, 2025
c1e6a0f
[ISSUE-9] - migrate strings.xml from detail
rviannaoliveira Jan 30, 2025
ded86fe
[ISSUE-6] - remove plugin and migrate core-shared-ui android to common
rviannaoliveira Jan 31, 2025
97802f7
Merge branch 'issue-6/androidMain-to-commonMain' into issue-9/migrati…
rviannaoliveira Jan 31, 2025
132a5ca
[ISSUE-9] - migration string resources: list, profile, search, coresh…
rviannaoliveira Jan 31, 2025
767bf14
[ISSUE-9] - migration string resources: navigation
rviannaoliveira Jan 31, 2025
823363c
[ISSUE-9] - migration string resources: networking
rviannaoliveira Jan 31, 2025
c9abaf1
[ISSUE-9] - migration string resources: improvements
rviannaoliveira Feb 1, 2025
0e95560
[ISSUE-11] - migration all easy drawable
rviannaoliveira Feb 1, 2025
79fdbcf
[ISSUE-11] - improve and remove some resources
rviannaoliveira Feb 1, 2025
61c9ad3
Merge pull request #8 from CodandoTV/issue-6/androidMain-to-commonMain
gabrielbmoro Feb 1, 2025
f12c41d
[ISSUE-13] - migration room
rviannaoliveira Feb 2, 2025
c2ad8a2
[ISSUE-13] - fix bug annotation
rviannaoliveira Feb 2, 2025
f419cf2
[ISSUE-13] - fix bug room
rviannaoliveira Feb 2, 2025
83de10f
Merge pull request #10 from CodandoTV/issue-9/migration-resources
rviannaoliveira Feb 2, 2025
9a73f62
Merge pull request #12 from CodandoTV/issue-11/migration-resources
rviannaoliveira Feb 2, 2025
b077572
Merge pull request #15 from CodandoTV/issue-13/migration-room
rviannaoliveira Feb 2, 2025
48d9600
Solve local storage module
gabrielbmoro Feb 2, 2025
9233012
Migrate core-networking to androidMain
gabrielbmoro Feb 3, 2025
89717f7
Migrate core-networking to androidMain
gabrielbmoro Feb 3, 2025
881624d
Migrate core-local-storage to androidMain
gabrielbmoro Feb 3, 2025
331540d
Remove unnecessary annotations + add ktor dependencies to the client …
gabrielbmoro Feb 3, 2025
5905ff1
Format build.gradle dependencies
gabrielbmoro Feb 3, 2025
9eda793
Dependencies cleanup
gabrielbmoro Feb 3, 2025
aeddeae
VideoPlayer dependency isolation
gabrielbmoro Feb 3, 2025
48b3de5
Enable iosTarget but not implementing it
gabrielbmoro Feb 3, 2025
78783ab
Lottie is also android specific
gabrielbmoro Feb 3, 2025
45264b7
Bringing back the build configs variables
gabrielbmoro Feb 5, 2025
3831391
Bringing back the ksp configuration for iOS
gabrielbmoro Feb 5, 2025
c45120d
Add platform suffix to the httpClientEngineProvider
gabrielbmoro Feb 5, 2025
bf70520
Add platform suffix to the Playercomponent
gabrielbmoro Feb 5, 2025
88d61b0
Merge pull request #18 from CodandoTV/feature/issue-17-commonMain-to-…
gabrielbmoro Feb 9, 2025
52a9803
Move previews to androidMain
gabrielbmoro Feb 11, 2025
aac5b78
[ISSUE-21/24] - remove lifecycle and add remember Koin
rviannaoliveira Feb 13, 2025
1b3376f
Revert "[ISSUE-21/24] - remove lifecycle and add remember Koin"
rviannaoliveira Feb 13, 2025
3184308
[ISSUE-21/24] - remove lifecycle and add remember Koin
rviannaoliveira Feb 13, 2025
4a8f2f9
Merge pull request #23 from CodandoTV/feature/issue-22-move-previews
gabrielbmoro Feb 13, 2025
fbbee50
Isolate lottie specific implementation
gabrielbmoro Feb 15, 2025
6e5061d
Isolate MainActivity and CustomApplication class - Android specific
gabrielbmoro Feb 15, 2025
1f666a1
Merge branch 'master' into issue-21-24/remove-lifecycle-koin
rviannaoliveira Feb 16, 2025
bbb12cd
[ISSUE-21/24] - remove lifecycle and add remember Koin
rviannaoliveira Feb 16, 2025
a3cf1cc
Merge pull request #25 from CodandoTV/issue-21-24/remove-lifecycle-koin
rviannaoliveira Feb 16, 2025
0d8e0d5
Merge pull request #28 from CodandoTV/gmoro/issue-27-isolate-main-act…
rviannaoliveira Feb 16, 2025
59af54f
Merge pull request #26 from CodandoTV/gmoro/issue-19-isolate-lottie-s…
gabrielbmoro Feb 16, 2025
3716dc0
[ISSUE-16] - add iOSApp
rviannaoliveira Feb 17, 2025
17cbe35
[ISSUE-16] - add iOSApp
rviannaoliveira Feb 18, 2025
5def70a
[ISSUE-16] - add iOSApp
rviannaoliveira Feb 18, 2025
76c3aa4
[ISSUE-16] - move commonMain to androidMain
rviannaoliveira Feb 18, 2025
890bd36
[ISSUE-16] - downgrade sqlite
rviannaoliveira Feb 18, 2025
0213df8
Replace paging library for paging library provided by cash app team
gabrielbmoro Feb 19, 2025
c4efcec
Solving some issues with: coil + lifecycle problems + koin view model…
gabrielbmoro Feb 19, 2025
706453b
🔥🔥🔥🔥 Compile on iOS
gabrielbmoro Feb 20, 2025
6b46a47
Merge pull request #40 from CodandoTV/issue-16/create-ios-app
rviannaoliveira Feb 24, 2025
5e99a07
[ISSUE-16] - downgrade agp to work with android
rviannaoliveira Feb 25, 2025
bd63968
Lottie animation for android - compatible multiplatform way
gabrielbmoro Feb 25, 2025
1586a46
Lottie animation for iOS - compatible multiplatform way
gabrielbmoro Feb 25, 2025
d501d07
Lottie animation for iOS - compatible multiplatform way
gabrielbmoro Feb 25, 2025
25bede9
ios build
pnalvarez Feb 25, 2025
0b0fc4b
initializing koin in ios app
pnalvarez Feb 26, 2025
70525b3
Merge pull request #42 from CodandoTV/issue-17/koin-ios
pnalvarez Feb 28, 2025
e505b14
Merge remote-tracking branch 'origin/master' into feature/lottie-anim…
rviannaoliveira Mar 3, 2025
5f45b2a
lottie animation
rviannaoliveira Mar 6, 2025
6bc3c0d
lottie
rviannaoliveira Mar 8, 2025
9a54339
lottie
rviannaoliveira Mar 8, 2025
7d5a876
lottie background black
rviannaoliveira Mar 8, 2025
b3d110e
finish lottie
rviannaoliveira Mar 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
/captures
.externalNativeBuild
.cxx
.kotlin
local.properties
31 changes: 0 additions & 31 deletions app/build.gradle.kts

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions app/src/main/res/xml/backup_rules.xml

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/res/xml/data_extraction_rules.xml

This file was deleted.

This file was deleted.

6 changes: 5 additions & 1 deletion build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@ plugins {
}

repositories {
mavenCentral()
google()
mavenCentral()
gradlePluginPortal()
maven(url = "https://plugins.gradle.org/m2/")
}

dependencies {
implementation(libs.android.gradle.plugin)
implementation(libs.kotlin.gradle.plugin)
implementation(libs.kover.gradle.plugin)
implementation(libs.detekt.gradle.plugin)
implementation(libs.serialization)
implementation(libs.com.google.devtools.ksp.gradle.plugin)
}
22 changes: 12 additions & 10 deletions build-logic/src/main/java/Config.kt
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
object Config {
const val applicationId = "com.codandotv.streamplayerapp"
const val compileSdkVersion = 34
const val minSdkVersion = 24
const val targetSdkVersion = 34
const val appName = "streamplayerapp"
const val applicationId = "com.codandotv.$appName"
const val compileSdkVersion = 35
const val minSdkVersion = 28
const val targetSdkVersion = 35
const val versionName = "1.0"
const val versionCode = 1
const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

object BuildField {
const val host_debug = "\"https://api.themoviedb.org/3/\""
const val host_release = "\"https://api.themoviedb.org/3/\""
const val api_profile_debug = "\"https://demo3364084.mockable.io/\""
const val api_profile_release = "\"https://demo3364084.mockable.io/\""
const val host_debug = "https://api.themoviedb.org/3/"
const val host_release = "https://api.themoviedb.org/3/"
const val api_profile_debug = "https://demo3364084.mockable.io/"
const val api_profile_release = "https://demo3364084.mockable.io/"

private const val tmdb_token_name_debug = "TMDB_BEARER_TOKEN_DEBUG"
private const val tmdb_token_name_release = "TMDB_BEARER_TOKEN_RELEASE"

private const val bearear_without_environment = "eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJiNDg2NWM4YTAzNzhmM2I4NjI0OWU1ZjNiYWFiMjU2NyIsInN1YiI6IjY0Mjk4YTg5YTNlNGJhMWM0NDgzM2U4OCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.9cIxv29vkaZ2yW88DIFRUFK_nXbK2b6KS8t96kA8WAE"

val api_bearer_debug = "\"Bearer ${System.getenv(tmdb_token_name_debug) ?: bearear_without_environment}\""
val api_bearer_release = "\"Bearer ${System.getenv(tmdb_token_name_release) ?: bearear_without_environment}\""
val api_bearer = System.getenv(tmdb_token_name_debug) ?: bearear_without_environment
val api_bearer_debug = System.getenv(tmdb_token_name_debug) ?: bearear_without_environment
val api_bearer_release = System.getenv(tmdb_token_name_release) ?: bearear_without_environment
}
}
12 changes: 0 additions & 12 deletions build-logic/src/main/java/Keys.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@

import extensions.dokkaPlugin
import extensions.getLibrary
import extensions.iosTarget
import extensions.setupAndroidDefaultConfig
import extensions.setupCompileOptions
import extensions.setupCompose
import extensions.setupPackingOptions
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")

plugins {
id("com.android.application")
id("kotlin-android")
id("org.jetbrains.kotlin.multiplatform")
id("kotlin-kapt")
id("kotlin-parcelize")
id("com.streamplayer.dokka")
Expand All @@ -20,14 +22,23 @@ plugins {
}
val catalog: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")

kotlin {
androidTarget {
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

iosTarget()
}

android {
namespace = Config.applicationId

setupCompileOptions()
setupPackingOptions()
setupAndroidDefaultConfig()
setupCompose(catalog)

defaultConfig {
applicationId = Config.applicationId
Expand Down
22 changes: 0 additions & 22 deletions build-logic/src/main/java/com.streamplayer.compose.gradle.kts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,38 @@

import extensions.dokkaPlugin
import extensions.getLibrary
import extensions.iosTarget
import extensions.setupAndroidDefaultConfig
import extensions.setupCompileOptions
import extensions.setupNameSpace
import extensions.setupPackingOptions
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")

val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
plugins {
id("org.jetbrains.kotlin.multiplatform")
id("com.android.library")
id("kotlin-android")
id("org.jetbrains.kotlin.plugin.serialization")
id("kotlin-kapt")
id("kotlin-parcelize")
id("com.streamplayer.dokka")
id("org.jetbrains.kotlinx.kover")
id("com.streamplayer.detekt")
}

kotlin {
androidTarget {
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}

iosTarget()
}

android {
setupNameSpace(project)

Expand All @@ -44,4 +59,4 @@ android {

dependencies {
dokkaPlugin(libs.getLibrary("dokka"))
}
}
Loading
Loading