Skip to content

Commit

Permalink
Merge pull request #48 from skiptomyliu/2022-08-10-xcode12
Browse files Browse the repository at this point in the history 
Fix search images, minor UI improvements and code refactor
  • Loading branch information
@skiptomyliu
skiptomyliu authored Aug 11, 2022
2 parents 10be584 + 69138a2 commit 47b2a13
Show file tree
Hide file tree
Showing 12 changed files with 125 additions and 166 deletions.
Binary file modified App/Milkshake.dmg
View file
Binary file not shown.
12 changes: 4 additions & 8 deletions Milkshake.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
05ED21131FD6ED8F00123317 /* MusicItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05ED21121FD6ED8E00123317 /* MusicItem.swift */; };
05ED21171FDA2CF600123317 /* album-500.png in Resources */ = {isa = PBXBuildFile; fileRef = 05ED21161FDA2CF600123317 /* album-500.png */; };
05ED21191FDC423A00123317 /* FlatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05ED21181FDC423A00123317 /* FlatButton.swift */; };
05F3C2B828A49F28007387A5 /* constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F3C2B728A49F28007387A5 /* constants.swift */; };
48F749471FCCEBD000F0A853 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48F749461FCCEBD000F0A853 /* AppDelegate.swift */; };
48F749491FCCEBD000F0A853 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48F749481FCCEBD000F0A853 /* MainViewController.swift */; };
48F7494B1FCCEBD000F0A853 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 48F7494A1FCCEBD000F0A853 /* Assets.xcassets */; };
Expand Down Expand Up @@ -164,6 +165,7 @@
05ED21121FD6ED8E00123317 /* MusicItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicItem.swift; sourceTree = "<group>"; };
05ED21161FDA2CF600123317 /* album-500.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "album-500.png"; sourceTree = "<group>"; };
05ED21181FDC423A00123317 /* FlatButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlatButton.swift; sourceTree = "<group>"; };
05F3C2B728A49F28007387A5 /* constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = constants.swift; sourceTree = "<group>"; };
48F749431FCCEBD000F0A853 /* Milkshake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Milkshake.app; sourceTree = BUILT_PRODUCTS_DIR; };
48F749461FCCEBD000F0A853 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
48F749481FCCEBD000F0A853 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -238,13 +240,6 @@
name = classes;
sourceTree = "<group>";
};
05ED21051FD3629A00123317 /* test */ = {
isa = PBXGroup;
children = (
);
name = test;
sourceTree = "<group>";
};
153A7C2C805AFCDA84A9FF61 /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -278,8 +273,8 @@
children = (
05D3420628A34A320039D620 /* imported */,
05B86E091FE388B9009EEC4F /* Milkshake.entitlements */,
05ED21051FD3629A00123317 /* test */,
48F749461FCCEBD000F0A853 /* AppDelegate.swift */,
05F3C2B728A49F28007387A5 /* constants.swift */,
05ED20D31FCCFA3000123317 /* classes */,
48F749561FCCEBFF00F0A853 /* views */,
48F749551FCCEBF800F0A853 /* controllers */,
Expand Down Expand Up @@ -578,6 +573,7 @@
05ED20E51FCD182E00123317 /* Util.swift in Sources */,
05ED20FE1FCFABC200123317 /* SearchTableRowView.swift in Sources */,
05ED20FC1FCFA80F00123317 /* MyTableView.swift in Sources */,
05F3C2B828A49F28007387A5 /* constants.swift in Sources */,
059C04B72027E6980007E456 /* TapManager.swift in Sources */,
054A311D1FF5E3190022D06E /* ArtTableCellView.swift in Sources */,
05ED20E71FCD2FBD00123317 /* SearchTableCellView.swift in Sources */,
Expand Down
Binary file modified Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
61 changes: 30 additions & 31 deletions Milkshake.xcworkspace/xcuserdata/dean.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
timestampString = "681811592.794281"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "114"
endingLineNumber = "114"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "103"
endingLineNumber = "103"
landmarkName = "request(_:params:callbackHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -32,27 +32,10 @@
timestampString = "681811592.794768"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "161"
endingLineNumber = "161"
landmarkName = "unknown"
landmarkType = "0">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BB7FD2FD-A2FF-4A44-81A1-C230E5451530"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Milkshake/API.swift"
timestampString = "681811592.7950161"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "185"
endingLineNumber = "185"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "150"
endingLineNumber = "150"
landmarkName = "auth(username:pass:callbackHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -66,10 +49,10 @@
timestampString = "681811592.795244"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "206"
endingLineNumber = "206"
landmarkName = "unknown"
landmarkType = "0">
startingLineNumber = "193"
endingLineNumber = "193"
landmarkName = "partnerAuthUserLogin(username:password:partnerAuthToken:partnerId:syncTime:callbackHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand All @@ -83,8 +66,8 @@
timestampString = "681804855.496473"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "77"
endingLineNumber = "77"
startingLineNumber = "63"
endingLineNumber = "63"
landmarkName = "callbackPartnerAuthUserLogin(results:)"
landmarkType = "7">
</BreakpointContent>
Expand All @@ -100,5 +83,21 @@
type = "4">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BDF4016D-5ABA-457D-9D74-6D8F7A7F7197"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Milkshake/SearchTableCellView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "152"
endingLineNumber = "152"
landmarkName = "setCellWithSearchResult(result:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Loading

0 comments on commit 47b2a13

Please sign in to comment.