Skip to content

WIP - I604 update win lose to have share button #635

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
gbusto wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP - I604 update win lose to have share button #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71070fc
Updated levels to have a share button.
Sep 12, 2019
a1f183f
Added screenshot for sharing levels win.
Sep 12, 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
15 changes: 15 additions & 0 deletions Ballz1/Assets.xcassets/win_lose_text_background.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "win_lose_text_background.pdf"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"preserves-vector-representation" : true
}
}
Binary file added Ballz1/Assets.xcassets/win_lose_text_background.imageset/win_lose_text_background.pdf
View file
Open in desktop
Binary file not shown.
52 changes: 51 additions & 1 deletion Ballz1/Controllers/LevelsGameController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class LevelsGameController: UIViewController,
@IBOutlet var rowCountLabel: UILabel!
@IBOutlet var heartImageView: UIImageView!

/* XXX REMOVE THESE NEXT 3 LINES */
@IBOutlet var gameOverView: UIView!
@IBOutlet var gameOverLevelCount: UILabel!
@IBOutlet var gameOverLevelScore: UILabel!
Expand All @@ -31,6 +32,11 @@ class LevelsGameController: UIViewController,

@IBOutlet weak var bannerAdView: GADBannerView!

@IBOutlet var gameOverViewNew: UIView!
@IBOutlet weak var gameOverTextBackground: UIImageView!
@IBOutlet weak var gameOverShareButton: UIButton!
@IBOutlet weak var gameOverNextButton: UIButton!

private var interstitialAd: GADInterstitial!

private var rewardAdViewController: RewardAdViewController!
Expand Down Expand Up @@ -269,6 +275,33 @@ class LevelsGameController: UIViewController,
}
}

@IBAction func gameOverShareButtonClicked(_ sender: Any) {
let layer = UIApplication.shared.keyWindow!.layer
let scale = UIScreen.main.scale
// Creates UIImage of same size as view
UIGraphicsBeginImageContextWithOptions(layer.frame.size, false, scale);
layer.render(in: UIGraphicsGetCurrentContext()!)
let screenshot = UIGraphicsGetImageFromCurrentImageContext()
UIGraphicsEndImageContext()

let activityViewController = UIActivityViewController(activityItems: [screenshot], applicationActivities: [])
self.present(activityViewController, animated: true, completion: nil)
}

@IBAction func gameOverNextButtonClicked(_ sender: Any) {
let scene = self.scene as! LevelsGameScene
scene.removeConfetti()
scene.removeGameOverView()

// Show an interstitial ad
if self.interstitialAd.isReady {
self.interstitialAd.present(fromRootViewController: self)
}

// Replay the game scene; state should have already been saved
self.goToGameScene()
}

override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Prepare for a segue
}
Expand Down Expand Up @@ -323,7 +356,14 @@ class LevelsGameController: UIViewController,
resumeButton.layer.cornerRadius = resumeButton.frame.height * 0.5
gameMenuButton.layer.cornerRadius = gameMenuButton.frame.height * 0.5

gameOverView.center = CGPoint(x: view.frame.midX, y: view.frame.midY)
// XXX REMOVE ME gameOverView.center = CGPoint(x: view.frame.midX, y: view.frame.midY)
gameOverViewNew.center = CGPoint(x: view.frame.midX, y: view.frame.midY)

gameOverNextButton.imageView?.contentMode = .scaleAspectFit
gameOverShareButton.imageView?.contentMode = .scaleAspectFit

gameOverNextButton.layer.cornerRadius = gameOverNextButton.frame.height * 0.5
gameOverShareButton.layer.cornerRadius = gameOverShareButton.frame.height * 0.5

view.presentScene(scene)
view.ignoresSiblingOrder = true
Expand Down Expand Up @@ -435,6 +475,7 @@ class LevelsGameController: UIViewController,
currentLevelCount -= 1
}

/* XXX REMOVE ME
gameOverLevelCount.attributedText = NSAttributedString(string: "Level \(currentLevelCount)",
attributes: strokeTextAttributes)
gameOverLevelScore.attributedText = NSAttributedString(string: "\(scene.gameModel!.gameScore)",
Expand All @@ -443,19 +484,26 @@ class LevelsGameController: UIViewController,
// If they beat their high score, let them know

scene.showGameOverView(win: win, gameOverView: gameOverView)
*/

if win {
// Used for determining when we might be able to prompt the use for a positive review (they're more likely to be happy if they've completed more than 1 level successfully)
numConsecutiveWins += 1
// Used in analytics to determine how many levels were completed in a session
numLevelsCompleted += 1
gameOverNextButton.setTitle("Next", for: .normal)
}
else {
numConsecutiveWins = 0
// Increment the number of levels failed
numLevelsFailed += 1

// Change the text of the button to say "Try Again" instead of "Next"
gameOverNextButton.setTitle("Try Again", for: .normal)
}

scene.showGameOverView(win: win, gameOverView: gameOverViewNew)

let winInt = win ? 1 : 0
let userRescuedInt = userWasRescued ? 1 : 0
// Analytics log event: level ending; send over the level number that just endedNS whether or not they just beat this level
Expand All @@ -466,6 +514,7 @@ class LevelsGameController: UIViewController,
"rescued": userRescuedInt as NSNumber,
])

/* XXX REWORK ME
let _ = Timer.scheduledTimer(withTimeInterval: 3.0, repeats: false) { _ in
let scene = self.scene as! LevelsGameScene
if win {
Expand All @@ -482,6 +531,7 @@ class LevelsGameController: UIViewController,
// Replay the game scene; state should have already been saved
self.goToGameScene()
}
*/
}

// MARK: Private functions
Expand Down
97 changes: 97 additions & 0 deletions Ballz1/Views/BrickBreak.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,49 @@
</constraints>
<viewLayoutGuide key="safeArea" id="Yeb-nJ-hu9"/>
</view>
<view hidden="YES" contentMode="scaleToFill" id="UHr-7i-BaQ">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Dcg-rG-s1r">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="win_lose_text_background" translatesAutoresizingMaskIntoConstraints="NO" id="O0L-pv-vXK">
<rect key="frame" x="0.0" y="0.0" width="300" height="145"/>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="FoD-tZ-nCw">
<rect key="frame" x="0.0" y="155" width="300" height="145"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xjf-Gr-tlP">
<rect key="frame" x="0.0" y="0.0" width="300" height="67.5"/>
<color key="backgroundColor" red="0.83137254900000002" green="0.0" blue="0.5568627451" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="Avenir-Light" family="Avenir" pointSize="31"/>
<state key="normal" title="Share">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mDV-Xr-R0H">
<rect key="frame" x="0.0" y="77.5" width="300" height="67.5"/>
<color key="backgroundColor" red="0.2470588235" green="0.42352941179999998" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="Avenir-Light" family="Avenir" pointSize="32"/>
<state key="normal" title="Play Again">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
</button>
</subviews>
</stackView>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Dcg-rG-s1r" firstAttribute="leading" secondItem="9On-Ek-1Sl" secondAttribute="leading" id="7Tg-ue-vtN"/>
<constraint firstItem="Dcg-rG-s1r" firstAttribute="top" secondItem="9On-Ek-1Sl" secondAttribute="top" id="CFi-yx-USR"/>
<constraint firstItem="9On-Ek-1Sl" firstAttribute="trailing" secondItem="Dcg-rG-s1r" secondAttribute="trailing" id="Wji-kX-5ae"/>
<constraint firstItem="9On-Ek-1Sl" firstAttribute="bottom" secondItem="Dcg-rG-s1r" secondAttribute="bottom" id="hUN-qm-uu3"/>
</constraints>
<viewLayoutGuide key="safeArea" id="9On-Ek-1Sl"/>
</view>
<exit id="BdV-NT-BI6" userLabel="Exit" sceneMemberID="exit"/>
<tapGestureRecognizer id="bNb-UM-NRp">
<connections>
Expand Down Expand Up @@ -907,7 +950,11 @@
<outlet property="gameMenuButton" destination="EpW-pu-3Ya" id="gxf-vg-iHo"/>
<outlet property="gameOverLevelCount" destination="sch-9a-iJz" id="KKS-60-ija"/>
<outlet property="gameOverLevelScore" destination="HeV-yu-1Hk" id="Y3C-K1-yoM"/>
<outlet property="gameOverNextButton" destination="mIP-zL-6vH" id="Kao-1c-AxY"/>
<outlet property="gameOverShareButton" destination="Ghf-oJ-Bi2" id="XQg-2J-u7M"/>
<outlet property="gameOverTextBackground" destination="KiQ-0E-LkJ" id="qmr-ZU-Vn6"/>
<outlet property="gameOverView" destination="eNe-4N-TTQ" id="BwE-R3-KYC"/>
<outlet property="gameOverViewNew" destination="pUa-zo-Khf" id="cJk-xg-d8j"/>
<outlet property="heartImageView" destination="kBu-Oi-gWf" id="bvF-PU-h5F"/>
<outlet property="levelCount" destination="djQ-6i-xDb" id="3Gk-Bb-C5C"/>
<outlet property="levelScore" destination="wRS-np-rfH" id="X7e-6K-z8T"/>
Expand Down Expand Up @@ -991,6 +1038,55 @@
</constraints>
<viewLayoutGuide key="safeArea" id="L9l-tV-Ri5"/>
</view>
<view hidden="YES" contentMode="scaleToFill" id="pUa-zo-Khf">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="LNz-wC-NAv">
<rect key="frame" x="0.0" y="0.0" width="300" height="300"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="win_lose_text_background" translatesAutoresizingMaskIntoConstraints="NO" id="KiQ-0E-LkJ">
<rect key="frame" x="0.0" y="0.0" width="300" height="145"/>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="RSv-O0-Jtg">
<rect key="frame" x="0.0" y="155" width="300" height="145"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ghf-oJ-Bi2">
<rect key="frame" x="0.0" y="0.0" width="300" height="67.5"/>
<color key="backgroundColor" red="0.83137254900000002" green="0.0" blue="0.5568627451" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="Avenir-Light" family="Avenir" pointSize="31"/>
<state key="normal" title="Share">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="gameOverShareButtonClicked:" destination="lds-87-3TS" eventType="touchUpInside" id="vRU-aW-8Wj"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mIP-zL-6vH">
<rect key="frame" x="0.0" y="77.5" width="300" height="67.5"/>
<color key="backgroundColor" red="0.2470588235" green="0.42352941179999998" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="Avenir-Light" family="Avenir" pointSize="32"/>
<state key="normal" title="Next">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="gameOverNextButtonClicked:" destination="lds-87-3TS" eventType="touchUpInside" id="Ifl-Du-qGG"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="LNz-wC-NAv" firstAttribute="top" secondItem="nAT-28-bjV" secondAttribute="top" id="A53-YY-kYd"/>
<constraint firstItem="LNz-wC-NAv" firstAttribute="leading" secondItem="nAT-28-bjV" secondAttribute="leading" id="DKL-36-BEs"/>
<constraint firstItem="nAT-28-bjV" firstAttribute="bottom" secondItem="LNz-wC-NAv" secondAttribute="bottom" id="KQ7-9j-sIE"/>
<constraint firstItem="nAT-28-bjV" firstAttribute="trailing" secondItem="LNz-wC-NAv" secondAttribute="trailing" id="UIs-UH-fjo"/>
</constraints>
<viewLayoutGuide key="safeArea" id="nAT-28-bjV"/>
</view>
<tapGestureRecognizer id="H8a-48-Q7M">
<connections>
<action selector="statusBarTapped:" destination="lds-87-3TS" id="4K3-Bp-N2p"/>
Expand Down Expand Up @@ -1044,5 +1140,6 @@
<image name="rating_icon_1" width="49" height="45"/>
<image name="undo_button" width="300" height="300"/>
<image name="unused_life" width="325" height="321"/>
<image name="win_lose_text_background" width="308" height="158"/>
</resources>
</document>
Loading