#171: Tag disabled 상태 추가 > 회색의 선택X 상태 표현

Zatch-Team · Feb 11, 2023 · bb900ba · bb900ba
1 parent 0febf27
commit bb900ba
Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/Zatch/Global/Source/Component/Tag/Tag.swift b/Zatch/Global/Source/Component/Tag/Tag.swift
@@ -33,6 +33,11 @@ extension ZatchComponent{
 
     class Tag: UILabel{
 
+        var isDisabled = false{
+            didSet{
+                isDisabled ? setDisabledState() : setNormalState()
+            }
+        }
         var isSelected = false{
             didSet{
                 isSelected ? setSelectState() : setNormalState()
@@ -89,6 +94,11 @@ extension ZatchComponent{
             self.backgroundColor = colorType.backgroundColor
         }
 
+        private func setDisabledState(){
+            self.textColor = colorType.disabledTextColor
+            self.backgroundColor = colorType.disabledBackgroundColor
+        }
+
         private func setSelectState(){
             self.textColor = colorType.selectedTextColor
             self.backgroundColor = colorType.selectedBackgroundColor

diff --git a/Zatch/Global/Source/Component/Tag/TagStlye.swift b/Zatch/Global/Source/Component/Tag/TagStlye.swift
@@ -26,18 +26,24 @@ extension ZatchComponent.Tag.TagColor{
         let backgroundColor: UIColor
         let selectedTextColor: UIColor = .white
         let selectedBackgroundColor: UIColor
+        let disabledTextColor: UIColor
+        let disabledBackgroundColor: UIColor
     }
 
     private var colorInfo: TagColorStyle{
         switch self{
         case .purple:
             return TagColorStyle(textColor: .zatchPurple,
                                  backgroundColor: .purple40,
-                                 selectedBackgroundColor: .zatchPurple)
+                                 selectedBackgroundColor: .zatchPurple,
+                                 disabledTextColor: .black20,
+                                 disabledBackgroundColor: .black10)
         case .yellow:
             return TagColorStyle(textColor: .zatchDeepYellow,
                                  backgroundColor: .yellow40,
-                                 selectedBackgroundColor: .zatchDeepYellow)
+                                 selectedBackgroundColor: .zatchDeepYellow,
+                                 disabledTextColor: .black20,
+                                 disabledBackgroundColor: .black10)
         }
     }
 
@@ -56,6 +62,14 @@ extension ZatchComponent.Tag.TagColor{
     var selectedBackgroundColor: UIColor{
         colorInfo.selectedBackgroundColor
     }
+
+    var disabledTextColor: UIColor{
+        colorInfo.disabledTextColor
+    }
+
+    var disabledBackgroundColor: UIColor{
+        colorInfo.disabledBackgroundColor
+    }
 }
 
 extension ZatchComponent.Tag.TagType{

diff --git a/Zatch/Resource/Storyboard/Base.lproj/Main.storyboard b/Zatch/Resource/Storyboard/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lyx-67-9H1">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Ynj-Qs-0DW">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -9,10 +9,10 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Check Share Register View Controller-->
+        <!--Zatch Register First View Controller-->
         <scene sceneID="S0q-X6-tua">
             <objects>
-                <viewController id="RWY-s0-TBQ" customClass="CheckShareRegisterViewController" customModule="Zatch" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="RWY-s0-TBQ" customClass="ZatchRegisterFirstViewController" customModule="Zatch" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ham-9L-aC2">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -37,7 +37,7 @@
                 </tabBarController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="8Fn-zm-M7o" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="6" y="1132"/>
+            <point key="canvasLocation" x="587" y="769"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="2WZ-s5-JQ5">