chore: clean up (#513)

Signed-off-by: Pierre-Yves Lapersonne <[email protected]>

Author: pylapp

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

@@ -133,9 +133,12 @@ struct BulletListItem: View {
     static func prefixAfter(_ accessibilityLabel: String, for level: OUDSBulletList.NestedLevel, at index: Int) -> String {
         let index = UInt8(index)
         let currentPrefix = switch level {
-        case .zero: OrderedBullet.levelZeroBullet(for: index)
-        case .one: OrderedBullet.levelOneBullet(for: index)
-        case .two: OrderedBullet.levelTwoBullet(for: index)
+        case .zero:
+            OrderedBullet.levelZeroBullet(for: index)
+        case .one:
+            OrderedBullet.levelOneBullet(for: index)
+        case .two:
+            OrderedBullet.levelTwoBullet(for: index)
         }
         return "\(accessibilityLabel)\(currentPrefix)"
     }

OUDS/Foundations/Sources/OUDSUtils.swift

@@ -25,8 +25,12 @@ public enum OUDSUtils {
         if let preferredLanguage = Locale.preferredLanguages.first, preferredLanguage.hasPrefix("ar") {
             return true
         }
-        if Locale.current.languageCode == "ar" {
-            return true
+        if #available(iOS 16.0, *) {
+            if let languageCode = Locale.current.language.languageCode, languageCode.identifier == "ar" {
+                return true
+            }
+        } else {
+            return Locale.current.languageCode == "ar"
         }
         return false
     }
@@ -37,7 +41,7 @@ public enum OUDSUtils {
     ///
     /// - Parameters:
     ///    - index: A rank, starting at 0
-    ///    - isUppserCase: True if letter must be upper cased, false otherwise
+    ///    - isUppercase: True if letter must be upper cased, false otherwise
     /// - Returns: A letter or group a letters (e.g. 1 to Z, AA to AZ, etc).
     public static func cyclicLatinLetter(at index: UInt8, isUppercase: Bool) -> String {
         let alphabetSize = 26
@@ -49,7 +53,7 @@ public enum OUDSUtils {
         repeat {
             let position = idx % alphabetSize
             let letter = Character(UnicodeScalar(baseChar + UInt8(position)))
-            result = String(letter) + result // Ajoute à gauche
+            result = String(letter) + result
             idx = idx / alphabetSize - 1
         } while idx >= 0
 

OUDS/Foundations/Tests/OUDSUtilsTests.swift

@@ -14,6 +14,7 @@
 @testable import OUDSFoundations
 import Testing
 
+// swiftlint:disable convenience_type
 @Suite("OUDS Utils Alphabet Tests (for OrderedBullet Lists)")
 struct OUDSUtilsTests {
 
@@ -56,7 +57,7 @@ struct OUDSUtilsTests {
             (5, "f"),
             (10, "k"),
             (15, "p"),
-            (20, "u")
+            (20, "u"),
         ])
         func middleValues(index: UInt8, expected: String) {
             #expect(OUDSUtils.cyclicLatinLetter(at: index, isUppercase: false) == expected)
@@ -68,7 +69,7 @@ struct OUDSUtilsTests {
             (35, "aj"),
             (40, "ao"),
             (45, "at"),
-            (50, "ay")
+            (50, "ay"),
         ])
         func doubleLetterProgression(index: UInt8, expected: String) {
             #expect(OUDSUtils.cyclicLatinLetter(at: index, isUppercase: false) == expected)
@@ -119,7 +120,7 @@ struct OUDSUtilsTests {
             (28, "AC"),
             (51, "AZ"),
             (52, "BA"),
-            (53, "BB")
+            (53, "BB"),
         ])
         func uppercaseProgression(index: UInt8, expected: String) {
             #expect(OUDSUtils.cyclicLatinLetter(at: index, isUppercase: true) == expected)
@@ -225,19 +226,25 @@ struct OUDSUtilsTests {
         @Test("Sequential indices should produce sequential letters (first 26)")
         func sequentialLetters() {
             let lowercase = (0 ..< 26).map { OUDSUtils.cyclicLatinLetter(at: $0, isUppercase: false) }
-            let expected = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
-                            "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"]
+            let expected = [
+                "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
+                "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
+            ]
             #expect(lowercase == expected)
         }
 
         @Test("Arabic sequential letters (first 28)")
         func arabicSequentialLetters() {
             let arabic = (0 ..< 28).map { OUDSUtils.cyclicArabicLetter(at: $0) }
-            let expected = ["ا", "ب", "ت", "ث", "ج", "ح", "خ", "د",
-                            "ذ", "ر", "ز", "س", "ش", "ص", "ض", "ط",
-                            "ظ", "ع", "غ", "ف", "ق", "ك", "ل", "م",
-                            "ن", "ه", "و", "ي"]
+            let expected = [
+                "ا", "ب", "ت", "ث", "ج", "ح", "خ", "د",
+                "ذ", "ر", "ز", "س", "ش", "ص", "ض", "ط",
+                "ظ", "ع", "غ", "ف", "ق", "ك", "ل", "م",
+                "ن", "ه", "و", "ي",
+            ]
             #expect(arabic == expected)
         }
     }
 }
+
+// swiftlint:enable convenience_type