Skip to content

Commit

Permalink
[Fix] Merge Conflict 해결 (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
pcsoyeon committed May 13, 2022
2 parents 28b42d9 + fd421e1 commit ec9fbe2
Show file tree
Hide file tree
Showing 44 changed files with 1,079 additions and 9 deletions.
24 changes: 24 additions & 0 deletions Instagram/Instagram.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
921E579E27FAE81E00CDC913 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 921E579D27FAE81E00CDC913 /* Colors.xcassets */; };
922DD0E8281290B9008F29DF /* UIWindow+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 922DD0E7281290B9008F29DF /* UIWindow+.swift */; };
9244A9DF27FEDD0400D7C2EC /* SignInViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9244A9DE27FEDD0400D7C2EC /* SignInViewModel.swift */; };
924AC4CD2816A7DB0056F0A5 /* HomeMainStoryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924AC4CC2816A7DB0056F0A5 /* HomeMainStoryTableViewCell.swift */; };
924AC4CF2816A8ED0056F0A5 /* HomeMainStoryDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924AC4CE2816A8ED0056F0A5 /* HomeMainStoryDataModel.swift */; };
924AC4D12816AC0F0056F0A5 /* HomeMainStoryCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924AC4D02816AC0F0056F0A5 /* HomeMainStoryCollectionViewCell.swift */; };
924AC4D32816B01A0056F0A5 /* HomeMainContentDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924AC4D22816B01A0056F0A5 /* HomeMainContentDataModel.swift */; };
924AC4D52816B1F60056F0A5 /* HomeMainContentTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924AC4D42816B1F60056F0A5 /* HomeMainContentTableViewCell.swift */; };
924AC4D72816C18D0056F0A5 /* UILabel+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924AC4D62816C18D0056F0A5 /* UILabel+.swift */; };
92920C7527FAE95F00DCABC7 /* Assets+Generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92920C7427FAE95F00DCABC7 /* Assets+Generated.swift */; };
92920C7727FAF71C00DCABC7 /* Reactive+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92920C7627FAF71C00DCABC7 /* Reactive+.swift */; };
92920C7927FAFE6800DCABC7 /* UserPasswordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92920C7827FAFE6800DCABC7 /* UserPasswordViewController.swift */; };
Expand Down Expand Up @@ -102,6 +108,12 @@
921E579D27FAE81E00CDC913 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
922DD0E7281290B9008F29DF /* UIWindow+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIWindow+.swift"; sourceTree = "<group>"; };
9244A9DE27FEDD0400D7C2EC /* SignInViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewModel.swift; sourceTree = "<group>"; };
924AC4CC2816A7DB0056F0A5 /* HomeMainStoryTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMainStoryTableViewCell.swift; sourceTree = "<group>"; };
924AC4CE2816A8ED0056F0A5 /* HomeMainStoryDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMainStoryDataModel.swift; sourceTree = "<group>"; };
924AC4D02816AC0F0056F0A5 /* HomeMainStoryCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMainStoryCollectionViewCell.swift; sourceTree = "<group>"; };
924AC4D22816B01A0056F0A5 /* HomeMainContentDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMainContentDataModel.swift; sourceTree = "<group>"; };
924AC4D42816B1F60056F0A5 /* HomeMainContentTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeMainContentTableViewCell.swift; sourceTree = "<group>"; };
924AC4D62816C18D0056F0A5 /* UILabel+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+.swift"; sourceTree = "<group>"; };
92920C7427FAE95F00DCABC7 /* Assets+Generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Assets+Generated.swift"; sourceTree = "<group>"; };
92920C7627FAF71C00DCABC7 /* Reactive+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Reactive+.swift"; sourceTree = "<group>"; };
92920C7827FAFE6800DCABC7 /* UserPasswordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPasswordViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -253,6 +265,7 @@
921E575627FAD11800CDC913 /* UITextField+.swift */,
92920C7627FAF71C00DCABC7 /* Reactive+.swift */,
922DD0E7281290B9008F29DF /* UIWindow+.swift */,
924AC4D62816C18D0056F0A5 /* UILabel+.swift */,
);
path = Extension;
sourceTree = "<group>";
Expand Down Expand Up @@ -415,6 +428,9 @@
isa = PBXGroup;
children = (
921E578927FADD0300CDC913 /* HomeMainView.swift */,
924AC4CC2816A7DB0056F0A5 /* HomeMainStoryTableViewCell.swift */,
924AC4D02816AC0F0056F0A5 /* HomeMainStoryCollectionViewCell.swift */,
924AC4D42816B1F60056F0A5 /* HomeMainContentTableViewCell.swift */,
);
path = View;
sourceTree = "<group>";
Expand All @@ -423,6 +439,8 @@
isa = PBXGroup;
children = (
921E578727FADCFA00CDC913 /* HomeMainModel.swift */,
924AC4CE2816A8ED0056F0A5 /* HomeMainStoryDataModel.swift */,
924AC4D22816B01A0056F0A5 /* HomeMainContentDataModel.swift */,
);
path = Model;
sourceTree = "<group>";
Expand Down Expand Up @@ -617,7 +635,9 @@
buildActionMask = 2147483647;
files = (
921E578C27FADD6A00CDC913 /* UserNameViewController.swift in Sources */,
924AC4D12816AC0F0056F0A5 /* HomeMainStoryCollectionViewCell.swift in Sources */,
921E578A27FADD0300CDC913 /* HomeMainView.swift in Sources */,
924AC4D52816B1F60056F0A5 /* HomeMainContentTableViewCell.swift in Sources */,
921E577427FADADC00CDC913 /* MoyaLoggingPlugin.swift in Sources */,
921E579627FAE33C00CDC913 /* CloseButton.swift in Sources */,
9244A9DF27FEDD0400D7C2EC /* SignInViewModel.swift in Sources */,
Expand All @@ -628,6 +648,7 @@
9201FE56282E33E800443946 /* SignInAPI.swift in Sources */,
921E576E27FADA7800CDC913 /* BaseResponse.swift in Sources */,
92920C7527FAE95F00DCABC7 /* Assets+Generated.swift in Sources */,
924AC4CF2816A8ED0056F0A5 /* HomeMainStoryDataModel.swift in Sources */,
921E579227FAE23B00CDC913 /* IDSNavigationBar.swift in Sources */,
92BF25332829689700DE0205 /* SignInRequest.swift in Sources */,
920995AF280DD9AD008C3491 /* ShopMainViewController.swift in Sources */,
Expand All @@ -642,8 +663,10 @@
920995AB280DD965008C3491 /* SearchMainViewController.swift in Sources */,
921E578E27FADD8E00CDC913 /* AuthCompleteViewController.swift in Sources */,
92BF253528296A8800DE0205 /* SignUpRequest.swift in Sources */,
924AC4CD2816A7DB0056F0A5 /* HomeMainStoryTableViewCell.swift in Sources */,
92920C7727FAF71C00DCABC7 /* Reactive+.swift in Sources */,
921E578827FADCFA00CDC913 /* HomeMainModel.swift in Sources */,
924AC4D72816C18D0056F0A5 /* UILabel+.swift in Sources */,
920995A8280DD79F008C3491 /* TabBarController.swift in Sources */,
921E573D27FACB1A00CDC913 /* SceneDelegate.swift in Sources */,
921E575C27FAD1DF00CDC913 /* IDSFont.swift in Sources */,
Expand All @@ -654,6 +677,7 @@
92BF253728296A9300DE0205 /* SignUpResponse.swift in Sources */,
921E577027FADA8900CDC913 /* GeneralAPI.swift in Sources */,
921E579427FAE2BA00CDC913 /* BackButton.swift in Sources */,
924AC4D32816B01A0056F0A5 /* HomeMainContentDataModel.swift in Sources */,
920995B4280DD9D9008C3491 /* ProfileMainViewController.swift in Sources */,
920995B1280DD9B5008C3491 /* ReelsMainViewController.swift in Sources */,
922DD0E8281290B9008F29DF /* UIWindow+.swift in Sources */,
Expand Down
4 changes: 4 additions & 0 deletions Instagram/Instagram/Global/Constant/Assets+Generated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ internal enum Asset {
internal static let icnUnlike = ImageAsset(name: "icn_unlike")
internal static let passwordHiddenEyeIcon = ImageAsset(name: "password_hidden_eyeIcon")
internal static let passwordShownEyeIcon = ImageAsset(name: "password_shown_eyeIcon")
internal static let postImage1 = ImageAsset(name: "postImage1")
internal static let postImage2 = ImageAsset(name: "postImage2")
internal static let postImage3 = ImageAsset(name: "postImage3")
internal static let postImage4 = ImageAsset(name: "postImage4")
}
internal enum Colors {
}
Expand Down
7 changes: 5 additions & 2 deletions Instagram/Instagram/Global/DesignSystem/Font/IDSFont.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
import UIKit

public enum IDSFont {
static let head1 = UIFont.systemFont(ofSize: 14, weight: .semibold)
static let head2 = UIFont.systemFont(ofSize: 12, weight: .semibold)

static let body1 = UIFont.systemFont(ofSize: 24, weight: .regular)
static let body2 = UIFont.systemFont(ofSize: 14, weight: .regular)
static let body3 = UIFont.systemFont(ofSize: 12, weight: .regular)

static let head1 = UIFont.systemFont(ofSize: 14, weight: .semibold)
static let head2 = UIFont.systemFont(ofSize: 12, weight: .semibold)
static let body4 = UIFont.systemFont(ofSize: 10, weight: .medium)
static let body5 = UIFont.systemFont(ofSize: 10, weight: .semibold)
}
18 changes: 18 additions & 0 deletions Instagram/Instagram/Global/Extension/UILabel+.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// UILabel+.swift
// Instagram
//
// Created by 소연 on 2022/04/25.
//

import UIKit

extension UILabel {
func setTextSpacingBy(value: Double) {
if let textString = self.text {
let attributedString = NSMutableAttributedString(string: textString)
attributedString.addAttribute(NSAttributedString.Key.kern, value: value, range: NSRange(location: 0, length: attributedString.length - 1))
attributedText = attributedString
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "avatar3.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_add.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_bookmark.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_home.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_home_selected.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_like.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "icn_profile.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "original"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"images" : [
{
"filename" : "icn_profile_selected.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "original"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_reels_selected.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icn_search.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading

0 comments on commit ec9fbe2

Please sign in to comment.