Skip to content

Commit 3959b0a

Browse files
committed
Revert "Create interface for all Render Models"
This reverts commit 1058546.
1 parent 4c82651 commit 3959b0a

29 files changed

+126
-208
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Copyright © 2023 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.data.abstraction.remote
33

4-
import com.yesferal.hornsapp.core.domain.entity.render.CategoryRenderContract
5-
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRenderContract
4+
import com.yesferal.hornsapp.core.domain.entity.render.CategoryRender
5+
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRender
66
import kotlinx.coroutines.flow.Flow
77

88
interface RenderRemoteDataSource {
9-
val homeRender: Flow<List<ScreenRenderContract>>
10-
val categoryRender: Flow<List<CategoryRenderContract>>
9+
val homeRender: Flow<List<ScreenRender>>
10+
val categoryRender: Flow<List<CategoryRender>>
1111
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Copyright © 2023 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.data.abstraction.remote
33

4-
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRenderContract
4+
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRender
55
import com.yesferal.hornsapp.core.domain.util.HaResult
66

77
interface ReviewRemoteDataSource {
8-
suspend fun getReview(id: String): HaResult<ScreenRenderContract>
8+
suspend fun getReview(id: String): HaResult<ScreenRender>
99
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.yesferal.hornsapp.core.data.abstraction.storage
22

3-
import com.yesferal.hornsapp.core.domain.entity.render.AppRenderContract
3+
import com.yesferal.hornsapp.core.domain.entity.render.AppRender
44

55
interface RenderStorageDataSource {
6-
fun getAppRender(): AppRenderContract?
7-
fun updateAppRender(appRender: AppRenderContract)
6+
fun getAppRender(): AppRender?
7+
fun updateAppRender(appRender: AppRender)
88
}

src/commonMain/kotlin/com/yesferal/hornsapp/core/data/repository/RenderRepositoryImpl.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ package com.yesferal.hornsapp.core.data.repository
33

44
import com.yesferal.hornsapp.core.data.abstraction.remote.RenderRemoteDataSource
55
import com.yesferal.hornsapp.core.domain.abstraction.RenderRepository
6-
import com.yesferal.hornsapp.core.domain.entity.render.CategoryRenderContract
7-
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRenderContract
6+
import com.yesferal.hornsapp.core.domain.entity.render.CategoryRender
7+
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRender
88
import kotlinx.coroutines.flow.Flow
99

1010
class RenderRepositoryImpl(private val renderRemoteDataSource: RenderRemoteDataSource): RenderRepository {
1111

12-
override fun getHomeRender(): Flow<List<ScreenRenderContract>> {
12+
override fun getHomeRender(): Flow<List<ScreenRender>> {
1313
return renderRemoteDataSource.homeRender
1414
}
1515

16-
override fun getCategoryRender(): Flow<List<CategoryRenderContract>> {
16+
override fun getCategoryRender(): Flow<List<CategoryRender>> {
1717
return renderRemoteDataSource.categoryRender
1818
}
1919
}

src/commonMain/kotlin/com/yesferal/hornsapp/core/data/repository/ServerDrivenRepositoryImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package com.yesferal.hornsapp.core.data.repository
33

44
import com.yesferal.hornsapp.core.data.abstraction.remote.ReviewRemoteDataSource
55
import com.yesferal.hornsapp.core.domain.abstraction.ServerDrivenRepository
6-
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRenderContract
6+
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRender
77
import com.yesferal.hornsapp.core.domain.util.HaResult
88

99
class ServerDrivenRepositoryImpl(
1010
private val reviewRemoteDataSource: ReviewRemoteDataSource
1111
): ServerDrivenRepository {
12-
override suspend fun getReview(id: String): HaResult<ScreenRenderContract> {
12+
override suspend fun getReview(id: String): HaResult<ScreenRender> {
1313
return reviewRemoteDataSource.getReview(id)
1414
}
1515
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Copyright © 2023 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.domain.abstraction
33

4-
import com.yesferal.hornsapp.core.domain.entity.render.CategoryRenderContract
5-
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRenderContract
4+
import com.yesferal.hornsapp.core.domain.entity.render.CategoryRender
5+
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRender
66
import kotlinx.coroutines.flow.Flow
77

88
interface RenderRepository {
9-
fun getHomeRender(): Flow<List<ScreenRenderContract>>
10-
fun getCategoryRender(): Flow<List<CategoryRenderContract>>
9+
fun getHomeRender(): Flow<List<ScreenRender>>
10+
fun getCategoryRender(): Flow<List<CategoryRender>>
1111
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Copyright © 2023 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.domain.abstraction
33

4-
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRenderContract
4+
import com.yesferal.hornsapp.core.domain.entity.render.ScreenRender
55
import com.yesferal.hornsapp.core.domain.util.HaResult
66

77
interface ServerDrivenRepository {
88
suspend fun getReview(
99
id: String
10-
): HaResult<ScreenRenderContract>
10+
): HaResult<ScreenRender>
1111
}

src/commonMain/kotlin/com/yesferal/hornsapp/core/domain/entity/Concert.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright © 2025 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.domain.entity
33

4-
import com.yesferal.hornsapp.core.domain.entity.render.ViewRenderContract
4+
import com.yesferal.hornsapp.core.domain.entity.render.ViewRender
55

66
data class Concert constructor(
77
val id: String,
@@ -13,7 +13,7 @@ data class Concert constructor(
1313
val headlinerImageUrl: String?,
1414
val ticketingName: String?,
1515
val ticketingUrl: String?,
16-
val links: List<ViewRenderContract>?,
16+
val links: List<ViewRender>?,
1717
val categories: List<String>?,
1818
val venue: Venue?,
1919
val state: State?,
@@ -30,7 +30,7 @@ data class Concert constructor(
3030
private var headlinerImageUrl: String? = null
3131
private var ticketingName: String? = null
3232
private var ticketingUrl: String? = null
33-
private var links: List<ViewRenderContract>? = null
33+
private var links: List<ViewRender>? = null
3434
private var categories: List<String>? = null
3535
private var venue: Venue? = null
3636
private var state: State? = null
@@ -70,7 +70,7 @@ data class Concert constructor(
7070
this.ticketingUrl = ticketingUrl
7171
}
7272

73-
fun addLinks(links: List<ViewRenderContract>?) = apply {
73+
fun addLinks(links: List<ViewRender>?) = apply {
7474
this.links = links
7575
}
7676

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
/* Copyright © 2023 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.domain.entity.render
33

4-
interface AppRenderContract {
5-
val platform: String?
6-
val appId: String?
7-
val docVersion: Long?
8-
val appVersion: Long?
9-
val screens: List<ScreenRenderContract>?
10-
val categories: List<CategoryRenderContract>?
11-
}
12-
134
data class AppRender(
14-
override val platform: String?,
15-
override val appId: String?,
16-
override val docVersion: Long?,
17-
override val appVersion: Long?,
18-
override val screens: List<ScreenRenderContract>?,
19-
override val categories: List<CategoryRenderContract>?
20-
) : AppRenderContract
5+
val platform: String?,
6+
val appId: String?,
7+
val docVersion: Long?,
8+
val appVersion: Long?,
9+
val screens: List<ScreenRender>?,
10+
val categories: List<CategoryRender>?
11+
)
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
/* Copyright © 2023 HornsApp. All rights reserved. */
22
package com.yesferal.hornsapp.core.domain.entity.render
33

4-
import com.yesferal.hornsapp.core.domain.entity.util.LocalizedStringContract
5-
6-
interface CategoryRenderContract {
7-
val _id: String?
8-
val name: LocalizedStringContract?
4+
import com.yesferal.hornsapp.core.domain.entity.util.LocalizedString
95

6+
data class CategoryRender(
7+
val _id: String?,
8+
val name: LocalizedString?,
9+
) {
1010
companion object {
1111
const val ALL = "ALL"
1212
}
1313
}
14-
15-
data class CategoryRender(
16-
override val _id: String?,
17-
override val name: LocalizedStringContract?
18-
) : CategoryRenderContract

0 commit comments

Comments
 (0)