Merge branch 'master' into fix/roundedRectangle

phimage · web-flow · commit 761cbf1d6c9d · 2019-09-23T09:39:51.000+02:00
diff --git a/IBAnimatableApp/IBAnimatableApp/Playground/ActivityIndicators/ActivityIndicatorCollectionViewController.swift b/IBAnimatableApp/IBAnimatableApp/Playground/ActivityIndicators/ActivityIndicatorCollectionViewController.swift
@@ -17,7 +17,7 @@ final class ActivityIndicatorCollectionViewController: UICollectionViewControlle
     iterateEnum(ActivityIndicatorType.self).forEach {
       types.append($0)
     }
-    if types.count % 2 != 0, let index = types.index(of: .none) {
+    if types.count % 2 != 0, let index = types.firstIndex(of: .none) {
       types.remove(at: index)
     }
     return types
diff --git a/IBAnimatableApp/IBAnimatableApp/Playground/Presentations/PresentingViewController.swift b/IBAnimatableApp/IBAnimatableApp/Playground/Presentations/PresentingViewController.swift
@@ -228,19 +228,19 @@ extension PresentingViewController {
   func resetSelectedItemPicker() {
     var row: Int?
     if selectedButton == btnAnimationType {
-      row = animations.index(of: selectedAnimationType ?? "")
+      row = animations.firstIndex(of: selectedAnimationType ?? "")
     } else if selectedButton == btnDismissalAnimationType {
-      row = animations.index(of: selectedDismissalAnimationType ?? "")
+      row = animations.firstIndex(of: selectedDismissalAnimationType ?? "")
     } else if selectedButton == btnModalPosition {
-      row = positions.index(of: selectedModalPosition ?? "")
+      row = positions.firstIndex(of: selectedModalPosition ?? "")
     } else if selectedButton == btnModalSize {
-      pickerView.selectRow(sizes.index(of: selectedModalWidth) ?? 0, inComponent: 0, animated: false)
-      pickerView.selectRow(sizes.index(of: selectedModalHeight) ?? 0, inComponent: 1, animated: false)
+      pickerView.selectRow(sizes.firstIndex(of: selectedModalWidth) ?? 0, inComponent: 0, animated: false)
+      pickerView.selectRow(sizes.firstIndex(of: selectedModalHeight) ?? 0, inComponent: 1, animated: false)
       return
     } else if selectedButton == btnKeyboardTranslation {
-      row = keyboardTranslations.index(of: selectedKeyboardTranslation ?? "")
+      row = keyboardTranslations.firstIndex(of: selectedKeyboardTranslation ?? "")
     } else if selectedButton == btnBlurEffectStyle {
-      row = blurEffectStyles.index(of: selectedBlurEffectStyle ?? "")
+      row = blurEffectStyles.firstIndex(of: selectedBlurEffectStyle ?? "")
     }
     pickerView.selectRow(row ?? 0, inComponent: 0, animated: false)
   }
@@ -287,3 +287,12 @@ extension PresentingViewController {
   }
 
 }
+
+/// Swift < 5.0 support
+#if swift(<5.0)
+extension Array where Element: Equatable {
+  public func firstIndex(of element: Element) -> Int? {
+    return self.index(of: element)
+  }
+}
+#endif

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ final class ActivityIndicatorCollectionViewController: UICollectionViewControlle`
`17`	`17`	`iterateEnum(ActivityIndicatorType.self).forEach {`
`18`	`18`	`types.append($0)`
`19`	`19`	`}`
`20`		`- if types.count % 2 != 0, let index = types.index(of: .none) {`
	`20`	`+ if types.count % 2 != 0, let index = types.firstIndex(of: .none) {`
`21`	`21`	`types.remove(at: index)`
`22`	`22`	`}`
`23`	`23`	`return types`