浏览代码

tweak positioning of elements in AccountSwitchViewController

cyberta 2 年之前
父节点
当前提交
343e09c883
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      deltachat-ios/Controller/AccountSwitchViewController.swift

+ 5 - 5
deltachat-ios/Controller/AccountSwitchViewController.swift

@@ -93,7 +93,7 @@ class AccountSwitchViewController: UITableViewController {
         if section == addSection {
         if section == addSection {
             let guide = self.view.safeAreaLayoutGuide
             let guide = self.view.safeAreaLayoutGuide
             let controllerHeight = guide.layoutFrame.size.height
             let controllerHeight = guide.layoutFrame.size.height
-            let contentHeight = CGFloat(accountIds.count + 1) * AccountCell.cellHeight + view.safeAreaInsets.vertical
+            let contentHeight = CGFloat(accountIds.count + 1) * AccountCell.cellHeight + (view.safeAreaInsets.vertical / 2)
             let diff = controllerHeight - contentHeight
             let diff = controllerHeight - contentHeight
             if diff > 12 {
             if diff > 12 {
                 return diff
                 return diff
@@ -291,18 +291,18 @@ class AccountCell: UITableViewCell {
         let margins = contentView.layoutMarginsGuide
         let margins = contentView.layoutMarginsGuide
         contentView.addConstraints([
         contentView.addConstraints([
             backgroundContainer.constraintAlignTopToAnchor(contentView.topAnchor, paddingTop: 0.5),
             backgroundContainer.constraintAlignTopToAnchor(contentView.topAnchor, paddingTop: 0.5),
-            backgroundContainer.constraintAlignTrailingToAnchor(contentView.trailingAnchor, paddingTrailing: 4),
-            backgroundContainer.constraintAlignLeadingToAnchor(contentView.leadingAnchor, paddingLeading: 4),
+            backgroundContainer.constraintAlignTrailingToAnchor(contentView.trailingAnchor, paddingTrailing: 8),
+            backgroundContainer.constraintAlignLeadingToAnchor(contentView.leadingAnchor, paddingLeading: 8),
             backgroundContainer.constraintAlignBottomToAnchor(contentView.bottomAnchor, paddingBottom: 0.5),
             backgroundContainer.constraintAlignBottomToAnchor(contentView.bottomAnchor, paddingBottom: 0.5),
             accountAvatar.constraintCenterYTo(contentView),
             accountAvatar.constraintCenterYTo(contentView),
-            accountAvatar.constraintAlignLeadingToAnchor(margins.leadingAnchor),
+            accountAvatar.constraintAlignLeadingToAnchor(margins.leadingAnchor, paddingLeading: 4),
             accountName.constraintAlignTopToAnchor(margins.topAnchor),
             accountName.constraintAlignTopToAnchor(margins.topAnchor),
             accountName.constraintToTrailingOf(accountAvatar, paddingLeading: 20),
             accountName.constraintToTrailingOf(accountAvatar, paddingLeading: 20),
             accountName.constraintAlignBottomToAnchor(margins.bottomAnchor),
             accountName.constraintAlignBottomToAnchor(margins.bottomAnchor),
             accountName.constraintAlignTrailingToAnchor(margins.trailingAnchor, paddingTrailing: 32, priority: .defaultLow),
             accountName.constraintAlignTrailingToAnchor(margins.trailingAnchor, paddingTrailing: 32, priority: .defaultLow),
             stateIndicator.constraintCenterYTo(contentView),
             stateIndicator.constraintCenterYTo(contentView),
             stateIndicator.constraintToTrailingOf(accountName),
             stateIndicator.constraintToTrailingOf(accountName),
-            stateIndicator.constraintAlignTrailingToAnchor(margins.trailingAnchor, paddingTrailing: 14),
+            stateIndicator.constraintAlignTrailingToAnchor(margins.trailingAnchor, paddingTrailing: 16),
             stateIndicator.constraintHeightTo(24),
             stateIndicator.constraintHeightTo(24),
             stateIndicator.constraintWidthTo(24)
             stateIndicator.constraintWidthTo(24)
         ])
         ])