Skip to content

Commit 1d4f775

Browse files
shinhyoshinhyo
committed
fix: api
1 parent dcf79ec commit 1d4f775

File tree

6 files changed

+20
-58
lines changed

6 files changed

+20
-58
lines changed

‎core/model/src/main/java/io/github/shinhyo/brba/core/model/BrbaCharacter.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@ data class BrbaCharacter(
2121
val charId: Long = -1,
2222
val name: String = "",
2323
val birthday: String = "",
24-
val occupation: List<String> = listOf(),
2524
val img: String = "",
2625
val status: String = "",
2726
val nickname: String = "",
28-
val appearance: List<Int> = listOf(),
2927
val portrayed: String = "",
3028
val category: String = "",
31-
val betterCallSaulAppearance: List<Int> = listOf(),
3229
val ratio: Float = 1f,
3330
val favorite: Boolean = false,
3431
val ctime: Date? = null,

‎core/network/src/main/java/io/github/shinhyo/brba/core/network/model/Character.kt‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,27 @@
1616
package io.github.shinhyo.brba.core.network.model
1717

1818
import com.google.gson.annotations.SerializedName
19+
import io.github.shinhyo.brba.core.model.BrbaCharacter
1920

2021
data class Character(
2122
@SerializedName("char_id")
22-
val charId: Long = 0,
23-
val name: String = "",
24-
val birthday: String = "",
25-
val occupation: List<String> = listOf(),
26-
val img: String = "",
27-
val status: String = "",
28-
val nickname: String = "",
29-
val appearance: List<Int> = listOf(),
30-
val portrayed: String = "",
31-
val category: String = "",
32-
@SerializedName("better_call_saul_appearance")
33-
val betterCallSaulAppearance: List<Int> = listOf(),
23+
val charId: Long?,
24+
val name: String?,
25+
val birthday: String?,
26+
val img: String?,
27+
val status: String?,
28+
val nickname: String?,
29+
val portrayed: String?,
30+
val category: String?,
3431
)
3532

36-
fun Character.asExternalModel() = io.github.shinhyo.brba.core.model.BrbaCharacter(
37-
charId = charId,
38-
name = name,
39-
birthday = birthday,
40-
occupation = occupation,
41-
img = img,
42-
status = status,
43-
nickname = nickname,
44-
appearance = appearance,
45-
portrayed = portrayed,
46-
category = category,
47-
betterCallSaulAppearance = betterCallSaulAppearance
33+
fun Character.asExternalModel() = BrbaCharacter(
34+
charId = charId ?: -1,
35+
name = name ?: "",
36+
birthday = birthday ?: "",
37+
img = img ?: "",
38+
status = status ?: "",
39+
nickname = nickname ?: "",
40+
portrayed = portrayed ?: "",
41+
category = category ?: "",
4842
)

‎core/network/src/main/java/io/github/shinhyo/brba/core/network/retrofit/RetrofitNetwork.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import javax.inject.Singleton
3636
private interface BaBrApi {
3737

3838
companion object {
39-
const val BASE_URL = "https://www.breakingbadapi.com"
39+
const val BASE_URL = "https://brba.shinhyo.workers.dev"
4040
}
4141

4242
@GET(value = "/api/characters")

‎feature/detail/src/main/kotlin/io/github/shinhyo/brba/feature/detail/DetailScreen.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,11 @@ private fun Preview() {
183183
charId = 0,
184184
name = "Walter White",
185185
birthday = "09-07-1958",
186-
occupation = listOf(
187-
"High School Chemistry Teacher",
188-
"Meth King Pin"
189-
),
190186
img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
191187
status = "Presumed dead",
192188
nickname = "Heisenberg",
193-
appearance = listOf(1, 2, 3, 4, 5),
194189
portrayed = "",
195190
category = "Breaking Bad",
196-
betterCallSaulAppearance = listOf(),
197191
ratio = 1.5f,
198192
favorite = false,
199193
ctime = null

‎feature/main/src/main/java/io/github/shinhyo/brba/feature/main/favorite/FavoriteScreen.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,17 +228,12 @@ private fun Preview() {
228228
charId = 0,
229229
name = "Walter White",
230230
birthday = "09-07-1958",
231-
occupation = listOf(
232-
"High School Chemistry Teacher",
233-
"Meth King Pin"
234-
),
231+
235232
img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
236233
status = "Presumed dead",
237234
nickname = "Heisenberg",
238-
appearance = listOf(1, 2, 3, 4, 5),
239235
portrayed = "",
240236
category = "Breaking Bad",
241-
betterCallSaulAppearance = listOf(),
242237
ratio = 1.5f,
243238
favorite = true,
244239
ctime = null

‎feature/main/src/main/java/io/github/shinhyo/brba/feature/main/list/ListScreen.kt‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,11 @@ private fun Preview() {
204204
charId = 0,
205205
name = "Walter White",
206206
birthday = "09-07-1958",
207-
occupation = listOf(
208-
"High School Chemistry Teacher",
209-
"Meth King Pin"
210-
),
211207
img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
212208
status = "Presumed dead",
213209
nickname = "Heisenberg",
214-
appearance = listOf(1, 2, 3, 4, 5),
215210
portrayed = "",
216211
category = "Breaking Bad",
217-
betterCallSaulAppearance = listOf(),
218212
ratio = 1.2f,
219213
favorite = true,
220214
ctime = null
@@ -223,17 +217,11 @@ private fun Preview() {
223217
charId = 0,
224218
name = "Walter White",
225219
birthday = "09-07-1958",
226-
occupation = listOf(
227-
"High School Chemistry Teacher",
228-
"Meth King Pin"
229-
),
230220
img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
231221
status = "Presumed dead",
232222
nickname = "Heisenberg",
233-
appearance = listOf(1, 2, 3, 4, 5),
234223
portrayed = "",
235224
category = "Breaking Bad",
236-
betterCallSaulAppearance = listOf(),
237225
ratio = 1.8f,
238226
favorite = false,
239227
ctime = null
@@ -242,17 +230,11 @@ private fun Preview() {
242230
charId = 0,
243231
name = "Walter White",
244232
birthday = "09-07-1958",
245-
occupation = listOf(
246-
"High School Chemistry Teacher",
247-
"Meth King Pin"
248-
),
249233
img = "img\":\"https://images.amcnetworks.com/amc.com/wp-content/uploads/2015/04/cast_bb_700x1000_walter-white-lg.jpg",
250234
status = "Presumed dead",
251235
nickname = "Heisenberg",
252-
appearance = listOf(1, 2, 3, 4, 5),
253236
portrayed = "",
254237
category = "Breaking Bad",
255-
betterCallSaulAppearance = listOf(),
256238
ratio = 1.5f,
257239
favorite = false,
258240
ctime = null

0 commit comments

Comments
 (0)