Merge pull request #180 from tokudai0000/178-delete-ikemen

178 ikemenライブラリの削除

Podfile

@@ -17,7 +17,6 @@ abstract_target 'All' do
   pod 'RxSwift' , '~> 6'
   pod 'KeychainAccess' , '~> 4'
   pod 'NorthLayout'
-  pod '※ikemen'
 
   target 'univIP' do
   end

Podfile.lock

@@ -122,7 +122,6 @@ PODS:
   - RxRelay (6.5.0):
     - RxSwift (= 6.5.0)
   - RxSwift (6.5.0)
-  - "※ikemen (0.8.0)"
 
 DEPENDENCIES:
   - APIKit (~> 5)
@@ -136,7 +135,6 @@ DEPENDENCIES:
   - RxCocoa (~> 6)
   - RxGesture (~> 4)
   - RxSwift (~> 6)
-  - "※ikemen"
 
 SPEC REPOS:
   trunk:
@@ -164,7 +162,6 @@ SPEC REPOS:
     - RxGesture
     - RxRelay
     - RxSwift
-    - "※ikemen"
 
 SPEC CHECKSUMS:
   APIKit: 0680e86d2e8abd5bc42e64963f5f89d209eb9271
@@ -191,8 +188,7 @@ SPEC CHECKSUMS:
   RxGesture: f3efb47ed2d26a8082f7b660d4a59970e275a7f8
   RxRelay: 1de1523e604c72b6c68feadedd1af3b1b4d0ecbd
   RxSwift: 5710a9e6b17f3c3d6e40d6e559b9fa1e813b2ef8
-  "※ikemen": dd846bad2317b0ea51e5c7dd8e565108fa40d528
 
-PODFILE CHECKSUM: 310558f561793f179059aed0fc9ec538b65a0d98
+PODFILE CHECKSUM: 3c2909e1f90fcb3c2b0d1789d39f82f0b5b205c9
 
 COCOAPODS: 1.14.3

univIP/Module/Agreement/AgreementViewController.swift

@@ -7,51 +7,65 @@
 
 import UIKit
 import RxSwift
-import Ikemen
 import NorthLayout
 
 final class AgreementViewController: UIViewController {
-    private var iconImageView = UIImageView() ※ {
-        $0.image = UIImage(resource: R.image.icon_tokumemo_plus)
-        $0.layer.cornerRadius = 50.0
-        $0.clipsToBounds = true
-    }
-    private var textView = UITextView() ※ {
-        $0.backgroundColor = R.color.ultraGrayColor()
-        $0.layer.cornerRadius = 10.0
-        $0.textAlignment = .center
-        $0.isEditable = false
-    }
-    private var termsButton = UIButton() ※ {
-        $0.backgroundColor = .white
-        $0.setTitle(R.string.localizable.terms_of_service(), for: .normal)
-        $0.setTitleColor(.black, for: .normal)
-        $0.titleLabel?.font = UIFont.systemFont(ofSize: 14)
-        $0.tintColor = .black
-        $0.layer.borderColor = UIColor.black.cgColor
-        $0.layer.borderWidth = 1
-        $0.layer.cornerRadius = 10.0
-    }
-    private var privacyButton = UIButton() ※ {
-        $0.backgroundColor = .white
-        $0.setTitle(R.string.localizable.privacy_policy_button(), for: .normal)
-        $0.setTitleColor(.black, for: .normal)
-        $0.titleLabel?.font = UIFont.systemFont(ofSize: 14)
-        $0.tintColor = .black
-        $0.layer.borderColor = UIColor.black.cgColor
-        $0.layer.borderWidth = 1
-        $0.layer.cornerRadius = 10.0
-    }
-    private var agreementButton = UIButton() ※ {
-        $0.backgroundColor = R.color.subColor()
-        $0.setTitle(R.string.localizable.agree(), for: .normal)
-        $0.setTitleColor(.black, for: .normal)
-        $0.titleLabel?.font = UIFont.systemFont(ofSize: 16)
-        $0.tintColor = .black
-        $0.layer.borderColor = UIColor.black.cgColor
-        $0.layer.borderWidth = 1
-        $0.layer.cornerRadius = 5.0
-    }
+    private var iconImageView: UIImageView = {
+        let imageView = UIImageView()
+        imageView.image = UIImage(resource: R.image.icon_tokumemo_plus)
+        imageView.layer.cornerRadius = 50.0
+        imageView.clipsToBounds = true
+        return imageView
+    }()
+
+    private var textView: UITextView = {
+        let textView = UITextView()
+        textView.backgroundColor = R.color.ultraGrayColor()
+        textView.layer.cornerRadius = 10.0
+        textView.textAlignment = .center
+        textView.isEditable = false
+        return textView
+    }()
+
+    private var termsButton: UIButton = {
+        let button = UIButton()
+        button.backgroundColor = .white
+        button.setTitle(R.string.localizable.terms_of_service(), for: .normal)
+        button.setTitleColor(.black, for: .normal)
+        button.titleLabel?.font = UIFont.systemFont(ofSize: 14)
+        button.tintColor = .black
+        button.layer.borderColor = UIColor.black.cgColor
+        button.layer.borderWidth = 1
+        button.layer.cornerRadius = 10.0
+        return button
+    }()
+
+    private var privacyButton: UIButton = {
+        let button = UIButton()
+        button.backgroundColor = .white
+        button.setTitle(R.string.localizable.privacy_policy_button(), for: .normal)
+        button.setTitleColor(.black, for: .normal)
+        button.titleLabel?.font = UIFont.systemFont(ofSize: 14)
+        button.tintColor = .black
+        button.layer.borderColor = UIColor.black.cgColor
+        button.layer.borderWidth = 1
+        button.layer.cornerRadius = 10.0
+        return button
+    }()
+
+    private var agreementButton: UIButton = {
+        let button = UIButton()
+        button.backgroundColor = R.color.subColor()
+        button.setTitle(R.string.localizable.agree(), for: .normal)
+        button.setTitleColor(.black, for: .normal)
+        button.titleLabel?.font = UIFont.systemFont(ofSize: 16)
+        button.tintColor = .black
+        button.layer.borderColor = UIColor.black.cgColor
+        button.layer.borderWidth = 1
+        button.layer.cornerRadius = 5.0
+        return button
+    }()
+
 
     private let disposeBag = DisposeBag()
 

univIP/Module/Credits/ThirdPartyCreditCell.swift

@@ -7,21 +7,25 @@
 
 import UIKit
 import Entity
-import Ikemen
 import NorthLayout
 
 final class ThirdPartyCreditCell: UITableViewCell {
     static let Reusable = "ThirdPartyCreditCell"
-
-    private let titleLabel = UILabel() ※ {
-        $0.font = .systemFont(ofSize: 18, weight: .semibold)
-        $0.textAlignment = .center
-    }
-    private let contentLabel = UILabel() ※ {
-        $0.font = .systemFont(ofSize: 8, weight: .thin)
-        $0.textAlignment = .center
-        $0.numberOfLines = 0
-    }
+
+    private let titleLabel: UILabel = {
+        let label = UILabel()
+        label.font = .systemFont(ofSize: 18, weight: .semibold)
+        label.textAlignment = .center
+        return label
+    }()
+
+    private let contentLabel: UILabel = {
+        let label = UILabel()
+        label.font = .systemFont(ofSize: 8, weight: .thin)
+        label.textAlignment = .center
+        label.numberOfLines = 0
+        return label
+    }()
 
     var tapHandler: (() -> Void)?
 

univIP/Module/Home/Banner/UnivNewsTableCell.swift

@@ -7,21 +7,26 @@
 
 import UIKit
 import Entity
-import Ikemen
 import NorthLayout
 
 final class UnivNewsTableCell: UITableViewCell {
     static let Reusable = "UnivNewsTableCell"
 
-    private let titleLabel = UILabel() ※ {
-        $0.font = .systemFont(ofSize: 14, weight: .medium)
-        $0.textAlignment = .left
-        $0.numberOfLines = 0
-    }
-    private let createdAtLabel = UILabel() ※ {
-        $0.font = .systemFont(ofSize: 8, weight: .semibold)
-        $0.textAlignment = .left
-    }
+    private let titleLabel: UILabel = {
+        let label = UILabel()
+        label.font = .systemFont(ofSize: 14, weight: .medium)
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        return label
+    }()
+
+    private let createdAtLabel: UILabel = {
+        let label = UILabel()
+        label.font = .systemFont(ofSize: 8, weight: .semibold)
+        label.textAlignment = .left
+        return label
+    }()
+
 
     var tapHandler: (() -> Void)?
 

univIP/Module/Home/HomeMenuCollectionCell.swift

@@ -7,17 +7,19 @@
 
 import UIKit
 import Entity
-import Ikemen
 import NorthLayout
 
 final class HomeMenuCollectionCell: UICollectionViewCell {
     static let Reusable = "HomeMenuCollectionCell"
 
     private let imageView = UIImageView()
-    private let titleLabel = UILabel() ※ {
-        $0.font = .systemFont(ofSize: 14, weight: .medium)
-        $0.textAlignment = .center
-    }
+    private let titleLabel: UILabel = {
+        let label = UILabel()
+        label.font = .systemFont(ofSize: 14, weight: .medium)
+        label.textAlignment = .center
+        return label
+    }()
+
 
     var tapHandler: (() -> Void)?
 

univIP/Module/News/NewsViewController.swift

@@ -8,15 +8,16 @@
 import UIKit
 import RxSwift
 import Entity
-import Ikemen
 
 class NewsViewController: UIViewController {
     private var tableView = UITableView()
-    private var viewActivityIndicator = UIActivityIndicatorView() ※ {
-        $0.frame = CGRect(x: 0, y: 0, width: 50, height: 50)
-        $0.style = UIActivityIndicatorView.Style.medium
-        $0.hidesWhenStopped = true
-    }
+    private var viewActivityIndicator: UIActivityIndicatorView = {
+        let indicator = UIActivityIndicatorView()
+        indicator.frame = CGRect(x: 0, y: 0, width: 50, height: 50)
+        indicator.style = UIActivityIndicatorView.Style.medium
+        indicator.hidesWhenStopped = true
+        return indicator
+    }()
 
     private let disposeBag = DisposeBag()
 

univIP/Module/Splash/SplashViewController.swift

@@ -9,23 +9,37 @@ import UIKit
 import WebKit
 import RxSwift
 import Entity
-import Ikemen
 import NorthLayout
 
 final class SplashViewController: UIViewController {
-    private var iconImageView = UIImageView() ※ {
-        $0.image = R.image.icon_memokichi()
-    }
-    private var activityIndicator = UIActivityIndicatorView()
-    private var loginStatusLabel = UILabel() ※ {
-        $0.text = R.string.localizable.verifying_authentication()
-    }
-    private var copylightLabel = UILabel() ※ {
-        $0.text = "Developed by Tokushima Univ Students \n GitHub: @tokudai0000"
-        $0.textAlignment = .center
-        $0.numberOfLines = 0
-        $0.textColor = R.color.lightGrayColor()
-    }
+    private var iconImageView: UIImageView = {
+        let imageView = UIImageView()
+        imageView.image = R.image.icon_memokichi()
+        return imageView
+    }()
+
+    private var activityIndicator: UIActivityIndicatorView = {
+        let indicator = UIActivityIndicatorView()
+        indicator.style = .medium // `.medium`は適宜、アプリケーションのデザインに合わせて変更してください
+        indicator.startAnimating() // 必要に応じてアニメーションを開始
+        return indicator
+    }()
+
+    private var loginStatusLabel: UILabel = {
+        let label = UILabel()
+        label.text = R.string.localizable.verifying_authentication()
+        return label
+    }()
+
+    private var copylightLabel: UILabel = {
+        let label = UILabel()
+        label.text = "Developed by Tokushima Univ Students \n GitHub: @tokudai0000"
+        label.textAlignment = .center
+        label.numberOfLines = 0
+        label.textColor = R.color.lightGrayColor()
+        return label
+    }()
+
     // バックグラウンドでログインの処理を行う
     private var webView = WKWebView()
 

univIP/Settings/Acknowledgements.plist

@@ -2676,35 +2676,6 @@ redistribute it freely, subject to the following restrictions:
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>Copyright (c) 2015 banjun &lt;[email protected]&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-</string>
-			<key>License</key>
-			<string>MIT</string>
-			<key>Title</key>
-			<string>※ikemen</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright (c) 2015 - 2016 Yosuke Ishikawa