Merge branch 'master' into feature/feedback

owncloud · Jul 3, 2024 · d8f71ca · d8f71ca
2 parents 6c410bc + 7709509
commit d8f71ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ownCloudAppShared/Client/Collection Views/Cells/ActionCell.swift b/ownCloudAppShared/Client/Collection Views/Cells/ActionCell.swift
@@ -110,7 +110,7 @@ class ActionCell: ThemeableCollectionViewCell {
 
 				titleLabel.textAlignment = .center
 
-				titleLabel.font = UIFont.systemFont(ofSize: 10)
+				titleLabel.font = UIFont.preferredFont(forTextStyle: .caption2)
 
 				self.configuredConstraints = [
 					iconView.leadingAnchor.constraint(greaterThanOrEqualTo: contentView.leadingAnchor, constant: iconInsets.left),

diff --git a/ownCloudAppShared/Client/View Controllers/ClientItemViewController.swift b/ownCloudAppShared/Client/View Controllers/ClientItemViewController.swift
@@ -283,7 +283,7 @@ open class ClientItemViewController: CollectionViewController, SortBarDelegate,
 
 			footerFolderStatisticsLabel = ThemeCSSLabel(withSelectors: [.sectionFooter, .statistics])
 			footerFolderStatisticsLabel?.translatesAutoresizingMaskIntoConstraints = false
-			footerFolderStatisticsLabel?.font = UIFont.systemFont(ofSize: UIFont.smallSystemFontSize)
+			footerFolderStatisticsLabel?.font = UIFont.preferredFont(forTextStyle: .footnote)
 			footerFolderStatisticsLabel?.textAlignment = .center
 			footerFolderStatisticsLabel?.setContentHuggingPriority(.required, for: .vertical)
 			footerFolderStatisticsLabel?.setContentCompressionResistancePriority(.required, for: .vertical)