Skip to content
This repository has been archived by the owner on Nov 26, 2020. It is now read-only.

Fix retain cycles #67

Merged
merged 1 commit into from
May 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/FolioReaderAudioPlayer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import UIKit
import AVFoundation
import MediaPlayer

protocol FolioReaderAudioPlayerDelegate {
protocol FolioReaderAudioPlayerDelegate: class {
/**
Notifies that Player read all sentence
*/
func didReadSentence()
}

class FolioReaderAudioPlayer: NSObject, AVAudioPlayerDelegate, AVSpeechSynthesizerDelegate {
var delegate: FolioReaderAudioPlayerDelegate!
weak var delegate: FolioReaderAudioPlayerDelegate!
var isTextToSpeech = false
var synthesizer: AVSpeechSynthesizer!
var playing = false
Expand Down
4 changes: 2 additions & 2 deletions Source/FolioReaderCenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ enum ScrollDirection: Int {

class ScrollScrubber: NSObject, UIScrollViewDelegate {

var delegate: FolioReaderCenter!
weak var delegate: FolioReaderCenter!
var showSpeed = 0.6
var hideSpeed = 0.6
var hideDelay = 1.0
Expand Down Expand Up @@ -232,7 +232,7 @@ class FolioReaderCenter: UIViewController, UICollectionViewDelegate, UICollectio
var totalPages: Int!
var tempFragment: String?
var currentPage: FolioReaderPage!
var folioReaderContainer: FolioReaderContainer!
weak var folioReaderContainer: FolioReaderContainer!
var animator: ZFModalTransitionAnimator!
var pageIndicatorView: FolioReaderPageIndicator!
var bookShareLink: String?
Expand Down
4 changes: 2 additions & 2 deletions Source/FolioReaderContainer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ enum SlideOutState {
}
}

protocol FolioReaderContainerDelegate {
protocol FolioReaderContainerDelegate: class {
/**
Notifies that the menu was expanded.
*/
Expand Down Expand Up @@ -78,7 +78,7 @@ class FolioReaderContainer: UIViewController, FolioReaderSidePanelDelegate {
kCurrentAudioRate: 1,
kCurrentHighlightStyle: 0,
kCurrentMediaOverlayStyle: MediaOverlayStyle.Default.rawValue
])
])
}

// MARK: - View life cicle
Expand Down
8 changes: 4 additions & 4 deletions Source/FolioReaderKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ public class FolioReader : NSObject {

static let sharedInstance = FolioReader()
static let defaults = NSUserDefaults.standardUserDefaults()
var readerCenter: FolioReaderCenter!
var readerSidePanel: FolioReaderSidePanel!
var readerContainer: FolioReaderContainer!
var readerAudioPlayer: FolioReaderAudioPlayer!
weak var readerCenter: FolioReaderCenter!
weak var readerSidePanel: FolioReaderSidePanel!
weak var readerContainer: FolioReaderContainer!
weak var readerAudioPlayer: FolioReaderAudioPlayer!
var isReaderOpen = false
var isReaderReady = false

Expand Down
2 changes: 1 addition & 1 deletion Source/FolioReaderPage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class FolioReaderPage: UICollectionViewCell, UIWebViewDelegate, UIGestureRecogni

var pageNumber: Int!
var webView: UIWebView!
var delegate: FolioPageDelegate!
weak var delegate: FolioPageDelegate!
private var shouldShowBar = true
private var menuIsVisible = false

Expand Down
2 changes: 1 addition & 1 deletion Source/FolioReaderSidePanel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ protocol FolioReaderSidePanelDelegate {

class FolioReaderSidePanel: UIViewController, UITableViewDelegate, UITableViewDataSource {

var delegate: FolioReaderSidePanelDelegate?
weak var delegate: FolioReaderSidePanelDelegate?
var tableView: UITableView!
var toolBar: UIToolbar!
let toolBarHeight: CGFloat = 50
Expand Down