Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IDLE-000] 스플래쉬 & 앱아이콘 등록 #54

Merged
merged 3 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"images" : [
{
"filename" : "40.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "60.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "29.png",
"idiom" : "iphone",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "58.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "87.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "80.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "120.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "57.png",
"idiom" : "iphone",
"scale" : "1x",
"size" : "57x57"
},
{
"filename" : "114.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "57x57"
},
{
"filename" : "120.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "180.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "40.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "58.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "40.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "80.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "50.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "50x50"
},
{
"filename" : "100.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "50x50"
},
{
"filename" : "72.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "72x72"
},
{
"filename" : "144.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "72x72"
},
{
"filename" : "76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "152.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "167.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"filename" : "1024.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions project/Projects/App/Resources/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "caremeet_Logo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "caremeet_Logo 1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "caremeet_Logo 2.png",
"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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 14 additions & 16 deletions project/Projects/App/Resources/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -17,29 +17,27 @@
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="안녕하세요" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EYZ-iW-z8a">
<rect key="frame" x="159.66666666666666" y="415.66666666666669" width="73.666666666666657" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="caremeet_Logo" translatesAutoresizingMaskIntoConstraints="NO" id="Lys-zB-zyf" userLabel="caremeetLogo">
<rect key="frame" x="109.66666666666667" y="378" width="173.66666666666663" height="96"/>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" name="orange500"/>
<constraints>
<constraint firstItem="EYZ-iW-z8a" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="49c-m0-m2d"/>
<constraint firstItem="EYZ-iW-z8a" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="ego-Ut-heY"/>
<constraint firstItem="Lys-zB-zyf" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="7QW-zT-GDy"/>
<constraint firstItem="Lys-zB-zyf" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="Arg-Ez-OPf"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
<point key="canvasLocation" x="-4" y="382"/>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<image name="caremeet_Logo" width="173.66667175292969" height="96"/>
<namedColor name="orange500">
<color red="1" green="0.47843137254901963" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class SelectAuthTypeViewController: BaseViewController {

func setAutoLayout() {

let selectAuthButtonStack = HStack([startAsCenterButton, startAsWorkerButton], spacing: 8)
let selectAuthButtonStack = HStack([startAsCenterButton, startAsWorkerButton], spacing: 8, distribution: .fillEqually)

let centerLoginContainer = HStack([loginAsCenterLabel, loginAsCenterButton], spacing: 12)
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ public class OnGoingPostVC: BaseViewController {
self.postData = postInfo

postTableView.reloadData()
DispatchQueue.main.async { [weak self] in
self?.postTableView.setContentOffset(.zero, animated: false)
}
})
.disposed(by: disposeBag)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public class PostDetailForCenterVC: BaseViewController {
viewModel
.showOptionSheet?
.drive(onNext: { [weak self] state in
guard let self, let vm = self.viewModel else { return }
guard let self, let vm = self.viewModel as? PostDetailViewModelable else { return }
var vc: IdleBottomSheetVC!
switch state {
case .onGoing:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,22 @@ public class CenterRecruitmentPostBoardVM: BaseViewModel, CenterRecruitmentPostB
super.init()

let requestOngoingPostResult = requestOngoingPost
.map({ [weak self]_ in
// 로딩 시작
self?.showLoading.onNext(())
})
.flatMap { [recruitmentPostUseCase] _ in
recruitmentPostUseCase
.getOngoingPosts()
}
.share()

requestOngoingPostResult
.subscribe (onNext: { [weak self] _ in
self?.dismissLoading.onNext(())
})
.disposed(by: disposeBag)

let requestOngoingPostSuccess = requestOngoingPostResult.compactMap { $0.value }
let requestOngoingPostFailure = requestOngoingPostResult.compactMap { $0.error }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,6 @@ public class WorkerProfileViewController: DisposableViewController {
}
}

// MARK: Divider
// 요양보호사 인적정보 / 요양보호사 구직정보 디바이더
let divider = UIView()
divider.backgroundColor = DSKitAsset.Colors.gray050.color


// 요양보호사 구직정보
let employeeInfoTitleLabel = IdleLabel(typography: .Subtitle1)
employeeInfoTitleLabel.textString = "상세 정보"
Expand Down Expand Up @@ -304,13 +298,31 @@ public class WorkerProfileViewController: DisposableViewController {
right: 20
)

// MARK: Divider
// 요양보호사 인적정보 / 요양보호사 구직정보 디바이더
let divider = Spacer(height: 8)
divider.backgroundColor = DSKitAsset.Colors.gray050.color

let contactButtonsAndDivider = VStack(
[
HStack([
Spacer(width: 36),
contactButtonContainer,
Spacer(width: 36)
]),
divider
],
spacing: 24,
alignment: .fill
)

[
grayBackgrounnd,
profileImageContainer,
// starButton,
tagNameStack,
humanInfoStack,
VStack([contactButtonContainer, divider], spacing: 24, alignment: .fill),
contactButtonsAndDivider,
employeeInfoTitleLabel,
employeeInfoStack

Expand Down Expand Up @@ -342,16 +354,11 @@ public class WorkerProfileViewController: DisposableViewController {
humanInfoStack.topAnchor.constraint(equalTo: tagNameStack.bottomAnchor, constant: 16),
humanInfoStack.centerXAnchor.constraint(equalTo: contentView.centerXAnchor),

contactButtonContainer.topAnchor.constraint(equalTo: humanInfoStack.bottomAnchor, constant: 24),
contactButtonContainer.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant: 36),
contactButtonContainer.rightAnchor.constraint(equalTo: contentView.rightAnchor, constant: -36),

divider.topAnchor.constraint(equalTo: contactButtonContainer.bottomAnchor, constant: 24),
divider.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
divider.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
divider.heightAnchor.constraint(equalToConstant: 8),
contactButtonsAndDivider.topAnchor.constraint(equalTo: humanInfoStack.bottomAnchor, constant: 24),
contactButtonsAndDivider.leftAnchor.constraint(equalTo: contentView.leftAnchor),
contactButtonsAndDivider.rightAnchor.constraint(equalTo: contentView.rightAnchor),

employeeInfoTitleLabel.topAnchor.constraint(equalTo: divider.bottomAnchor, constant: 24),
employeeInfoTitleLabel.topAnchor.constraint(equalTo: contactButtonsAndDivider.bottomAnchor, constant: 24),
employeeInfoTitleLabel.leadingAnchor.constraint(equalTo: contentView.layoutMarginsGuide.leadingAnchor),

employeeInfoStack.topAnchor.constraint(equalTo: employeeInfoTitleLabel.bottomAnchor, constant: 20),
Expand Down