Skip to content

Release 5.18.21 #42

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

Open
JohnEmborianContus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Release 5.18.21 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions MirrorflyShareKit/Authentication PIN/AuthenticationPINViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class AuthenticationPINViewController: ShareKitBaseViewController, UITextFieldDe

@IBOutlet weak var forgotButtonoutlet: UIButton! {
didSet {
forgotButtonoutlet.isHidden = true
forgotButtonoutlet.isHidden = false
}
}

Expand All @@ -67,6 +67,8 @@ class AuthenticationPINViewController: ShareKitBaseViewController, UITextFieldDe

@IBOutlet weak var pinEnteredcollectionview: UICollectionView!

@IBOutlet weak var backBtn: UIButton!

var isDisablePin = false

override func viewDidLoad() {
Expand Down Expand Up @@ -185,6 +187,7 @@ class AuthenticationPINViewController: ShareKitBaseViewController, UITextFieldDe

override func viewWillAppear(_ animated: Bool) {
self.navigationController?.setNavigationBarHidden(true, animated: false)
self.navigationController?.interactivePopGestureRecognizer?.isEnabled = false
}

func setupUI() {
Expand All @@ -203,7 +206,7 @@ class AuthenticationPINViewController: ShareKitBaseViewController, UITextFieldDe
//self.forgotButtonoutlet.isHidden = false
}
else if fingerPrintLogout == true || logout == true || disableBothPIN == true || fingerPrintEnable == true {
self.forgotButtonoutlet.isHidden = true
self.forgotButtonoutlet.isHidden = false
}
txtFirst.delegate = self
txtSecond.delegate = self
Expand Down Expand Up @@ -266,6 +269,11 @@ class AuthenticationPINViewController: ShareKitBaseViewController, UITextFieldDe
txtSixth.text = ""
}


@IBAction func backBtn(_ sender: UIButton) {
self.navigationController?.popViewController(animated: true)
}

@objc override func didMoveToBackground() {
self.currentBackgroundDate = Date()

Expand Down
66 changes: 44 additions & 22 deletions MirrorflyShareKit/Authentication PIN/AuthenticationPINViewController.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
Expand All @@ -25,6 +26,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AuthenticationPINViewController" customModule="MirrorflyShareKit" customModuleProvider="target">
<connections>
<outlet property="backBtn" destination="9dk-mF-b7G" id="z9Y-Ib-g51"/>
<outlet property="collectionview" destination="K9E-Fq-iW1" id="yTH-ce-1ji"/>
<outlet property="forgotButtonoutlet" destination="2GS-Hn-39V" id="5o2-1P-oLk"/>
<outlet property="forgotpinBottomConstraint" destination="hVo-Dw-IAs" id="Anz-op-RdM"/>
Expand Down Expand Up @@ -52,10 +54,10 @@
<rect key="frame" x="0.0" y="48" width="414" height="814"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tjn-zb-Wtd">
<rect key="frame" x="0.0" y="0.0" width="414" height="677"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="814"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="PIN_screen" translatesAutoresizingMaskIntoConstraints="NO" id="sJs-RB-kcq">
<rect key="frame" x="0.0" y="0.0" width="414" height="677"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="814"/>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo_blue" translatesAutoresizingMaskIntoConstraints="NO" id="QEs-vo-YkO">
<rect key="frame" x="43" y="70" width="328" height="41"/>
Expand Down Expand Up @@ -120,38 +122,57 @@
<constraint firstItem="K9E-Fq-iW1" firstAttribute="leading" secondItem="VDg-wY-Yl4" secondAttribute="leading" id="yyg-ja-DZk"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2GS-Hn-39V">
<rect key="frame" x="157" y="607" width="100" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="F6r-6y-NrK"/>
<constraint firstAttribute="height" constant="30" id="iTJ-7c-Tyz"/>
</constraints>
<fontDescription key="fontDescription" name="SFUIDisplay-Regular" family="SF UI Display" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="Forgot PIN?">
<color key="titleColor" red="1" green="0.11764705882352941" blue="0.11764705882352941" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
</state>
<connections>
<action selector="forgotbutton:" destination="-1" eventType="touchUpInside" id="jVJ-zG-rSX"/>
</connections>
</button>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="94u-IF-upN">
<rect key="frame" x="157" y="607" width="100" height="75"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2GS-Hn-39V">
<rect key="frame" x="0.0" y="0.0" width="100" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="F6r-6y-NrK"/>
<constraint firstAttribute="height" constant="30" id="iTJ-7c-Tyz"/>
</constraints>
<fontDescription key="fontDescription" name="SFUIDisplay-Regular" family="SF UI Display" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="Forgot PIN?">
<color key="titleColor" red="1" green="0.11764705882352941" blue="0.11764705882352941" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
</state>
<connections>
<action selector="forgotbutton:" destination="-1" eventType="touchUpInside" id="jVJ-zG-rSX"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9dk-mF-b7G">
<rect key="frame" x="0.0" y="45" width="100" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="z2d-jY-DAI"/>
<constraint firstAttribute="width" constant="100" id="zec-X5-N6z"/>
</constraints>
<fontDescription key="fontDescription" name="SFUIDisplay-Regular" family="SF UI Display" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="Cancel">
<color key="titleColor" red="1" green="0.1176470588" blue="0.1176470588" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
</state>
<connections>
<action selector="backBtn:" destination="-1" eventType="touchUpInside" id="9aK-Tb-qU3"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="QEs-vo-YkO" firstAttribute="top" secondItem="tjn-zb-Wtd" secondAttribute="top" constant="70" id="3Zk-pf-GER"/>
<constraint firstAttribute="trailing" secondItem="VDg-wY-Yl4" secondAttribute="trailing" constant="70" id="9n7-go-gS9"/>
<constraint firstAttribute="bottom" secondItem="sJs-RB-kcq" secondAttribute="bottom" id="EgX-Sn-oZ8"/>
<constraint firstAttribute="trailing" secondItem="sJs-RB-kcq" secondAttribute="trailing" id="IaL-eA-8Vi"/>
<constraint firstItem="2GS-Hn-39V" firstAttribute="centerX" secondItem="tjn-zb-Wtd" secondAttribute="centerX" id="Kbw-Zn-Tyw"/>
<constraint firstItem="94u-IF-upN" firstAttribute="centerX" secondItem="tjn-zb-Wtd" secondAttribute="centerX" id="IqS-QX-riW"/>
<constraint firstItem="sJs-RB-kcq" firstAttribute="top" secondItem="tjn-zb-Wtd" secondAttribute="top" id="LRU-oM-dVg"/>
<constraint firstItem="VDg-wY-Yl4" firstAttribute="top" secondItem="LDf-06-dSd" secondAttribute="bottom" constant="30" id="Mxg-WO-Hma"/>
<constraint firstItem="2GS-Hn-39V" firstAttribute="top" secondItem="VDg-wY-Yl4" secondAttribute="bottom" constant="15" id="WkE-Sn-hXL"/>
<constraint firstItem="94u-IF-upN" firstAttribute="top" secondItem="VDg-wY-Yl4" secondAttribute="bottom" constant="15" id="Qca-AL-on1"/>
<constraint firstItem="LDf-06-dSd" firstAttribute="top" secondItem="CjA-NC-CpV" secondAttribute="bottom" constant="31" id="ZII-Ub-f8a"/>
<constraint firstItem="CjA-NC-CpV" firstAttribute="top" secondItem="QEs-vo-YkO" secondAttribute="bottom" constant="30" id="bCk-ev-z6T"/>
<constraint firstItem="LDf-06-dSd" firstAttribute="centerX" secondItem="tjn-zb-Wtd" secondAttribute="centerX" id="cBy-hg-cW2"/>
<constraint firstAttribute="trailing" secondItem="QEs-vo-YkO" secondAttribute="trailing" constant="43" id="feY-qa-zdM"/>
<constraint firstItem="sJs-RB-kcq" firstAttribute="leading" secondItem="tjn-zb-Wtd" secondAttribute="leading" id="lpT-fe-L6H"/>
<constraint firstAttribute="bottom" secondItem="2GS-Hn-39V" secondAttribute="bottom" constant="40" id="qai-PJ-EN6"/>
<constraint firstItem="VDg-wY-Yl4" firstAttribute="leading" secondItem="tjn-zb-Wtd" secondAttribute="leading" constant="70" id="rle-kt-ZIt"/>
<constraint firstItem="CjA-NC-CpV" firstAttribute="centerX" secondItem="tjn-zb-Wtd" secondAttribute="centerX" id="tnG-mc-iTs"/>
<constraint firstItem="QEs-vo-YkO" firstAttribute="leading" secondItem="tjn-zb-Wtd" secondAttribute="leading" constant="43" id="zBs-9W-WAH"/>
Expand All @@ -164,6 +185,7 @@
<constraint firstAttribute="bottom" secondItem="tjn-zb-Wtd" secondAttribute="bottom" id="Qy7-nv-dxl"/>
<constraint firstItem="tjn-zb-Wtd" firstAttribute="width" secondItem="xWy-2z-Wr8" secondAttribute="width" id="S8a-QZ-O7F"/>
<constraint firstItem="tjn-zb-Wtd" firstAttribute="leading" secondItem="xWy-2z-Wr8" secondAttribute="leading" id="dW7-x2-Sxp"/>
<constraint firstAttribute="bottom" secondItem="94u-IF-upN" secondAttribute="bottom" constant="132" id="i4W-qa-4T8"/>
<constraint firstAttribute="bottom" secondItem="tjn-zb-Wtd" secondAttribute="bottom" id="ke9-RJ-be8"/>
</constraints>
</scrollView>
Expand Down
1 change: 1 addition & 0 deletions MirrorflyShareKit/Authentication PIN/FingerPrint PIN/FingerPrintPINViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class FingerPrintPINViewController: ShareKitBaseViewController {

override func viewWillAppear(_ animated: Bool) {
authenticationWithTouchID()
self.navigationController?.interactivePopGestureRecognizer?.isEnabled = false
}

override func willCometoForeground() {
Expand Down
2 changes: 1 addition & 1 deletion MirrorflyShareKit/ShareScreen/SharekitShareToViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class SharekitShareToViewController: ShareKitBaseViewController {
navigationController?.isNavigationBarHidden = true
sendButton?.isEnabled = false
sendButton?.alpha = 0.4

self.navigationController?.interactivePopGestureRecognizer?.isEnabled = false
if !selectedProfiles.isEmpty {
sendButton?.isEnabled = true
sendButton?.alpha = 1
Expand Down
1 change: 1 addition & 0 deletions MirrorflyShareKit/WarningPopUp/QuickSharePopupViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class QuickSharePopupViewController : ShareKitBaseViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
contentView?.roundCorners(corners: [.topLeft,.topRight,.bottomLeft,.bottomRight], radius: 10.0)
self.navigationController?.interactivePopGestureRecognizer?.isEnabled = false
}

override func viewDidLoad() {
Expand Down
Loading