Skip to content

Commit 1366805

Browse files
fix: spoiler fixes
1 parent 14362f1 commit 1366805

File tree

13 files changed

+114
-99
lines changed

13 files changed

+114
-99
lines changed

Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,16 @@ build-web:
1313

1414
build-android:
1515
flutter build apk --release
16-
open build/app/outputs/flutter-apk/
1716

1817
build-ios:
1918
flutter build ipa --release && open -a Transporter `find build/ios/ipa -type f -name '*.ipa'`
2019

2120
generate-icons:
2221
dart run flutter_launcher_icons
2322

24-
remake-ios:
25-
flutter create --platforms ios .
26-
27-
remake-android:
28-
flutter create --platforms android .
23+
# build-android:
24+
# flutter build appbundle --release
25+
# open build/app/outputs/bundle/release/
2926

3027
java-config:
3128
java -XshowSettings:properties -version

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<uses-permission android:name="android.permission.INTERNET" />
23
<application
34
android:label="Wheel of Time Compendium (Unofficial)"
45
android:name="${applicationName}"

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip

android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "8.1.0" apply false
22-
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
21+
id "com.android.application" version "8.4.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.25" apply false
2323
}
2424

2525
include ":app"

assets/data/book-06.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"id": "Alric",
5252
"name": "Alric",
5353
"chapter": "Chapter 30: To Heal Again",
54-
"info": "[Siuan](#Siuan-Sanche)'s Warder for about twenty years. He was killed when Siuan was deposed; the shock of what [Elaida](#Elaida-do-Avriny-a-Roihan) intended to do masked the usual emotions that accompany the death of a Warder for her at first, and when she was stilled she lost all contact with the destroyed bond. However, when she was Healed, all the emotions came rushing back to her."
54+
"info": "[Siuan](#Siuan-Sanche)'s Warder for about twenty years. He was killed when Siuan was deposed; the shock of what [Elaida](#Elaida-do-Avriny-a-Roihan) intended to do masked the usual emotions that accompany the death of a Warder for her at first, and when she was stilled she lost all contact with the destroyed bond."
5555
},
5656
{
5757
"id": "Alsbet-Luhhan",
@@ -183,7 +183,7 @@
183183
"id": "Asmodean",
184184
"name": "Asmodean",
185185
"chapter": "Prologue: The First Message",
186-
"info": "One of the Forsaken. He was born Joar Addam Nessosin in the then coastal city of Shorelle, a child prodigy in music and art. He gave his life to the Shadow in exchange for the immortality he received, so he could study and perfect his music. After being released from the Bore, he was coerced by [Lanfear](#Lanfear) into coming with her, eventually to teach [Rand](#Rand-al-Thor) to channel without killing himself. Asmodean was drawn to Rhuidean and the stash of _angreal_, _ter'angreal_, and most especially the two white statue _ter'angreal_ that linked the holder to the great _sa'angreal_ buried near Cairhien and on Tremalking, which together could Break the World beyond repair. He went there to obtain the male statue, but was thwarted by Rand, who severed his bonds to the [Dark One](#Dark-One). He then became Rand's teacher, and went into hiding from the rest of the Chosen, who would kill him on sight if they saw him. He was killed by someone of yet unknown identity right after [Rahvin](#Rahvin) and Lanfear were killed/trapped."
186+
"info": "One of the Forsaken. He was born Joar Addam Nessosin in the then coastal city of Shorelle, a child prodigy in music and art. He gave his life to the Shadow in exchange for the immortality he received, so he could study and perfect his music. After being released from the Bore, he was coerced by [Lanfear](#Lanfear) into coming with her, eventually to teach [Rand](#Rand-al-Thor) to channel without killing himself. Asmodean was drawn to Rhuidean and the stash of _angreal_, _ter'angreal_, and most especially the two white statue _ter'angreal_ that linked the holder to the great _sa'angreal_ buried near Cairhien and on Tremalking, which together could Break the World beyond repair. He went there to obtain the male statue, but was thwarted by Rand, who severed his bonds to the [Dark One](#Dark-One). He then became Rand's teacher, and went into hiding from the rest of the Chosen, who would kill him on sight if they saw him."
187187
},
188188
{
189189
"id": "Asra",

assets/data/book-07.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2781,6 +2781,6 @@
27812781
"id": "al-Lan-Mandragoran",
27822782
"name": "al'Lan Mandragoran",
27832783
"chapter": "Chapter 12: A Morning of Victory",
2784-
"info": "The uncrowned king of Malkier, and formerly Warder to [Moiraine](#Moiraine-Damodred). He is quite tall, and doesn't get very emotional—in fact, he has emotional walls all around him that he has been building for years. His country, Malkier, was overrun by Trollocs shortly after he was born, and is now corrupted by the Great Blight. Lan, the last of his people, then proceeded to fight a one-man war against the Shadow by killing Shadowspawn in the Blight. He fought Aiel during the Aiel War, and achieved Blademaster status. He was eventually bonded by Moiraine, which ended his lonely fight (or at least changed its style). When Lan and Moiraine brought [Rand](#Rand-al-Thor), [Mat](#Matrim-Mat-Cauthon), [Perrin](#Perrin-t-Bashere-Aybara), [Egwene](#Egwene-al-Vere), and [Nynaeve](#Nynaeve-al-Meara) out of their home in the Two Rivers, he found that there was something which could throw his guard down, but he was the last to notice it: affection for Nynaeve. As Moiraine put it, Nynaeve was able to plant vines in Lan's emotional walls and break them down without him even knowing they were there. He loves her very much, whether he admits it openly or not, and Nynaeve, to her surprise, loves him in return. Upon Moiraine's death, Lan's bond was immediately transferred to [Myrelle](#Myrelle-Berengari) until Nynaeve is ready to have his bond transferred to her. Myrelle tried to keep Lan's status secret, but she was given away when she tried to buy one of Lan's favorite foods, coin peppers, too far south (they are very popular in Shienar, and were in Malkier before it fell to the Blight, but don't grow well in southern climates). Upon learning of where Lan was, [Egwene](#Egwene-al-Vere) sent him to Ebou Dar to serve as a Warder for her."
2784+
"info": "The uncrowned king of Malkier, and formerly Warder to [Moiraine](#Moiraine-Damodred). He is quite tall, and doesn't get very emotional—in fact, he has emotional walls all around him that he has been building for years. His country, Malkier, was overrun by Trollocs shortly after he was born, and is now corrupted by the Great Blight. Lan, the last of his people, then proceeded to fight a one-man war against the Shadow by killing Shadowspawn in the Blight. He fought Aiel during the Aiel War, and achieved Blademaster status. He was eventually bonded by Moiraine, which ended his lonely fight (or at least changed its style). When Lan and Moiraine brought [Rand](#Rand-al-Thor), [Mat](#Matrim-Mat-Cauthon), [Perrin](#Perrin-t-Bashere-Aybara), [Egwene](#Egwene-al-Vere), and [Nynaeve](#Nynaeve-al-Meara) out of their home in the Two Rivers, he found that there was something which could throw his guard down, but he was the last to notice it: affection for Nynaeve. As Moiraine put it, Nynaeve was able to plant vines in Lan's emotional walls and break them down without him even knowing they were there. He loves her very much, whether he admits it openly or not, and Nynaeve, to her surprise, loves him in return. Upon Moiraine's death, Lan's bond was immediately transferred to [Myrelle](#Myrelle-Berengari) until Nynaeve is ready to have his bond transferred to her. Myrelle tried to keep Lan's status secret, but she was given away when she tried to buy one of Lan's favorite foods, coin peppers, too far south (they are very popular in Shienar, and were in Malkier before it fell to the Blight, but don't grow well in southern climates)."
27852785
}
27862786
]

assets/data/book-08.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@
435435
"id": "Chulein",
436436
"name": "Chulein",
437437
"chapter": "Chapter 6: Threads",
438-
"info": "Controller of [Segani](#Segani), a _raken_ from Seanchan. People of his profession are called _morat'raken_."
438+
"info": "Controller of [Segani](#Segani), a _raken_ from Seanchan. People of her profession are called _morat'raken_."
439439
},
440440
{
441441
"id": "Cieryl-Arjuna",
@@ -693,7 +693,7 @@
693693
"id": "Eliya",
694694
"name": "Eliya",
695695
"chapter": "Chapter 6: Threads",
696-
"info": "Rider of [Segani](#Segani), along with [Chulein](#Chulein) the _morat'raken_. He fell off the animal and died."
696+
"info": "Rider of [Segani](#Segani), along with [Chulein](#Chulein) the _morat'raken_. She fell off the animal and died."
697697
},
698698
{
699699
"id": "Elmindreda-Min-Farshaw",

assets/data/book-10.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@
627627
"id": "Elayne-Trakand",
628628
"name": "Elayne Trakand",
629629
"chapter": "Prologue: Glimmers of the Pattern",
630-
"info": "Daughter-Heir of Andor, now Aes Sedai of the Green Ajah. She is the daughter of [Morgase](#Morgase-Trakand) and her late husband, Taringail, and sister to [Gawyn](#Gawyn-Trakand). She is also half-sister to [Galad](#Galadedrid-Galad-Damodred), although she would rather not be reminded of this fact; she thinks Galad virtuous to the point of fault, and does not really like him. She has considerable potential in the One Power, and is one of the strongest Aes Sedai in a thousand years or more, possibly since the Age of Legends, with the exceptions of [Egwene](#Egwene-al-Vere), [Nynaeve](#el-Nynaeve-ti-al-Meara-Mandragoran), [Aviendha](#Aviendha), and some trainees. She has red-gold curly hair. During her stay in the Stone of Tear, Elayne realized she loved [Rand al'Thor](#Rand-al-Thor), and told him how she felt; he felt similarly. She had no idea at the time what [Min](#Elmindreda-Min-Farshaw) meant about “having to share him,” but now knows about Min's viewing of Rand with the three women's heads, indicating that Rand will fall in love with Min, Elayne, and Aviendha, and they with him. Later, when she and Nynaeve had trouble with [Moghedien](#Moghedien), Elayne ended up bonding [Birgitte](#Birgitte) as her Warder (despite being only Accepted at the time) in order to save Birgitte's life. Elayne later went to Ebou Dar and found the Bowl of the Winds, a _ter'angreal_ that they used to fix the weather. She has since returned to Andor upon hearing news of her mother's disappearance; she plans to take the Lion Throne, as soon as she has garnered enough support to keep it. In the meantime, Elayne has managed to reproduce several _ter'angreal_, something which no one else has been able to do since the Breaking of the World, as well as discover a way to share a Warder bond between three women; she bonded Rand along with Aviendha, her new sister by Aiel tradition, and Min. Shortly after bonding Rand, she became pregnant with Rand's twins. To protect the children, she is allowing the rumor that [Doilin Mellar](#Doilin-Mellar) fathered them to persist."
630+
"info": "Daughter-Heir of Andor, now Aes Sedai of the Green Ajah. She is the daughter of [Morgase](#Morgase-Trakand) and her late husband, Taringail, and sister to [Gawyn](#Gawyn-Trakand). She is also half-sister to [Galad](#Galadedrid-Galad-Damodred), although she would rather not be reminded of this fact; she thinks Galad virtuous to the point of fault, and does not really like him. She has considerable potential in the One Power, and is one of the strongest Aes Sedai in a thousand years or more, possibly since the Age of Legends, with the exceptions of [Egwene](#Egwene-al-Vere), [Nynaeve](#el-Nynaeve-ti-al-Meara-Mandragoran), [Aviendha](#Aviendha), and some trainees. She has red-gold curly hair. During her stay in the Stone of Tear, Elayne realized she loved [Rand al'Thor](#Rand-al-Thor), and told him how she felt; he felt similarly. She had no idea at the time what [Min](#Elmindreda-Min-Farshaw) meant about “having to share him,” but now knows about Min's viewing of Rand with the three women's heads, indicating that Rand will fall in love with Min, Elayne, and Aviendha, and they with him. Later, when she and Nynaeve had trouble with [Moghedien](#Moghedien), Elayne ended up bonding [Birgitte](#Birgitte) as her Warder (despite being only Accepted at the time) in order to save Birgitte's life. Elayne later went to Ebou Dar and found the Bowl of the Winds, a _ter'angreal_ that they used to fix the weather. She has since returned to Andor upon hearing news of her mother's disappearance; she plans to take the Lion Throne, as soon as she has garnered enough support to keep it. In the meantime, Elayne has managed to reproduce several _ter'angreal_, something which no one else has been able to do since the Breaking of the World, as well as discover a way to share a Warder bond between three women; she bonded Rand along with Aviendha, her new sister by Aiel tradition, and Min."
631631
},
632632
{
633633
"id": "Elder-Alar",

assets/data/book-11.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,7 @@
15991599
"id": "High-Lady-Suroth-Sabelle-Meldarath",
16001600
"name": "High Lady Suroth Sabelle Meldarath",
16011601
"chapter": "Prologue: Embers Falling on Dry Grass",
1602-
"info": "High Lady of Asinbayar and Barsabba, leader of Those Who Come Before. She has her head shaven on the sides and long, black hair in the middle. This is the typical Seanchan style for those “of the Blood.” Suroth was determined to redeem herself after High Lord Turak's mishap at Falme—she did not want to have to explain a failure that was not hers to the [Empress](#The-Empress-of-Seanchan-). She gathered all of the Seanchan ships that fled Falme so they would not go back home; she then retook portions of the mainland again, but was prevented from taking Illian by [Rand](#Rand-al-Thor) and his Asha'man. Known to few, Suroth is _Atha'an Shadar_, “Those Bound to Shadow” (a Darkfriend), and is high in their ranks."
1602+
"info": "High Lady of Asinbayar and Barsabba, leader of Those Who Come Before. She has her head shaven on the sides and long, black hair in the middle. This is the typical Seanchan style for those “of the Blood.” Suroth was determined to redeem herself after High Lord Turak's mishap at Falme—she did not want to have to explain a failure that was not hers to the [Empress](#The-Empress-of-Seanchan-). She gathered all of the Seanchan ships that fled Falme so they would not go back home; she then retook portions of the mainland again, but was prevented from taking Illian by [Rand](#Rand-al-Thor) and his Asha'man."
16031603
},
16041604
{
16051605
"id": "High-Lady-Tuon-Athaem-Kore-Paendrag",

assets/data/book-12.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
"id": "Bakayar-Mishima",
196196
"name": "Bakayar Mishima",
197197
"chapter": "Prelude",
198-
"info": "Seanchan Captain under [Khirgan](#Lieutenant-General-Tylee-Khirgan). His drawl is worse than hers. He hails from Hamalak. Mishima was killed by a Trolloc arrow when Khirgan's unit was attacked."
198+
"info": "Seanchan Captain under [Khirgan](#Lieutenant-General-Tylee-Khirgan). His drawl is worse than hers. He hails from Hamalak."
199199
},
200200
{
201201
"id": "Balladare-Arandaille",

0 commit comments

Comments
 (0)