Merge branch 'hotfix/1.2.4'

bcylin · Jul 2, 2020 · f2a8120 · f2a8120
2 parents 3ac01fb + 9d77076
commit f2a8120
Show file tree

Hide file tree

Showing 19 changed files with 149 additions and 19 deletions.
diff --git a/.jazzy.yml b/.jazzy.yml
@@ -2,14 +2,14 @@ clean: true
 author: bcylin
 author_url: https://github.com/bcylin
 github_url: https://github.com/bcylin/QuickTableViewController
-github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.2.3
+github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.2.4
 xcodebuild_arguments: [
   -project, QuickTableViewController.xcodeproj,
   -scheme, QuickTableViewController-iOS,
   -sdk, iphonesimulator
 ]
 module: QuickTableViewController
-module_version: 1.2.3
+module_version: 1.2.4
 output: docs/output
 theme: fullwidth
 skip_undocumented: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v1.2.4
+
+* Fix an issue where the same identifier is used for different cell types [#50](https://github.com/bcylin/QuickTableViewController/issues/50)
+
 ## v1.2.3
 
 * Fix Swift version in podspec

diff --git a/Example-iOS/Info.plist b/Example-iOS/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleVersion</key>
 	<string>101</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Example-iOSUITests/Info.plist b/Example-iOSUITests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/Example-tvOS/Info.plist b/Example-tvOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleVersion</key>
 	<string>101</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Example-tvOSUITests/Info.plist b/Example-tvOSUITests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/QuickTableViewController.podspec b/QuickTableViewController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "QuickTableViewController"
-  s.version       = "1.2.3"
+  s.version       = "1.2.4"
   s.summary       = "A simple way to create a UITableView for settings."
   s.screenshots   = "https://raw.githubusercontent.com/bcylin/QuickTableViewController/gh-pages/img/screenshot-1.png",
                     "https://raw.githubusercontent.com/bcylin/QuickTableViewController/gh-pages/img/screenshot-2.png"

diff --git a/QuickTableViewController/Info-iOS.plist b/QuickTableViewController/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/QuickTableViewController/Info-iOSTests.plist b/QuickTableViewController/Info-iOSTests.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/QuickTableViewController/Info-tvOS.plist b/QuickTableViewController/Info-tvOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/QuickTableViewController/Info-tvOSTests.plist b/QuickTableViewController/Info-tvOSTests.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/Source/Rows/NavigationRow.swift b/Source/Rows/NavigationRow.swift
@@ -143,7 +143,7 @@ open class NavigationRow<T: UITableViewCell>: NavigationRowCompatible, Equatable
 }
 
 
-private extension UITableViewCell.CellStyle {
+internal extension UITableViewCell.CellStyle {
 
   var stringValue: String {
     switch self {

diff --git a/Source/Rows/OptionRow.swift b/Source/Rows/OptionRow.swift
@@ -79,8 +79,10 @@ open class OptionRow<T: UITableViewCell>: OptionRowCompatible, Equatable {
   /// The type of the table view cell to display the row.
   public let cellType: UITableViewCell.Type = T.self
 
-  /// The reuse identifier of the table view cell to display the row. The default value is **UITableViewCell**.
-  public let cellReuseIdentifier: String = T.reuseIdentifier
+  /// Returns the reuse identifier of the table view cell to display the row.
+  public var cellReuseIdentifier: String {
+    return T.reuseIdentifier + (detailText?.style.stringValue ?? "")
+  }
 
   /// Returns the table view cell style for the specified detail text.
   public var cellStyle: UITableViewCell.CellStyle {

diff --git a/Source/Rows/SwitchRow.swift b/Source/Rows/SwitchRow.swift
@@ -79,8 +79,10 @@ open class SwitchRow<T: SwitchCell>: SwitchRowCompatible, Equatable {
   /// The type of the table view cell to display the row.
   public let cellType: UITableViewCell.Type = T.self
 
-  /// The reuse identifier of the table view cell to display the row. The default value is **SwitchCell**.
-  public let cellReuseIdentifier: String = T.reuseIdentifier
+  /// Returns the reuse identifier of the table view cell to display the row.
+  public var cellReuseIdentifier: String {
+    return T.reuseIdentifier + (detailText?.style.stringValue ?? "")
+  }
 
   /// Returns the table view cell style for the specified detail text.
   public var cellStyle: UITableViewCell.CellStyle {

diff --git a/Tests/CustomTypes.swift b/Tests/CustomTypes.swift
@@ -30,6 +30,7 @@ import UIKit
 internal final class CustomCell: UITableViewCell {}
 internal final class CustomSwitchCell: SwitchCell {}
 internal final class CustomTapActionCell: TapActionCell {}
+internal final class CustomOptionCell: UITableViewCell {}
 
 internal final class CustomNavigationRow<T: UITableViewCell>: NavigationRow<T> {}
 internal final class CustomSwitchRow<T: SwitchCell>: SwitchRow<T> {}

diff --git a/Tests/Row/NavigationRowTests.swift b/Tests/Row/NavigationRowTests.swift
@@ -100,20 +100,44 @@ internal final class NavigationRowTests: XCTestCase {
   }
   #endif
 
-  func testCellReuseIdentifier() {
+  func testCellStyleWithReuseIdentifier() {
     // When
     let a = NavigationRow(text: "", detailText: .none)
     let b = NavigationRow(text: "", detailText: .subtitle(""))
     let c = NavigationRow(text: "", detailText: .value1(""))
     let d = NavigationRow(text: "", detailText: .value2(""))
 
     // Then
+    XCTAssertEqual(a.cellStyle, .default)
+    XCTAssertEqual(b.cellStyle, .subtitle)
+    XCTAssertEqual(c.cellStyle, .value1)
+    XCTAssertEqual(d.cellStyle, .value2)
+
     XCTAssertEqual(a.cellReuseIdentifier, "UITableViewCell.default")
     XCTAssertEqual(b.cellReuseIdentifier, "UITableViewCell.subtitle")
     XCTAssertEqual(c.cellReuseIdentifier, "UITableViewCell.value1")
     XCTAssertEqual(d.cellReuseIdentifier, "UITableViewCell.value2")
   }
 
+  func testCellStyleWithReuseIdentifier_customCellType() {
+    // When
+    let a = NavigationRow<CustomCell>(text: "", detailText: .none)
+    let b = NavigationRow<CustomCell>(text: "", detailText: .subtitle(""))
+    let c = NavigationRow<CustomCell>(text: "", detailText: .value1(""))
+    let d = NavigationRow<CustomCell>(text: "", detailText: .value2(""))
+
+    // Then
+    XCTAssertEqual(a.cellStyle, .default)
+    XCTAssertEqual(b.cellStyle, .subtitle)
+    XCTAssertEqual(c.cellStyle, .value1)
+    XCTAssertEqual(d.cellStyle, .value2)
+
+    XCTAssertEqual(a.cellReuseIdentifier, "CustomCell.default")
+    XCTAssertEqual(b.cellReuseIdentifier, "CustomCell.subtitle")
+    XCTAssertEqual(c.cellReuseIdentifier, "CustomCell.value1")
+    XCTAssertEqual(d.cellReuseIdentifier, "CustomCell.value2")
+  }
+
   #if os(iOS)
   func testAccessoryType_iOS() {
     // When

diff --git a/Tests/Row/OptionRowTests.swift b/Tests/Row/OptionRowTests.swift
@@ -46,7 +46,7 @@ internal final class OptionRowTests: XCTestCase {
     XCTAssertEqual(row.isSelected, true)
 
     // With RowStyle
-    XCTAssertEqual(row.cellReuseIdentifier, "UITableViewCell")
+    XCTAssertEqual(row.cellReuseIdentifier, "UITableViewCell.subtitle")
     XCTAssertEqual(row.cellStyle, .subtitle)
     XCTAssertEqual(row.icon, icon)
     XCTAssertEqual(row.accessoryType, .checkmark)
@@ -60,6 +60,50 @@ internal final class OptionRowTests: XCTestCase {
     XCTAssertEqual(actionInvoked, true)
   }
 
+  func testCellStyleWithReuseIdentifier() {
+    // When
+    let a = OptionRow(text: "", detailText: nil, isSelected: true, action: { _ in })
+    let b = OptionRow(text: "", detailText: DetailText.none, isSelected: true, action: { _ in })
+    let c = OptionRow(text: "", detailText: .subtitle(""), isSelected: true, action: { _ in })
+    let d = OptionRow(text: "", detailText: .value1(""), isSelected: true, action: { _ in })
+    let e = OptionRow(text: "", detailText: .value2(""), isSelected: true, action: { _ in })
+
+    // Then
+    XCTAssertEqual(a.cellStyle, .default)
+    XCTAssertEqual(b.cellStyle, .default)
+    XCTAssertEqual(c.cellStyle, .subtitle)
+    XCTAssertEqual(d.cellStyle, .value1)
+    XCTAssertEqual(e.cellStyle, .value2)
+
+    XCTAssertEqual(a.cellReuseIdentifier, "UITableViewCell")
+    XCTAssertEqual(b.cellReuseIdentifier, "UITableViewCell.default")
+    XCTAssertEqual(c.cellReuseIdentifier, "UITableViewCell.subtitle")
+    XCTAssertEqual(d.cellReuseIdentifier, "UITableViewCell.value1")
+    XCTAssertEqual(e.cellReuseIdentifier, "UITableViewCell.value2")
+  }
+
+  func testCellStyleWithReuseIdentifier_customCellType() {
+    // When
+    let a = OptionRow<CustomOptionCell>(text: "", detailText: nil, isSelected: true, action: { _ in })
+    let b = OptionRow<CustomOptionCell>(text: "", detailText: DetailText.none, isSelected: true, action: { _ in })
+    let c = OptionRow<CustomOptionCell>(text: "", detailText: .subtitle(""), isSelected: true, action: { _ in })
+    let d = OptionRow<CustomOptionCell>(text: "", detailText: .value1(""), isSelected: true, action: { _ in })
+    let e = OptionRow<CustomOptionCell>(text: "", detailText: .value2(""), isSelected: true, action: { _ in })
+
+    // Then
+    XCTAssertEqual(a.cellStyle, .default)
+    XCTAssertEqual(b.cellStyle, .default)
+    XCTAssertEqual(c.cellStyle, .subtitle)
+    XCTAssertEqual(d.cellStyle, .value1)
+    XCTAssertEqual(e.cellStyle, .value2)
+
+    XCTAssertEqual(a.cellReuseIdentifier, "CustomOptionCell")
+    XCTAssertEqual(b.cellReuseIdentifier, "CustomOptionCell.default")
+    XCTAssertEqual(c.cellReuseIdentifier, "CustomOptionCell.subtitle")
+    XCTAssertEqual(d.cellReuseIdentifier, "CustomOptionCell.value1")
+    XCTAssertEqual(e.cellReuseIdentifier, "CustomOptionCell.value2")
+  }
+
   // MARK: - Equatable
 
   func testEquatable_withIdenticalParameters() {

diff --git a/Tests/Row/SwitchRowTests.swift b/Tests/Row/SwitchRowTests.swift
@@ -46,7 +46,7 @@ internal final class SwitchRowTests: XCTestCase {
     XCTAssertEqual(row.switchValue, true)
 
     // With RowStyle
-    XCTAssertEqual(row.cellReuseIdentifier, "SwitchCell")
+    XCTAssertEqual(row.cellReuseIdentifier, "SwitchCell.subtitle")
     XCTAssertEqual(row.cellStyle, .subtitle)
     XCTAssertEqual(row.icon, icon)
     XCTAssertNil(row.customize)
@@ -66,6 +66,50 @@ internal final class SwitchRowTests: XCTestCase {
     XCTAssertEqual(actionInvoked, true)
   }
 
+  func testCellStyleWithReuseIdentifier() {
+    // When
+    let a = SwitchRow(text: "", detailText: nil, switchValue: true, action: { _ in })
+    let b = SwitchRow(text: "", detailText: DetailText.none, switchValue: true, action: { _ in })
+    let c = SwitchRow(text: "", detailText: .subtitle(""), switchValue: true, action: { _ in })
+    let d = SwitchRow(text: "", detailText: .value1(""), switchValue: true, action: { _ in })
+    let e = SwitchRow(text: "", detailText: .value2(""), switchValue: true, action: { _ in })
+
+    // Then
+    XCTAssertEqual(a.cellStyle, .default)
+    XCTAssertEqual(b.cellStyle, .default)
+    XCTAssertEqual(c.cellStyle, .subtitle)
+    XCTAssertEqual(d.cellStyle, .value1)
+    XCTAssertEqual(e.cellStyle, .value2)
+
+    XCTAssertEqual(a.cellReuseIdentifier, "SwitchCell")
+    XCTAssertEqual(b.cellReuseIdentifier, "SwitchCell.default")
+    XCTAssertEqual(c.cellReuseIdentifier, "SwitchCell.subtitle")
+    XCTAssertEqual(d.cellReuseIdentifier, "SwitchCell.value1")
+    XCTAssertEqual(e.cellReuseIdentifier, "SwitchCell.value2")
+  }
+
+  func testCellStyleWithReuseIdentifier_customCellType() {
+    // When
+    let a = SwitchRow<CustomSwitchCell>(text: "", detailText: nil, switchValue: true, action: { _ in })
+    let b = SwitchRow<CustomSwitchCell>(text: "", detailText: DetailText.none, switchValue: true, action: { _ in })
+    let c = SwitchRow<CustomSwitchCell>(text: "", detailText: .subtitle(""), switchValue: true, action: { _ in })
+    let d = SwitchRow<CustomSwitchCell>(text: "", detailText: .value1(""), switchValue: true, action: { _ in })
+    let e = SwitchRow<CustomSwitchCell>(text: "", detailText: .value2(""), switchValue: true, action: { _ in })
+
+    // Then
+    XCTAssertEqual(a.cellStyle, .default)
+    XCTAssertEqual(b.cellStyle, .default)
+    XCTAssertEqual(c.cellStyle, .subtitle)
+    XCTAssertEqual(d.cellStyle, .value1)
+    XCTAssertEqual(e.cellStyle, .value2)
+
+    XCTAssertEqual(a.cellReuseIdentifier, "CustomSwitchCell")
+    XCTAssertEqual(b.cellReuseIdentifier, "CustomSwitchCell.default")
+    XCTAssertEqual(c.cellReuseIdentifier, "CustomSwitchCell.subtitle")
+    XCTAssertEqual(d.cellReuseIdentifier, "CustomSwitchCell.value1")
+    XCTAssertEqual(e.cellReuseIdentifier, "CustomSwitchCell.value2")
+  }
+
   // MARK: - Equatable
 
   func testEquatable_withIdenticalParameters() {

diff --git a/Tests/Row/TapActionRowTests.swift b/Tests/Row/TapActionRowTests.swift
@@ -49,6 +49,15 @@ internal final class TapActionRowTests: XCTestCase {
     XCTAssertEqual(actionInvoked, true)
   }
 
+  func testCellStyleWithReuseIdentifier_customCellType() {
+    // When
+    let row = TapActionRow<CustomTapActionCell>(text: "", action: { _ in })
+
+    // Then
+    XCTAssertEqual(row.cellStyle, .default)
+    XCTAssertEqual(row.cellReuseIdentifier, "CustomTapActionCell")
+  }
+
   // MARK: - Equatable
 
   func testEquatable_withIdenticalParameters() {