pogmommy/TapeDeck
Archived
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

1.3.2 i guess

Browse source
This commit is contained in:
Micah Gomez 2021-09-30 14:52:21 -06:00
parent 91f4c26678
commit 71ea330b9e
6 changed files with 75 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
TapeDeck.xcodeproj/project.pbxproj
View file

@ -649,7 +649,7 @@
CODE_SIGN_ENTITLEMENTS = grandfatherrock/grandfatherrock.entitlements; CODE_SIGN_ENTITLEMENTS = grandfatherrock/grandfatherrock.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668; DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = grandfatherrock/Info.plist; INFOPLIST_FILE = grandfatherrock/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -657,7 +657,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.3.1; MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock; PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock;
PRODUCT_NAME = "AC Tape Deck"; PRODUCT_NAME = "AC Tape Deck";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
@ -675,7 +675,7 @@
CODE_SIGN_ENTITLEMENTS = grandfatherrock/grandfatherrock.entitlements; CODE_SIGN_ENTITLEMENTS = grandfatherrock/grandfatherrock.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668; DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = grandfatherrock/Info.plist; INFOPLIST_FILE = grandfatherrock/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -683,7 +683,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.3.1; MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock; PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock;
PRODUCT_NAME = "AC Tape Deck"; PRODUCT_NAME = "AC Tape Deck";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
@ -785,7 +785,7 @@
CODE_SIGN_ENTITLEMENTS = hssceneExtension.entitlements; CODE_SIGN_ENTITLEMENTS = hssceneExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668; DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = hsscene/Info.plist; INFOPLIST_FILE = hsscene/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0; IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@ -794,7 +794,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.3.1; MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock.hsscene; PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock.hsscene;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@ -813,7 +813,7 @@
CODE_SIGN_ENTITLEMENTS = hssceneExtension.entitlements; CODE_SIGN_ENTITLEMENTS = hssceneExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668; DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = hsscene/Info.plist; INFOPLIST_FILE = hsscene/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0; IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@ -822,7 +822,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.3.1; MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock.hsscene; PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock.hsscene;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;

BIN
TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate generated
View file

Binary file not shown.

4
TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist
View file

@ -49,12 +49,12 @@
<key>grandfatherrock.xcscheme_^#shared#^_</key> <key>grandfatherrock.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>1</integer> <integer>0</integer>
</dict> </dict>
<key>hssceneExtension.xcscheme_^#shared#^_</key> <key>hssceneExtension.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>0</integer> <integer>1</integer>
</dict> </dict>
<key>hswidgetExtension.xcscheme_^#shared#^_</key> <key>hswidgetExtension.xcscheme_^#shared#^_</key>
<dict> <dict>

23
grandfatherrock/Base.lproj/Main.storyboard
View file

@ -17,13 +17,13 @@
<!--Home--> <!--Home-->
<scene sceneID="hNz-n2-bh7"> <scene sceneID="hNz-n2-bh7">
<objects> <objects>
<viewController id="9pv-A4-QxB" customClass="FirstViewController" customModule="Nook_Music" customModuleProvider="target" sceneMemberID="viewController"> <viewController id="9pv-A4-QxB" customClass="FirstViewController" customModule="AC_Tape_Deck" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="tsR-hK-woN"> <view key="view" contentMode="scaleToFill" id="tsR-hK-woN">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/> <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1nc-vR-sG8"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1nc-vR-sG8">
<rect key="frame" x="0.0" y="0.0" width="320" height="519"/> <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view> </view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ACBackgroundDay" translatesAutoresizingMaskIntoConstraints="NO" id="Ujw-y3-bt3"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ACBackgroundDay" translatesAutoresizingMaskIntoConstraints="NO" id="Ujw-y3-bt3">
@ -33,7 +33,7 @@
</constraints> </constraints>
</imageView> </imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nou-CB-qnJ"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nou-CB-qnJ">
<rect key="frame" x="95" y="195" width="130" height="129"/> <rect key="frame" x="95" y="219.5" width="130" height="129"/>
<accessibility key="accessibilityConfiguration" hint="Press to pause/play the music" label="Media Control Button"/> <accessibility key="accessibilityConfiguration" hint="Press to pause/play the music" label="Media Control Button"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="130" id="1c8-JO-es0"/> <constraint firstAttribute="width" constant="130" id="1c8-JO-es0"/>
@ -47,7 +47,7 @@
</connections> </connections>
</button> </button>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="EB1-zK-bx6"> <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="EB1-zK-bx6">
<rect key="frame" x="30" y="344.5" width="260" height="32"/> <rect key="frame" x="30" y="369" width="260" height="32"/>
<segments> <segments>
<segment title="☀️"/> <segment title="☀️"/>
<segment title="🌧"/> <segment title="🌧"/>
@ -121,7 +121,7 @@
<!--Select Music--> <!--Select Music-->
<scene sceneID="wg7-f3-ORb"> <scene sceneID="wg7-f3-ORb">
<objects> <objects>
<viewController title="Select Music" id="8rJ-Kc-sve" customClass="SecondViewController" customModule="Nook_Music" customModuleProvider="target" sceneMemberID="viewController"> <viewController title="Select Music" id="8rJ-Kc-sve" customClass="SecondViewController" customModule="AC_Tape_Deck" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="QS5-Rx-YEW"> <view key="view" contentMode="scaleToFill" id="QS5-Rx-YEW">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/> <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -146,7 +146,7 @@
<rect key="frame" x="16" y="86" width="288" height="353"/> <rect key="frame" x="16" y="86" width="288" height="353"/>
<color key="backgroundColor" systemColor="systemFillColor"/> <color key="backgroundColor" systemColor="systemFillColor"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleAspectFit" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="hourcell" rowHeight="80" id="4WK-Bk-wob" customClass="hourDataCell" customModule="Nook_Music" customModuleProvider="target"> <tableViewCell clipsSubviews="YES" contentMode="scaleAspectFit" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="hourcell" rowHeight="80" id="4WK-Bk-wob" customClass="hourDataCell" customModule="AC_Tape_Deck" customModuleProvider="target">
<rect key="frame" x="0.0" y="24.5" width="288" height="80"/> <rect key="frame" x="0.0" y="24.5" width="288" height="80"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4WK-Bk-wob" id="zgb-be-Y4R"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4WK-Bk-wob" id="zgb-be-Y4R">
@ -166,7 +166,7 @@
<rect key="frame" x="16" y="12" width="256" height="31"/> <rect key="frame" x="16" y="12" width="256" height="31"/>
<accessibility key="accessibilityConfiguration" hint="Press to select a track for this hour"/> <accessibility key="accessibilityConfiguration" hint="Press to select a track for this hour"/>
<fontDescription key="fontDescription" name="FinkHeavy" family="FinkHeavy" pointSize="32"/> <fontDescription key="fontDescription" name="FinkHeavy" family="FinkHeavy" pointSize="32"/>
<color key="textColor" red="0.86256664989999998" green="0.69524472950000005" blue="0.2422021627" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.86274509803921573" green="0.69411764705882351" blue="0.24313725490196078" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
</subviews> </subviews>
@ -266,11 +266,12 @@
<scene sceneID="yl2-sM-qoP"> <scene sceneID="yl2-sM-qoP">
<objects> <objects>
<tabBarController id="49e-Tb-3d3" sceneMemberID="viewController"> <tabBarController id="49e-Tb-3d3" sceneMemberID="viewController">
<tabBar key="tabBar" contentMode="scaleToFill" barStyle="black" translucent="NO" backgroundImage="grass" itemPositioning="fill" id="W28-zg-YXA"> <tabBar key="tabBar" contentMode="scaleToFill" backgroundImage="grass" itemPositioning="fill" id="W28-zg-YXA">
<rect key="frame" x="0.0" y="975" width="768" height="49"/> <rect key="frame" x="0.0" y="975" width="768" height="49"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="tintColor" red="0.86256664989999998" green="0.69524472950000005" blue="0.2422021627" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="tintColor" red="0.86256664989999998" green="0.69524472950000005" blue="0.2422021627" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="barTintColor" red="0.86274509799999999" green="0.69411764710000001" blue="0.24313725489999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="selectedImageTintColor" red="0.86274509799999999" green="0.69411764710000001" blue="0.24313725489999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="selectedImageTintColor" red="0.86274509799999999" green="0.69411764710000001" blue="0.24313725489999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</tabBar> </tabBar>
<connections> <connections>
@ -285,7 +286,7 @@
<!--Information--> <!--Information-->
<scene sceneID="jKA-ec-7mv"> <scene sceneID="jKA-ec-7mv">
<objects> <objects>
<viewController storyboardIdentifier="ThirdViewController" title="Information" useStoryboardIdentifierAsRestorationIdentifier="YES" id="8LK-WS-C3a" customClass="ThirdViewController" customModule="Nook_Music" customModuleProvider="target" sceneMemberID="viewController"> <viewController storyboardIdentifier="ThirdViewController" title="Information" useStoryboardIdentifierAsRestorationIdentifier="YES" id="8LK-WS-C3a" customClass="ThirdViewController" customModule="AC_Tape_Deck" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="uzG-eo-7Z1"> <view key="view" contentMode="scaleToFill" id="uzG-eo-7Z1">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/> <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -463,7 +464,7 @@
<!--Select Files--> <!--Select Files-->
<scene sceneID="Bvz-2B-EZq"> <scene sceneID="Bvz-2B-EZq">
<objects> <objects>
<viewController storyboardIdentifier="FourthViewController" title="Select Files" id="XMN-Ld-irO" customClass="FourthViewController" customModule="Nook_Music" customModuleProvider="target" sceneMemberID="viewController"> <viewController storyboardIdentifier="FourthViewController" title="Select Files" id="XMN-Ld-irO" customClass="FourthViewController" customModule="AC_Tape_Deck" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="SQY-U2-iSU"> <view key="view" contentMode="scaleToFill" id="SQY-U2-iSU">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/> <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -477,7 +478,7 @@
<rect key="frame" x="16" y="20" width="288" height="412"/> <rect key="frame" x="16" y="20" width="288" height="412"/>
<color key="backgroundColor" systemColor="systemFillColor"/> <color key="backgroundColor" systemColor="systemFillColor"/>
<prototypes> <prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleAspectFit" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="filecell" rowHeight="36" id="sfi-qk-UU3" customClass="fileDataCell" customModule="Nook_Music" customModuleProvider="target"> <tableViewCell clipsSubviews="YES" contentMode="scaleAspectFit" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="filecell" rowHeight="36" id="sfi-qk-UU3" customClass="fileDataCell" customModule="AC_Tape_Deck" customModuleProvider="target">
<rect key="frame" x="0.0" y="24.5" width="288" height="36"/> <rect key="frame" x="0.0" y="24.5" width="288" height="36"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sfi-qk-UU3" id="EA1-9A-ReP"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sfi-qk-UU3" id="EA1-9A-ReP">

54
grandfatherrock/FirstViewController.swift
View file

@ -395,6 +395,7 @@ class FirstViewController: UIViewController{
controlButton.setBackgroundImage(UIImage(systemName: "play.circle"), for: UIControl.State.normal) controlButton.setBackgroundImage(UIImage(systemName: "play.circle"), for: UIControl.State.normal)
UIView.animate(withDuration: 0.4, delay: 0,usingSpringWithDamping: 0.5,initialSpringVelocity: 0, animations: {self.PlayButtonSize.constant = 90;self.view.layoutIfNeeded()}, completion: nil) UIView.animate(withDuration: 0.4, delay: 0,usingSpringWithDamping: 0.5,initialSpringVelocity: 0, animations: {self.PlayButtonSize.constant = 90;self.view.layoutIfNeeded()}, completion: nil)
} }
labelTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector:#selector(self.tick) , userInfo: nil, repeats: true)
} }
override func viewDidLoad() { override func viewDidLoad() {
@ -546,6 +547,55 @@ class FirstViewController: UIViewController{
//print(error) //print(error)
}*/ }*/
var foundSong = false
print("woah! \(GlobalVars.selectedMusicList)")
for i in GlobalVars.musicSelectionID[GlobalVars.selectedMusicList] {
if (i != 0){
foundSong = true
}
}
for i in GlobalVars.musicFileURL[GlobalVars.selectedMusicList] {
if (i != ""){
foundSong = true
}
}
print("found song? \(foundSong)")
if !foundSong {
print("no song found!")
let errorAlert = UIAlertController(title: "Song Error", message: "No songs found in this track. Please visit the 'Select Music' tab to set a song and get started!", preferredStyle: .alert)
// Create OK button
let OKAction = UIAlertAction(title: "OK", style: .default) { (action:UIAlertAction!) in
let helpAlert = UIAlertController(title: "Need Help Importing Music?", message: "A tutorial is available to help with importing music to use with this app. Would you like to view it?", preferredStyle: .alert)
// Create OK button
let HelpAction = UIAlertAction(title: "Yes Please!", style: .default) { (action:UIAlertAction!) in
if let url = URL(string: "https://youtu.be/YtOC5YFCt7E") {
UIApplication.shared.open(url)
}
}
helpAlert.addAction(HelpAction)
let NoHelpAction = UIAlertAction(title: "No Thanks", style: .default) { (action:UIAlertAction!) in
//print("Ok button tapped");
}
helpAlert.addAction(NoHelpAction)
// Present Dialog message
self.present(helpAlert, animated: true, completion:nil)
}
errorAlert.addAction(OKAction)
// Present Dialog message
self.present(errorAlert, animated: true, completion:nil)
print("Song is missing for at one hour")
}
} }
override func viewWillLayoutSubviews() { override func viewWillLayoutSubviews() {
@ -627,7 +677,7 @@ class FirstViewController: UIViewController{
} }
if !foundSong && defaults.bool(forKey: "didRun") { if !foundSong && defaults.bool(forKey: "didRun") {
let errorAlert = UIAlertController(title: "Song Error", message: "No songs found in this track. Please visit the 'Select Music' tab to set a song and get started!", preferredStyle: .alert) /*let errorAlert = UIAlertController(title: "Song Error", message: "No songs found in this track. Please visit the 'Select Music' tab to set a song and get started!", preferredStyle: .alert)
// Create OK button // Create OK button
let OKAction = UIAlertAction(title: "OK", style: .default) { (action:UIAlertAction!) in let OKAction = UIAlertAction(title: "OK", style: .default) { (action:UIAlertAction!) in
@ -654,7 +704,7 @@ class FirstViewController: UIViewController{
// Present Dialog message // Present Dialog message
self.present(errorAlert, animated: true, completion:nil) self.present(errorAlert, animated: true, completion:nil)
//print("Song is missing for at one hour") //print("Song is missing for at one hour")*/
controlButton.isEnabled = false controlButton.isEnabled = false
controlButton.accessibilityLabel = "Play Button. Music Cannot be played." controlButton.accessibilityLabel = "Play Button. Music Cannot be played."

1
grandfatherrock/SecondViewController.swift
View file

@ -95,6 +95,7 @@ class SecondViewController: UIViewController, UITableViewDelegate, UITableViewDa
cell.songLabel?.text = GlobalVars.musicSelection[GlobalVars.selectedMusicList][indexPath.row] cell.songLabel?.text = GlobalVars.musicSelection[GlobalVars.selectedMusicList][indexPath.row]
if ((GlobalVars.musicSelectionID[GlobalVars.selectedMusicList][indexPath.row] == 0) && (GlobalVars.musicFileURL[GlobalVars.selectedMusicList][indexPath.row] == "")){ if ((GlobalVars.musicSelectionID[GlobalVars.selectedMusicList][indexPath.row] == 0) && (GlobalVars.musicFileURL[GlobalVars.selectedMusicList][indexPath.row] == "")){
cell.accessoryType = .detailButton cell.accessoryType = .detailButton
cell.tintColor = UIColor(red: 0.86, green: 0.69, blue: 0.24, alpha: 1.00)
cell.accessibilityLabel?.append("No song set") cell.accessibilityLabel?.append("No song set")
} else { } else {
cell.accessoryType = .none cell.accessoryType = .none