diff --git a/TapeDeck.xcodeproj/project.pbxproj b/TapeDeck.xcodeproj/project.pbxproj
index 89d05f5..8b82083 100644
--- a/TapeDeck.xcodeproj/project.pbxproj
+++ b/TapeDeck.xcodeproj/project.pbxproj
@@ -649,7 +649,7 @@
CODE_SIGN_ENTITLEMENTS = grandfatherrock/grandfatherrock.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = grandfatherrock/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -657,7 +657,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.3.1;
+ MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock;
PRODUCT_NAME = "AC Tape Deck";
SUPPORTS_MACCATALYST = YES;
@@ -675,7 +675,7 @@
CODE_SIGN_ENTITLEMENTS = grandfatherrock/grandfatherrock.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = grandfatherrock/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -683,7 +683,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.3.1;
+ MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock;
PRODUCT_NAME = "AC Tape Deck";
SUPPORTS_MACCATALYST = YES;
@@ -785,7 +785,7 @@
CODE_SIGN_ENTITLEMENTS = hssceneExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = hsscene/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -794,7 +794,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.3.1;
+ MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock.hsscene;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@@ -813,7 +813,7 @@
CODE_SIGN_ENTITLEMENTS = hssceneExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 1;
+ CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = PRBH2T6668;
INFOPLIST_FILE = hsscene/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -822,7 +822,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 1.3.1;
+ MARKETING_VERSION = 1.3.2;
PRODUCT_BUNDLE_IDENTIFIER = dev.mpg13.grandfatherrock.hsscene;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
diff --git a/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate b/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate
index f048283..07c9fd7 100644
Binary files a/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate and b/TapeDeck.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist b/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist
index a49472b..92396fa 100644
--- a/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/TapeDeck.xcodeproj/xcuserdata/micahgomez.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -49,12 +49,12 @@
grandfatherrock.xcscheme_^#shared#^_
orderHint
- 1
+ 0
hssceneExtension.xcscheme_^#shared#^_
orderHint
- 0
+ 1
hswidgetExtension.xcscheme_^#shared#^_
diff --git a/grandfatherrock/Base.lproj/Main.storyboard b/grandfatherrock/Base.lproj/Main.storyboard
index e9554a0..327ed72 100644
--- a/grandfatherrock/Base.lproj/Main.storyboard
+++ b/grandfatherrock/Base.lproj/Main.storyboard
@@ -17,13 +17,13 @@
-
+
-
+
@@ -33,7 +33,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
@@ -146,7 +146,7 @@
-
+
@@ -166,7 +166,7 @@
-
+
@@ -266,11 +266,12 @@
-
+
+
@@ -285,7 +286,7 @@
-
+
@@ -463,7 +464,7 @@
-
+
@@ -477,7 +478,7 @@
-
+
diff --git a/grandfatherrock/FirstViewController.swift b/grandfatherrock/FirstViewController.swift
index b833418..2c3c92f 100644
--- a/grandfatherrock/FirstViewController.swift
+++ b/grandfatherrock/FirstViewController.swift
@@ -395,6 +395,7 @@ class FirstViewController: UIViewController{
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)
}
+ labelTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector:#selector(self.tick) , userInfo: nil, repeats: true)
}
override func viewDidLoad() {
@@ -546,6 +547,55 @@ class FirstViewController: UIViewController{
//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() {
@@ -627,7 +677,7 @@ class FirstViewController: UIViewController{
}
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
let OKAction = UIAlertAction(title: "OK", style: .default) { (action:UIAlertAction!) in
@@ -654,7 +704,7 @@ class FirstViewController: UIViewController{
// Present Dialog message
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.accessibilityLabel = "Play Button. Music Cannot be played."
diff --git a/grandfatherrock/SecondViewController.swift b/grandfatherrock/SecondViewController.swift
index d01f9dc..c9b3ac6 100644
--- a/grandfatherrock/SecondViewController.swift
+++ b/grandfatherrock/SecondViewController.swift
@@ -95,6 +95,7 @@ class SecondViewController: UIViewController, UITableViewDelegate, UITableViewDa
cell.songLabel?.text = GlobalVars.musicSelection[GlobalVars.selectedMusicList][indexPath.row]
if ((GlobalVars.musicSelectionID[GlobalVars.selectedMusicList][indexPath.row] == 0) && (GlobalVars.musicFileURL[GlobalVars.selectedMusicList][indexPath.row] == "")){
cell.accessoryType = .detailButton
+ cell.tintColor = UIColor(red: 0.86, green: 0.69, blue: 0.24, alpha: 1.00)
cell.accessibilityLabel?.append("No song set")
} else {
cell.accessoryType = .none