dnrops
/
ResourcePackage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to work with updated textFormater (1.2.0)

This commit is contained in:
Alfred Gao 2017-02-08 21:02:41 +08:00
parent 7fca562a8e
commit 7586dba4a9
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -9,6 +9,10 @@ Package resources to a single file, and access them via file name as key.
[![License](https://img.shields.io/cocoapods/l/ResourcePackage.svg?style=flat)](http://cocoapods.org/pods/ResourcePackage)
[![Platform](https://img.shields.io/cocoapods/p/ResourcePackage.svg?style=flat)](http://cocoapods.org/pods/ResourcePackage)
* modified to work with updated textFormater
* textFormater 1.2.0 : add persentage size support for image
# 1.1.0
* add language sufix support
# 1.0.5

4
ResourcePackage.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ResourcePackage'
s.version = '1.1.0'
s.version = '1.2.0'
s.summary = 'Manage resources for application.'
s.description = <<-DESC
@ -21,6 +21,6 @@ So resources can be easily managemented as well as encrypted.
s.source_files = 'Sources/*'
s.dependency 'SimpleEncrypter'
s.dependency 'TextFormater'
s.dependency 'TextFormater', '~> 1.2.0'
s.ios.dependency 'DeviceKit'
end

3
Sources/ResourcePackageReader.swift
View File

@ -222,9 +222,6 @@ public class ResourcePackageReader: NSObject {
}
}
/// used by Themes extension
var _textFormater = TextFormater()
/// used by sounds extension
var musicPlayer : AVAudioPlayer?
var sounds: [String : SystemSoundID] = [:]

4
Sources/Themes.swift
View File

@ -46,7 +46,6 @@ extension ResourcePackageReader {
_logger("Theme \(newValue) not exists, use \(_keyprefix)")
}
}
_textFormater = themeTextFormater
}
}
@ -191,7 +190,6 @@ extension ResourcePackageReader {
withPrefix: theme,
withPrefixBackward: backward)
packages = respkg
_textFormater = themeTextFormater
}
/// 获取主题文本
@ -211,7 +209,7 @@ extension ResourcePackageReader {
/// get formatted text from theme
/// - returns NSAttributedString or nil if key not found or resource cannot be converted to string
public func getFormatedString(_ key: String, formater: TextFormater? = nil) -> NSAttributedString? {
let _f = formater ?? self._textFormater
let _f = formater ?? self.themeTextFormater
return _f.format(getString(key))
}
/// 获取主题图片

16
Sources/UIExtensions.swift
View File

@ -22,6 +22,12 @@
/// - parameter formater: TextFormater for texts, `nil` will use theme default setting
public func loadTheme(from reader: ResourcePackageReader, key: String, with formater: TextFormater? = nil) {
let textFormater = formater ?? reader.themeTextFormater
self.layoutIfNeeded()
let _width = self.bounds.size.width
let _height = self.bounds.size.height
for (_sname, _state) in [
(key, UIControlState.normal),
(key + ".disabled", UIControlState.disabled),
@ -29,7 +35,7 @@
(key + ".selected", UIControlState.selected),
(key + ".focused", UIControlState.focused),
] {
setAttributedTitle(reader.getFormatedString(_sname + ".title", formater: formater), for: _state)
setAttributedTitle(textFormater.format(reader.getString(_sname + ".title"), imgWidth: _width, imgHeight: _height), for: _state)
setImage(reader.getImage(_sname + ".image"), for: _state)
setBackgroundImage(reader.getImage(_sname + ".bgimg"), for: _state)
}
@ -50,7 +56,13 @@
/// - parameter formater: TextFormater for texts, `nil` will use theme default setting
public func setText(from reader: ResourcePackageReader, key: String, with formater: TextFormater? = nil) {
attributedText = reader.getFormatedString(key, formater: formater)
let textFormater = formater ?? reader.themeTextFormater
self.layoutIfNeeded()
let _width = self.bounds.size.width
let _height = self.bounds.size.height
attributedText = textFormater.format(reader.getString(key), imgWidth: _width, imgHeight: _height)
}
}