Skip to content

ui changes logic and refactor #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RoiKed merged 6 commits into from
May 21, 2019
Merged

ui changes logic and refactor #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
415aaf1
ui changes logic and refactor
RoiKed May 19, 2019
ed2c30a
update version
RoiKed May 20, 2019
f25bfc3
ui change
RoiKed May 20, 2019
c5c48fa
rename manifest
RoiKed May 20, 2019
4bb3ad0
update podspecs
RoiKed May 20, 2019
cec616b
update close button position
RoiKed May 21, 2019
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
2 changes: 1 addition & 1 deletion ParentLockScreenPlugin-iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.2</string>
<string>1.0.3</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
</dict>
Expand Down
94 changes: 53 additions & 41 deletions ParentLockScreenPlugin-iOS/ParentLockScreenPluginVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
var pluginModel: ZPPluginModel?
var hookCompletion:HookCompletion?
var dataSourceModel: NSObject?
var numberOfValidationButtons:String?
var numberOfValidationButtons:Int?
var isVlidated:Bool!
var generatedValues: [String]
var enterdValues: [String]
Expand All @@ -28,12 +28,14 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
let localizationDelegate: ZAAppDelegateConnectorLocalizationProtocol
let ParentLockScreenNumberLimit = 3;
let cornerRadius: CGFloat = 0.5;
let isFlowBlocker: Bool = true

@IBOutlet weak var backgroundImageView: UIImageView!
@IBOutlet weak var imageView: UIImageView!
@IBOutlet weak var containerImageView: UIImageView!
@IBOutlet weak var closeButton: UIButton!
@IBOutlet weak var infoLabel: UILabel!
@IBOutlet weak var randomNumbersLabel: UILabel!
@IBOutlet weak var secondaryRandomNumbersLabel: UILabel!
@IBOutlet weak var dotsContainerView: UIView!
@IBOutlet var dotImagesCollection: [APImageView]!
@IBOutlet var numberButtonsCollection: [UIButton]!
Expand Down Expand Up @@ -66,7 +68,7 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
//MARK: - ZPScreenHookAdapterProtocol

func executeHook(presentationIndex: NSInteger, dataDict: [String : Any]?, taskFinishedWithCompletion: @escaping (Bool, NSError?, [String : Any]?) -> Void) {
hookCompletion = taskFinishedWithCompletion
hookCompletion = taskFinishedWithCompletion
}

required convenience init?(pluginModel: ZPPluginModel, dataSourceModel: NSObject?) {
Expand Down Expand Up @@ -98,20 +100,15 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr

private func setNumberButtons() {
for button in numberButtonsCollection {
if let backgroundImage = UIImage(named: "number_btn_not_selected_bg") {
button.setBackgroundImage(backgroundImage, for: .normal)
}
if let selectedBackgroundImage = UIImage(named: "number_btn_selected_bg") {
button.setBackgroundImage(selectedBackgroundImage, for: .highlighted)
}
if let pluginStyles = pluginStyles {
if let backgroundImage = UIImage(named: "Number_btn_not_selected_bg") {
button.setBackgroundImage(backgroundImage, for: .normal)
if let selectedBackgroundImage = UIImage(named: "Number_btn_selected_bg") {
button.setBackgroundImage(selectedBackgroundImage, for: .highlighted)
}
} else {
button.layer.cornerRadius = cornerRadius * button.bounds.size.width
button.clipsToBounds = true
button.layer.borderWidth = 2
button.layer.borderColor = StylesHelper.getColorForKey(key: "number_buttons_selected_background_color", from: pluginStyles).cgColor
}
StylesHelper.setColorforButton(button: button, key: "number_color", from: pluginStyles, for: .normal)
StylesHelper.setColorforButton(button: button, key: "number_color_pressed", from: pluginStyles, for: UIControl.State.highlighted)
StylesHelper.setColorforButton(button: button, key: "number_color_pressed", from: pluginStyles, for: .highlighted)
StylesHelper.setFontforButton(button: button, fontNameKey: "font", fontSizeKey: "number_font_size", from: pluginStyles)
}
if let buttonNumber = numberButtonsCollection.firstIndex(of: button) {
Expand All @@ -127,20 +124,22 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
setIndicatorsToMainColor()
setNumberButtons()
setInfoLabel()
let containerBackgroundImageName = (numberOfValidationDigitsToPresent() == 3) ? "background_image_1_3" : "background_image_1_9"
if let containerBackgroundImage = UIImage(named: containerBackgroundImageName) {
self.containerImageView.image = containerBackgroundImage
}
if let parentLockscreenBackgroundImage = UIImage(named: "parent_lock_background_image_736h") {
self.backgroundImageView.image = parentLockscreenBackgroundImage
}
if let pluginGeneralSettings = pluginGeneralSettings {
if let screenBackgroundImage = StylesHelper.image(for: "container_background_image", using: pluginGeneralSettings) {
self.imageView.image = screenBackgroundImage
}
let screenBackgroundColor = StylesHelper.getColorForKey(key: "background_color", from: pluginGeneralSettings)
self.backgroundImageView.backgroundColor = screenBackgroundColor
}
}

private func setCloseButtonImage() {
if let pluginGeneralSettings = pluginGeneralSettings {
if let closeButtonImage = StylesHelper.image(for: "close_button", using: pluginGeneralSettings) {
closeButton.setImage(closeButtonImage, for: .normal)
}
if let closeButtonImage = UIImage(named: "close_button") {
closeButton.setImage(closeButtonImage, for: .normal)
}
}

Expand All @@ -153,41 +152,57 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
}

private func numberOfValidationDigitsToPresent() -> Int {
let defaultNumberOfValidationDigits = 3;
var validationDigits:Int = 3;
if let pluginGeneralSettings = pluginGeneralSettings,
let numberOfValidationButtons = pluginGeneralSettings["validation_flow_type"] as? String {
validationDigits = Int(numberOfValidationButtons) ?? defaultNumberOfValidationDigits
var retVal:Int = 3;
if let numberOfValidationButtons = numberOfValidationButtons {
return numberOfValidationButtons
} else {
if let pluginGeneralSettings = pluginGeneralSettings,
let ValidationButtonsNumberString = pluginGeneralSettings["validation_flow_type"] as? String {
self.numberOfValidationButtons = Int(ValidationButtonsNumberString) ?? 3
retVal = self.numberOfValidationButtons!
}
}
return validationDigits
return retVal
}

private func generateValues() {
var generatedValuesLocalizedArray = [String]()
var nonLocalizedGeneratedValues = [String]()
for _ in 1...ParentLockScreenNumberLimit {
let generatedValue = String(Int.random(in: 1 ... numberOfValidationDigitsToPresent()))
generatedValues.append(generatedValue)
if let stringGeneratedValue = NumbersDictionary[generatedValue] {
nonLocalizedGeneratedValues.append(stringGeneratedValue)
let stringGeneratedValueKey = "Number\(stringGeneratedValue)"
if let localizedValue = self.localizationDelegate.localizationString(byKey: stringGeneratedValueKey, defaultString: stringGeneratedValue) {
generatedValuesLocalizedArray.append(localizedValue)
}
}
}
//set text font font size size and color
//set font, size and color
randomNumbersLabel.text = generatedValuesLocalizedArray.joined(separator: ", ")
StylesHelper.setColorforLabel(label: randomNumbersLabel, key: "random_numbers_color", from: pluginStyles)
StylesHelper.setFontforLabel(label: randomNumbersLabel, fontNameKey: "font", fontSizeKey: "random_numbers_font_size", from: pluginStyles)
let localizationLanguage = APApplicasterController.sharedInstance()?.localizationLanguage
if localizationLanguage == "en" || localizationLanguage == "en-GB" || localizationLanguage == "en-UK"{
secondaryRandomNumbersLabel.isHidden = true
} else {
//set font, size and color
secondaryRandomNumbersLabel.text = nonLocalizedGeneratedValues.joined(separator: ", ")
StylesHelper.setColorforLabel(label: secondaryRandomNumbersLabel, key: "secondary_random_numbers_color", from: pluginStyles)
StylesHelper.setFontforLabel(label: secondaryRandomNumbersLabel, fontNameKey: "font", fontSizeKey: "secondary_random_numbers_font_size", from: pluginStyles)
}
}

@IBAction func handleUserPushCloseButton(_ sender: UIButton) {
closeScreenPlugin()
closeScreenPlugin(with: false)
}

private func closeScreenPlugin() {
// self.willMove(toParent: nil)
// self.view.removeAllSubviews()
// self.removeFromParent()
private func closeScreenPlugin(with success:Bool) {
if let hookCompletion = self.hookCompletion {
let error = success ? nil : NSError(domain: "User has closed hook execution failed", code: 0, userInfo: nil)
hookCompletion(success, error, nil)
}
if let screenPluginDelegate = self.screenPluginDelegate {
screenPluginDelegate.removeScreenPluginFromNavigationStack()
}
Expand All @@ -200,10 +215,7 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
if enterdValues.count == ParentLockScreenNumberLimit {
if enterdValues == generatedValues {
self.isVlidated = true
closeScreenPlugin()
if let hookCompletion = self.hookCompletion {
hookCompletion(true,nil,nil)
}
closeScreenPlugin(with: true)
} else {
generatedValues.removeAll()
generateValues()
Expand All @@ -217,7 +229,7 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
private func clearValidationIndicators() {
if let pluginGeneralSettings = pluginGeneralSettings {
for dot in dotImagesCollection {
dot.backgroundColor = StylesHelper.getColorForKey(key: "indicator_main_color", from: pluginGeneralSettings)
dot.backgroundColor = StylesHelper.getColorForKey(key: "indicator_normal", from: pluginGeneralSettings)
}
}
}
Expand All @@ -227,15 +239,15 @@ class ParentLockScreenPluginVC: UIViewController,ZPPluggableScreenProtocol,ZPScr
dot.layer.cornerRadius = cornerRadius * dot.bounds.size.width
dot.clipsToBounds = true
dot.layer.borderWidth = 1
dot.layer.borderColor = StylesHelper.getColorForKey(key: "number_buttons_selected_background_color", from: pluginStyles).cgColor
dot.layer.borderColor = StylesHelper.getColorForKey(key: "indicator_highlighted", from: pluginStyles).cgColor
}
clearValidationIndicators()
}

private func updateIndicatorAtIndex(index:Int) {
if let pluginGeneralSettings = pluginGeneralSettings {
let dot = self.dotImagesCollection[index]
dot.backgroundColor = StylesHelper.getColorForKey(key: "indicator_secondary_color", from: pluginGeneralSettings)
dot.backgroundColor = StylesHelper.getColorForKey(key: "indicator_highlighted", from: pluginGeneralSettings)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ParentLockScreenPlugin.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ParentLockScreenPlugin"
s.version = '1.0.2'
s.version = '1.0.3'
s.summary = "ParentLockScreenPlugin"
s.description = <<-DESC
plugin that provides a parent Validation before entering a specific area.
Expand All @@ -17,7 +17,7 @@ Pod::Spec.new do |s|


s.resources = [
"**/*.{png,xib}"
"Resources/*.{png,xib}"
]

s.xcconfig = {
Expand Down
Loading