Skip to content

Commit

Permalink
merge :: (#1) displayname 변경
Browse files Browse the repository at this point in the history
Merge pull request #1 from DSM-FLOW/master
  • Loading branch information
kimdaehee0824 authored Sep 14, 2022
2 parents e3c56ce + 25427a3 commit e9f1460
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
// MARK: - Asset Catalogs

// swiftlint:disable identifier_name line_length nesting type_body_length type_name
public enum DMSAsset {
public static let accentColor = DMSColors(name: "AccentColor")
public enum DMSAliensAsset {
public static let accentColor = DMSAliensColors(name: "AccentColor")
}
// swiftlint:enable identifier_name line_length nesting type_body_length type_name

// MARK: - Implementation Details

public final class DMSColors {
public final class DMSAliensColors {
public fileprivate(set) var name: String

#if os(macOS)
Expand All @@ -45,10 +45,10 @@ public final class DMSColors {
}
}

public extension DMSColors.Color {
public extension DMSAliensColors.Color {
@available(iOS 11.0, tvOS 11.0, watchOS 4.0, macOS 10.13, *)
convenience init?(asset: DMSColors) {
let bundle = DMSResources.bundle
convenience init?(asset: DMSAliensColors) {
let bundle = DMSAliensResources.bundle
#if os(iOS) || os(tvOS)
self.init(named: asset.name, in: bundle, compatibleWith: nil)
#elseif os(macOS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Foundation
private class BundleFinder {}

extension Foundation.Bundle {
/// Since DMS-A is a application, the bundle for classes within this module can be used directly.
/// Since DMS-Aliens is a application, the bundle for classes within this module can be used directly.
static var module: Bundle = {
return Bundle(for: BundleFinder.self)
}()
Expand All @@ -17,7 +17,7 @@ extension Foundation.Bundle {
// MARK: - Objective-C Bundle Accessor

@objc
public class DMSResources: NSObject {
public class DMSAliensResources: NSObject {
@objc public class var bundle: Bundle {
return .module
}
Expand Down
2 changes: 2 additions & 0 deletions Projects/App/Support/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>DMS</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/Environment.swift
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import ProjectDescription

public enum Environment {
public static let appName = "DMS"
public static let targetName = "DMS-A"
public static let appName = "DMS-Aliens"
public static let targetName = "DMS-Aliens"
public static let targetTestName = "\(targetName)Tests"
public static let organizationName = "com.team.aliens"
public static let deploymentTarget: DeploymentTarget = .iOS(targetVersion: "15.0", devices: [.iphone, .ipad])
Expand Down

0 comments on commit e9f1460

Please sign in to comment.