Skip to content

Commit

Permalink
🔀 Merge feature/#1
Browse files Browse the repository at this point in the history
Feature/#1
  • Loading branch information
hansolnoh95 authored Oct 1, 2021
2 parents f3c7e38 + 8b175d3 commit 04f9663
Show file tree
Hide file tree
Showing 640 changed files with 104,917 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ extension KakaoFriendNodeController {
private func layoutSpecThatFits(_ constrainedSize: ASSizeRange) -> ASLayoutSpec {
return ASInsetLayoutSpec(
insets: UIEdgeInsets(
top: 56,
left: 14,
bottom: 0,
right: 14),
top: 56,
left: 14,
bottom: 0,
right: 14),
child: subnodesStackLayoutSpec())
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct KakaoFriendsModel {
profileNameText: String?,
profileMessageText: String?) {

self.profileImageName = profileImageName ?? "freindtabProfileImg"
self.profileImageName = profileImageName ?? "friendtabProfileImg"
self.profileNameText = profileNameText ?? ""
self.profileMessageText = profileMessageText ?? ""
}
Expand Down
4 changes: 2 additions & 2 deletions BasicExercise/BasicExercise/Support/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if let windowScene = scene as? UIWindowScene {

let window = UIWindow(windowScene: windowScene)
let rootVC = KakaoFriendNodeController()
rootVC.view.backgroundColor = .white
let rootVC = AppleMusicNodeController()
rootVC.view.backgroundColor = .black
window.rootViewController = rootVC
self.window = window
window.makeKeyAndVisible()
Expand Down
10 changes: 10 additions & 0 deletions Starbucks_Clone_TexBrother/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'Starbucks_Clone_TexBrother' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

# Pods for Starbucks_Clone_TexBrother
pod "Texture"
end
56 changes: 56 additions & 0 deletions Starbucks_Clone_TexBrother/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
PODS:
- PINCache (3.0.3):
- PINCache/Arc-exception-safe (= 3.0.3)
- PINCache/Core (= 3.0.3)
- PINCache/Arc-exception-safe (3.0.3):
- PINCache/Core
- PINCache/Core (3.0.3):
- PINOperation (~> 1.2.1)
- PINOperation (1.2.1)
- PINRemoteImage/Core (3.0.3):
- PINOperation
- PINRemoteImage/iOS (3.0.3):
- PINRemoteImage/Core
- PINRemoteImage/PINCache (3.0.3):
- PINCache (~> 3.0.3)
- PINRemoteImage/Core
- Texture (3.0.0):
- Texture/AssetsLibrary (= 3.0.0)
- Texture/Core (= 3.0.0)
- Texture/MapKit (= 3.0.0)
- Texture/Photos (= 3.0.0)
- Texture/PINRemoteImage (= 3.0.0)
- Texture/Video (= 3.0.0)
- Texture/AssetsLibrary (3.0.0):
- Texture/Core
- Texture/Core (3.0.0)
- Texture/MapKit (3.0.0):
- Texture/Core
- Texture/Photos (3.0.0):
- Texture/Core
- Texture/PINRemoteImage (3.0.0):
- PINRemoteImage/iOS (~> 3.0.0)
- PINRemoteImage/PINCache
- Texture/Core
- Texture/Video (3.0.0):
- Texture/Core

DEPENDENCIES:
- Texture

SPEC REPOS:
trunk:
- PINCache
- PINOperation
- PINRemoteImage
- Texture

SPEC CHECKSUMS:
PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086
PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20
PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01
Texture: 2f109e937850d94d1d07232041c9c7313ccddb81

PODFILE CHECKSUM: c8a7f79c681b37a0828e8d0f5642236879111c53

COCOAPODS: 1.10.1
56 changes: 56 additions & 0 deletions Starbucks_Clone_TexBrother/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

201 changes: 201 additions & 0 deletions Starbucks_Clone_TexBrother/Pods/PINCache/LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 04f9663

Please sign in to comment.