Skip to content

[Design/#17] #18

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

Merged
iiuoon merged 5 commits into from
Jul 17, 2025
Merged

[Design/#17] #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5a59db
design: QuizView color update
iiuoon Jul 17, 2025
63739f4
design: LoginView update
iiuoon Jul 17, 2025
2d1b5fb
feat: Navigation leftButton Event
iiuoon Jul 17, 2025
453130e
feat: edit text
iiuoon Jul 17, 2025
7cf6df6
design: QuizCompleteAlertView
iiuoon Jul 17, 2025
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
21 changes: 4 additions & 17 deletions Projects/CommonUI/CommonUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 55;
objectVersion = 56;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -272,8 +272,6 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
TargetAttributes = {
};
};
buildConfigurationList = 26B57D5F96290632B0503228 /* Build configuration list for PBXProject "CommonUI" */;
compatibilityVersion = "Xcode 14.0";
Expand Down Expand Up @@ -358,11 +356,7 @@
"$(inherited)",
"-fmodule-map-file=$(SRCROOT)/../../Tuist/.build/tuist-derived/RxCocoaRuntime/RxCocoaRuntime.modulemap",
);
OTHER_SWIFT_FLAGS = (
"$(inherited)",
"-Xcc",
"-fmodule-map-file=$(SRCROOT)/../../Tuist/.build/tuist-derived/RxCocoaRuntime/RxCocoaRuntime.modulemap",
);
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=$(SRCROOT)/../../Tuist/.build/tuist-derived/RxCocoaRuntime/RxCocoaRuntime.modulemap";
PRODUCT_BUNDLE_IDENTIFIER = io.tuist.CommonUI;
PRODUCT_NAME = CommonUI;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -456,22 +450,15 @@
"$(inherited)",
"-fmodule-map-file=$(SRCROOT)/../../Tuist/.build/tuist-derived/RxCocoaRuntime/RxCocoaRuntime.modulemap",
);
OTHER_SWIFT_FLAGS = (
"$(inherited)",
"-Xcc",
"-fmodule-map-file=$(SRCROOT)/../../Tuist/.build/tuist-derived/RxCocoaRuntime/RxCocoaRuntime.modulemap",
);
OTHER_SWIFT_FLAGS = "$(inherited) -Xcc -fmodule-map-file=$(SRCROOT)/../../Tuist/.build/tuist-derived/RxCocoaRuntime/RxCocoaRuntime.modulemap";
PRODUCT_BUNDLE_IDENTIFIER = io.tuist.CommonUI;
PRODUCT_NAME = CommonUI;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = (
"$(inherited)",
DEBUG,
);
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
SWIFT_COMPILATION_MODE = singlefile;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand Down
312 changes: 156 additions & 156 deletions Projects/CommonUI/Derived/Sources/TuistAssets+CommonUI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,156 +1,156 @@
// swiftlint:disable:this file_name
// swiftlint:disable all
// swift-format-ignore-file
// swiftformat:disable all
// Generated using tuist — https://github.com/tuist/tuist

#if os(macOS)
import AppKit
#elseif os(iOS)
import UIKit
#elseif os(tvOS) || os(watchOS)
import UIKit
#endif
#if canImport(SwiftUI)
import SwiftUI
#endif

// MARK: - Asset Catalogs

public enum CommonUIAsset: Sendable {
public enum Colors {
public static let lmBlack = CommonUIColors(name: "LMBlack")
public static let lmGray01 = CommonUIColors(name: "LMGray01")
public static let lmGray03 = CommonUIColors(name: "LMGray03")
public static let lmGray05 = CommonUIColors(name: "LMGray05")
public static let lmWhite = CommonUIColors(name: "LMWhite")
public static let lmOrange01 = CommonUIColors(name: "LMOrange01")
public static let lmOrange03 = CommonUIColors(name: "LMOrange03")
public static let lmOrange04 = CommonUIColors(name: "LMOrange04")
}
public enum Images {
public static let back = CommonUIImages(name: "back")
public static let play = CommonUIImages(name: "play")
public static let smallLogo = CommonUIImages(name: "small_logo")
public static let tabIconChat = CommonUIImages(name: "tab_icon_chat")
public static let tabIconChatSelected = CommonUIImages(name: "tab_icon_chat_selected")
public static let tabIconDiary = CommonUIImages(name: "tab_icon_diary")
public static let tabIconDiarySelected = CommonUIImages(name: "tab_icon_diary_selected")
public static let tabIconHome = CommonUIImages(name: "tab_icon_home")
public static let tabIconHomeSelected = CommonUIImages(name: "tab_icon_home_selected")
public static let tabIconMypage = CommonUIImages(name: "tab_icon_mypage")
public static let tabIconMypageSelected = CommonUIImages(name: "tab_icon_mypage_selected")
public static let tabIconStats = CommonUIImages(name: "tab_icon_stats")
public static let tabIconStatsSelected = CommonUIImages(name: "tab_icon_stats_selected")
}
}

// MARK: - Implementation Details

public final class CommonUIColors: Sendable {
public let name: String

#if os(macOS)
public typealias Color = NSColor
#elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
public typealias Color = UIColor
#endif

@available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, visionOS 1.0, *)
public var color: Color {
guard let color = Color(asset: self) else {
fatalError("Unable to load color asset named \(name).")
}
return color
}

#if canImport(SwiftUI)
@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
public var swiftUIColor: SwiftUI.Color {
return SwiftUI.Color(asset: self)
}
#endif

fileprivate init(name: String) {
self.name = name
}
}

public extension CommonUIColors.Color {
@available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, visionOS 1.0, *)
convenience init?(asset: CommonUIColors) {
let bundle = Bundle.module
#if os(iOS) || os(tvOS) || os(visionOS)
self.init(named: asset.name, in: bundle, compatibleWith: nil)
#elseif os(macOS)
self.init(named: NSColor.Name(asset.name), bundle: bundle)
#elseif os(watchOS)
self.init(named: asset.name)
#endif
}
}

#if canImport(SwiftUI)
@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
public extension SwiftUI.Color {
init(asset: CommonUIColors) {
let bundle = Bundle.module
self.init(asset.name, bundle: bundle)
}
}
#endif

public struct CommonUIImages: Sendable {
public let name: String

#if os(macOS)
public typealias Image = NSImage
#elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
public typealias Image = UIImage
#endif

public var image: Image {
let bundle = Bundle.module
#if os(iOS) || os(tvOS) || os(visionOS)
let image = Image(named: name, in: bundle, compatibleWith: nil)
#elseif os(macOS)
let image = bundle.image(forResource: NSImage.Name(name))
#elseif os(watchOS)
let image = Image(named: name)
#endif
guard let result = image else {
fatalError("Unable to load image asset named \(name).")
}
return result
}

#if canImport(SwiftUI)
@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
public var swiftUIImage: SwiftUI.Image {
SwiftUI.Image(asset: self)
}
#endif
}

#if canImport(SwiftUI)
@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
public extension SwiftUI.Image {
init(asset: CommonUIImages) {
let bundle = Bundle.module
self.init(asset.name, bundle: bundle)
}

init(asset: CommonUIImages, label: Text) {
let bundle = Bundle.module
self.init(asset.name, bundle: bundle, label: label)
}

init(decorative asset: CommonUIImages) {
let bundle = Bundle.module
self.init(decorative: asset.name, bundle: bundle)
}
}
#endif

// swiftformat:enable all
// swiftlint:enable all
//// swiftlint:disable:this file_name
//// swiftlint:disable all
//// swift-format-ignore-file
//// swiftformat:disable all
//// Generated using tuist — https://github.com/tuist/tuist
//
//#if os(macOS)
// import AppKit
//#elseif os(iOS)
// import UIKit
//#elseif os(tvOS) || os(watchOS)
// import UIKit
//#endif
//#if canImport(SwiftUI)
// import SwiftUI
//#endif
//
//// MARK: - Asset Catalogs
//
//public enum CommonUIAsset: Sendable {
// public enum Colors {
// public static let lmBlack = CommonUIColors(name: "LMBlack")
// public static let lmGray01 = CommonUIColors(name: "LMGray01")
// public static let lmGray03 = CommonUIColors(name: "LMGray03")
// public static let lmGray05 = CommonUIColors(name: "LMGray05")
// public static let lmWhite = CommonUIColors(name: "LMWhite")
// public static let lmOrange01 = CommonUIColors(name: "LMOrange01")
// public static let lmOrange03 = CommonUIColors(name: "LMOrange03")
// public static let lmOrange04 = CommonUIColors(name: "LMOrange04")
// }
// public enum Images {
// public static let back = CommonUIImages(name: "back")
// public static let play = CommonUIImages(name: "play")
// public static let smallLogo = CommonUIImages(name: "small_logo")
// public static let tabIconChat = CommonUIImages(name: "tab_icon_chat")
// public static let tabIconChatSelected = CommonUIImages(name: "tab_icon_chat_selected")
// public static let tabIconDiary = CommonUIImages(name: "tab_icon_diary")
// public static let tabIconDiarySelected = CommonUIImages(name: "tab_icon_diary_selected")
// public static let tabIconHome = CommonUIImages(name: "tab_icon_home")
// public static let tabIconHomeSelected = CommonUIImages(name: "tab_icon_home_selected")
// public static let tabIconMypage = CommonUIImages(name: "tab_icon_mypage")
// public static let tabIconMypageSelected = CommonUIImages(name: "tab_icon_mypage_selected")
// public static let tabIconStats = CommonUIImages(name: "tab_icon_stats")
// public static let tabIconStatsSelected = CommonUIImages(name: "tab_icon_stats_selected")
// }
//}
//
//// MARK: - Implementation Details
//
//public final class CommonUIColors: Sendable {
// public let name: String
//
// #if os(macOS)
// public typealias Color = NSColor
// #elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
// public typealias Color = UIColor
// #endif
//
// @available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, visionOS 1.0, *)
// public var color: Color {
// guard let color = Color(asset: self) else {
// fatalError("Unable to load color asset named \(name).")
// }
// return color
// }
//
// #if canImport(SwiftUI)
// @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
// public var swiftUIColor: SwiftUI.Color {
// return SwiftUI.Color(asset: self)
// }
// #endif
//
// fileprivate init(name: String) {
// self.name = name
// }
//}
//
//public extension CommonUIColors.Color {
// @available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, visionOS 1.0, *)
// convenience init?(asset: CommonUIColors) {
// let bundle = Bundle.module
// #if os(iOS) || os(tvOS) || os(visionOS)
// self.init(named: asset.name, in: bundle, compatibleWith: nil)
// #elseif os(macOS)
// self.init(named: NSColor.Name(asset.name), bundle: bundle)
// #elseif os(watchOS)
// self.init(named: asset.name)
// #endif
// }
//}
//
//#if canImport(SwiftUI)
//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
//public extension SwiftUI.Color {
// init(asset: CommonUIColors) {
// let bundle = Bundle.module
// self.init(asset.name, bundle: bundle)
// }
//}
//#endif
//
//public struct CommonUIImages: Sendable {
// public let name: String
//
// #if os(macOS)
// public typealias Image = NSImage
// #elseif os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
// public typealias Image = UIImage
// #endif
//
// public var image: Image {
// let bundle = Bundle.module
// #if os(iOS) || os(tvOS) || os(visionOS)
// let image = Image(named: name, in: bundle, compatibleWith: nil)
// #elseif os(macOS)
// let image = bundle.image(forResource: NSImage.Name(name))
// #elseif os(watchOS)
// let image = Image(named: name)
// #endif
// guard let result = image else {
// fatalError("Unable to load image asset named \(name).")
// }
// return result
// }
//
// #if canImport(SwiftUI)
// @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
// public var swiftUIImage: SwiftUI.Image {
// SwiftUI.Image(asset: self)
// }
// #endif
//}
//
//#if canImport(SwiftUI)
//@available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, visionOS 1.0, *)
//public extension SwiftUI.Image {
// init(asset: CommonUIImages) {
// let bundle = Bundle.module
// self.init(asset.name, bundle: bundle)
// }
//
// init(asset: CommonUIImages, label: Text) {
// let bundle = Bundle.module
// self.init(asset.name, bundle: bundle, label: label)
// }
//
// init(decorative asset: CommonUIImages) {
// let bundle = Bundle.module
// self.init(decorative: asset.name, bundle: bundle)
// }
//}
//#endif
//
//// swiftformat:enable all
//// swiftlint:enable all
Loading
Loading