Skip to content

Commit

Permalink
Merge pull request #13 from thatcherclough/develop
Browse files Browse the repository at this point in the history
- Added an option to sign out of Apple Music / Spotify
- Added an option to randomize the order of the colors
- Added a contact button
- Slightly modified the spashscreen UI
  • Loading branch information
thatcherclough authored Dec 12, 2020
2 parents e4c873a + f261044 commit 582ecfe
Show file tree
Hide file tree
Showing 15 changed files with 433 additions and 182 deletions.
16 changes: 8 additions & 8 deletions CoverFlow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
DD428420254E74FF00E6E3D1 /* audioCheck.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DD42841F254E74FF00E6E3D1 /* audioCheck.mp3 */; };
DD439AD125609FDC00082CEF /* AppleMusicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD439AD025609FDC00082CEF /* AppleMusicController.swift */; };
DD439AD325609FE700082CEF /* SpotifyController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD439AD225609FE700082CEF /* SpotifyController.swift */; };
DD6EF8B7257DE16B0046654E /* Grota_Sans_Bold_Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD6EF8B6257DE16A0046654E /* Grota_Sans_Bold_Italic.otf */; };
DDAEDC98253CF53D002F3175 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAEDC97253CF53D002F3175 /* AppDelegate.swift */; };
DDAEDC9A253CF53D002F3175 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAEDC99253CF53D002F3175 /* SceneDelegate.swift */; };
DDAEDC9C253CF53D002F3175 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAEDC9B253CF53D002F3175 /* SettingsViewController.swift */; };
Expand All @@ -25,6 +24,7 @@
DDAEDCBD253CFCD7002F3175 /* BridgeDiscoveryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDAEDCBC253CFCD7002F3175 /* BridgeDiscoveryController.swift */; };
DDB07A7C25799901003EA4AF /* LocalNetworkPermissionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB07A7B25799901003EA4AF /* LocalNetworkPermissionService.swift */; };
DDB07A962579AD5C003EA4AF /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDB07A952579AD5C003EA4AF /* MainViewController.swift */; };
DDB639D02583EC3D00029360 /* Grota_Sans_Bold_Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = DDB639CF2583EC3A00029360 /* Grota_Sans_Bold_Italic.otf */; };
DDF07094256C375100353469 /* MusicProviderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF07093256C375100353469 /* MusicProviderViewController.swift */; };
DDFD8BDF253E323900BBE27A /* BridgeInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDFD8BDE253E323900BBE27A /* BridgeInfo.swift */; };
DDFD8BE1253E382C00BBE27A /* PushButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDFD8BE0253E382C00BBE27A /* PushButtonViewController.swift */; };
Expand Down Expand Up @@ -56,7 +56,6 @@
DD42841F254E74FF00E6E3D1 /* audioCheck.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = audioCheck.mp3; path = CoverFlow/Assets.xcassets/audioCheck.mp3; sourceTree = "<group>"; };
DD439AD025609FDC00082CEF /* AppleMusicController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleMusicController.swift; sourceTree = "<group>"; };
DD439AD225609FE700082CEF /* SpotifyController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpotifyController.swift; sourceTree = "<group>"; };
DD6EF8B6257DE16A0046654E /* Grota_Sans_Bold_Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Grota_Sans_Bold_Italic.otf; sourceTree = "<group>"; };
DDAEDC94253CF53D002F3175 /* CoverFlow.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CoverFlow.app; sourceTree = BUILT_PRODUCTS_DIR; };
DDAEDC97253CF53D002F3175 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
DDAEDC99253CF53D002F3175 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -69,6 +68,7 @@
DDAEDCBC253CFCD7002F3175 /* BridgeDiscoveryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgeDiscoveryController.swift; sourceTree = "<group>"; };
DDB07A7B25799901003EA4AF /* LocalNetworkPermissionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalNetworkPermissionService.swift; sourceTree = "<group>"; };
DDB07A952579AD5C003EA4AF /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
DDB639CF2583EC3A00029360 /* Grota_Sans_Bold_Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Grota_Sans_Bold_Italic.otf; path = CoverFlow/Assets.xcassets/Grota_Sans_Bold_Italic.otf; sourceTree = "<group>"; };
DDF07093256C375100353469 /* MusicProviderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicProviderViewController.swift; sourceTree = "<group>"; };
DDFD8BDE253E323900BBE27A /* BridgeInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgeInfo.swift; sourceTree = "<group>"; };
DDFD8BE0253E382C00BBE27A /* PushButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushButtonViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -117,7 +117,7 @@
DDAEDCAD253CF56F002F3175 /* CoverFlow-Bridging-Header.h */,
DD42841F254E74FF00E6E3D1 /* audioCheck.mp3 */,
DD42841D254E743500E6E3D1 /* songChange.mp3 */,
DD6EF8B6257DE16A0046654E /* Grota_Sans_Bold_Italic.otf */,
DDB639CF2583EC3A00029360 /* Grota_Sans_Bold_Italic.otf */,
DDAEDC96253CF53D002F3175 /* CoverFlow */,
DDAEDC95253CF53D002F3175 /* Products */,
8CDE867E1AF6CD0C9F350EFD /* Pods */,
Expand Down Expand Up @@ -218,7 +218,7 @@
buildActionMask = 2147483647;
files = (
DDAEDCA4253CF541002F3175 /* LaunchScreen.storyboard in Resources */,
DD6EF8B7257DE16B0046654E /* Grota_Sans_Bold_Italic.otf in Resources */,
DDB639D02583EC3D00029360 /* Grota_Sans_Bold_Italic.otf in Resources */,
DD42841E254E743500E6E3D1 /* songChange.mp3 in Resources */,
DD428420254E74FF00E6E3D1 /* audioCheck.mp3 in Resources */,
DDAEDCA1253CF541002F3175 /* Assets.xcassets in Resources */,
Expand Down Expand Up @@ -436,7 +436,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = YA924NN5VN;
DYLIB_INSTALL_NAME_BASE = "";
ENABLE_BITCODE = NO;
Expand All @@ -450,7 +450,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down Expand Up @@ -486,7 +486,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = YA924NN5VN;
DYLIB_INSTALL_NAME_BASE = "";
ENABLE_BITCODE = NO;
Expand All @@ -500,7 +500,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.0;
MARKETING_VERSION = 1.3.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-framework",
Expand Down
File renamed without changes.
21 changes: 21 additions & 0 deletions CoverFlow/Assets.xcassets/Twitter.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "icons8-twitter.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 582ecfe

Please sign in to comment.