Skip to content

Commit 458644c

Browse files
committed
refactor: manage arabic language for bullets of ordered lists (#513)
Acked-by: Ahmed Amine Zribi <ahmedamine.zribi@sofrecom.com> Signed-off-by: Pierre-Yves Lapersonne <pierreyves.lapersonne@orange.com>
1 parent 69c3dfe commit 458644c

File tree

1 file changed

+15
-7
lines changed
  • OUDS/Core/Components/Sources/ContentDisplay/BulletList/Internal

1 file changed

+15
-7
lines changed

OUDS/Core/Components/Sources/ContentDisplay/BulletList/Internal/Bullet.swift

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ struct Bullet: View {
8585

8686
// MARK: - Unordered Bullet
8787

88-
private struct UnorderedBullet: View {
88+
struct UnorderedBullet: View {
8989

9090
// MARK: Properties
9191

@@ -147,7 +147,7 @@ private struct UnorderedBullet: View {
147147

148148
// MARK: - Ordered Bullet
149149

150-
private struct OrderedBullet: View {
150+
struct OrderedBullet: View {
151151

152152
// MARK: Properties
153153

@@ -162,27 +162,35 @@ private struct OrderedBullet: View {
162162
Group {
163163
switch level {
164164
case .zero:
165-
Text(String("\(index + 1)."))
165+
Text(Self.levelZeroBullet(for: index))
166166
case .one:
167-
Text(levelOneBullet(for: index))
167+
Text(Self.levelOneBullet(for: index))
168168
case .two:
169-
Text(levelTwoBullet(for: index))
169+
Text(Self.levelTwoBullet(for: index))
170170
}
171171
}
172172
.modifier(BulletTextModifier(textStyle: textStyle, isBold: isBold))
173173
}
174174

175175
// MARK: Helpers
176176

177-
private func levelOneBullet(for index: UInt8) -> String {
177+
static func levelZeroBullet(for index: UInt8) -> String {
178+
if OUDSUtils.isArabicLanguageInUse() {
179+
".\(index + 1)"
180+
} else {
181+
"\(index + 1)."
182+
}
183+
}
184+
185+
static func levelOneBullet(for index: UInt8) -> String {
178186
if OUDSUtils.isArabicLanguageInUse() {
179187
"." + OUDSUtils.cyclicArabicLetter(at: index)
180188
} else {
181189
OUDSUtils.cyclicLatinLetter(at: index, isUppercase: true) + "."
182190
}
183191
}
184192

185-
private func levelTwoBullet(for index: UInt8) -> String {
193+
static func levelTwoBullet(for index: UInt8) -> String {
186194
if OUDSUtils.isArabicLanguageInUse() {
187195
OUDSUtils.cyclicArabicLetter(at: index)
188196
} else {

0 commit comments

Comments
 (0)