Fix ColorPickerCell for phone user interface idiom

zotero · Nov 21, 2023 · 4d1c7b2 · 4d1c7b2
1 parent f9f4c88
commit 4d1c7b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Zotero/Scenes/Detail/Annotation Popover/Views/ColorPickerCell.swift b/Zotero/Scenes/Detail/Annotation Popover/Views/ColorPickerCell.swift
@@ -28,9 +28,9 @@ final class ColorPickerCell: UITableViewCell {
             let hexColors = AnnotationsConfig.allColors
             let colorPicker = ColorPickerStackView(
                 hexColors: hexColors,
-                columnsDistribution: .fixed(numberOfColumns: hexColors.count),
+                columnsDistribution: UIDevice.current.userInterfaceIdiom == .pad ? .fixed(numberOfColumns: hexColors.count) : .fitInWidth(width: UIScreen.main.bounds.width),
                 allowsMultipleSelection: false,
-                circleBackgroundColor: backgroundColor ?? .secondarySystemBackground,
+                circleBackgroundColor: .secondarySystemGroupedBackground,
                 circleContentInsets: UIEdgeInsets(top: 11, left: 11, bottom: 11, right: 11),
                 accessibilityLabelProvider: { hexColor, isSelected in
                     name(for: hexColor, isSelected: isSelected)

diff --git a/Zotero/Scenes/Detail/PDF/Views/AnnotationToolOptionsViewController.swift b/Zotero/Scenes/Detail/PDF/Views/AnnotationToolOptionsViewController.swift
@@ -70,7 +70,7 @@ class AnnotationToolOptionsViewController: UIViewController {
                     circleSelectionLineWidth: 3,
                     circleSelectionInset: UIEdgeInsets(top: 4, left: 4, bottom: 4, right: 4),
                     trailingSpacerViewProvider: {
-                        guard UIDevice.current.userInterfaceIdiom == .phone  else { return nil }
+                        guard UIDevice.current.userInterfaceIdiom == .phone else { return nil }
                         let spacerView = UIView()
                         spacerView.setContentHuggingPriority(.defaultLow, for: .horizontal)
                         return spacerView