Skip to content

Commit 24dbf5d

Browse files
telpiriontelpirion
committed
chore: cleans up data classes
1 parent f350205 commit 24dbf5d

File tree

4 files changed

+204
-9
lines changed

4 files changed

+204
-9
lines changed

‎LatinReader/greekreader-views/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
4+
id "kotlin-kapt"
45
}
56

67
android {
@@ -9,6 +10,10 @@ android {
910
version = release(36)
1011
}
1112

13+
dataBinding {
14+
enabled = true
15+
}
16+
1217
defaultConfig {
1318
applicationId "com.ericmschmidt.classicsreader.greek.views"
1419
minSdk 24
@@ -39,6 +44,7 @@ dependencies {
3944
implementation 'androidx.core:core-ktx:1.17.0'
4045
implementation 'androidx.appcompat:appcompat:1.7.1'
4146
implementation 'com.google.android.material:material:1.13.0'
47+
kapt "androidx.databinding:databinding-compiler:8.13.2"
4248
testImplementation 'junit:junit:4.13.2'
4349
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
4450
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'

‎LatinReader/latinreader-views/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
4+
id "kotlin-kapt"
45
}
56

67
android {
78
namespace 'com.ericmschmidt.classicsreader.latin.views'
89
compileSdk {
910
version = release(36)
1011
}
11-
12+
dataBinding {
13+
enabled = true
14+
}
1215
defaultConfig {
1316
applicationId "com.ericmschmidt.classicsreader.latin.views"
1417
minSdk 24
@@ -39,6 +42,7 @@ dependencies {
3942
implementation 'androidx.core:core-ktx:1.17.0'
4043
implementation 'androidx.appcompat:appcompat:1.7.1'
4144
implementation 'com.google.android.material:material:1.13.0'
45+
kapt "androidx.databinding:databinding-compiler:8.13.2"
4246
testImplementation 'junit:junit:4.13.2'
4347
androidTestImplementation 'androidx.test.ext:junit:1.3.0'
4448
androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'

‎LatinReader/latinreader/src/main/java/com/ericmschmidt/latin/data/LatinReaderManifest.kt‎

Lines changed: 187 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ class LatinReaderManifest : Manifest() {
3232
englishLocation = R.raw.caes_bg_eng,
3333
workType = WorkInfo.WorkType.PROSE,
3434
tocEntries = arrayListOf(
35-
TOCEntry("", 0, 0),
36-
TOCEntry("", 1, 0),
37-
TOCEntry("", 2, 0),
38-
TOCEntry("", 3, 0),
39-
TOCEntry("", 4, 0),
40-
TOCEntry("", 5, 0),
41-
TOCEntry("", 6, 0),
42-
TOCEntry("", 7, 0)
35+
TOCEntry("COMMENTARIUS PRIMUS", 0, 0),
36+
TOCEntry("COMMENTARIUS SECUNDUS", 1, 0),
37+
TOCEntry("COMMENTARIUS TERTIUS", 2, 0),
38+
TOCEntry("COMMENTARIUS QUARTUS", 3, 0),
39+
TOCEntry("COMMENTARIUS QUINTUS", 4, 0),
40+
TOCEntry("COMMENTARIUS SEXTUS", 5, 0),
41+
TOCEntry("COMMENTARIUS SEPTIMUS", 6, 0),
42+
TOCEntry("COMMENTARIUS OCTAVUS", 7, 0),
4343
),
4444
image = R.drawable.work_de_bello_gallico,
4545
description = caesarDescription,
@@ -54,6 +54,11 @@ class LatinReaderManifest : Manifest() {
5454
location = R.raw.hor_carm_lat,
5555
englishLocation = R.raw.hor_carm_eng,
5656
workType = WorkInfo.WorkType.POEM,
57+
tocEntries = arrayListOf(
58+
TOCEntry("Book 1", 0, 0),
59+
TOCEntry("Book 2", 1, 0),
60+
TOCEntry("Book 3", 2, 0),
61+
TOCEntry("Book 4", 3, 0)),
5762
image = R.drawable.work_carmina,
5863
description = horaceDescription,
5964
editor = "Paul Shorey and Gordon J. Laing",
@@ -67,6 +72,13 @@ class LatinReaderManifest : Manifest() {
6772
location = R.raw.lucretius_lat,
6873
englishLocation = R.raw.lucretius_eng,
6974
workType = WorkInfo.WorkType.POEM,
75+
tocEntries = arrayListOf(
76+
TOCEntry("Liber Primus", 0, 0),
77+
TOCEntry("Liber Secundus", 1, 0),
78+
TOCEntry("Liber Tertius", 2, 0),
79+
TOCEntry("Liber Quartus", 3, 0),
80+
TOCEntry("Liber Quintus", 4, 0),
81+
TOCEntry("Liber Sextus", 5, 0)),
7082
image = R.drawable.work_de_rerum_natura,
7183
description = lucretiusDescription,
7284
editor = "William Ellery Leonard",
@@ -81,6 +93,22 @@ class LatinReaderManifest : Manifest() {
8193
location = R.raw.ovid_met_lat,
8294
englishLocation = R.raw.ovid_met_eng,
8395
workType = WorkInfo.WorkType.POEM,
96+
tocEntries = arrayListOf(
97+
TOCEntry("Book 1", 0, 0),
98+
TOCEntry("Book 2", 1, 0),
99+
TOCEntry("Book 3", 2, 0),
100+
TOCEntry("Book 4", 3, 0),
101+
TOCEntry("Book 5", 4, 0),
102+
TOCEntry("Book 6", 5, 0),
103+
TOCEntry("Book 7", 6, 0),
104+
TOCEntry("Book 8", 7, 0),
105+
TOCEntry("Book 9", 8, 0),
106+
TOCEntry("Book 10", 9, 0),
107+
TOCEntry("Book 11", 10, 0),
108+
TOCEntry("Book 12", 11, 0),
109+
TOCEntry("Book 13", 12, 0),
110+
TOCEntry("Book 14", 13, 0),
111+
TOCEntry("Book 15", 14, 0)),
84112
image = R.drawable.work_metamorphoses,
85113
description = ovidDescription,
86114
editor = "Hugo Magnus",
@@ -94,6 +122,10 @@ class LatinReaderManifest : Manifest() {
94122
location = R.raw.petr_lat,
95123
englishLocation = R.raw.petr_eng,
96124
workType = WorkInfo.WorkType.PROSE,
125+
tocEntries = arrayListOf(
126+
TOCEntry("Satyricon", 0, 0),
127+
TOCEntry("Fragments", 1, 0),
128+
TOCEntry("Poems", 2, 0)),
97129
image = R.drawable.work_satyricon,
98130
description = petroniusDescription,
99131
editor = "Michael Heseltine",
@@ -106,6 +138,121 @@ class LatinReaderManifest : Manifest() {
106138
englishAuthor = "Sallust",
107139
location = R.raw.sallust_jugur_eng,
108140
workType = WorkInfo.WorkType.PROSE,
141+
tocEntries = arrayListOf(
142+
TOCEntry("Chapter 1", 0, 0),
143+
TOCEntry("Chapter 2", 1, 0),
144+
TOCEntry("Chapter 3", 2, 0),
145+
TOCEntry("Chapter 4", 3, 0),
146+
TOCEntry("Chapter 5", 4, 0),
147+
TOCEntry("Chapter 6", 5, 0),
148+
TOCEntry("Chapter 7", 6, 0),
149+
TOCEntry("Chapter 8", 7, 0),
150+
TOCEntry("Chapter 9", 8, 0),
151+
TOCEntry("Chapter 10", 9, 0),
152+
TOCEntry("Chapter 11", 10, 0),
153+
TOCEntry("Chapter 12", 11, 0),
154+
TOCEntry("Chapter 13", 12, 0),
155+
TOCEntry("Chapter 14", 13, 0),
156+
TOCEntry("Chapter 15", 14, 0),
157+
TOCEntry("Chapter 16", 15, 0),
158+
TOCEntry("Chapter 17", 16, 0),
159+
TOCEntry("Chapter 18", 17, 0),
160+
TOCEntry("Chapter 19", 18, 0),
161+
TOCEntry("Chapter 20", 19, 0),
162+
TOCEntry("Chapter 21", 20, 0),
163+
TOCEntry("Chapter 22", 21, 0),
164+
TOCEntry("Chapter 23", 22, 0),
165+
TOCEntry("Chapter 24", 23, 0),
166+
TOCEntry("Chapter 25", 24, 0),
167+
TOCEntry("Chapter 26", 25, 0),
168+
TOCEntry("Chapter 27", 26, 0),
169+
TOCEntry("Chapter 28", 27, 0),
170+
TOCEntry("Chapter 29", 28, 0),
171+
TOCEntry("Chapter 30", 29, 0),
172+
TOCEntry("Chapter 31", 30, 0),
173+
TOCEntry("Chapter 32", 31, 0),
174+
TOCEntry("Chapter 33", 32, 0),
175+
TOCEntry("Chapter 34", 33, 0),
176+
TOCEntry("Chapter 35", 34, 0),
177+
TOCEntry("Chapter 36", 35, 0),
178+
TOCEntry("Chapter 37", 36, 0),
179+
TOCEntry("Chapter 38", 37, 0),
180+
TOCEntry("Chapter 39", 38, 0),
181+
TOCEntry("Chapter 40", 39, 0),
182+
TOCEntry("Chapter 41", 40, 0),
183+
TOCEntry("Chapter 42", 41, 0),
184+
TOCEntry("Chapter 43", 42, 0),
185+
TOCEntry("Chapter 44", 43, 0),
186+
TOCEntry("Chapter 45", 44, 0),
187+
TOCEntry("Chapter 46", 45, 0),
188+
TOCEntry("Chapter 47", 46, 0),
189+
TOCEntry("Chapter 48", 47, 0),
190+
TOCEntry("Chapter 49", 48, 0),
191+
TOCEntry("Chapter 50", 49, 0),
192+
TOCEntry("Chapter 51", 50, 0),
193+
TOCEntry("Chapter 52", 51, 0),
194+
TOCEntry("Chapter 53", 52, 0),
195+
TOCEntry("Chapter 54", 53, 0),
196+
TOCEntry("Chapter 55", 54, 0),
197+
TOCEntry("Chapter 56", 55, 0),
198+
TOCEntry("Chapter 57", 56, 0),
199+
TOCEntry("Chapter 58", 57, 0),
200+
TOCEntry("Chapter 59", 58, 0),
201+
TOCEntry("Chapter 60", 59, 0),
202+
TOCEntry("Chapter 61", 60, 0),
203+
TOCEntry("Chapter 62", 61, 0),
204+
TOCEntry("Chapter 63", 62, 0),
205+
TOCEntry("Chapter 64", 63, 0),
206+
TOCEntry("Chapter 65", 64, 0),
207+
TOCEntry("Chapter 66", 65, 0),
208+
TOCEntry("Chapter 67", 66, 0),
209+
TOCEntry("Chapter 68", 67, 0),
210+
TOCEntry("Chapter 69", 68, 0),
211+
TOCEntry("Chapter 70", 69, 0),
212+
TOCEntry("Chapter 71", 70, 0),
213+
TOCEntry("Chapter 72", 71, 0),
214+
TOCEntry("Chapter 73", 72, 0),
215+
TOCEntry("Chapter 74", 73, 0),
216+
TOCEntry("Chapter 75", 74, 0),
217+
TOCEntry("Chapter 76", 75, 0),
218+
TOCEntry("Chapter 77", 76, 0),
219+
TOCEntry("Chapter 78", 77, 0),
220+
TOCEntry("Chapter 79", 78, 0),
221+
TOCEntry("Chapter 80", 79, 0),
222+
TOCEntry("Chapter 81", 80, 0),
223+
TOCEntry("Chapter 82", 81, 0),
224+
TOCEntry("Chapter 83", 82, 0),
225+
TOCEntry("Chapter 84", 83, 0),
226+
TOCEntry("Chapter 85", 84, 0),
227+
TOCEntry("Chapter 86", 85, 0),
228+
TOCEntry("Chapter 87", 86, 0),
229+
TOCEntry("Chapter 88", 87, 0),
230+
TOCEntry("Chapter 89", 88, 0),
231+
TOCEntry("Chapter 90", 89, 0),
232+
TOCEntry("Chapter 91", 90, 0),
233+
TOCEntry("Chapter 92", 91, 0),
234+
TOCEntry("Chapter 93", 92, 0),
235+
TOCEntry("Chapter 94", 93, 0),
236+
TOCEntry("Chapter 95", 94, 0),
237+
TOCEntry("Chapter 96", 95, 0),
238+
TOCEntry("Chapter 97", 96, 0),
239+
TOCEntry("Chapter 98", 97, 0),
240+
TOCEntry("Chapter 99", 98, 0),
241+
TOCEntry("Chapter 100", 99, 0),
242+
TOCEntry("Chapter 101", 100, 0),
243+
TOCEntry("Chapter 102", 101, 0),
244+
TOCEntry("Chapter 103", 102, 0),
245+
TOCEntry("Chapter 104", 103, 0),
246+
TOCEntry("Chapter 105", 104, 0),
247+
TOCEntry("Chapter 106", 105, 0),
248+
TOCEntry("Chapter 107", 106, 0),
249+
TOCEntry("Chapter 108", 107, 0),
250+
TOCEntry("Chapter 109", 108, 0),
251+
TOCEntry("Chapter 110", 109, 0),
252+
TOCEntry("Chapter 111", 110, 0),
253+
TOCEntry("Chapter 112", 111, 0),
254+
TOCEntry("Chapter 113", 112, 0),
255+
TOCEntry("Chapter 114", 113, 0)),
109256
image = R.drawable.work_de_bellum_jugurthinum,
110257
description = sallustDescription,
111258
editor = "John Selby Watson",
@@ -119,6 +266,22 @@ class LatinReaderManifest : Manifest() {
119266
location = R.raw.sen_apoc_lat,
120267
englishLocation = R.raw.sen_apoc_eng,
121268
workType = WorkInfo.WorkType.PROSE,
269+
tocEntries = arrayListOf(
270+
TOCEntry("Section 1", 0, 0),
271+
TOCEntry("Section 2", 1, 0),
272+
TOCEntry("Section 3", 2, 0),
273+
TOCEntry("Section 4", 3, 0),
274+
TOCEntry("Section 5", 4, 0),
275+
TOCEntry("Section 6", 5, 0),
276+
TOCEntry("Section 7", 6, 0),
277+
TOCEntry("Section 8", 7, 0),
278+
TOCEntry("Section 9", 8, 0),
279+
TOCEntry("Section 10", 9, 0),
280+
TOCEntry("Section 11", 10, 0),
281+
TOCEntry("Section 12", 11, 0),
282+
TOCEntry("Section 13", 12, 0),
283+
TOCEntry("Section 14", 13, 0),
284+
TOCEntry("Section 15", 14, 0)),
122285
image = R.drawable.work_apocolocyntosis,
123286
description = senecaDescription,
124287
editor = "W.H.D. Rouse, M.A. Litt. D.",
@@ -133,6 +296,19 @@ class LatinReaderManifest : Manifest() {
133296
location = R.raw.verg_a_lat,
134297
englishLocation = R.raw.verg_a_eng,
135298
workType = WorkInfo.WorkType.POEM,
299+
tocEntries = arrayListOf(
300+
TOCEntry("Book 1", 0, 0),
301+
TOCEntry("Book 2", 1, 0),
302+
TOCEntry("Book 3", 2, 0),
303+
TOCEntry("Book 4", 3, 0),
304+
TOCEntry("Book 5", 4, 0),
305+
TOCEntry("Book 6", 5, 0),
306+
TOCEntry("Book 7", 6, 0),
307+
TOCEntry("Book 8", 7, 0),
308+
TOCEntry("Book 9", 8, 0),
309+
TOCEntry("Book 10", 9, 0),
310+
TOCEntry("Book 11", 10, 0),
311+
TOCEntry("Book 12", 11, 0)),
136312
image = R.drawable.work_aeneid,
137313
description = vergilDescription,
138314
editor = "J. B. Greenough",
@@ -147,6 +323,9 @@ class LatinReaderManifest : Manifest() {
147323
location = R.raw.livy_01_02_lat,
148324
englishLocation = R.raw.livy_01_02_eng,
149325
workType = WorkInfo.WorkType.PROSE,
326+
tocEntries = arrayListOf(
327+
TOCEntry("Book 1", 0, 0),
328+
TOCEntry("Book 2", 1, 0)),
150329
image = R.drawable.work_ab_urbe_condita,
151330
description = livyDescription,
152331
editor = "Benjamin Oliver Foster, Ph.D.",

‎LatinReader/views/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@ plugins {
33
id "org.jetbrains.kotlin.android"
44
id "org.jetbrains.kotlin.plugin.compose"
55
id "androidx.navigation.safeargs.kotlin"
6+
id "kotlin-kapt"
67
}
78

89
android {
910
namespace "com.ericmschmidt.classicsreader.views"
1011
compileSdkVersion 36
1112

13+
dataBinding {
14+
enabled = true
15+
}
16+
1217
defaultConfig {
1318
minSdk 24
1419
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -52,6 +57,7 @@ dependencies {
5257
// Markdown
5358
//noinspection GradleDependency Required for MarkdownView view
5459
implementation("com.github.mukeshsolanki:MarkdownView-Android:1.0.4")
60+
kapt "androidx.databinding:databinding-compiler:8.13.2"
5561

5662
testImplementation("junit:junit:4.13.2")
5763
androidTestImplementation("androidx.test.ext:junit:1.3.0")

0 commit comments

Comments
 (0)