瀏覽代碼

simplify column calculation, prefer 'let' over 'var'

B. Petersen 2 年之前
父節點
當前提交
597c4358b3
共有 1 個文件被更改,包括 4 次插入7 次删除
  1. 4 7
      deltachat-ios/Controller/GalleryViewController.swift

+ 4 - 7
deltachat-ios/Controller/GalleryViewController.swift

@@ -271,14 +271,14 @@ private extension GalleryViewController {
         let orientation = UIApplication.shared.statusBarOrientation
         let deviceType = UIDevice.current.userInterfaceIdiom
 
-        var gridDisplay: GridDisplay?
+        let gridDisplay: GridDisplay
         if deviceType == .phone {
             if orientation.isPortrait {
                 gridDisplay = .grid(columns: phonePortrait)
             } else {
                 gridDisplay = .grid(columns: phoneLandscape)
             }
-        } else if deviceType == .pad {
+        } else {
             if orientation.isPortrait {
                 gridDisplay = .grid(columns: padPortrait)
             } else {
@@ -286,11 +286,8 @@ private extension GalleryViewController {
             }
         }
 
-        if let gridDisplay = gridDisplay {
-            gridLayout.display = gridDisplay
-        } else {
-            safe_fatalError("undefined format")
-        }
+        gridLayout.display = gridDisplay
+
         let containerWidth = view.bounds.width - view.safeAreaInsets.left - view.safeAreaInsets.right - 2 * gridDefaultSpacing
         gridLayout.containerWidth = containerWidth
     }