Merge remote-tracking branch 'origin/develop' into release/1.42

hyperskill · Nov 20, 2023 · 7655d04 · 7655d04
2 parents 7599944 + 2964d3f
commit 7655d04
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/...illApp/iosHyperskillApp/Sources/Modules/GamificationToolbar/Views/GemsBarButtonItem.swift b/...illApp/iosHyperskillApp/Sources/Modules/GamificationToolbar/Views/GemsBarButtonItem.swift
@@ -15,16 +15,9 @@ struct GemsBarButtonItem: View {
                         .resizable()
                         .aspectRatio(contentMode: .fit)
 
-                    if #available(iOS 17.0, *) {
-                        Text("\(hypercoinsBalance)")
-                            .foregroundColor(.primaryText)
-                            .animation(.default, value: hypercoinsBalance)
-                            .contentTransition(.numericText(value: Double(hypercoinsBalance)))
-                    } else {
-                        Text("\(hypercoinsBalance)")
-                            .foregroundColor(.primaryText)
-                            .animation(.default, value: hypercoinsBalance)
-                    }
+                    Text("\(hypercoinsBalance)")
+                        .foregroundColor(.primaryText)
+                        .animation(.default, value: hypercoinsBalance)
                 }
             }
         )

diff --git a/...lApp/iosHyperskillApp/Sources/Modules/GamificationToolbar/Views/StreakBarButtonItem.swift b/...lApp/iosHyperskillApp/Sources/Modules/GamificationToolbar/Views/StreakBarButtonItem.swift
@@ -21,16 +21,9 @@ struct StreakBarButtonItem: View {
                     .resizable()
                     .aspectRatio(contentMode: .fit)
 
-                    if #available(iOS 17.0, *) {
-                        Text("\(currentStreak)")
-                            .foregroundColor(.primaryText)
-                            .animation(.default, value: currentStreak)
-                            .contentTransition(.numericText(value: Double(currentStreak)))
-                    } else {
-                        Text("\(currentStreak)")
-                            .foregroundColor(.primaryText)
-                            .animation(.default, value: currentStreak)
-                    }
+                    Text("\(currentStreak)")
+                        .foregroundColor(.primaryText)
+                        .animation(.default, value: currentStreak)
                 }
             }
         )