Skip to content

Commit

Permalink
Feat [#7] DetailVC MVVM 리팩토링
Browse files Browse the repository at this point in the history 
시간별 collectionView 반영 필요
  • Loading branch information
@chaentopia
chaentopia committed Dec 10, 2023
1 parent c234940 commit d4c311b
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 96 deletions.
56 changes: 56 additions & 0 deletions DO_SOPT_33_Assignment/DO_SOPT_33_Assignment/Presentation/Detail/DetaliViewModel.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
//
// DetailViewModel.swift
// DO_SOPT_33_Assignment
//
// Created by 정채은 on 12/5/23.
//

import UIKit

final class DetailViewModel: NSObject {

var indexNumber: Int = 0

var minTempArray: [Int] = []
var maxTempArray: [Int] = []
var minMinTemp: Int = 0
var maxMaxTemp: Int = 0
var hourWeatherCount: Int = 0

var hourDetailWeathersData: [WeatherDetailResponseDTO] = [WeatherDetailResponseDTO(cod: "", message: 0, cnt: 0, list: [List(dt: 0, main: MainClass(temp: 0, feelsLike: 0, tempMin: 0, tempMax: 0, pressure: 0, seaLevel: 0, grndLevel: 0, humidity: 0, tempKf: 0), weather: [DetailWeather(id: 0, main: .clear, description: "", icon: "")], clouds: Clouds(all: 0), wind: Wind(speed: 0, deg: 0, gust: 0), visibility: 0, pop: 0, sys: DetailSys(pod: .d), dtTxt: "", rain: Rain(the3h: 0), snow: Rain(the3h: 0))], city: City(id: 0, name: "", coord: Coord(lon: 0, lat: 0), country: "", population: 0, timezone: 0, sunrise: 0, sunset: 0))]

func loadWeatherDetailData(completion : @escaping() -> Void) {
Task {
do {
let cities = ["seoul", "daegu", "busan", "daejeon", "mokpo"]

self.hourDetailWeathersData = []

for cityName in cities {
do {
if let receivedData = try await WeatherDetailService.shared.GetDetailWeatherData(cityName: cityName) {
hourDetailWeathersData.append(receivedData)
}
} catch {
print("Failed to get weather data for \(cityName): \(error)")
}
}

DispatchQueue.main.async {
self.hourWeatherCount = 9
print("💛💛💛💛💛💛💛")
}
}
}
}

func caculateMinMax(data: [TenDaysWeather]) {
data.forEach {
minTempArray.append($0.minTemp)
maxTempArray.append($0.maxTemp)
}

minMinTemp = minTempArray.min() ?? 0
maxMaxTemp = maxTempArray.max() ?? 0
}
}
1 change: 0 additions & 1 deletion ...t/DO_SOPT_33_Assignment/Presentation/Detail/ViewController/DetailPageViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ class DetailPageViewController: UIViewController {
}

extension DetailPageViewController: UIPageViewControllerDataSource {
// UIPageViewControllerDataSource 메서드
func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
if let currentIndex = detailViewControllers.firstIndex(of: viewController as! DetailViewController), currentIndex > 0 {
return detailViewControllers[currentIndex - 1]
Expand Down
137 changes: 44 additions & 93 deletions ...nment/DO_SOPT_33_Assignment/Presentation/Detail/ViewController/DetailViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,7 @@ import SnapKit
import Then

final class DetailViewController: UIViewController {

var indexNumber: Int = 0
var minTempArray: [Int] = []
var maxTempArray: [Int] = []
var minMinTemp: Int = 0
var maxMaxTemp: Int = 0
var hourWeatherCount: Int = 0

var hourDetailWeathersData: [WeatherDetailResponseDTO] = [WeatherDetailResponseDTO(cod: "", message: 0, cnt: 0, list: [List(dt: 0, main: MainClass(temp: 0, feelsLike: 0, tempMin: 0, tempMax: 0, pressure: 0, seaLevel: 0, grndLevel: 0, humidity: 0, tempKf: 0), weather: [DetailWeather(id: 0, main: .clear, description: "", icon: "")], clouds: Clouds(all: 0), wind: Wind(speed: 0, deg: 0, gust: 0), visibility: 0, pop: 0, sys: DetailSys(pod: .d), dtTxt: "", rain: Rain(the3h: 0), snow: Rain(the3h: 0))], city: City(id: 0, name: "", coord: Coord(lon: 0, lat: 0), country: "", population: 0, timezone: 0, sunrise: 0, sunset: 0))]


var detailWeatherData: WeatherResponseDTO = WeatherResponseDTO(coord: Coord(lon: 0, lat: 0), weather: [Weathers(id: 0, main: "", description: "", icon: "")], base: "", main: Main(temp: 0.0, feelsLike: 0.0, tempMin: 0.0, tempMax: 0.0, pressure: 0, humidity: 0, seaLevel: 0, grndLevel: 0), visibility: 0, wind: Wind(speed: 0.0, deg: 0, gust: 0.0), clouds: Clouds(all: 0), dt: 0, sys: Sys(type: 0, id: 0, country: "", sunrise: 0, sunset: 0), timezone: 0, id: 0, name: "", cod: 0)

let backgroundImageView = UIImageView()
Expand All @@ -29,15 +20,18 @@ final class DetailViewController: UIViewController {
collectionViewLayout: detailFlowLayout)
let detailFlowLayout = UICollectionViewFlowLayout()

let detailViewModel = DetailViewModel()

override func viewDidLoad() {
super.viewDidLoad()
loadWeatherDetailData()
setUI()
}

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(true)
loadWeatherDetailData()
detailViewModel.loadWeatherDetailData {
self.detailCollectionView.reloadData()
}
}

private func setUI() {
Expand Down Expand Up @@ -96,19 +90,43 @@ final class DetailViewController: UIViewController {
$0.bottom.equalToSuperview().inset(82)
}
}
}

extension DetailViewController: UICollectionViewDelegate { }

extension DetailViewController: UICollectionViewDelegateFlowLayout {
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {

switch indexPath.section {
case 0:
if kind == UICollectionView.elementKindSectionHeader {
let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: DetailLocalView.identifier, for: indexPath) as! DetailLocalView
headerView.configLocalView(data: detailWeatherData)
return headerView
} else {
return UICollectionReusableView()
}
default:
return UICollectionReusableView()
}
}

func caculateMinMax(data: [TenDaysWeather]) {
data.forEach {
minTempArray.append($0.minTemp)
maxTempArray.append($0.maxTemp)
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
if collectionView == detailCollectionView {
switch section {
case 0:
return CGSize(width: UIScreen.main.bounds.width, height: 260)
default:
return CGSize.zero
}
} else {
return CGSize.zero
}

minMinTemp = minTempArray.min() ?? 0
maxMaxTemp = maxTempArray.max() ?? 0
}
}

extension DetailViewController: UICollectionViewDelegate { }
extension DetailViewController: UITableViewDelegate { }

extension DetailViewController: UICollectionViewDataSource {

func numberOfSections(in collectionView: UICollectionView) -> Int {
Expand All @@ -123,7 +141,7 @@ extension DetailViewController: UICollectionViewDataSource {
if collectionView == detailCollectionView {
return 1
} else {
return hourWeatherCount
return detailViewModel.hourWeatherCount
}
}

Expand All @@ -149,7 +167,7 @@ extension DetailViewController: UICollectionViewDataSource {
switch indexPath.section {
case 0:
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: TimeCardView.identifier, for: indexPath) as? TimeCardView else { return UICollectionViewCell() }
cell.configTimeCardView(indexNumber: indexNumber)
cell.configTimeCardView(indexNumber: detailViewModel.indexNumber)
cell.weatherTimeCollectionView.isScrollEnabled = true
cell.weatherTimeCollectionView.delegate = self
cell.weatherTimeCollectionView.dataSource = self
Expand All @@ -158,8 +176,7 @@ extension DetailViewController: UICollectionViewDataSource {
return cell
case 1:
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: TenDaysCardView.identifier, for: indexPath) as? TenDaysCardView else { return UICollectionViewCell() }
self.caculateMinMax(data: tenDaysWeatherDummy)

self.detailViewModel.caculateMinMax(data: tenDaysWeatherDummy)
cell.tenDaysTableView.delegate = self
cell.tenDaysTableView.dataSource = self
return cell
Expand All @@ -168,45 +185,13 @@ extension DetailViewController: UICollectionViewDataSource {
}
} else {
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: DetailTimeCollectionViewCell.identifier, for: indexPath) as? DetailTimeCollectionViewCell else { return UICollectionViewCell() }
cell.bindData(data: hourDetailWeathersData[indexNumber], row: indexPath.row)
cell.bindData(data: detailViewModel.hourDetailWeathersData[detailViewModel.indexNumber], row: indexPath.row)
return cell
}
}
}


extension DetailViewController: UICollectionViewDelegateFlowLayout {
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {

switch indexPath.section {
case 0:
if kind == UICollectionView.elementKindSectionHeader {
let headerView = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: DetailLocalView.identifier, for: indexPath) as! DetailLocalView
headerView.configLocalView(data: detailWeatherData)
return headerView
} else {
return UICollectionReusableView()
}
default:
return UICollectionReusableView()
}
}

func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
if collectionView == detailCollectionView {
switch section {
case 0:
return CGSize(width: UIScreen.main.bounds.width, height: 260)
default:
return CGSize.zero
}
} else {
return CGSize.zero
}
}
}

extension DetailViewController: UITableViewDelegate { }
extension DetailViewController: UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 10
Expand All @@ -216,46 +201,12 @@ extension DetailViewController: UITableViewDataSource {
guard let cell = tableView.dequeueReusableCell(withIdentifier: TenDaysTableViewCell.identifier, for: indexPath) as? TenDaysTableViewCell else { return UITableViewCell() }
cell.bindData(data: tenDaysWeatherDummy[indexPath.row])
cell.selectionStyle = .none
cell.minMinTemp = minMinTemp
cell.maxMaxTemp = maxMaxTemp
cell.minMinTemp = detailViewModel.minMinTemp
cell.maxMaxTemp = detailViewModel.maxMaxTemp
return cell
}

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

extension DetailViewController {
private func loadWeatherDetailData() {
Task {
do {
let cities = ["seoul", "daegu", "busan", "daejeon", "mokpo"]

self.hourDetailWeathersData = []
var hourDetailWeatherDataArray: [WeatherDetailResponseDTO] = []

for cityName in cities {
do {
if let receivedData = try await WeatherDetailService.shared.GetDetailWeatherData(cityName: cityName) {
hourDetailWeatherDataArray.append(receivedData)
}
} catch {
print("Failed to get weather data for \(cityName): \(error)")
}
}

DispatchQueue.main.async {
self.hourDetailWeathersData = hourDetailWeatherDataArray
self.hourWeatherCount = 9
self.detailCollectionView.reloadData()
print(hourDetailWeatherDataArray)
print("💛💛💛💛💛💛💛")
}
} catch {
print(error)
}
}
}
}

4 changes: 2 additions & 2 deletions ...ssignment/DO_SOPT_33_Assignment/Presentation/Home/ViewController/HomeViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ extension HomeViewController: WeatherButtonDelegate {

for index in 0..<homeViewModel.resultArray.count {
let detailViewController = DetailViewController()
detailViewController.indexNumber = index
detailViewController.detailViewModel.indexNumber = index
detailViewController.detailWeatherData = homeViewModel.resultArray[index]
detailPageViewController.detailViewControllers.append(detailViewController)
}

let firstViewController = detailPageViewController.detailViewControllers[sender.indexNumber]
detailPageViewController.pageViewController.setViewControllers([firstViewController], direction: .forward, animated: true, completion: nil)

detailPageViewController.detailViewControllers[sender.indexNumber].indexNumber = sender.indexNumber
detailPageViewController.detailViewControllers[sender.indexNumber].detailViewModel.indexNumber = sender.indexNumber

navigationController?.pushViewController(detailPageViewController, animated: true)
}
Expand Down

0 comments on commit d4c311b

Please sign in to comment.