Skip to content

Commit

Permalink
Merge pull request TeamDooRiBon#150 from Taehyeon-Kim/feature/141-fix-ui
Browse files Browse the repository at this point in the history
[FEAT] TeamDooRiBon#141 - UI 버그 μˆ˜μ •
  • Loading branch information
Taehyeon-Kim authored Jul 16, 2021
2 parents bc96118 + 5e691e6 commit 608b0ea
Show file tree
Hide file tree
Showing 34 changed files with 273 additions and 233 deletions.
5 changes: 2 additions & 3 deletions DooRiBon/DooRiBon.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,6 @@
BD75C300268B5BA800C4F233 /* UIFont+Extension.swift in Sources */,
BD6074B7269DF92700CA62F3 /* BoardResponse.swift in Sources */,
39FC9D8F269F6604002E12A5 /* CheckTripViewController.swift in Sources */,
BD6074B7269DF92700CA62F3 /* BoardResponse.swift in Sources */,
BD5EEC9426986AB100D09B11 /* BoardNoDataTableViewCell.swift in Sources */,
4029D7AD26A0401C00C4F5A0 /* EditPlanService.swift in Sources */,
40A0EA42269C4596009EDE74 /* NibConstants.swift in Sources */,
Expand Down Expand Up @@ -1549,7 +1548,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.dooriboncorp.DooRiBon;
PRODUCT_BUNDLE_IDENTIFIER = com.codershigh.dooribon;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -1569,7 +1568,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.dooriboncorp.DooRiBon;
PRODUCT_BUNDLE_IDENTIFIER = com.codershigh.dooribon;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"images" : [
{
"idiom" : "universal",
"filename" : "iconBackWhite.png",
"scale" : "1x"
"scale" : "1x",
"filename" : "iconAirplaneFillWhite.png"
},
{
"filename" : "[email protected]",
"scale" : "2x",
"idiom" : "universal",
"scale" : "2x"
"filename" : "[email protected]"
},
{
"filename" : "iconBackWhite@3x.png",
"filename" : "iconAirplaneFillWhite@3x.png",
"scale" : "3x",
"idiom" : "universal"
}
Expand Down
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,23 @@
{
"images" : [
{
"filename" : "mainhomeIllust031.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,7 @@
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="gyK-uK-iJ4" secondAttribute="trailing" id="tQL-Lw-Jkz"/>
</constraints>
</view>
<tabBarItem key="tabBarItem" title="λ³΄λ“œ" image="iconBoardInactiveIos" selectedImage="iconBoardActiveIos" id="qOq-cj-B3K">
<inset key="imageInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-12"/>
</tabBarItem>
<tabBarItem key="tabBarItem" title="λ³΄λ“œ" image="iconBoardInactiveIos" selectedImage="iconBoardActiveIos" id="qOq-cj-B3K"/>
<navigationItem key="navigationItem" id="6H8-YY-rO3"/>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
<connections>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<rect key="frame" x="0.0" y="0.0" width="339" height="226"/>
<color key="backgroundColor" name="white8"/>
</view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imgTestStart" translatesAutoresizingMaskIntoConstraints="NO" id="hb3-Cc-jT3">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imgTestStart" translatesAutoresizingMaskIntoConstraints="NO" id="hb3-Cc-jT3">
<rect key="frame" x="0.0" y="0.0" width="339" height="226"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
Expand Down Expand Up @@ -66,12 +66,12 @@
<constraints>
<constraint firstItem="Jib-ZP-3Nc" firstAttribute="bottom" secondItem="G3g-ZW-vwb" secondAttribute="bottom" id="0Fq-ZU-JyJ"/>
<constraint firstItem="G3g-ZW-vwb" firstAttribute="trailing" secondItem="70X-cf-Wgw" secondAttribute="trailing" constant="74" id="BpF-uQ-ENm"/>
<constraint firstItem="hb3-Cc-jT3" firstAttribute="leading" secondItem="G3g-ZW-vwb" secondAttribute="leading" id="CJ2-fR-Fiq"/>
<constraint firstItem="hb3-Cc-jT3" firstAttribute="leading" secondItem="QWe-l4-Ecl" secondAttribute="leading" id="CJ2-fR-Fiq"/>
<constraint firstItem="Jib-ZP-3Nc" firstAttribute="top" secondItem="QWe-l4-Ecl" secondAttribute="top" id="Fez-5G-Smf"/>
<constraint firstItem="G3g-ZW-vwb" firstAttribute="trailing" secondItem="hb3-Cc-jT3" secondAttribute="trailing" id="GtA-VF-zoH"/>
<constraint firstAttribute="trailing" secondItem="hb3-Cc-jT3" secondAttribute="trailing" id="GtA-VF-zoH"/>
<constraint firstItem="Kuv-wA-d94" firstAttribute="leading" secondItem="G3g-ZW-vwb" secondAttribute="leading" constant="42" id="J4O-cv-07x"/>
<constraint firstItem="G3g-ZW-vwb" firstAttribute="trailing" secondItem="Kuv-wA-d94" secondAttribute="trailing" constant="42" id="O3b-zA-pdg"/>
<constraint firstItem="G3g-ZW-vwb" firstAttribute="bottom" secondItem="hb3-Cc-jT3" secondAttribute="bottom" id="QUs-7e-e7n"/>
<constraint firstAttribute="bottom" secondItem="hb3-Cc-jT3" secondAttribute="bottom" id="QUs-7e-e7n"/>
<constraint firstItem="hb3-Cc-jT3" firstAttribute="top" secondItem="QWe-l4-Ecl" secondAttribute="top" id="X06-gl-PvI"/>
<constraint firstItem="Jib-ZP-3Nc" firstAttribute="leading" secondItem="G3g-ZW-vwb" secondAttribute="leading" id="bbs-zd-GjV"/>
<constraint firstItem="Jib-ZP-3Nc" firstAttribute="trailing" secondItem="G3g-ZW-vwb" secondAttribute="trailing" id="eff-oo-SXW"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="465"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" contentViewInsetsToSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pYF-Jo-LZa">
<tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" contentViewInsetsToSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pYF-Jo-LZa">
<rect key="frame" x="18" y="0.0" width="378" height="465"/>
<color key="backgroundColor" name="white8"/>
<prototypes>
Expand Down Expand Up @@ -224,8 +224,8 @@
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" name="white8"/>
<constraints>
<constraint firstItem="pYF-Jo-LZa" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" constant="18" id="1Bi-We-cuF"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="pYF-Jo-LZa" secondAttribute="trailing" constant="18" id="4Zj-dC-Yik"/>
<constraint firstItem="pYF-Jo-LZa" firstAttribute="leading" secondItem="5EZ-qb-Rvc" secondAttribute="leading" constant="18" id="1Bi-We-cuF"/>
<constraint firstAttribute="trailing" secondItem="pYF-Jo-LZa" secondAttribute="trailing" constant="18" id="4Zj-dC-Yik"/>
<constraint firstItem="pYF-Jo-LZa" firstAttribute="top" secondItem="5EZ-qb-Rvc" secondAttribute="top" id="Ihj-as-vlw"/>
<constraint firstAttribute="bottom" secondItem="pYF-Jo-LZa" secondAttribute="bottom" id="zpw-38-UqJ"/>
</constraints>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class MemberOurViewController: UIViewController, PageComponentProtocol {
memberOurTableView.register(NibConstants.MemberStartViewNib, forCellReuseIdentifier: "MemberStartView")
memberOurTableView.register(NibConstants.MemberStartNib, forCellReuseIdentifier: "MemberStartTableViewCell")
memberOurTableView.register(NibConstants.MemberCodeCopyNib, forCellReuseIdentifier: "MemberCodeCopyTableViewCell")
memberOurTableView.backgroundColor = .clear
// memberOurTableView.backgroundColor = .clear
}

private func getStyleData() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@
<constraint firstItem="5ld-ms-rFm" firstAttribute="leading" secondItem="pKD-2S-Oes" secondAttribute="leading" id="gJV-n6-AA3"/>
</constraints>
</view>
<tabBarItem key="tabBarItem" title="멀버" image="iconPeopleInactiveIos" selectedImage="iconMembersActive" id="9SQ-1c-JHc">
<inset key="imageInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-12"/>
</tabBarItem>
<tabBarItem key="tabBarItem" title="κ·Έλ£Ή" image="iconPeopleInactiveIos" selectedImage="iconMembersActive" id="9SQ-1c-JHc"/>
<navigationItem key="navigationItem" id="jcf-2a-Q0S"/>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
<connections>
Expand Down
54 changes: 0 additions & 54 deletions DooRiBon/DooRiBon/Sources/Base/Member/MemberViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -130,57 +130,3 @@ extension MemberViewController {
ToastView.show("μ°Έμ—¬μ½”λ“œ 볡사 μ™„λ£Œ! μ›ν•˜λŠ” 곳에 λΆ™μ—¬λ„£κΈ° ν•˜μ„Έμš”.")
}
}

class PagerTabSampleComponent1ViewController: UIViewController, PageComponentProtocol {
var pageTitle: String {
"component1"
}

override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .purple
}
}

class PagerTabSampleComponent2ViewController: UITableViewController, PageComponentProtocol {
var pageTitle: String {
"component2"
}

override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .systemIndigo
}

override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
100
}

override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
30
}

override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = UITableViewCell()
let label = UILabel()
cell.addSubview(label)
label.snp.makeConstraints {
$0.center.equalToSuperview()
}
label.text = "IndexPath : \(indexPath)"
cell.backgroundColor = .systemTeal
return cell
}
}

class PagerTabSampleComponent3ViewController: UIViewController, PageComponentProtocol {
var pageTitle: String {
"component3"
}

override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .magenta
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<rect key="frame" x="313" y="16" width="43" height="17"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3λͺ…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ArU-bu-Cfh">
<rect key="frame" x="12.5" y="0.0" width="18.5" height="17"/>
<rect key="frame" x="13" y="0.0" width="17.5" height="17"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Regular" family="Spoqa Han Sans Neo" pointSize="12"/>
<color key="textColor" name="white9"/>
<nil key="highlightedColor"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class TakeLookViewController: UIViewController, PageComponentProtocol, HeaderVie
private var countList: [TakeLookData] = [] {
didSet {
styleQuestionTableView.reloadData()

}
}

Expand Down Expand Up @@ -61,7 +60,6 @@ class TakeLookViewController: UIViewController, PageComponentProtocol, HeaderVie
case .success(let countData):
if let data = countData as? [TakeLookData] {
self.countList = data
print(self.countList, 213313)
}
case .requestErr(let message):
print("requestERR", message)
Expand Down Expand Up @@ -196,8 +194,6 @@ extension TakeLookViewController: UITableViewDataSource
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
guard let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "QuestionCell") as? QuestionCell else { return UITableViewHeaderFooterView() }

headerView.backgroundColor = .white

headerView.sectionIndex = section // μ„Ήμ…˜μ˜ 인덱슀 값을 담아두기
headerView.numberLabel.text = numberList[section]
headerView.questionTitleLabel.text = questionList[section]
Expand All @@ -207,8 +203,6 @@ extension TakeLookViewController: UITableViewDataSource

return headerView
}


}
extension TakeLookViewController {
private func setupFirstData() {
Expand Down
6 changes: 2 additions & 4 deletions DooRiBon/DooRiBon/Sources/Base/Plan/PlanStoryboard.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<rect key="frame" x="0.0" y="0.0" width="79" height="71"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rit-r2-uHf">
<rect key="frame" x="34" y="13" width="19.5" height="10.5"/>
<rect key="frame" x="34" y="13" width="18" height="9.5"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Regular" family="Spoqa Han Sans Neo" pointSize="8"/>
<color key="textColor" name="subBlue1"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -147,9 +147,7 @@
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="B9K-oA-KgM" secondAttribute="trailing" id="xU3-EY-P6L"/>
</constraints>
</view>
<tabBarItem key="tabBarItem" title="일정" image="iconCalendarInactiveIos" selectedImage="iconCalendarActiveIos" id="KWx-Pg-r3U">
<inset key="imageInsets" minX="0.0" minY="0.0" maxX="0.0" maxY="-12"/>
</tabBarItem>
<tabBarItem key="tabBarItem" title="일정" image="iconCalendarInactiveIos" selectedImage="iconCalendarActiveIos" id="KWx-Pg-r3U"/>
<navigationItem key="navigationItem" id="YtJ-y8-o83"/>
<nil key="simulatedTopBarMetrics"/>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ struct TripInformService
encoding: JSONEncoding.default,
headers: header)
dataRequest.responseData { dataResponse in

dump(dataResponse)

switch dataResponse.result {
case .success:
guard let statusCode = dataResponse.response?.statusCode else {return}
Expand Down
2 changes: 1 addition & 1 deletion DooRiBon/DooRiBon/Sources/Base/TripStoryboard.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<objects>
<tabBarController storyboardIdentifier="TripViewController" automaticallyAdjustsScrollViewInsets="NO" id="S7L-3Y-fNE" customClass="TripViewController" customModule="DooRiBon" customModuleProvider="target" sceneMemberID="viewController">
<toolbarItems/>
<tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="NAz-DL-ieH" customClass="CustomTabBar" customModule="DooRiBon" customModuleProvider="target">
<tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="NAz-DL-ieH">
<rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/>
<autoresizingMask key="autoresizingMask"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand Down
18 changes: 9 additions & 9 deletions DooRiBon/DooRiBon/Sources/Base/TripViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class TripViewController: UITabBarController {
NSAttributedString.Key.font: UIFont.SpoqaHanSansNeo(.regular, size: 12)], for: .selected)

// 타이틀 μœ„μΉ˜ μ‘°μ •
appearance.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: 8)
// appearance.titlePositionAdjustment = UIOffset(horizontal: 0, vertical: 8)
}
}

Expand All @@ -81,11 +81,11 @@ extension UITabBar {
}
}

// MARK: - TabBar 높이 μ„ΈνŒ… μœ„ν•œ 클래슀
class CustomTabBar : UITabBar {
override open func sizeThatFits(_ size: CGSize) -> CGSize {
var sizeThatFits = super.sizeThatFits(size)
sizeThatFits.height = 82
return sizeThatFits
}
}
//// MARK: - TabBar 높이 μ„ΈνŒ… μœ„ν•œ 클래슀
//class CustomTabBar : UITabBar {
// override open func sizeThatFits(_ size: CGSize) -> CGSize {
// var sizeThatFits = super.sizeThatFits(size)
// sizeThatFits.height = 82
// return sizeThatFits
// }
//}
2 changes: 1 addition & 1 deletion DooRiBon/DooRiBon/Sources/Common/TripTop/TripTopView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ class TripTopView: UIView {
periodLabel.text = "\(start) - \(end)"
tripTitleLabel.text = tripData.travelName
destinationLabel.text = tripData.destination
memberDescriptionLabel.text = tripData.members[0]
memberDescriptionLabel.text = "\(tripData.members[0])λ‹˜κ³Ό ν•¨κ»˜"
}
}
Loading

0 comments on commit 608b0ea

Please sign in to comment.