Skip to content

Commit 47a6d7c

Browse files
chore: update Kotlin wrappers to match Kotlin SDK 1.0.1
1 parent c27dc38 commit 47a6d7c

3 files changed

Lines changed: 35 additions & 20 deletions

File tree

android/src/main/java/com/youversion/reactnativesdk/api/YVPBibleApi.kt

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,17 @@ import com.youversion.platform.core.bibles.domain.BibleVersionRepository
77

88
object YVPBibleApi {
99
suspend fun versions(languageTag: String?): List<BibleVersionRecord> {
10-
val response = YouVersionApi.bible.versions(languageTag)
11-
val records = response.map { BibleVersionRecord(it) }
12-
return records
10+
val allResults = mutableListOf<BibleVersionRecord>()
11+
var pageToken: String? = null
12+
13+
do {
14+
val response = YouVersionApi.bible.versions(languageTag, pageToken = pageToken)
15+
allResults.addAll(response.data.map { BibleVersionRecord(it) })
16+
17+
pageToken = response.nextPageToken
18+
} while (pageToken != null)
19+
20+
return allResults
1321
}
1422

1523
suspend fun version(versionId: Int): BibleVersionRecord {
@@ -19,14 +27,13 @@ object YVPBibleApi {
1927
}
2028

2129
suspend fun chapter(bibleReference: BibleReferenceRecord, context: Context): String {
22-
val response = BibleVersionRepository(context).chapter(
23-
reference = BibleReference(
24-
versionId = bibleReference.versionId,
25-
bookUSFM = bibleReference.bookUSFM,
26-
chapter = bibleReference.chapter,
27-
)
30+
val passageId = bibleReference.bookUSFM + "." + bibleReference.chapter.toString()
31+
32+
val response = YouVersionApi.bible.passage(
33+
versionId = bibleReference.versionId,
34+
passageId = passageId
2835
)
2936

30-
return response
37+
return response.content
3138
}
3239
}

android/src/main/java/com/youversion/reactnativesdk/api/YVPLanguagesApi.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ import com.youversion.platform.core.api.YouVersionApi
44

55
object YVPLanguagesApi {
66
suspend fun languages(country: String?): List<LanguageRecord> {
7-
val response = YouVersionApi.languages.languages(country)
8-
val records = response.map { LanguageRecord(it) }
9-
return records
7+
val allResults = mutableListOf<LanguageRecord>()
8+
var pageToken: String? = null
9+
10+
do {
11+
val response = YouVersionApi.languages.languages(country, pageToken = pageToken)
12+
allResults.addAll(response.data.map { LanguageRecord(it) })
13+
14+
pageToken = response.nextPageToken
15+
} while (pageToken != null)
16+
17+
return allResults
1018
}
1119
}

android/src/main/java/com/youversion/reactnativesdk/api/YVPRecords.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ data class YouVersionVerseOfTheDayRecord(
2323

2424
data class LanguageRecord(
2525
@Field
26-
val id: String,
26+
val id: String?,
2727
@Field
28-
val language: String,
28+
val language: String?,
2929
@Field
3030
val script: String?,
3131
@Field
3232
val scriptName: String?,
3333
@Field
34-
val aliases: List<String>,
34+
val aliases: List<String>?,
3535
@Field
36-
val displayNames: Map<String, String>,
36+
val displayNames: Map<String, String>?,
3737
@Field
38-
val scripts: List<String>,
38+
val scripts: List<String>?,
3939
@Field
40-
val variants: List<String>,
40+
val variants: List<String>?,
4141
@Field
42-
val countries: List<String>,
42+
val countries: List<String>?,
4343
@Field
4444
val textDirection: String,
4545
@Field

0 commit comments

Comments
 (0)