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.

Sign up for GitHub

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

๐Ÿ”€ :: (#949, #791) ํ”„๋กœํ•„ ๋ณ€๊ฒฝ ๊ธฐ๋Šฅ ๊ตฌํ˜„ ์™ธ1 #952

Merged
merged 14 commits into from
Aug 2, 2024
Merged

๐Ÿ”€ :: (#949, #791) ํ”„๋กœํ•„ ๋ณ€๊ฒฝ ๊ธฐ๋Šฅ ๊ตฌํ˜„ ์™ธ1 #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
981e171
โœจ :: [#949] ํ”„๋กœํ•„ ๋ณ€๊ฒฝ ๊ธฐ๋Šฅ
KangTaeHoon Aug 1, 2024
b5ac46f
๐ŸŽจ :: ์ฝ”๋“œ Formatting ์ ์šฉ
KangTaeHoon Aug 1, 2024
7f59edc
โœจ :: [#949] ์ฝ”๋“œ ์ •๋ฆฌ
KangTaeHoon Aug 1, 2024
f1b89cf
โœจ :: [#949] #791 ํ•จ๊ป˜์ฒ˜๋ฆฌ
KangTaeHoon Aug 1, 2024
ee71c96
๐Ÿ› :: [#949] ๊ณต์ง€์ƒ์„ธ > ๋ฌดํ•œ ๋กœ๋”ฉ ํ˜„์ƒ ํ•ด๊ฒฐ
KangTaeHoon Aug 1, 2024
9f16068
๐ŸŽจ :: ์ฝ”๋“œ Formatting ์ ์šฉ
KangTaeHoon Aug 1, 2024
719f91e
โœจ :: [#949] ์ฝ์€ ๊ณต์ง€ ID ์ถ”๊ฐ€ ๋กœ์ง ๊ฐœ์„ 
KangTaeHoon Aug 1, 2024
52777e6
โœจ :: [#949] ์ฝ์€ ๊ณต์ง€ ID ์ถ”๊ฐ€ ๋กœ์ง ๊ฐœ์„  2t
KangTaeHoon Aug 1, 2024
c14bbe2
โœจ :: [#949] ๋ฌธ์˜ํ•˜๊ธฐ > X ๋ฒ„ํŠผ ์œ„์น˜ ์ˆ˜์ •
KangTaeHoon Aug 1, 2024
720ef19
โœจ :: [#949] ํฐํŠธ ์ˆ˜์ •
KangTaeHoon Aug 2, 2024
af1cac9
โœจ :: [#949] ์ฝ”๋“œ ์ •๋ฆฌ
KangTaeHoon Aug 2, 2024
14e8afa
๐ŸŽจ :: ์ฝ”๋“œ Formatting ์ ์šฉ
KangTaeHoon Aug 2, 2024
47b60a3
โœจ :: [#949] throttle ์ถ”๊ฐ€
KangTaeHoon Aug 2, 2024
4aa0dc8
โœจ :: [#949] UI ๋””ํ…Œ์ผ ์ฒ˜๋ฆฌ
KangTaeHoon Aug 2, 2024
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
4 changes: 2 additions & 2 deletions Projects/App/Sources/Application/AppComponent+MyInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extension AppComponent {
ServiceInfoComponent(parent: self)
}

var profilePopComponent: ProfilePopComponent {
ProfilePopComponent(parent: self)
var profilePopupFactory: any ProfilePopupFactory {
ProfilePopupComponent(parent: self)
}
}
4 changes: 4 additions & 0 deletions Projects/Features/MyInfoFeature/Interface/Protocol/Factory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ public protocol QuestionFactory {
public protocol ServiceInfoFactory {
func makeView() -> UIViewController
}

public protocol ProfilePopupFactory {
func makeView(completion: (() -> Void)?) -> UIViewController
}
6 changes: 3 additions & 3 deletions Projects/Features/MyInfoFeature/Resources/Notice.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<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"/>
Expand Down Expand Up @@ -181,7 +181,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bau-r8-IYJ">
<rect key="frame" x="341" y="8" width="32" height="32"/>
<rect key="frame" x="20" y="8" width="32" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="EfH-Ea-DGB"/>
<constraint firstAttribute="width" constant="32" id="pSQ-p0-GN8"/>
Expand All @@ -193,10 +193,10 @@
</button>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="bau-r8-IYJ" secondAttribute="trailing" constant="20" id="7zI-kw-Dbm"/>
<constraint firstItem="ZeI-bM-ifs" firstAttribute="centerX" secondItem="dDG-n2-HUg" secondAttribute="centerX" id="Bro-3U-9V5"/>
<constraint firstItem="bau-r8-IYJ" firstAttribute="centerY" secondItem="dDG-n2-HUg" secondAttribute="centerY" id="Phy-sj-AbE"/>
<constraint firstItem="ZeI-bM-ifs" firstAttribute="centerY" secondItem="dDG-n2-HUg" secondAttribute="centerY" id="Y6a-bb-YSu"/>
<constraint firstItem="bau-r8-IYJ" firstAttribute="leading" secondItem="dDG-n2-HUg" secondAttribute="leading" constant="20" id="ZEn-AV-Pyg"/>
<constraint firstAttribute="height" constant="48" id="wh3-GK-zsr"/>
</constraints>
</view>
Expand Down
34 changes: 22 additions & 12 deletions Projects/Features/MyInfoFeature/Resources/ProfilePopUp.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<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="collection view cell content view" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Profile Pop View Controller-->
<!--Profile Popup View Controller-->
<scene sceneID="Koo-Xz-EJd">
<objects>
<viewController storyboardIdentifier="ProfilePopViewController" id="hme-7V-zw7" customClass="ProfilePopViewController" customModule="MyInfoFeature" sceneMemberID="viewController">
<viewController storyboardIdentifier="ProfilePopupViewController" id="hme-7V-zw7" customClass="ProfilePopupViewController" customModule="MyInfoFeature" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="d3s-tF-NcB">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xKK-GX-h0X">
<rect key="frame" x="0.0" y="59" width="393" height="390"/>
<rect key="frame" x="0.0" y="59" width="393" height="352"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ํ”„๋กœํ•„์„ ์„ ํƒํ•ด์ฃผ์„ธ์š”" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="puc-8O-iQI">
<rect key="frame" x="20" y="24" width="152" height="28"/>
<rect key="frame" x="20" y="24" width="353" height="28"/>
<constraints>
<constraint firstAttribute="height" constant="28" id="4xI-Ti-Ml4"/>
</constraints>
Expand All @@ -32,10 +32,10 @@
<nil key="highlightedColor"/>
</label>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="E1b-B1-vL0">
<rect key="frame" x="20" y="84" width="353" height="200"/>
<rect key="frame" x="20" y="84" width="353" height="162"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="200" id="tIL-bw-1sb"/>
<constraint firstAttribute="height" constant="162" id="tIL-bw-1sb"/>
</constraints>
<collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="mNM-uR-7sF">
<size key="itemSize" width="128" height="128"/>
Expand All @@ -51,40 +51,49 @@
<rect key="frame" x="0.0" y="0.0" width="128" height="128"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TFA-vx-hh5">
<rect key="frame" x="-2" y="-2" width="132" height="132"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jQT-KA-bwN">
<rect key="frame" x="0.0" y="0.0" width="128" height="128"/>
</imageView>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="jQT-KA-bwN" secondAttribute="trailing" id="Dej-4a-WGT"/>
<constraint firstAttribute="trailing" secondItem="TFA-vx-hh5" secondAttribute="trailing" constant="-2" id="HND-Ky-h30"/>
<constraint firstAttribute="bottom" secondItem="jQT-KA-bwN" secondAttribute="bottom" id="MEj-Uf-TJf"/>
<constraint firstItem="TFA-vx-hh5" firstAttribute="leading" secondItem="fQf-MW-HF6" secondAttribute="leading" constant="-2" id="fhC-Rx-FBC"/>
<constraint firstItem="TFA-vx-hh5" firstAttribute="top" secondItem="fQf-MW-HF6" secondAttribute="top" constant="-2" id="hxB-mz-qab"/>
<constraint firstItem="jQT-KA-bwN" firstAttribute="top" secondItem="fQf-MW-HF6" secondAttribute="top" id="lQd-Dk-vja"/>
<constraint firstAttribute="bottom" secondItem="TFA-vx-hh5" secondAttribute="bottom" constant="-2" id="o1I-Hj-oKY"/>
<constraint firstItem="jQT-KA-bwN" firstAttribute="leading" secondItem="fQf-MW-HF6" secondAttribute="leading" id="oR4-jc-Qfm"/>
</constraints>
</collectionViewCellContentView>
<connections>
<outlet property="imageView" destination="jQT-KA-bwN" id="EuY-RA-Ssn"/>
<outlet property="outerView" destination="TFA-vx-hh5" id="yPk-7c-QU3"/>
</connections>
</collectionViewCell>
</cells>
</collectionView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iOw-zJ-dA6" customClass="NVActivityIndicatorView" customModule="NVActivityIndicatorView">
<rect key="frame" x="181.66666666666666" y="169" width="30" height="30"/>
<rect key="frame" x="181.66666666666666" y="150" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="1tu-SR-oBd"/>
<constraint firstAttribute="width" constant="30" id="qkT-qf-uUI"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="50v-bU-gkn">
<rect key="frame" x="20" y="324" width="353" height="56"/>
<rect key="frame" x="20" y="286" width="353" height="56"/>
<color key="backgroundColor" name="POINT"/>
<constraints>
<constraint firstAttribute="height" constant="56" id="GWJ-19-6cf"/>
</constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bOJ-6G-cdo" customClass="NVActivityIndicatorView" customModule="NVActivityIndicatorView">
<rect key="frame" x="181.66666666666666" y="337" width="30" height="30"/>
<rect key="frame" x="181.66666666666666" y="299" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="Yhb-BD-4NK"/>
<constraint firstAttribute="height" constant="30" id="oxU-pP-rOc"/>
Expand All @@ -97,6 +106,7 @@
<constraint firstItem="E1b-B1-vL0" firstAttribute="leading" secondItem="xKK-GX-h0X" secondAttribute="leading" constant="20" id="3QI-wI-mky"/>
<constraint firstItem="iOw-zJ-dA6" firstAttribute="centerY" secondItem="E1b-B1-vL0" secondAttribute="centerY" id="HQM-S6-4Ds"/>
<constraint firstItem="E1b-B1-vL0" firstAttribute="top" secondItem="puc-8O-iQI" secondAttribute="bottom" constant="32" id="OaH-dL-LsM"/>
<constraint firstAttribute="trailing" secondItem="puc-8O-iQI" secondAttribute="trailing" constant="20" id="SUK-GL-u95"/>
<constraint firstAttribute="trailing" secondItem="50v-bU-gkn" secondAttribute="trailing" constant="20" id="Szf-aD-Hww"/>
<constraint firstItem="50v-bU-gkn" firstAttribute="top" secondItem="E1b-B1-vL0" secondAttribute="bottom" constant="40" id="Z2Y-H2-dDh"/>
<constraint firstItem="bOJ-6G-cdo" firstAttribute="centerY" secondItem="50v-bU-gkn" secondAttribute="centerY" id="gR5-aV-Z3Q"/>
Expand All @@ -109,7 +119,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WRu-bu-pdr">
<rect key="frame" x="0.0" y="449" width="393" height="0.0"/>
<rect key="frame" x="0.0" y="411" width="393" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" id="Kh4-KU-VLh"/>
Expand All @@ -130,8 +140,8 @@
</view>
<connections>
<outlet property="activityIndicator" destination="bOJ-6G-cdo" id="sAq-eb-6HP"/>
<outlet property="collectionVIewHeight" destination="tIL-bw-1sb" id="fpR-0r-8he"/>
<outlet property="collectionView" destination="E1b-B1-vL0" id="gso-6R-5Eh"/>
<outlet property="collectionViewHeightConstraint" destination="tIL-bw-1sb" id="Vvp-5b-dp6"/>
<outlet property="dataLoadActivityIndicator" destination="iOw-zJ-dA6" id="X5x-dq-bQ7"/>
<outlet property="saveButton" destination="50v-bU-gkn" id="lfk-ZU-col"/>
<outlet property="titleLabel" destination="puc-8O-iQI" id="jYj-nw-tLV"/>
Expand Down
6 changes: 3 additions & 3 deletions Projects/Features/MyInfoFeature/Resources/Question.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -26,7 +26,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tup-mo-jxt">
<rect key="frame" x="341" y="8" width="32" height="32"/>
<rect key="frame" x="20" y="8" width="32" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="DrT-RV-7sg"/>
<constraint firstAttribute="width" constant="32" id="UHv-Ft-UDR"/>
Expand All @@ -38,7 +38,7 @@
<constraint firstItem="jOQ-7X-YkZ" firstAttribute="centerX" secondItem="UNY-WU-BPW" secondAttribute="centerX" id="83C-LZ-gAx"/>
<constraint firstItem="jOQ-7X-YkZ" firstAttribute="centerY" secondItem="UNY-WU-BPW" secondAttribute="centerY" id="8se-eV-Xe2"/>
<constraint firstItem="Tup-mo-jxt" firstAttribute="centerY" secondItem="UNY-WU-BPW" secondAttribute="centerY" id="Iih-A8-5by"/>
<constraint firstAttribute="trailing" secondItem="Tup-mo-jxt" secondAttribute="trailing" constant="20" id="eok-vE-VpI"/>
<constraint firstItem="Tup-mo-jxt" firstAttribute="leading" secondItem="UNY-WU-BPW" secondAttribute="leading" constant="20" id="ShL-M7-YSB"/>
<constraint firstAttribute="height" constant="48" id="yOe-eO-fmd"/>
</constraints>
</view>
Expand Down
6 changes: 3 additions & 3 deletions Projects/Features/MyInfoFeature/Sources/Components/MyInfoComponent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import NeedleFoundation
import NoticeDomainInterface
import SignInFeatureInterface
import TeamFeatureInterface
import UserDomainInterface
import UIKit
import UserDomainInterface

public protocol MyInfoDependency: Dependency {
var signInFactory: any SignInFactory { get }
Expand All @@ -17,7 +17,7 @@ public protocol MyInfoDependency: Dependency {
var questionFactory: any QuestionFactory { get }
var teamInfoFactory: any TeamInfoFactory { get }
var settingFactory: any SettingFactory { get }
var profilePopComponent: ProfilePopComponent { get }
var profilePopupFactory: any ProfilePopupFactory { get }
var fruitDrawFactory: any FruitDrawFactory { get }
var fruitStorageFactory: any FruitStorageFactory { get }
var fetchNoticeIDListUseCase: any FetchNoticeIDListUseCase { get }
Expand All @@ -33,7 +33,7 @@ public final class MyInfoComponent: Component<MyInfoDependency>, MyInfoFactory {
setUserNameUseCase: dependency.setUserNameUseCase,
fetchUserInfoUseCase: dependency.fetchUserInfoUseCase
),
profilePopUpComponent: dependency.profilePopComponent,
profilePopupFactory: dependency.profilePopupFactory,
textPopUpFactory: dependency.textPopUpFactory,
multiPurposePopUpFactory: dependency.multiPurposePopUpFactory,
signInFactory: dependency.signInFactory,
Expand Down
Loading
Loading