ユーザーのアイコン押してもプロフィールが開かなくなっていたデグレを修正 related: #136

cinderella-project · Mar 19, 2019 · 649bab5 · 649bab5
1 parent 4b3bc99
commit 649bab5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/iMast/CustomViews/MastodonPostCellViewController.swift b/iMast/CustomViews/MastodonPostCellViewController.swift
@@ -23,6 +23,7 @@ class MastodonPostCellViewController: UIViewController, Instantiatable, Injectab
         v.snp.makeConstraints { make in
             make.width.equalTo(v.snp.height)
         }
+        v.isUserInteractionEnabled = true
     }
 
     var input: Input
@@ -61,19 +62,22 @@ class MastodonPostCellViewController: UIViewController, Instantiatable, Injectab
 
         // layout
         self.view.addSubview(iconView)
+        iconView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.iconTapped)))
         iconWidthConstraint = iconView.widthAnchor.constraint(equalToConstant: 64) ※ {
             $0.isActive = true
         }
         iconView.snp.makeConstraints { make in
             make.leading.top.equalToSuperview().offset(8)
             make.bottom.lessThanOrEqualToSuperview().offset(-8)
         }
+
         let userStackView = UIStackView(arrangedSubviews: [
             userNameLabel,
             createdAtLabel,
         ]) ※ {
             $0.axis = .horizontal
         }
+
         let topStackView = ContainerView(arrangedSubviews: [
             userStackView,
             textView,
@@ -98,6 +102,7 @@ class MastodonPostCellViewController: UIViewController, Instantiatable, Injectab
     }
 
     func input(_ originalInput: MastodonPost) {
+        self.input = originalInput
         let input = originalInput.repost ?? originalInput
         // ブースト時の処理
         if originalInput.repost != nil {
@@ -160,8 +165,8 @@ class MastodonPostCellViewController: UIViewController, Instantiatable, Injectab
         }
     }
 
-    @IBAction func iconTapped(_ sender: Any) {
-        let vc = openUserProfile(user: input.account)
+    @objc func iconTapped() {
+        let vc = openUserProfile(user: (input.repost ?? input).account)
         self.navigationController?.pushViewController(vc, animated: true)
     }
 }