From 1c963bec67836a518a99fb7c8b48cf43f106bdaf Mon Sep 17 00:00:00 2001 From: Chris Li Date: Tue, 7 Feb 2017 10:05:33 -0500 Subject: [PATCH] Code removal --- Kiwix-iOS/View/Cells.swift | 7 ++++++- Kiwix-iOS/View/LibraryCells.swift | 16 ---------------- Kiwix-iOS/View/Others.swift | 15 --------------- Kiwix-iOS/View/SearchBar.swift | 2 -- Kiwix.xcodeproj/project.pbxproj | 4 ---- 5 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 Kiwix-iOS/View/LibraryCells.swift diff --git a/Kiwix-iOS/View/Cells.swift b/Kiwix-iOS/View/Cells.swift index 7475869c..b359481f 100644 --- a/Kiwix-iOS/View/Cells.swift +++ b/Kiwix-iOS/View/Cells.swift @@ -173,7 +173,12 @@ class LibraryCollectionHeader: UICollectionReusableView { } - +class DownloadTaskCell: UITableViewCell { + @IBOutlet weak var thumbImageView: UIImageView! + @IBOutlet weak var titleLabel: UILabel! + @IBOutlet weak var subtitleLabel: UILabel! + @IBOutlet weak var progressView: UIProgressView! +} // MARK: - last time refactor diff --git a/Kiwix-iOS/View/LibraryCells.swift b/Kiwix-iOS/View/LibraryCells.swift deleted file mode 100644 index 4d7b4378..00000000 --- a/Kiwix-iOS/View/LibraryCells.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// LibraryCells.swift -// Kiwix -// -// Created by Chris Li on 1/26/17. -// Copyright © 2017 Chris Li. All rights reserved. -// - -import UIKit - -class DownloadTaskCell: UITableViewCell { - @IBOutlet weak var thumbImageView: UIImageView! - @IBOutlet weak var titleLabel: UILabel! - @IBOutlet weak var subtitleLabel: UILabel! - @IBOutlet weak var progressView: UIProgressView! -} diff --git a/Kiwix-iOS/View/Others.swift b/Kiwix-iOS/View/Others.swift index f3254830..82ece29a 100644 --- a/Kiwix-iOS/View/Others.swift +++ b/Kiwix-iOS/View/Others.swift @@ -51,21 +51,6 @@ class DropShadowView: UIView { } } -class SearchHRegularDropShadowView: UIView { - override func awakeFromNib() { - layer.masksToBounds = false - layer.cornerRadius = 10.0 - layer.shadowOffset = CGSize(width: 0, height: 0) - layer.shadowRadius = 50.0 - layer.shadowOpacity = 0.2 - } - - override func layoutSubviews() { - super.layoutSubviews() - layer.shadowPath = UIBezierPath(rect: bounds).cgPath - } -} - class SearchRoundedCornerView: UIView { override func awakeFromNib() { diff --git a/Kiwix-iOS/View/SearchBar.swift b/Kiwix-iOS/View/SearchBar.swift index 3a7106e2..3a734283 100644 --- a/Kiwix-iOS/View/SearchBar.swift +++ b/Kiwix-iOS/View/SearchBar.swift @@ -230,8 +230,6 @@ private class SearchBarBackgroundView: UIView { } override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { -// let frame = self.bounds.insetBy(dx: 0, dy: -12) -// return frame.contains(point) ? self : nil return bounds.contains(point) ? self : nil } diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index 6cb2493c..07ba9e01 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -72,7 +72,6 @@ 9779C3171D4575AE0064CC8E /* TodayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9779C3161D4575AE0064CC8E /* TodayViewController.swift */; }; 9779C31E1D4575AE0064CC8E /* Bookmarks.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 9779C3131D4575AD0064CC8E /* Bookmarks.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 977AE7F91DD8F22400F1E581 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971A102A1D022AD5007FC62C /* SearchBar.swift */; }; - 977B121C1E3A5E8D00981890 /* LibraryCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 977B121B1E3A5E8D00981890 /* LibraryCells.swift */; }; 977B954D1DD4C40400F6F62B /* ScanProcedure.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811E1D6F70AC00E5FA99 /* ScanProcedure.swift */; }; 9780DE061E43BFF5009B6945 /* NetworkActivityIndicatorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9780DE051E43BFF5009B6945 /* NetworkActivityIndicatorController.swift */; }; 97A08C151DD263B90070D0E4 /* Book.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D681341D6F711A00E5FA99 /* Book.swift */; }; @@ -210,7 +209,6 @@ 9779C3131D4575AD0064CC8E /* Bookmarks.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Bookmarks.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 9779C3161D4575AE0064CC8E /* TodayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodayViewController.swift; sourceTree = ""; }; 9779C31B1D4575AE0064CC8E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 977B121B1E3A5E8D00981890 /* LibraryCells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LibraryCells.swift; sourceTree = ""; }; 9780DE051E43BFF5009B6945 /* NetworkActivityIndicatorController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkActivityIndicatorController.swift; sourceTree = ""; }; 9788419C1DA2FF2A00D22D3C /* MainInterface.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainInterface.storyboard; sourceTree = ""; }; 978C9DBF1E4245B60078BFF7 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; @@ -403,7 +401,6 @@ children = ( 971A10241D022AD5007FC62C /* BarButtonItems.swift */, 971A10261D022AD5007FC62C /* Cells.swift */, - 977B121B1E3A5E8D00981890 /* LibraryCells.swift */, 971A10271D022AD5007FC62C /* Logo.swift */, 9764CBD01D806AD800072D6A /* RefreshLibControl.swift */, 971A102A1D022AD5007FC62C /* SearchBar.swift */, @@ -924,7 +921,6 @@ 970E7F831DA0305000741290 /* WelcomeController.swift in Sources */, 97A1FD3B1D6F724E00A80EE2 /* stringTools.cpp in Sources */, 9780DE061E43BFF5009B6945 /* NetworkActivityIndicatorController.swift in Sources */, - 977B121C1E3A5E8D00981890 /* LibraryCells.swift in Sources */, 97599AA21E26D3B000BA15EF /* BookmarkBooksController.swift in Sources */, 97D0E9931DDA487E0029530E /* SearchBaseController.swift in Sources */, 97A1FD321D6F723D00A80EE2 /* resourceTools.cpp in Sources */,