Skip to content

Commit

Permalink
Merge pull request #241 from MaeumgaGym/refactoring/#240-allLabelrefa…
Browse files Browse the repository at this point in the history
…ctoring

🔀 :: [#240] Label 이름 변경했습니다.
  • Loading branch information
Eunho0922 authored Feb 25, 2024
2 parents 518ccc2 + 48f797a commit 9eda704
Show file tree
Hide file tree
Showing 39 changed files with 208 additions and 220 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ import DSKit

open class UserProfileView: UIView {

private lazy var userNameTitle = UILabel().then {
$0.numberOfLines = 1
$0.backgroundColor = .clear
}
private lazy var userNameTitle = MGLabel(numberOfLineCount: 1)

private lazy var smallProfile = MGProfileView(profileImage: MGProfileImage(type: .custom, customImage: nil), profileType: .smallProfile)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ public class PostureMainViewController: BaseViewController<PostureMainViewModel>

private let categoryTitleList = ["추천", "가슴", "", "어깨", "", "복근", "앞 허벅지"]

private let titleText = UILabel().then {
$0.text = "자세"
$0.textColor = .black
$0.font = UIFont.Pretendard.titleLarge
$0.textAlignment = .left
}
private let titleText = MGLabel(text: "자세",
font: UIFont.Pretendard.titleLarge,
textColor: .black,
isCenter: false
)

private lazy var pagingTabBar = MGPagingTabBar(categoryTitleList: categoryTitleList)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ public class PostureDetailPickeTableViewCell: BaseTableViewCell {

private var pickleColellectionView: UICollectionView!

private let titleLabel = UILabel().then {
$0.text = "관련 피클"
$0.textColor = .black
$0.font = UIFont.Pretendard.titleMedium
$0.textAlignment = .left
}
private let titleLabel = MGLabel(text: "관련 피클",
font: UIFont.Pretendard.titleMedium,
textColor: .black,
isCenter: false
)

var pickleData: [PostureDetailPickleImageModel] = [] {
didSet {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ import DSKit
public class PostureDetailCautionTableViewCell: UITableViewCell {
static let identifier: String = "PostureDetailCautionTableViewCell"

private var exerciseWay = UILabel().then {
$0.text = "주의사항"
$0.textColor = .black
$0.textAlignment = .left
$0.font = UIFont.Pretendard.titleMedium
}
private var exerciseWay = MGLabel(text: "주의사항",
font: UIFont.Pretendard.titleMedium,
textColor: .black,
isCenter: false
)

private var exerciseCaution1 = MGPostureInfoLabel(
titleNumber: "01",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ public class PostureDetailExerciseInfoTableViewCell: BaseTableViewCell {

static let identifier: String = "PostureDetailExerciseInfoTableViewCell"

private var exerciseWay = UILabel().then {
$0.text = "운동 방법"
$0.textColor = .black
$0.textAlignment = .left
$0.font = UIFont.Pretendard.titleMedium
}
private var exerciseWay = MGLabel(text: "운동 방법",
font: UIFont.Pretendard.titleMedium,
textColor: .black,
isCenter: false
)

private var exerciseInfo1 = MGPostureInfoLabel(
titleNumber: "01",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@ import Domain
public class PostureDetailTitleTableViewCell: BaseTableViewCell{

static let identifier: String = "PostureDetailTitleTableViewCell"

private var englishTitle = MGLabel(font: UIFont.Pretendard.titleMedium,
textColor: DSKitAsset.Colors.gray600.color,
isCenter: false
)

private var englishTitle = UILabel().then {
$0.font = UIFont.Pretendard.titleMedium
$0.textColor = DSKitAsset.Colors.gray600.color
$0.textAlignment = .left
}
private var koreanTitle = MGLabel(font: UIFont.Pretendard.titleLarge,
textColor: .black,
isCenter: false
)

private var koreanTitle = UILabel().then {
$0.font = UIFont.Pretendard.titleLarge
$0.textColor = .black
$0.textAlignment = .left
}

public override func layout() {
contentView.addSubviews([englishTitle, koreanTitle])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,17 @@ public class PostureSearchTableViewCell: UITableViewCell {
$0.backgroundColor = DSKitAsset.Colors.gray50.color
$0.layer.cornerRadius = 8.0
}

private var exerciseNameLabel = UILabel().then {
$0.font = UIFont.Pretendard.bodyMedium
$0.textColor = .black
$0.textAlignment = .left
}

private var exercisePartLabel = UILabel().then {
$0.font = UIFont.Pretendard.bodyMedium
$0.textColor = DSKitAsset.Colors.gray400.color
$0.textAlignment = .left
}


private var exerciseNameLabel = MGLabel(font: UIKit.UIFont.Pretendard.bodyMedium,
textColor: .black,
isCenter: false
)

private var exercisePartLabel = MGLabel(font: UIFont.Pretendard.bodyMedium,
textColor: DSKitAsset.Colors.gray400.color,
isCenter: false
)

public func setup(image: UIImage, name: String, part: String) {
searchImageView.image = image
exerciseNameLabel.text = name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ public class PosturePartTableViewCell: BaseTableViewCell {
$0.layer.cornerRadius = 8.0
}

private let exerciseNameLabel = UILabel().then {
$0.textColor = .black
$0.backgroundColor = .clear
$0.textAlignment = .left
$0.font = UIFont.Pretendard.bodyMedium
}
private let exerciseNameLabel = MGLabel(font: UIFont.Pretendard.bodyMedium,
textColor: .black,
isCenter: false
)

public override func layout() {
super.layout()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,13 @@ public class PostureRecommandCollectionViewCell: UICollectionViewCell {
$0.layer.cornerRadius = 8.0
}

private var exerciseNameLabel = UILabel().then {
$0.textColor = .black
$0.backgroundColor = .clear
$0.textAlignment = .left
}
private var exerciseNameLabel = MGLabel(textColor: .black,
isCenter: false
)

private var exercisePartLabel = UILabel().then {
$0.textColor = DSKitAsset.Colors.gray600.color
$0.backgroundColor = .clear
$0.textAlignment = .left
}
private var exercisePartLabel = MGLabel(textColor: DSKitAsset.Colors.gray600.color,
isCenter: false
)

private func layout() {
addSubviews([postureImageView, exerciseNameLabel, exercisePartLabel])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ public class PostureRecommandTableViewCell: BaseTableViewCell{
$0.layer.cornerRadius = 8.0
}

private var exerciseTitleLabel = UILabel().then {
$0.font = UIFont.Pretendard.titleMedium
$0.textColor = .black
$0.contentMode = .left
}
private var exerciseTitleLabel = MGLabel(font: UIFont.Pretendard.titleMedium,
textColor: .black,
isCenter: false
)

private var seemoreButton = MaeumGaGymSeeMoreButton()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ final public class AlbumNavigationBar: UIView {

private let leftButton = MGImageButton(image: SelfCareResourcesService.Assets.leftArrow)

private let leftLabel = UILabel().then {
$0.font = UIFont.Pretendard.titleMedium
$0.text = SelfCareResourcesService.Title.selectPicture
$0.textColor = .white
}
private let leftLabel = MGLabel(text: SelfCareResourcesService.Title.selectPicture,
font: UIFont.Pretendard.titleMedium,
textColor: .white
)

private lazy var leftItemsStackView = UIStackView(arrangedSubviews: [leftButton, leftLabel]).then {
$0.axis = .horizontal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ final public class CameraNavigationBar: UIView {

private let leftButton = MGImageButton(image: SelfCareResourcesService.Assets.cameraCancle)

private let leftLabel = UILabel().then {
$0.font = UIFont.Pretendard.titleMedium
$0.text = "사진 촬영"
$0.textColor = .white
}
private let leftLabel = MGLabel(text: "사진 촬영",
font: UIFont.Pretendard.titleMedium,
textColor: .white
)

private lazy var leftItemsStackView = UIStackView(arrangedSubviews: [leftButton, leftLabel]).then {
$0.axis = .horizontal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ public class SelfCareIntroductTableViewCell: BaseTableViewCell {
profileType: .smallProfile
)

private let mainTitle = UILabel().then {
$0.font = UIFont.Pretendard.titleLarge
}

private let subTitle = UILabel().then {
$0.font = UIFont.Pretendard.bodyMedium
$0.textColor = DSKitAsset.Colors.gray600.color
$0.numberOfLines = 2
}
private let mainTitle = MGLabel(font: UIFont.Pretendard.titleLarge)

private let subTitle = MGLabel(font: UIFont.Pretendard.bodyMedium,
textColor: DSKitAsset.Colors.gray600.color,
numberOfLineCount: 2
)

public func configure(with message: SelfCareIntroductModel) {
titleImageView.configureImage(with: MGProfileImage(type: .custom,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ public class SelfCareMenuCollectionCell: UICollectionViewCell {
$0.layer.cornerRadius = 8.0
}

private var menuLabel = UILabel().then {
$0.textColor = .black
$0.textAlignment = .center
}
private var menuLabel = MGLabel(textColor: .black,
isCenter: true
)
// 보류
// private var arrowImageView = UIImageView().then {
// $0.image = UIImage(systemName: "chevron.right")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ public class SelfCareMenuTableViewCell: BaseTableViewCell {

static let identifier: String = SelfCareResourcesService.identifier.selfCareMenuTableViewCell

private var nameTitle = UILabel().then {
$0.text = SelfCareResourcesService.Title.selfCare
$0.textColor = .black
$0.font = UIFont.Pretendard.titleMedium
}
private var nameTitle = MGLabel(text: SelfCareResourcesService.Title.selfCare,
font: UIFont.Pretendard.titleMedium,
textColor: .black
)

private var selfCareMenuCollectionView: UICollectionView = {
let layout = UICollectionViewFlowLayout()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@ public class SelfCareProfileTableViewCell: BaseTableViewCell {
customImage: DSKitAsset.Assets.basicProfile.image),
profileType: .bigProfile
)

private let userNameLabel = MGLabel(font: UIFont.Pretendard.labelLarge,
textColor: .black
)

private let userNameLabel = UILabel().then {
$0.font = UIFont.Pretendard.labelLarge
$0.textColor = .black
}

private var userTimerLabel = UILabel().then {
$0.font = UIFont.Pretendard.bodyMedium
$0.textColor = DSKitAsset.Colors.gray400.color
}
private var userTimerLabel = MGLabel(font: UIFont.Pretendard.bodyMedium,
textColor: DSKitAsset.Colors.gray400.color
)

private var userBageView = MGProfileView(
profileImage: MGProfileImage(type: .custom,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ public class SelfCareMyRoutineViewController: BaseViewController<SelfCareMyRouti
private var containerView = UIView()
private var headerView = UIView()

private let myRoutineTitleLabel = UILabel().then {
$0.textColor = .black
$0.contentMode = .left
$0.font = UIFont.Pretendard.titleLarge
}
private let myRoutineTitleLabel = MGLabel(font: UIFont.Pretendard.titleLarge,
textColor: .black,
isCenter: false
)


private let myRoutineSubTitleLabel = UILabel().then {
$0.numberOfLines = 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,16 @@ public class SelfCareTargetMainViewController: BaseViewController<SelfCareTarget

private var headerView = UIView()
private var containerView = UIView()

private let targetTitleLabel = UILabel().then {
$0.textColor = .black
$0.contentMode = .left
$0.font = UIFont.Pretendard.titleLarge
}

private let targetSubTitleLabel = UILabel().then {
$0.numberOfLines = 1
$0.textColor = DSKitAsset.Colors.gray600.color
$0.font = UIFont.Pretendard.bodyMedium
}

private let targetTitleLabel = MGLabel(font: UIFont.Pretendard.titleLarge,
textColor: .black,
isCenter: false
)

private let targetSubTitleLabel = MGLabel(font: UIFont.Pretendard.bodyMedium,
textColor: DSKitAsset.Colors.gray600.color,
numberOfLineCount: 1
)

private var targetMainTableView = UITableView().then {
$0.showsVerticalScrollIndicator = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,17 @@ public class MyRoutineDetailTableViewCell: BaseTableViewCell {
$0.contentMode = .scaleToFill
}

private var exerciseNameLabel = UILabel().then {
$0.font = UIFont.Pretendard.bodyLarge
$0.textColor = .black
$0.textAlignment = .left
$0.numberOfLines = 1
}

private var exerciseRoutineLabel = UILabel().then {
$0.font = UIFont.Pretendard.bodyMedium
$0.textColor = DSKitAsset.Colors.gray400.color
$0.textAlignment = .left
$0.numberOfLines = 1
}
private let exerciseNameLabel = MGLabel(font: UIFont.Pretendard.bodyLarge,
textColor: .black,
isCenter: false,
numberOfLineCount: 1
)

private var exerciseRoutineLabel = MGLabel(font: UIFont.Pretendard.bodyMedium,
textColor: DSKitAsset.Colors.gray400.color,
isCenter: false,
numberOfLineCount: 1
)

private var deatilImage = UIImageView().then {
$0.image = DSKitAsset.Assets.right.image
Expand Down
Loading

0 comments on commit 9eda704

Please sign in to comment.