Skip to content
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

Blur background available, choose the image contentMode #27

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Blur background available, choose the image contentMode #27

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
8436636
Update AlertOnboarding.swift
DanielZanchi Oct 27, 2017
808c920
Update AlertOnboarding.swift
DanielZanchi Oct 27, 2017
110bf10
Added Blur and ImageContentMode selectable.
DanielZanchi Oct 31, 2017
d4cfc3d
improved image content mode, without method.
DanielZanchi Oct 31, 2017
3bcf309
Added blur option and choose image content mode.
DanielZanchi Oct 31, 2017
c74a877
Font changed and size of images.
DanielZanchi Jan 26, 2018
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
50 changes: 32 additions & 18 deletions AlertOnboarding/AlertChildPageViewController.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11201" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="MarkerFeltThin.ttf">
<string>MarkerFelt-Thin</string>
</array>
<array key="MarkerFeltWide.ttf">
<string>MarkerFelt-Wide</string>
</array>
</customFonts>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
Expand All @@ -19,19 +30,19 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ozM-3f-JWg" userLabel="View 2:2">
<frame key="frameInset" minY="314" width="600" height="286"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ozM-3f-JWg" userLabel="View 2:2">
<rect key="frame" x="0.0" y="433.5" width="375" height="233.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="CHOOSE THE PLANET" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="64e-Bi-ts0">
<frame key="frameInset" minX="8" minY="8" width="584" height="57"/>
<fontDescription key="fontDescription" name="Avenir-Heavy" family="Avenir" pointSize="17"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CHOOSE THE PLANET" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="64e-Bi-ts0">
<rect key="frame" x="10" y="10" width="355" height="22.5"/>
<fontDescription key="fontDescription" name="MarkerFelt-Wide" family="Marker Felt" pointSize="17"/>
<color key="textColor" red="0.6705882353" green="0.69411764710000001" blue="0.76862745099999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eh1-05-M15">
<frame key="frameInset" minX="8" minY="92" width="584" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eh1-05-M15">
<rect key="frame" x="10" y="42.5" width="355" height="76.5"/>
<string key="text">Lorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum</string>
<fontDescription key="fontDescription" name="Avenir-Book" family="Avenir" pointSize="13"/>
<fontDescription key="fontDescription" name="MarkerFelt-Thin" family="Marker Felt" pointSize="14"/>
<color key="textColor" red="0.6705882353" green="0.69411764710000001" blue="0.76862745099999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
Expand All @@ -46,18 +57,21 @@
<constraint firstItem="64e-Bi-ts0" firstAttribute="top" secondItem="ozM-3f-JWg" secondAttribute="top" constant="10" id="rib-H8-35l"/>
</constraints>
</view>
<view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="idc-BF-yRA" userLabel="View 1:2">
<frame key="frameInset" width="600" height="313"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="idc-BF-yRA" userLabel="View 1:2">
<rect key="frame" x="0.0" y="0.0" width="375" height="433.5"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BOp-iF-ff6">
<frame key="frameInset" minX="157" minY="45" width="286" height="223"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="BOp-iF-ff6">
<rect key="frame" x="24" y="53.5" width="327" height="327"/>
<constraints>
<constraint firstAttribute="width" secondItem="BOp-iF-ff6" secondAttribute="height" multiplier="1:1" id="TPE-Vx-D0c"/>
</constraints>
</imageView>
</subviews>
<constraints>
<constraint firstItem="BOp-iF-ff6" firstAttribute="centerX" secondItem="idc-BF-yRA" secondAttribute="centerX" id="4uh-YD-I07"/>
<constraint firstItem="BOp-iF-ff6" firstAttribute="width" secondItem="idc-BF-yRA" secondAttribute="height" multiplier="0.8" id="JQe-2J-Cdd"/>
<constraint firstAttribute="trailing" secondItem="BOp-iF-ff6" secondAttribute="trailing" constant="24" id="E7q-cu-vRO"/>
<constraint firstItem="BOp-iF-ff6" firstAttribute="centerY" secondItem="idc-BF-yRA" secondAttribute="centerY" id="SfY-fI-spo"/>
<constraint firstItem="BOp-iF-ff6" firstAttribute="height" secondItem="idc-BF-yRA" secondAttribute="height" multiplier="0.8" id="lpb-33-HGv"/>
<constraint firstItem="BOp-iF-ff6" firstAttribute="leading" secondItem="idc-BF-yRA" secondAttribute="leading" constant="24" id="VJe-J0-YCs"/>
</constraints>
</view>
</subviews>
Expand Down Expand Up @@ -85,8 +99,8 @@
<mask key="constraints">
<include reference="9EX-Px-g1g"/>
<exclude reference="yP1-qO-zR9"/>
<exclude reference="bk9-sX-BJj"/>
<include reference="5NH-Qw-DpT"/>
<exclude reference="bk9-sX-BJj"/>
</mask>
</variation>
</view>
Expand Down
15 changes: 12 additions & 3 deletions AlertOnboarding/AlertOnboarding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {
open var buttonBottom: UIButton!
fileprivate var container: AlertPageViewController!
open var background: UIView!


//PUBLIC VARS ------------------------
open var colorForAlertViewBackground: UIColor = UIColor.white
Expand All @@ -50,6 +50,9 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {

open var delegate: AlertOnboardingDelegate?

open var shouldBlur = false
open var imageContentMode = UIViewContentMode.scaleToFill


public init (arrayOfImage: [String], arrayOfTitle: [String], arrayOfDescription: [String]) {
super.init(frame: CGRect(x: 0,y: 0,width: 0,height: 0))
Expand Down Expand Up @@ -78,14 +81,13 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {
//-----------------------------------------------------------------------------------------

open func show() {

//Update Color
self.buttonBottom.backgroundColor = colorButtonBottomBackground
self.backgroundColor = colorForAlertViewBackground
self.buttonBottom.setTitleColor(colorButtonText, for: UIControlState())
self.buttonBottom.setTitle(self.titleSkipButton, for: UIControlState())

self.container = AlertPageViewController(arrayOfImage: arrayOfImage, arrayOfTitle: arrayOfTitle, arrayOfDescription: arrayOfDescription, alertView: self)
self.container = AlertPageViewController(arrayOfImage: arrayOfImage, arrayOfTitle: arrayOfTitle, arrayOfDescription: arrayOfDescription, alertView: self, imageContentMode: self.imageContentMode)
self.container.delegate = self
self.insertSubview(self.container.view, aboveSubview: self)
self.insertSubview(self.buttonBottom, aboveSubview: self)
Expand All @@ -95,6 +97,13 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {
return
}



//here I check if I should blur the view -----------------------
if self.shouldBlur {
self.background = UIVisualEffectView(effect: UIBlurEffect(style: .light))
}

// Find current stop viewcontroller
if let topController = getTopViewController() {
let superView: UIView = topController.view
Expand Down
8 changes: 7 additions & 1 deletion AlertOnboarding/AlertPageViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class AlertPageViewController: UIViewController, UIPageViewControllerDataSource,
var pageControl: UIPageControl!
var alertview: AlertOnboarding!

var imageContentView: UIViewContentMode!

//FOR DATA
var arrayOfImage: [String]!
var arrayOfTitle: [String]!
Expand All @@ -32,12 +34,14 @@ class AlertPageViewController: UIViewController, UIPageViewControllerDataSource,
var delegate: AlertPageViewDelegate?


init (arrayOfImage: [String], arrayOfTitle: [String], arrayOfDescription: [String], alertView: AlertOnboarding) {
init (arrayOfImage: [String], arrayOfTitle: [String], arrayOfDescription: [String], alertView: AlertOnboarding, imageContentMode icm: UIViewContentMode) {
super.init(nibName: nil, bundle: nil)
self.arrayOfImage = arrayOfImage
self.arrayOfTitle = arrayOfTitle
self.arrayOfDescription = arrayOfDescription
self.alertview = alertView

self.imageContentView = icm
}

required init(coder: NSCoder) {
Expand Down Expand Up @@ -111,11 +115,13 @@ class AlertPageViewController: UIViewController, UIPageViewControllerDataSource,
pageContentViewController = UINib(nibName: "AlertChildPageViewController", bundle: nil).instantiate(withOwner: nil, options: nil)[0] as! AlertChildPageViewController
}


pageContentViewController.pageIndex = index // 0

let realIndex = arrayOfImage.count - index - 1

pageContentViewController.image.image = UIImage(named: arrayOfImage[realIndex])
pageContentViewController.image.contentMode = self.imageContentView
pageContentViewController.labelMainTitle.text = arrayOfTitle[realIndex]
pageContentViewController.labelMainTitle.textColor = alertview.colorTitleLabel
pageContentViewController.labelDescription.text = arrayOfDescription[realIndex]
Expand Down
7 changes: 6 additions & 1 deletion AlertOnboarding/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,13 @@ class ViewController: UIViewController, AlertOnboardingDelegate {
self.alertView.percentageRatioHeight = 0.5
self.alertView.percentageRatioWidth = 0.5

*/


self.alertView.imageContentMode = .scaleAspectFit

self.alertView.shouldBlur = true

*/

self.alertView.show()

Expand Down
15 changes: 12 additions & 3 deletions Pod/Classes/AlertOnboarding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {
open var buttonBottom: UIButton!
fileprivate var container: AlertPageViewController!
open var background: UIView!


//PUBLIC VARS ------------------------
open var colorForAlertViewBackground: UIColor = UIColor.white
Expand All @@ -50,6 +50,9 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {

open var delegate: AlertOnboardingDelegate?

open var shouldBlur = false
open var imageContentMode = UIViewContentMode.scaleToFill


public init (arrayOfImage: [String], arrayOfTitle: [String], arrayOfDescription: [String]) {
super.init(frame: CGRect(x: 0,y: 0,width: 0,height: 0))
Expand Down Expand Up @@ -78,14 +81,13 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {
//-----------------------------------------------------------------------------------------

open func show() {

//Update Color
self.buttonBottom.backgroundColor = colorButtonBottomBackground
self.backgroundColor = colorForAlertViewBackground
self.buttonBottom.setTitleColor(colorButtonText, for: UIControlState())
self.buttonBottom.setTitle(self.titleSkipButton, for: UIControlState())

self.container = AlertPageViewController(arrayOfImage: arrayOfImage, arrayOfTitle: arrayOfTitle, arrayOfDescription: arrayOfDescription, alertView: self)
self.container = AlertPageViewController(arrayOfImage: arrayOfImage, arrayOfTitle: arrayOfTitle, arrayOfDescription: arrayOfDescription, alertView: self, imageContentMode: self.imageContentMode)
self.container.delegate = self
self.insertSubview(self.container.view, aboveSubview: self)
self.insertSubview(self.buttonBottom, aboveSubview: self)
Expand All @@ -95,6 +97,13 @@ open class AlertOnboarding: UIView, AlertPageViewDelegate {
return
}



//here I check if I should blur the view -----------------------
if self.shouldBlur {
self.background = UIVisualEffectView(effect: UIBlurEffect(style: .light))
}

// Find current stop viewcontroller
if let topController = getTopViewController() {
let superView: UIView = topController.view
Expand Down
8 changes: 7 additions & 1 deletion Pod/Classes/AlertPageViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class AlertPageViewController: UIViewController, UIPageViewControllerDataSource,
var pageControl: UIPageControl!
var alertview: AlertOnboarding!

var imageContentView: UIViewContentMode!

//FOR DATA
var arrayOfImage: [String]!
var arrayOfTitle: [String]!
Expand All @@ -32,12 +34,14 @@ class AlertPageViewController: UIViewController, UIPageViewControllerDataSource,
var delegate: AlertPageViewDelegate?


init (arrayOfImage: [String], arrayOfTitle: [String], arrayOfDescription: [String], alertView: AlertOnboarding) {
init (arrayOfImage: [String], arrayOfTitle: [String], arrayOfDescription: [String], alertView: AlertOnboarding, imageContentMode icm: UIViewContentMode) {
super.init(nibName: nil, bundle: nil)
self.arrayOfImage = arrayOfImage
self.arrayOfTitle = arrayOfTitle
self.arrayOfDescription = arrayOfDescription
self.alertview = alertView

self.imageContentView = icm
}

required init(coder: NSCoder) {
Expand Down Expand Up @@ -111,11 +115,13 @@ class AlertPageViewController: UIViewController, UIPageViewControllerDataSource,
pageContentViewController = UINib(nibName: "AlertChildPageViewController", bundle: nil).instantiate(withOwner: nil, options: nil)[0] as! AlertChildPageViewController
}


pageContentViewController.pageIndex = index // 0

let realIndex = arrayOfImage.count - index - 1

pageContentViewController.image.image = UIImage(named: arrayOfImage[realIndex])
pageContentViewController.image.contentMode = self.imageContentView
pageContentViewController.labelMainTitle.text = arrayOfTitle[realIndex]
pageContentViewController.labelMainTitle.textColor = alertview.colorTitleLabel
pageContentViewController.labelDescription.text = arrayOfDescription[realIndex]
Expand Down