diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..8444e871 --- /dev/null +++ b/Gemfile @@ -0,0 +1,5 @@ + +source "https://rubygems.org" + +gem "fastlane" +gem "abbrev" diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..a7ff4fc2 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,229 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + abbrev (0.1.2) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.2) + aws-partitions (1.1107.0) + aws-sdk-core (3.224.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + jmespath (~> 1, >= 1.6.1) + logger + aws-sdk-kms (1.101.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.186.1) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.7.0) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.4.0) + fastlane (2.227.2) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.4.1) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.8.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.5.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.8) + domain_name (~> 0.5) + httpclient (2.9.0) + mutex_m + jmespath (1.6.2) + json (2.12.2) + jwt (2.10.1) + base64 + logger (1.7.0) + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) + naturally (2.2.1) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.2) + public_suffix (6.0.2) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.4.1) + rouge (3.28.0) + ruby2_keywords (0.0.5) + rubyzip (2.4.1) + security (0.1.5) + signet (0.20.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) + xcodeproj (1.27.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.1) + rouge (~> 3.28.0) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + arm64-darwin-24 + ruby + +DEPENDENCIES + abbrev + fastlane + +BUNDLED WITH + 2.6.2 diff --git a/Siksha.xcodeproj/project.pbxproj b/Siksha.xcodeproj/project.pbxproj index fabe8ae1..35efe56b 100644 --- a/Siksha.xcodeproj/project.pbxproj +++ b/Siksha.xcodeproj/project.pbxproj @@ -106,6 +106,7 @@ 4E4E22EE2ABEC96300A81E47 /* Inter-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E4E22E52ABEC96300A81E47 /* Inter-ExtraBold.ttf */; }; 4E4E22EF2ABEC96300A81E47 /* Inter-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E4E22E62ABEC96300A81E47 /* Inter-Regular.ttf */; }; 4E4E22F02ABEC96300A81E47 /* Inter-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4E4E22E72ABEC96300A81E47 /* Inter-Medium.ttf */; }; + 4E51987D2DDA2FD300F85388 /* Font.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E51987C2DDA2FCE00F85388 /* Font.swift */; }; 4E6465102B1D8DB200A4ABAD /* UserManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E64650F2B1D8DB200A4ABAD /* UserManager.swift */; }; 4E6465122B1D8EEB00A4ABAD /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6465112B1D8EEB00A4ABAD /* User.swift */; }; 4E74167D2A9B63A10010769F /* CommentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E74167C2A9B63A00010769F /* CommentCell.swift */; }; @@ -284,6 +285,7 @@ 4E4E22E52ABEC96300A81E47 /* Inter-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-ExtraBold.ttf"; sourceTree = ""; }; 4E4E22E62ABEC96300A81E47 /* Inter-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Regular.ttf"; sourceTree = ""; }; 4E4E22E72ABEC96300A81E47 /* Inter-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Medium.ttf"; sourceTree = ""; }; + 4E51987C2DDA2FCE00F85388 /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = ""; }; 4E64650F2B1D8DB200A4ABAD /* UserManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserManager.swift; sourceTree = ""; }; 4E6465112B1D8EEB00A4ABAD /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = ""; }; 4E74167C2A9B63A00010769F /* CommentCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentCell.swift; sourceTree = ""; }; @@ -489,6 +491,7 @@ 1E3A573825C6FE1600DBB3F4 /* Library */ = { isa = PBXGroup; children = ( + 4E51987C2DDA2FCE00F85388 /* Font.swift */, BFA4759D2950B53500B41AA7 /* Extensions */, 1ECB250025F16D4D00875E18 /* UIRepresentable */, 1E3A573925C6FE2700DBB3F4 /* Extensions.swift */, @@ -932,6 +935,7 @@ 4E3D4EEF2A750078005C7AB2 /* TopPosts.swift in Sources */, 231C9CF825F83A850072C07A /* RestaurantInformationView.swift in Sources */, 4E79A1862C80B6BE007CE49B /* AlertView.swift in Sources */, + 4E51987D2DDA2FD300F85388 /* Font.swift in Sources */, 1ECB255D25F2B3EA00875E18 /* ReviewCell.swift in Sources */, BF60ADE42AC1EAA20015C468 /* DomainUtils.swift in Sources */, 1E3A572425C6FDA300DBB3F4 /* MenuView.swift in Sources */, @@ -1181,10 +1185,14 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; BUNDLE_NAME = "식샤-Debug"; CODE_SIGN_ENTITLEMENTS = Siksha/Siksha.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"Siksha/Preview Content\""; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K9883YB4VR; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = Siksha/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.4; @@ -1192,9 +1200,12 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.4.0; + MARKETING_VERSION = 3.4.1; OTHER_LDFLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = com.wafflestudio.siksha.dev; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.wafflestudio.siksha.dev"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; @@ -1211,10 +1222,14 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; BUNDLE_NAME = "식샤"; CODE_SIGN_ENTITLEMENTS = Siksha/Siksha.entitlements; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"Siksha/Preview Content\""; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = K9883YB4VR; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = Siksha/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.4; @@ -1222,9 +1237,11 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.4.0; + MARKETING_VERSION = 3.4.1; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.wafflestudio.siksha"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; diff --git a/Siksha/AppDelegate.swift b/Siksha/AppDelegate.swift index 59aabdfe..c304ece0 100644 --- a/Siksha/AppDelegate.swift +++ b/Siksha/AppDelegate.swift @@ -14,26 +14,13 @@ import FirebaseCore @main class AppDelegate: UIResponder, UIApplicationDelegate { - public var configDict: NSDictionary? - + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. - #if DEBUG - let configKey = "debug" - Config.shared.baseURL = "https://siksha-api-dev.wafflestudio.com" - #else - let configKey = "release" - Config.shared.baseURL = "https://siksha-api.wafflestudio.com" - #endif - - let dictPath = Bundle.main.path(forResource: "config", ofType: "plist") - self.configDict = NSDictionary(contentsOfFile: dictPath!)!.object(forKey: configKey) as? NSDictionary - - - let googleClientId = configDict?.object(forKey: "google_client_id") as! String - let kakaoAppKey = configDict?.object(forKey: "kakao_app_key") as! String - let naverMapClientId = configDict?.object(forKey: "naver_map_client_id") as! String + let googleClientId = Config.shared.googleClientId + let naverMapClientId = Config.shared.naverMapClientId + let kakaoAppKey = Config.shared.kakaoAppKey NMFAuthManager.shared().clientId = naverMapClientId GIDSignIn.sharedInstance.configuration = GIDConfiguration(clientID: googleClientId) @@ -43,8 +30,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate { KakaoSDK.initSDK(appKey: kakaoAppKey) let config = Realm.Configuration( - schemaVersion: 2, // 새로운 스키마 버전 설정 + schemaVersion: 3, // 새로운 스키마 버전 설정 migrationBlock: { migration, oldSchemaVersion in + if oldSchemaVersion < 3{ + migration.enumerateObjects(ofType: DailyMenu.className()){ + oldObject,newObject in + newObject!["dateType"] = 0 + } + } if oldSchemaVersion < 2 { // 1-1. 마이그레이션 수행 migration.enumerateObjects(ofType: Meal.className()) { oldObject, newObject in @@ -52,6 +45,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { newObject!["likeCnt"] = 0 // Provide a default value for 'likeCnt' } } + } ) diff --git a/Siksha/Assets.xcassets/Favorite-selected.imageset/Contents.json b/Siksha/Assets.xcassets/BreakfastTime.imageset/Contents.json similarity index 66% rename from Siksha/Assets.xcassets/Favorite-selected.imageset/Contents.json rename to Siksha/Assets.xcassets/BreakfastTime.imageset/Contents.json index 7ab24bf3..48bb23a2 100644 --- a/Siksha/Assets.xcassets/Favorite-selected.imageset/Contents.json +++ b/Siksha/Assets.xcassets/BreakfastTime.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "favoriteSelected.png", + "filename" : "breakfastTime.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "favoriteSelected@2x.png", + "filename" : "breakfastTime@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "favoriteSelected@3x.png", + "filename" : "breakfastTime@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime.png b/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime.png new file mode 100644 index 00000000..d94cf5b1 Binary files /dev/null and b/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime.png differ diff --git a/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime@2x.png b/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime@2x.png new file mode 100644 index 00000000..a99b1df1 Binary files /dev/null and b/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime@2x.png differ diff --git a/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime@3x.png b/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime@3x.png new file mode 100644 index 00000000..92dc11c4 Binary files /dev/null and b/Siksha/Assets.xcassets/BreakfastTime.imageset/breakfastTime@3x.png differ diff --git a/Siksha/Assets.xcassets/Color/Accent/Contents.json b/Siksha/Assets.xcassets/Color/Accent/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Accent/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/CommunityPostMenuColor.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Accent/like.colorset/Contents.json similarity index 66% rename from Siksha/Assets.xcassets/CommunityPostMenuColor.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Accent/like.colorset/Contents.json index 550be123..34d7bc60 100644 --- a/Siksha/Assets.xcassets/CommunityPostMenuColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Accent/like.colorset/Contents.json @@ -2,12 +2,12 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0xDF", - "green" : "0xDF", - "red" : "0xDF" + "blue" : "0x27", + "green" : "0x66", + "red" : "0xF8" } }, "idiom" : "universal" @@ -20,12 +20,12 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0xDF", - "green" : "0xDF", - "red" : "0xDF" + "blue" : "0x27", + "green" : "0x66", + "red" : "0xF8" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Color/Background/Contents.json b/Siksha/Assets.xcassets/Color/Background/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Background/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/Color/Background/Dim.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Background/Dim.colorset/Contents.json new file mode 100644 index 00000000..76394b9e --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Background/Dim.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.250", + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "0.500", + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/CommentLikeBackgroundColor.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Background/main.colorset/Contents.json similarity index 77% rename from Siksha/Assets.xcassets/CommentLikeBackgroundColor.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Background/main.colorset/Contents.json index 41f9fe42..af98268c 100644 --- a/Siksha/Assets.xcassets/CommentLikeBackgroundColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Background/main.colorset/Contents.json @@ -2,7 +2,7 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", "blue" : "0xF8", @@ -20,12 +20,12 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0xF8", - "green" : "0xF8", - "red" : "0xF8" + "blue" : "0x12", + "green" : "0x12", + "red" : "0x12" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Color/Contents.json b/Siksha/Assets.xcassets/Color/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/CommunityPostMenuTextColor.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Base/BlackColor.colorset/Contents.json similarity index 84% rename from Siksha/Assets.xcassets/CommunityPostMenuTextColor.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Base/BlackColor.colorset/Contents.json index cc85922b..0c600f92 100644 --- a/Siksha/Assets.xcassets/CommunityPostMenuTextColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Base/BlackColor.colorset/Contents.json @@ -5,8 +5,8 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0x66", + "blue" : "0x00", + "green" : "0x00", "red" : "0x00" } }, @@ -24,8 +24,8 @@ "components" : { "alpha" : "1.000", "blue" : "0xFF", - "green" : "0x66", - "red" : "0x00" + "green" : "0xFF", + "red" : "0xFF" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Color/Foundation/Base/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Base/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Foundation/Base/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/DarkFontColor.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Base/WhiteColor.colorset/Contents.json similarity index 76% rename from Siksha/Assets.xcassets/DarkFontColor.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Base/WhiteColor.colorset/Contents.json index e6a64a48..802fa68a 100644 --- a/Siksha/Assets.xcassets/DarkFontColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Base/WhiteColor.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x4F", - "green" : "0x4F", - "red" : "0x4F" + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFE" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "79", - "green" : "79", - "red" : "79" + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Color/Foundation/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Foundation/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/Gray100.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/100.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray100.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/100.colorset/Contents.json index a9411473..2e9c7e87 100644 --- a/Siksha/Assets.xcassets/Gray100.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/100.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xF4", - "green" : "0xF3", - "red" : "0xF2" + "blue" : "0x20", + "green" : "0x20", + "red" : "0x20" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray200.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/200.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray200.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/200.colorset/Contents.json index e7a571da..6827a97c 100644 --- a/Siksha/Assets.xcassets/Gray200.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/200.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xE9", - "green" : "0xE6", - "red" : "0xE5" + "blue" : "0x23", + "green" : "0x23", + "red" : "0x23" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray300.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/300.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray300.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/300.colorset/Contents.json index 0a46ceff..2bad7b36 100644 --- a/Siksha/Assets.xcassets/Gray300.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/300.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xDE", - "green" : "0xDA", - "red" : "0xD8" + "blue" : "0x28", + "green" : "0x28", + "red" : "0x28" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray400.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/400.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray400.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/400.colorset/Contents.json index d8f70a81..b23bc570 100644 --- a/Siksha/Assets.xcassets/Gray400.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/400.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xD3", - "green" : "0xCD", - "red" : "0xCB" + "blue" : "0x2D", + "green" : "0x2D", + "red" : "0x2D" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray50.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/50.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray50.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/50.colorset/Contents.json index 41f9fe42..ef4b411d 100644 --- a/Siksha/Assets.xcassets/Gray50.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/50.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xF8", - "green" : "0xF8", - "red" : "0xF8" + "blue" : "0x1E", + "green" : "0x1E", + "red" : "0x1E" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray500.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/500.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray500.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/500.colorset/Contents.json index 71e21cdb..ecb6e40c 100644 --- a/Siksha/Assets.xcassets/Gray500.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/500.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xC8", - "green" : "0xC1", - "red" : "0xBE" + "blue" : "0x40", + "green" : "0x40", + "red" : "0x40" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray600.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/600.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray600.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/600.colorset/Contents.json index 3782a6e9..e5428bc8 100644 --- a/Siksha/Assets.xcassets/Gray600.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/600.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xA0", - "green" : "0x9A", - "red" : "0x98" + "blue" : "0x91", + "green" : "0x91", + "red" : "0x91" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray700.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/700.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray700.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/700.colorset/Contents.json index 7dde0687..dcd6f89f 100644 --- a/Siksha/Assets.xcassets/Gray700.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/700.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x78", - "green" : "0x74", - "red" : "0x72" + "blue" : "0xB7", + "green" : "0xB7", + "red" : "0xB7" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray800.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/800.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray800.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/800.colorset/Contents.json index e0ef1854..4d6304fa 100644 --- a/Siksha/Assets.xcassets/Gray800.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/800.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x50", - "green" : "0x4D", - "red" : "0x4C" + "blue" : "0xCC", + "green" : "0xCB", + "red" : "0xCB" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Gray900.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/900.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/Gray900.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Gray/900.colorset/Contents.json index 4fb0cb7a..1b84e9bd 100644 --- a/Siksha/Assets.xcassets/Gray900.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/900.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x28", - "green" : "0x27", - "red" : "0x26" + "blue" : "0xE9", + "green" : "0xE6", + "red" : "0xE5" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Color/Foundation/Gray/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Gray/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Foundation/Gray/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/MainActiveColor.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/100.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/MainActiveColor.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Orange/100.colorset/Contents.json index f9b9507f..9d5d2239 100644 --- a/Siksha/Assets.xcassets/MainActiveColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/100.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xD3", - "green" : "0xEA", - "red" : "0xFF" + "blue" : "0xC6", + "green" : "0xDC", + "red" : "0xF0" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/UnselectedBoardColor.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/200.colorset/Contents.json similarity index 69% rename from Siksha/Assets.xcassets/UnselectedBoardColor.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Orange/200.colorset/Contents.json index d2e48055..ff51bcd2 100644 --- a/Siksha/Assets.xcassets/UnselectedBoardColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/200.colorset/Contents.json @@ -2,12 +2,12 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0xF2", - "green" : "0xF2", - "red" : "0xF2" + "blue" : "0xA7", + "green" : "0xD5", + "red" : "0xFF" } }, "idiom" : "universal" @@ -20,11 +20,11 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0xF2", - "green" : "0xF2", + "blue" : "0x9E", + "green" : "0xCA", "red" : "0xF2" } }, diff --git a/Siksha/Assets.xcassets/Color/Foundation/Orange/300.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/300.colorset/Contents.json new file mode 100644 index 00000000..4c405e35 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/300.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x7A", + "green" : "0xBF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x73", + "green" : "0xB5", + "red" : "0xF1" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/Color/Foundation/Orange/400.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/400.colorset/Contents.json new file mode 100644 index 00000000..46a991e2 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/400.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x4E", + "green" : "0xAA", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x4A", + "green" : "0xA1", + "red" : "0xF1" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/main.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/500.colorset/Contents.json similarity index 88% rename from Siksha/Assets.xcassets/main.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Orange/500.colorset/Contents.json index d2515741..3450ad7a 100644 --- a/Siksha/Assets.xcassets/main.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/500.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x22", - "green" : "0x95", - "red" : "0xFF" + "blue" : "0x1D", + "green" : "0x8C", + "red" : "0xF2" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/DefaultFontColor.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/600.colorset/Contents.json similarity index 70% rename from Siksha/Assets.xcassets/DefaultFontColor.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Orange/600.colorset/Contents.json index e68ed5f9..e5692506 100644 --- a/Siksha/Assets.xcassets/DefaultFontColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/600.colorset/Contents.json @@ -2,12 +2,12 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0x70", + "blue" : "0x00", "green" : "0x70", - "red" : "0x70" + "red" : "0xD2" } }, "idiom" : "universal" @@ -20,12 +20,12 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "112", - "green" : "112", - "red" : "112" + "blue" : "0x00", + "green" : "0x6A", + "red" : "0xC7" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Color/Foundation/Orange/700.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/700.colorset/Contents.json new file mode 100644 index 00000000..f95e59d0 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/700.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x4C", + "red" : "0xA5" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x46", + "red" : "0x98" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/Color 1.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/800.colorset/Contents.json similarity index 66% rename from Siksha/Assets.xcassets/Color 1.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Orange/800.colorset/Contents.json index 22c4bb0a..10b9a22c 100644 --- a/Siksha/Assets.xcassets/Color 1.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/800.colorset/Contents.json @@ -2,12 +2,12 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x00", + "green" : "0x29", + "red" : "0x7C" } }, "idiom" : "universal" @@ -20,12 +20,12 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" + "blue" : "0x00", + "green" : "0x24", + "red" : "0x6B" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Grey5.colorset/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/900.colorset/Contents.json similarity index 69% rename from Siksha/Assets.xcassets/Grey5.colorset/Contents.json rename to Siksha/Assets.xcassets/Color/Foundation/Orange/900.colorset/Contents.json index 430605ce..f2c9d33a 100644 --- a/Siksha/Assets.xcassets/Grey5.colorset/Contents.json +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/900.colorset/Contents.json @@ -2,11 +2,11 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0x57", - "green" : "0x57", + "blue" : "0x00", + "green" : "0x00", "red" : "0x57" } }, @@ -20,12 +20,12 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0x57", - "green" : "0x57", - "red" : "0x57" + "blue" : "0x00", + "green" : "0x00", + "red" : "0x41" } }, "idiom" : "universal" diff --git a/Siksha/Assets.xcassets/Color/Foundation/Orange/Contents.json b/Siksha/Assets.xcassets/Color/Foundation/Orange/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/Color/Foundation/Orange/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled.png b/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled.png new file mode 100644 index 00000000..01c9b4e2 Binary files /dev/null and b/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled.png differ diff --git a/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled@2x.png b/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled@2x.png new file mode 100644 index 00000000..251d4b8a Binary files /dev/null and b/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled@2x.png differ diff --git a/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled@3x.png b/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled@3x.png new file mode 100644 index 00000000..34fd338d Binary files /dev/null and b/Siksha/Assets.xcassets/Community-disabled.imageset/Community-disabled@3x.png differ diff --git a/Siksha/Assets.xcassets/Community-disabled.imageset/Contents.json b/Siksha/Assets.xcassets/Community-disabled.imageset/Contents.json index 1ec761f2..48650699 100644 --- a/Siksha/Assets.xcassets/Community-disabled.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Community-disabled.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "status=off.png", + "filename" : "Community-disabled.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "status=off@2x.png", + "filename" : "Community-disabled@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "status=off@3x.png", + "filename" : "Community-disabled@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Community-disabled.imageset/status=off.png b/Siksha/Assets.xcassets/Community-disabled.imageset/status=off.png deleted file mode 100644 index 2bf154db..00000000 Binary files a/Siksha/Assets.xcassets/Community-disabled.imageset/status=off.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Community-disabled.imageset/status=off@2x.png b/Siksha/Assets.xcassets/Community-disabled.imageset/status=off@2x.png deleted file mode 100644 index f3061550..00000000 Binary files a/Siksha/Assets.xcassets/Community-disabled.imageset/status=off@2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Community-disabled.imageset/status=off@3x.png b/Siksha/Assets.xcassets/Community-disabled.imageset/status=off@3x.png deleted file mode 100644 index 4284c02a..00000000 Binary files a/Siksha/Assets.xcassets/Community-disabled.imageset/status=off@3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Community.imageset/Community-enabled.png b/Siksha/Assets.xcassets/Community.imageset/Community-enabled.png new file mode 100644 index 00000000..2bd4051d Binary files /dev/null and b/Siksha/Assets.xcassets/Community.imageset/Community-enabled.png differ diff --git a/Siksha/Assets.xcassets/Community.imageset/Community-enabled@2x.png b/Siksha/Assets.xcassets/Community.imageset/Community-enabled@2x.png new file mode 100644 index 00000000..4c684561 Binary files /dev/null and b/Siksha/Assets.xcassets/Community.imageset/Community-enabled@2x.png differ diff --git a/Siksha/Assets.xcassets/Community.imageset/Community-enabled@3x.png b/Siksha/Assets.xcassets/Community.imageset/Community-enabled@3x.png new file mode 100644 index 00000000..4203ac0c Binary files /dev/null and b/Siksha/Assets.xcassets/Community.imageset/Community-enabled@3x.png differ diff --git a/Siksha/Assets.xcassets/Community.imageset/Component 2.png b/Siksha/Assets.xcassets/Community.imageset/Component 2.png deleted file mode 100644 index 3b50317c..00000000 Binary files a/Siksha/Assets.xcassets/Community.imageset/Component 2.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Community.imageset/Component 2@2x.png b/Siksha/Assets.xcassets/Community.imageset/Component 2@2x.png deleted file mode 100644 index 9f5faa41..00000000 Binary files a/Siksha/Assets.xcassets/Community.imageset/Component 2@2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Community.imageset/Component 2@3x.png b/Siksha/Assets.xcassets/Community.imageset/Component 2@3x.png deleted file mode 100644 index 7af8f698..00000000 Binary files a/Siksha/Assets.xcassets/Community.imageset/Component 2@3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Community.imageset/Contents.json b/Siksha/Assets.xcassets/Community.imageset/Contents.json index 645e5eb2..a0b36801 100644 --- a/Siksha/Assets.xcassets/Community.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Community.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Component 2.png", + "filename" : "Community-enabled.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Component 2@2x.png", + "filename" : "Community-enabled@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Component 2@3x.png", + "filename" : "Community-enabled@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/DarkBackgroundColor.colorset/Contents.json b/Siksha/Assets.xcassets/DarkBackgroundColor.colorset/Contents.json deleted file mode 100644 index 5bfd59f1..00000000 --- a/Siksha/Assets.xcassets/DarkBackgroundColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.100", - "blue" : "0x91", - "green" : "0x91", - "red" : "0x91" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.100", - "blue" : "0x91", - "green" : "0x91", - "red" : "0x91" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/DefaultImageColor.colorset/Contents.json b/Siksha/Assets.xcassets/DefaultImageColor.colorset/Contents.json deleted file mode 100644 index ea75ab60..00000000 --- a/Siksha/Assets.xcassets/DefaultImageColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xD9", - "green" : "0xD9", - "red" : "0xD9" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xD9", - "green" : "0xD9", - "red" : "0xD9" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/DinnerTime.imageset/Contents.json b/Siksha/Assets.xcassets/DinnerTime.imageset/Contents.json new file mode 100644 index 00000000..d5453311 --- /dev/null +++ b/Siksha/Assets.xcassets/DinnerTime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "dinnerTime.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "dinnerTime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "dinnerTime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime.png b/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime.png new file mode 100644 index 00000000..4aca21ad Binary files /dev/null and b/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime.png differ diff --git a/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime@2x.png b/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime@2x.png new file mode 100644 index 00000000..734108b8 Binary files /dev/null and b/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime@2x.png differ diff --git a/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime@3x.png b/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime@3x.png new file mode 100644 index 00000000..93311920 Binary files /dev/null and b/Siksha/Assets.xcassets/DinnerTime.imageset/dinnerTime@3x.png differ diff --git a/Siksha/Assets.xcassets/DividerColor.colorset/Contents.json b/Siksha/Assets.xcassets/DividerColor.colorset/Contents.json deleted file mode 100644 index 3ed3626a..00000000 --- a/Siksha/Assets.xcassets/DividerColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF0", - "green" : "0xF0", - "red" : "0xF0" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xF0", - "green" : "0xF0", - "red" : "0xF0" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/Favorite-default.imageset/Contents.json b/Siksha/Assets.xcassets/Favorite-default.imageset/Contents.json index f62f97d6..49d6d55c 100644 --- a/Siksha/Assets.xcassets/Favorite-default.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Favorite-default.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "favorite.png", + "filename" : "favorite-default.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "favorite@2x.png", + "filename" : "favorite-default@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "favorite@3x.png", + "filename" : "favorite-default@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default.png b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default.png new file mode 100644 index 00000000..c1ed47f6 Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default.png differ diff --git a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default@2x.png b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default@2x.png new file mode 100644 index 00000000..6d22beac Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default@2x.png differ diff --git a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default@3x.png b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default@3x.png new file mode 100644 index 00000000..d92ba0fa Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite-default@3x.png differ diff --git a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite.png b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite.png deleted file mode 100644 index 7d3169cb..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite@2x.png b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite@2x.png deleted file mode 100644 index f833b4a3..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite@2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite@3x.png b/Siksha/Assets.xcassets/Favorite-default.imageset/favorite@3x.png deleted file mode 100644 index 3e9d495e..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-default.imageset/favorite@3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Contents.json b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Contents.json index 8641021c..b2013cda 100644 --- a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Favorite_1x.png", + "filename" : "Favorite.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Favorite_2x.png", + "filename" : "Favorite@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Favorite_3x.png", + "filename" : "Favorite@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite.png b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite.png new file mode 100644 index 00000000..b3b86326 Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite.png differ diff --git a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite@2x.png b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite@2x.png new file mode 100644 index 00000000..e2fe8d82 Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite@2x.png differ diff --git a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite@3x.png b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite@3x.png new file mode 100644 index 00000000..f8594310 Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite@3x.png differ diff --git a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_1x.png b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_1x.png deleted file mode 100644 index 8650b988..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_1x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_2x.png b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_2x.png deleted file mode 100644 index 83b3907e..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_3x.png b/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_3x.png deleted file mode 100644 index f8aa5f0e..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-disabled.imageset/Favorite_3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected.png b/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected.png deleted file mode 100644 index f5125cfe..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected@2x.png b/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected@2x.png deleted file mode 100644 index 9b97232e..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected@2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected@3x.png b/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected@3x.png deleted file mode 100644 index 2d8f74bf..00000000 Binary files a/Siksha/Assets.xcassets/Favorite-selected.imageset/favoriteSelected@3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite.imageset/Contents.json b/Siksha/Assets.xcassets/Favorite.imageset/Contents.json index 4603406c..470d686c 100644 --- a/Siksha/Assets.xcassets/Favorite.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Favorite.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "FavoriteOn_1x.png", + "filename" : "Favorite-selected.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "FavoriteOn_2x.png", + "filename" : "Favorite-selected@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "FavoriteOn_3x.png", + "filename" : "Favorite-selected@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected.png b/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected.png new file mode 100644 index 00000000..73ec1550 Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected.png differ diff --git a/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected@2x.png b/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected@2x.png new file mode 100644 index 00000000..2fd7d16d Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected@2x.png differ diff --git a/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected@3x.png b/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected@3x.png new file mode 100644 index 00000000..15965f03 Binary files /dev/null and b/Siksha/Assets.xcassets/Favorite.imageset/Favorite-selected@3x.png differ diff --git a/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_1x.png b/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_1x.png deleted file mode 100644 index e17aa716..00000000 Binary files a/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_1x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_2x.png b/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_2x.png deleted file mode 100644 index 423cb523..00000000 Binary files a/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_3x.png b/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_3x.png deleted file mode 100644 index 00cb5fd8..00000000 Binary files a/Siksha/Assets.xcassets/Favorite.imageset/FavoriteOn_3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Grey0.5.colorset/Contents.json b/Siksha/Assets.xcassets/Grey0.5.colorset/Contents.json deleted file mode 100644 index 29d5d424..00000000 --- a/Siksha/Assets.xcassets/Grey0.5.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0.941", - "green" : "0.941", - "red" : "0.941" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/Grey2.colorset/Contents.json b/Siksha/Assets.xcassets/Grey2.colorset/Contents.json deleted file mode 100644 index ccd72493..00000000 --- a/Siksha/Assets.xcassets/Grey2.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0.875", - "green" : "0.875", - "red" : "0.875" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/Grey3.colorset/Contents.json b/Siksha/Assets.xcassets/Grey3.colorset/Contents.json deleted file mode 100644 index ca979b9b..00000000 --- a/Siksha/Assets.xcassets/Grey3.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0.718", - "green" : "0.718", - "red" : "0.718" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/Grey4.colorset/Contents.json b/Siksha/Assets.xcassets/Grey4.colorset/Contents.json deleted file mode 100644 index b61f52a9..00000000 --- a/Siksha/Assets.xcassets/Grey4.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0.859", - "green" : "0.859", - "red" : "0.859" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "1.000", - "green" : "1.000", - "red" : "1.000" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/Heart-default.imageset/Contents.json b/Siksha/Assets.xcassets/Heart-default.imageset/Contents.json index 239ecd4c..8be463b4 100644 --- a/Siksha/Assets.xcassets/Heart-default.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Heart-default.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Heart-default.png", + "filename" : "heart-default.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Heart-default@2x.png", + "filename" : "heart-default@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Heart-default@3x.png", + "filename" : "heart-default@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default.png b/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default.png deleted file mode 100644 index 172d3276..00000000 Binary files a/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default@2x.png b/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default@2x.png deleted file mode 100644 index bdecb344..00000000 Binary files a/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default@2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default@3x.png b/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default@3x.png deleted file mode 100644 index d2e62cf9..00000000 Binary files a/Siksha/Assets.xcassets/Heart-default.imageset/Heart-default@3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Heart-default.imageset/heart-default.png b/Siksha/Assets.xcassets/Heart-default.imageset/heart-default.png new file mode 100644 index 00000000..c8f60b6b Binary files /dev/null and b/Siksha/Assets.xcassets/Heart-default.imageset/heart-default.png differ diff --git a/Siksha/Assets.xcassets/Heart-default.imageset/heart-default@2x.png b/Siksha/Assets.xcassets/Heart-default.imageset/heart-default@2x.png new file mode 100644 index 00000000..f7450ac2 Binary files /dev/null and b/Siksha/Assets.xcassets/Heart-default.imageset/heart-default@2x.png differ diff --git a/Siksha/Assets.xcassets/Heart-default.imageset/heart-default@3x.png b/Siksha/Assets.xcassets/Heart-default.imageset/heart-default@3x.png new file mode 100644 index 00000000..6a40f268 Binary files /dev/null and b/Siksha/Assets.xcassets/Heart-default.imageset/heart-default@3x.png differ diff --git a/Siksha/Assets.xcassets/Heart-selected.imageset/Contents.json b/Siksha/Assets.xcassets/Heart-selected.imageset/Contents.json index b3577e26..7ff8765a 100644 --- a/Siksha/Assets.xcassets/Heart-selected.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Heart-selected.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Heart-selected.png", + "filename" : "heart-selected.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Heart-selected@2x.png", + "filename" : "heart-selected@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Heart-selected@3x.png", + "filename" : "heart-selected@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected.png b/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected.png deleted file mode 100644 index 186377c8..00000000 Binary files a/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected@2x.png b/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected@2x.png deleted file mode 100644 index fb8e3cd8..00000000 Binary files a/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected@2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected@3x.png b/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected@3x.png deleted file mode 100644 index 71c1169e..00000000 Binary files a/Siksha/Assets.xcassets/Heart-selected.imageset/Heart-selected@3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected.png b/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected.png new file mode 100644 index 00000000..8404df05 Binary files /dev/null and b/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected.png differ diff --git a/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected@2x.png b/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected@2x.png new file mode 100644 index 00000000..1d6a803f Binary files /dev/null and b/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected@2x.png differ diff --git a/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected@3x.png b/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected@3x.png new file mode 100644 index 00000000..7dc22021 Binary files /dev/null and b/Siksha/Assets.xcassets/Heart-selected.imageset/heart-selected@3x.png differ diff --git a/Siksha/Assets.xcassets/Info.imageset/info.png b/Siksha/Assets.xcassets/Info.imageset/info.png index 38a8d0cf..97055ada 100644 Binary files a/Siksha/Assets.xcassets/Info.imageset/info.png and b/Siksha/Assets.xcassets/Info.imageset/info.png differ diff --git a/Siksha/Assets.xcassets/Info.imageset/info@2x.png b/Siksha/Assets.xcassets/Info.imageset/info@2x.png index bf42cbfa..5d4c1fa7 100644 Binary files a/Siksha/Assets.xcassets/Info.imageset/info@2x.png and b/Siksha/Assets.xcassets/Info.imageset/info@2x.png differ diff --git a/Siksha/Assets.xcassets/Info.imageset/info@3x.png b/Siksha/Assets.xcassets/Info.imageset/info@3x.png index 6a597f51..703a04cf 100644 Binary files a/Siksha/Assets.xcassets/Info.imageset/info@3x.png and b/Siksha/Assets.xcassets/Info.imageset/info@3x.png differ diff --git a/Siksha/Assets.xcassets/KakaoShare.imageset/Contents.json b/Siksha/Assets.xcassets/KakaoShare.imageset/Contents.json index fdf1b919..55b1b9b7 100644 --- a/Siksha/Assets.xcassets/KakaoShare.imageset/Contents.json +++ b/Siksha/Assets.xcassets/KakaoShare.imageset/Contents.json @@ -1,15 +1,17 @@ { "images" : [ { - "filename" : "Vector.svg", + "filename" : "kakaoshare.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "kakaoshare@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "kakaoshare@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/KakaoShare.imageset/Vector.svg b/Siksha/Assets.xcassets/KakaoShare.imageset/Vector.svg deleted file mode 100644 index ac76339e..00000000 --- a/Siksha/Assets.xcassets/KakaoShare.imageset/Vector.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare.png b/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare.png new file mode 100644 index 00000000..a60367c7 Binary files /dev/null and b/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare.png differ diff --git a/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare@2x.png b/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare@2x.png new file mode 100644 index 00000000..f3f241f4 Binary files /dev/null and b/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare@2x.png differ diff --git a/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare@3x.png b/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare@3x.png new file mode 100644 index 00000000..e26f92e8 Binary files /dev/null and b/Siksha/Assets.xcassets/KakaoShare.imageset/kakaoshare@3x.png differ diff --git a/Siksha/Assets.xcassets/LightFontColor.colorset/Contents.json b/Siksha/Assets.xcassets/LightFontColor.colorset/Contents.json deleted file mode 100644 index 430605ce..00000000 --- a/Siksha/Assets.xcassets/LightFontColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x57", - "green" : "0x57", - "red" : "0x57" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x57", - "green" : "0x57", - "red" : "0x57" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/LightGrayColor.colorset/Contents.json b/Siksha/Assets.xcassets/LightGrayColor.colorset/Contents.json deleted file mode 100644 index 89aa936a..00000000 --- a/Siksha/Assets.xcassets/LightGrayColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xBA", - "green" : "0xBA", - "red" : "0xBA" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xBA", - "green" : "0xBA", - "red" : "0xBA" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/Location.imageset/Contents.json b/Siksha/Assets.xcassets/Location.imageset/Contents.json index 91292b05..73ee9ddd 100644 --- a/Siksha/Assets.xcassets/Location.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Location.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "location-1.png", + "filename" : "location 1.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "location.png", + "filename" : "location@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "location-2.png", + "filename" : "location@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Location.imageset/location 1.png b/Siksha/Assets.xcassets/Location.imageset/location 1.png new file mode 100644 index 00000000..fb84c9e7 Binary files /dev/null and b/Siksha/Assets.xcassets/Location.imageset/location 1.png differ diff --git a/Siksha/Assets.xcassets/Location.imageset/location-1.png b/Siksha/Assets.xcassets/Location.imageset/location-1.png deleted file mode 100644 index 3a8c0245..00000000 Binary files a/Siksha/Assets.xcassets/Location.imageset/location-1.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Location.imageset/location-2.png b/Siksha/Assets.xcassets/Location.imageset/location-2.png deleted file mode 100644 index 3a8c0245..00000000 Binary files a/Siksha/Assets.xcassets/Location.imageset/location-2.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Location.imageset/location.png b/Siksha/Assets.xcassets/Location.imageset/location.png deleted file mode 100644 index 3a8c0245..00000000 Binary files a/Siksha/Assets.xcassets/Location.imageset/location.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Location.imageset/location@2x.png b/Siksha/Assets.xcassets/Location.imageset/location@2x.png new file mode 100644 index 00000000..349ad945 Binary files /dev/null and b/Siksha/Assets.xcassets/Location.imageset/location@2x.png differ diff --git a/Siksha/Assets.xcassets/Location.imageset/location@3x.png b/Siksha/Assets.xcassets/Location.imageset/location@3x.png new file mode 100644 index 00000000..2e662586 Binary files /dev/null and b/Siksha/Assets.xcassets/Location.imageset/location@3x.png differ diff --git a/Siksha/Assets.xcassets/LunchTime.imageset/Contents.json b/Siksha/Assets.xcassets/LunchTime.imageset/Contents.json new file mode 100644 index 00000000..1746ba9f --- /dev/null +++ b/Siksha/Assets.xcassets/LunchTime.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "lunchTime.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "lunchTime@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "lunchTime@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime.png b/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime.png new file mode 100644 index 00000000..b8b86fb5 Binary files /dev/null and b/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime.png differ diff --git a/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime@2x.png b/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime@2x.png new file mode 100644 index 00000000..bec44893 Binary files /dev/null and b/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime@2x.png differ diff --git a/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime@3x.png b/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime@3x.png new file mode 100644 index 00000000..0690bd07 Binary files /dev/null and b/Siksha/Assets.xcassets/LunchTime.imageset/lunchTime@3x.png differ diff --git a/Siksha/Assets.xcassets/Main-disabled.imageset/Contents.json b/Siksha/Assets.xcassets/Main-disabled.imageset/Contents.json index 8b8a8ecb..9eb35b73 100644 --- a/Siksha/Assets.xcassets/Main-disabled.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Main-disabled.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Main_1x.png", + "filename" : "Main.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Main_2x.png", + "filename" : "Main@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Main_3x.png", + "filename" : "Main@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Main-disabled.imageset/Main.png b/Siksha/Assets.xcassets/Main-disabled.imageset/Main.png new file mode 100644 index 00000000..2a0c893f Binary files /dev/null and b/Siksha/Assets.xcassets/Main-disabled.imageset/Main.png differ diff --git a/Siksha/Assets.xcassets/Main-disabled.imageset/Main@2x.png b/Siksha/Assets.xcassets/Main-disabled.imageset/Main@2x.png new file mode 100644 index 00000000..d3707c56 Binary files /dev/null and b/Siksha/Assets.xcassets/Main-disabled.imageset/Main@2x.png differ diff --git a/Siksha/Assets.xcassets/Main-disabled.imageset/Main@3x.png b/Siksha/Assets.xcassets/Main-disabled.imageset/Main@3x.png new file mode 100644 index 00000000..437d09a6 Binary files /dev/null and b/Siksha/Assets.xcassets/Main-disabled.imageset/Main@3x.png differ diff --git a/Siksha/Assets.xcassets/Main-disabled.imageset/Main_1x.png b/Siksha/Assets.xcassets/Main-disabled.imageset/Main_1x.png deleted file mode 100644 index 31a6be9a..00000000 Binary files a/Siksha/Assets.xcassets/Main-disabled.imageset/Main_1x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Main-disabled.imageset/Main_2x.png b/Siksha/Assets.xcassets/Main-disabled.imageset/Main_2x.png deleted file mode 100644 index d64ff803..00000000 Binary files a/Siksha/Assets.xcassets/Main-disabled.imageset/Main_2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Main-disabled.imageset/Main_3x.png b/Siksha/Assets.xcassets/Main-disabled.imageset/Main_3x.png deleted file mode 100644 index 17ed6525..00000000 Binary files a/Siksha/Assets.xcassets/Main-disabled.imageset/Main_3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Main.imageset/Contents.json b/Siksha/Assets.xcassets/Main.imageset/Contents.json index 461d4b42..47916f49 100644 --- a/Siksha/Assets.xcassets/Main.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Main.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "MainOn_1x.png", + "filename" : "Meal-enabled.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "MainOn_2x.png", + "filename" : "Meal-enabled@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "MainOn_3x.png", + "filename" : "Meal-enabled@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Main.imageset/MainOn_1x.png b/Siksha/Assets.xcassets/Main.imageset/MainOn_1x.png deleted file mode 100644 index d22d16b6..00000000 Binary files a/Siksha/Assets.xcassets/Main.imageset/MainOn_1x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Main.imageset/MainOn_2x.png b/Siksha/Assets.xcassets/Main.imageset/MainOn_2x.png deleted file mode 100644 index 7ea93ea4..00000000 Binary files a/Siksha/Assets.xcassets/Main.imageset/MainOn_2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Main.imageset/MainOn_3x.png b/Siksha/Assets.xcassets/Main.imageset/MainOn_3x.png deleted file mode 100644 index 537ebe35..00000000 Binary files a/Siksha/Assets.xcassets/Main.imageset/MainOn_3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Main.imageset/Meal-enabled.png b/Siksha/Assets.xcassets/Main.imageset/Meal-enabled.png new file mode 100644 index 00000000..b064b2fd Binary files /dev/null and b/Siksha/Assets.xcassets/Main.imageset/Meal-enabled.png differ diff --git a/Siksha/Assets.xcassets/Main.imageset/Meal-enabled@2x.png b/Siksha/Assets.xcassets/Main.imageset/Meal-enabled@2x.png new file mode 100644 index 00000000..b22fba8f Binary files /dev/null and b/Siksha/Assets.xcassets/Main.imageset/Meal-enabled@2x.png differ diff --git a/Siksha/Assets.xcassets/Main.imageset/Meal-enabled@3x.png b/Siksha/Assets.xcassets/Main.imageset/Meal-enabled@3x.png new file mode 100644 index 00000000..88c6a99c Binary files /dev/null and b/Siksha/Assets.xcassets/Main.imageset/Meal-enabled@3x.png differ diff --git a/Siksha/Assets.xcassets/ReviewHighColor.colorset/Contents.json b/Siksha/Assets.xcassets/ReviewHighColor.colorset/Contents.json deleted file mode 100644 index 09c53f9a..00000000 --- a/Siksha/Assets.xcassets/ReviewHighColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x39", - "green" : "0x39", - "red" : "0x39" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x39", - "green" : "0x39", - "red" : "0x39" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/ReviewLowColor.colorset/Contents.json b/Siksha/Assets.xcassets/ReviewLowColor.colorset/Contents.json deleted file mode 100644 index 739d1663..00000000 --- a/Siksha/Assets.xcassets/ReviewLowColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xB7", - "green" : "0xB7", - "red" : "0xB7" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xB7", - "green" : "0xB7", - "red" : "0xB7" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/ReviewMediumColor.colorset/Contents.json b/Siksha/Assets.xcassets/ReviewMediumColor.colorset/Contents.json deleted file mode 100644 index 2f8a8cc1..00000000 --- a/Siksha/Assets.xcassets/ReviewMediumColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x79", - "green" : "0x79", - "red" : "0x79" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x79", - "green" : "0x79", - "red" : "0x79" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/Schedule.imageset/Contents.json b/Siksha/Assets.xcassets/Schedule.imageset/Contents.json new file mode 100644 index 00000000..eee12296 --- /dev/null +++ b/Siksha/Assets.xcassets/Schedule.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "schedule.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "schedule@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "schedule@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/Schedule.imageset/schedule.png b/Siksha/Assets.xcassets/Schedule.imageset/schedule.png new file mode 100644 index 00000000..9a92c219 Binary files /dev/null and b/Siksha/Assets.xcassets/Schedule.imageset/schedule.png differ diff --git a/Siksha/Assets.xcassets/Schedule.imageset/schedule@2x.png b/Siksha/Assets.xcassets/Schedule.imageset/schedule@2x.png new file mode 100644 index 00000000..27e24890 Binary files /dev/null and b/Siksha/Assets.xcassets/Schedule.imageset/schedule@2x.png differ diff --git a/Siksha/Assets.xcassets/Schedule.imageset/schedule@3x.png b/Siksha/Assets.xcassets/Schedule.imageset/schedule@3x.png new file mode 100644 index 00000000..5b954c89 Binary files /dev/null and b/Siksha/Assets.xcassets/Schedule.imageset/schedule@3x.png differ diff --git a/Siksha/Assets.xcassets/SemanticColor/Background/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Background/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Background/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Background/Dark.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Background/Dark.colorset/Contents.json new file mode 100644 index 00000000..f300ce47 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Background/Dark.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x00", + "green" : "0x00", + "red" : "0x00" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Background/GNB.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Background/GNB.colorset/Contents.json new file mode 100644 index 00000000..2d2618b8 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Background/GNB.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x22", + "green" : "0x95", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x12", + "green" : "0x12", + "red" : "0x12" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Background/Primary.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Background/Primary.colorset/Contents.json new file mode 100644 index 00000000..ceebd940 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Background/Primary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x12", + "green" : "0x12", + "red" : "0x12" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Background/Secondary.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Background/Secondary.colorset/Contents.json new file mode 100644 index 00000000..aaa8b7a5 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Background/Secondary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x23", + "green" : "0x23", + "red" : "0x23" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Background/Toast.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Background/Toast.colorset/Contents.json new file mode 100644 index 00000000..3dfaaeb4 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Background/Toast.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x78", + "green" : "0x74", + "red" : "0x72" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x2D", + "green" : "0x2D", + "red" : "0x2D" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Border/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Border/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Border/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Border/Primary.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Border/Primary.colorset/Contents.json new file mode 100644 index 00000000..c89d09dc --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Border/Primary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xE9", + "green" : "0xE6", + "red" : "0xE5" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x2D", + "green" : "0x2D", + "red" : "0x2D" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Border/Secondary.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Border/Secondary.colorset/Contents.json new file mode 100644 index 00000000..ebfc3895 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Border/Secondary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xE9", + "green" : "0xE6", + "red" : "0xE5" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x40", + "green" : "0x40", + "red" : "0x40" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Element/Chip.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Element/Chip.colorset/Contents.json new file mode 100644 index 00000000..c799736a --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Element/Chip.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xF4", + "green" : "0xF3", + "red" : "0xF2" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x1E", + "green" : "0x1E", + "red" : "0x1E" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Element/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Element/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Element/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Element/Control.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Element/Control.colorset/Contents.json new file mode 100644 index 00000000..ebfc3895 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Element/Control.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xE9", + "green" : "0xE6", + "red" : "0xE5" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x40", + "green" : "0x40", + "red" : "0x40" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Element/Tooltip.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Element/Tooltip.colorset/Contents.json new file mode 100644 index 00000000..53072dc1 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Element/Tooltip.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xF4", + "green" : "0xF3", + "red" : "0xF2" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x2D", + "green" : "0x2D", + "red" : "0x2D" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Icon/Close_bg.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Icon/Close_bg.colorset/Contents.json new file mode 100644 index 00000000..faa2b15f --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Icon/Close_bg.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xD3", + "green" : "0xCD", + "red" : "0xCB" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x40", + "green" : "0x40", + "red" : "0x40" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Icon/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Icon/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Icon/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Icon/Like.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Icon/Like.colorset/Contents.json new file mode 100644 index 00000000..ebfc3895 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Icon/Like.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xE9", + "green" : "0xE6", + "red" : "0xE5" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0x40", + "green" : "0x40", + "red" : "0x40" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Icon/WhiteIcon.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Icon/WhiteIcon.colorset/Contents.json new file mode 100644 index 00000000..92ef0317 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Icon/WhiteIcon.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/MainThemeColor.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Text/Accent.colorset/Contents.json similarity index 81% rename from Siksha/Assets.xcassets/MainThemeColor.colorset/Contents.json rename to Siksha/Assets.xcassets/SemanticColor/Text/Accent.colorset/Contents.json index d2515741..40c0d800 100644 --- a/Siksha/Assets.xcassets/MainThemeColor.colorset/Contents.json +++ b/Siksha/Assets.xcassets/SemanticColor/Text/Accent.colorset/Contents.json @@ -2,7 +2,7 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", "blue" : "0x22", @@ -20,11 +20,11 @@ } ], "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", - "blue" : "0x22", - "green" : "0x95", + "blue" : "0xFF", + "green" : "0xFF", "red" : "0xFF" } }, diff --git a/Siksha/Assets.xcassets/SemanticColor/Text/Button.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Text/Button.colorset/Contents.json new file mode 100644 index 00000000..92ef0317 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Text/Button.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Text/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Text/Contents.json new file mode 100644 index 00000000..6e965652 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Text/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Text/Dim.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Text/Dim.colorset/Contents.json new file mode 100644 index 00000000..92ef0317 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Text/Dim.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/SemanticColor/Text/GNB.colorset/Contents.json b/Siksha/Assets.xcassets/SemanticColor/Text/GNB.colorset/Contents.json new file mode 100644 index 00000000..8d386170 --- /dev/null +++ b/Siksha/Assets.xcassets/SemanticColor/Text/GNB.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0xE9", + "green" : "0xE6", + "red" : "0xE5" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Siksha/Assets.xcassets/Settings-disabled.imageset/Contents.json b/Siksha/Assets.xcassets/Settings-disabled.imageset/Contents.json index 8b69b40e..7ac16695 100644 --- a/Siksha/Assets.xcassets/Settings-disabled.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Settings-disabled.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "Setting_1x.png", + "filename" : "Settings-disabled.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "Setting_2x.png", + "filename" : "Settings-disabled@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "Setting_3x.png", + "filename" : "Settings-disabled@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_1x.png b/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_1x.png deleted file mode 100644 index f20f9840..00000000 Binary files a/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_1x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_2x.png b/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_2x.png deleted file mode 100644 index f9a7b49b..00000000 Binary files a/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_3x.png b/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_3x.png deleted file mode 100644 index 10f1ee11..00000000 Binary files a/Siksha/Assets.xcassets/Settings-disabled.imageset/Setting_3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled.png b/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled.png new file mode 100644 index 00000000..fe92ce5d Binary files /dev/null and b/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled.png differ diff --git a/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled@2x.png b/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled@2x.png new file mode 100644 index 00000000..a7715d33 Binary files /dev/null and b/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled@2x.png differ diff --git a/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled@3x.png b/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled@3x.png new file mode 100644 index 00000000..06caa02b Binary files /dev/null and b/Siksha/Assets.xcassets/Settings-disabled.imageset/Settings-disabled@3x.png differ diff --git a/Siksha/Assets.xcassets/Settings.imageset/Contents.json b/Siksha/Assets.xcassets/Settings.imageset/Contents.json index 6b91248d..9d5974c2 100644 --- a/Siksha/Assets.xcassets/Settings.imageset/Contents.json +++ b/Siksha/Assets.xcassets/Settings.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "SettingOn_1x.png", + "filename" : "Settings-enabled.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "SettingOn_2x.png", + "filename" : "Settings-enabled@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "SettingOn_3x.png", + "filename" : "Settings-enabled@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Siksha/Assets.xcassets/Settings.imageset/SettingOn_1x.png b/Siksha/Assets.xcassets/Settings.imageset/SettingOn_1x.png deleted file mode 100644 index 49f19a44..00000000 Binary files a/Siksha/Assets.xcassets/Settings.imageset/SettingOn_1x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Settings.imageset/SettingOn_2x.png b/Siksha/Assets.xcassets/Settings.imageset/SettingOn_2x.png deleted file mode 100644 index a262b961..00000000 Binary files a/Siksha/Assets.xcassets/Settings.imageset/SettingOn_2x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Settings.imageset/SettingOn_3x.png b/Siksha/Assets.xcassets/Settings.imageset/SettingOn_3x.png deleted file mode 100644 index db2bac1c..00000000 Binary files a/Siksha/Assets.xcassets/Settings.imageset/SettingOn_3x.png and /dev/null differ diff --git a/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled.png b/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled.png new file mode 100644 index 00000000..84434648 Binary files /dev/null and b/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled.png differ diff --git a/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled@2x.png b/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled@2x.png new file mode 100644 index 00000000..2aabd277 Binary files /dev/null and b/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled@2x.png differ diff --git a/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled@3x.png b/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled@3x.png new file mode 100644 index 00000000..157060f2 Binary files /dev/null and b/Siksha/Assets.xcassets/Settings.imageset/Settings-enabled@3x.png differ diff --git a/Siksha/Assets.xcassets/TextFieldBorderColor.colorset/Contents.json b/Siksha/Assets.xcassets/TextFieldBorderColor.colorset/Contents.json deleted file mode 100644 index 143937de..00000000 --- a/Siksha/Assets.xcassets/TextFieldBorderColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE8", - "green" : "0xE8", - "red" : "0xE8" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xE8", - "green" : "0xE8", - "red" : "0xE8" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/TitleFontColor.colorset/Contents.json b/Siksha/Assets.xcassets/TitleFontColor.colorset/Contents.json deleted file mode 100644 index e6a64a48..00000000 --- a/Siksha/Assets.xcassets/TitleFontColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x4F", - "green" : "0x4F", - "red" : "0x4F" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "79", - "green" : "79", - "red" : "79" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Assets.xcassets/VersionInfoColor.colorset/Contents.json b/Siksha/Assets.xcassets/VersionInfoColor.colorset/Contents.json deleted file mode 100644 index e74eca27..00000000 --- a/Siksha/Assets.xcassets/VersionInfoColor.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xB9", - "green" : "0xB9", - "red" : "0xB9" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xB9", - "green" : "0xB9", - "red" : "0xB9" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Siksha/Base.lproj/LaunchScreen.storyboard b/Siksha/Base.lproj/LaunchScreen.storyboard index e9e0fdc9..31086295 100644 --- a/Siksha/Base.lproj/LaunchScreen.storyboard +++ b/Siksha/Base.lproj/LaunchScreen.storyboard @@ -33,7 +33,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/Siksha/Community/AlertView.swift b/Siksha/Community/AlertView.swift index a004d43e..0e25cd63 100644 --- a/Siksha/Community/AlertView.swift +++ b/Siksha/Community/AlertView.swift @@ -2,9 +2,9 @@ import SwiftUI struct AlertView: View where CommunityPostViewModel: CommunityPostViewModelType { - private let fontColor = Color("DefaultFontColor") - private let orangeColor = Color.init("main") - private let lightGrayColor = Color.init("LightGrayColor") + private let fontColor = Color("Color/Foundation/Gray/700") + private let orangeColor = Color.init("Color/Foundation/Orange/500") + private let lightGrayColor = Color.init("Color/Foundation/Gray/600") private var commentId:Int? = nil @EnvironmentObject var appState:AppState @Environment(\.presentationMode) var presentationMode: Binding @@ -48,7 +48,7 @@ struct AlertView: View where CommunityPostViewModel: Com VStack { VStack(spacing:0){ ZStack{ - Color("MainThemeColor") + Color("Color/Foundation/Orange/500") .ignoresSafeArea(.all) HStack{ backButton diff --git a/Siksha/Community/BoardNameCell.swift b/Siksha/Community/BoardNameCell.swift index 32665027..40b7c68d 100644 --- a/Siksha/Community/BoardNameCell.swift +++ b/Siksha/Community/BoardNameCell.swift @@ -8,11 +8,11 @@ import Foundation import SwiftUI struct BoardNameCell: View{ - let selectedBackgroundColor = Color.init("MainThemeColor") - let unSelectedBackgroundColor = Color.init("UnselectedBoardColor") + let selectedBackgroundColor = Color.init("Color/Foundation/Orange/500") + let unSelectedBackgroundColor = Color.init("Color/Foundation/Gray/100") let selectedFontColor = Color.white - let unSelectedFontColor = Color.init("ReviewLowColor") + let unSelectedFontColor = Color.init("Color/Foundation/Gray/500") var isSelected: Bool var boardName: String diff --git a/Siksha/Community/CommentCell.swift b/Siksha/Community/CommentCell.swift index 2f970e93..204a4b47 100644 --- a/Siksha/Community/CommentCell.swift +++ b/Siksha/Community/CommentCell.swift @@ -58,14 +58,14 @@ struct CommentCell: View where ViewModel: CommunityPostViewModelType .frame(width:8.2) Text(relativeDate) .font(.custom("NanumSquareOTFR", size: 10)) - .foregroundColor(.init("ReviewLowColor")) + .foregroundColor(.init("Color/Foundation/Gray/600")) } Spacer() .frame(height:9.37) Text(comment.content) .font(.custom("NanumSquareOTFR", size: 12)) - .foregroundColor(.init("ReviewHighColor")) + .foregroundColor(.init("Color/Foundation/Gray/900")) Image("etc") @@ -92,10 +92,10 @@ struct CommentCell: View where ViewModel: CommunityPostViewModelType .padding(.init(top: 0, leading: 0, bottom: 4, trailing: 0)) Text("\(comment.likeCnt)") .font(.custom("Inter-Regular", size: 8)) - .foregroundColor(.init("MainThemeColor")) + .foregroundColor(.init("Color/Foundation/Orange/500")) } .padding(EdgeInsets(top: 12.5, leading: 11, bottom: 12.5, trailing: 11)) - .background(Color("CommentLikeBackgroundColor")) + .background(Color("Color/Foundation/Gray/50")) .cornerRadius(6) Spacer() .frame(height: 10) @@ -134,7 +134,7 @@ struct EditCommentView: View { var body: some View { VStack(spacing: 0) { ZStack(alignment: .bottom) { - Color("MainThemeColor") + Color("Color/Foundation/Orange/500") .edgesIgnoringSafeArea(.top) HStack { @@ -155,7 +155,7 @@ struct EditCommentView: View { .font(.custom("NanumSquareOTFR", size: 15)) } .padding() - .background(Color("MainThemeColor").opacity(0)) + .background(Color("Color/Foundation/Orange/500").opacity(0)) } .frame(height: 40) diff --git a/Siksha/Community/CommunityPostPublishView.swift b/Siksha/Community/CommunityPostPublishView.swift index 43cde08d..b6b1aab4 100644 --- a/Siksha/Community/CommunityPostPublishView.swift +++ b/Siksha/Community/CommunityPostPublishView.swift @@ -63,7 +63,7 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu }) { ZStack { RoundedRectangle(cornerRadius: cornerRadius) - .fill(viewModel.title.isEmpty || viewModel.content.isEmpty ? Color.gray : Color("MainThemeColor")) + .fill(viewModel.title.isEmpty || viewModel.content.isEmpty ? Color.gray : Color("Color/Foundation/Orange/500")) .frame(height: 60) Text("완료") .font(.custom("Inter-SemiBold", size: 14)) @@ -81,7 +81,7 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu }) { ZStack { RoundedRectangle(cornerRadius: cornerRadius) - .fill(viewModel.title.isEmpty || viewModel.content.isEmpty ? Color.gray : Color("MainThemeColor")) + .fill(viewModel.title.isEmpty || viewModel.content.isEmpty ? Color.gray : Color("Color/Foundation/Orange/500")) .frame(height: 60) Text("올리기") .font(.custom("Inter-SemiBold", size: 17)) @@ -112,7 +112,7 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu } configuration.label - .foregroundColor(configuration.isOn ? Color("MainThemeColor") : Color(hex:0x575757)) + .foregroundColor(configuration.isOn ? Color("Color/Foundation/Orange/500") : Color(hex:0x575757)) } .padding(EdgeInsets(top: 5, leading: 0, bottom: 5, trailing: 0)) .contentShape(Rectangle()) @@ -125,7 +125,7 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu var customDivider: some View { HStack { - Color("DefaultImageColor") + Color("Color/Foundation/Gray/100") .frame(height: 0.5) .frame(maxWidth: .infinity) } @@ -169,7 +169,7 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu }) { ZStack { RoundedRectangle(cornerRadius: cornerRadius) - .foregroundColor(Color("DefaultImageColor")) + .foregroundColor(Color("Color/Foundation/Gray/100")) .frame(width: 106, height: 106) Image(systemName: "plus") @@ -236,9 +236,9 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu Spacer() if viewModel.boardId == board.id { Text(board.name) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) Image("CheckMark") - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) } else { Text(board.name) .foregroundColor(Color(hex: 0x575757)) @@ -284,7 +284,7 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu }) { Text("OK") .font(.custom("Inter-SemiBold", size: 16)) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) .padding(.trailing, 20) } } @@ -325,7 +325,7 @@ struct CommunityPostPublishView: View where ViewModel:CommunityPostPu if viewModel.content.isEmpty { Text(placeholder) .font(.custom("Inter-ExtraLight", size: 12)) - .foregroundColor(Color.init("ReviewLowColor")) + .foregroundColor(Color.init("Color/Foundation/Gray/300")) .frame(maxWidth: .infinity, alignment: .leading) .padding(EdgeInsets(top: 8, leading: 6, bottom: 0, trailing: 0)) } diff --git a/Siksha/Community/CommunityPostView.swift b/Siksha/Community/CommunityPostView.swift index dadec394..f0d3b60c 100644 --- a/Siksha/Community/CommunityPostView.swift +++ b/Siksha/Community/CommunityPostView.swift @@ -62,7 +62,7 @@ struct CommunityPostView: View where ViewModel: CommunityPostViewMode ZStack(alignment:.topTrailing){ Text("\(imageIndex + 1)/\(imageURLs.count)") .frame(width:28,height: 17) - .background(Color("LightFontColor")) + .background(Color("Color/Foundation/Gray/400")) .foregroundColor(.white) .cornerRadius(10) .font(.custom("NanumSquareOTFR", size: 10)) @@ -120,7 +120,7 @@ struct CommunityPostView: View where ViewModel: CommunityPostViewMode .font(Font.custom("NanumSquareOTFB", size: 11)) Text(relativeDate) .font(Font.custom("NanumSquareOTFR", size: 10)) - .foregroundColor(Color("ReviewLowColor")) + .foregroundColor(Color("Color/Foundation/Gray/600")) } Spacer() /*Menu{ @@ -213,7 +213,7 @@ struct CommunityPostView: View where ViewModel: CommunityPostViewMode Button(action:{showPostDeleteAlert = false},label:{Text("취소") .font(.custom("Inter-Bold", size: 16)) .frame(maxWidth:.infinity)}) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) .frame(maxWidth: .infinity,alignment: .center) Divider() Button(action:{ @@ -253,7 +253,7 @@ struct CommunityPostView: View where ViewModel: CommunityPostViewMode },label:{Text("취소") .font(.custom("Inter-Bold", size: 16)) .frame(maxWidth:.infinity)}) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) .frame(maxWidth: .infinity,alignment: .center) Divider() Button(action:{ @@ -317,7 +317,7 @@ struct CommunityPostView: View where ViewModel: CommunityPostViewMode .frame(width: 4) Text(String(viewModel.postInfo.likeCount)) .font(.custom("Inter-Regular", size: 10)) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) } HStack(alignment: .center) { @@ -327,7 +327,7 @@ struct CommunityPostView: View where ViewModel: CommunityPostViewMode .frame(width: 4) Text(String(viewModel.postInfo.commentCount)) .font(.custom("Inter-Regular", size: 10)) - .foregroundColor(Color.init("ReviewMediumColor")) + .foregroundColor(Color.init("Color/Foundation/Gray/700")) .frame(height: 11, alignment: .center) } diff --git a/Siksha/Community/CommunityReplyBar.swift b/Siksha/Community/CommunityReplyBar.swift index 72ac4bb6..4762575c 100644 --- a/Siksha/Community/CommunityReplyBar.swift +++ b/Siksha/Community/CommunityReplyBar.swift @@ -37,7 +37,7 @@ struct CommunityReplyBar: View { }){ Text("올리기") .padding(EdgeInsets(top: 6.5, leading: 11, bottom: 6.5, trailing: 11)) - .background(Color("main")) + .background(Color("Color/Foundation/Orange/500")) .font(.custom("NanumSquareOTFB", size: 12)) .foregroundColor(.white) .cornerRadius(6) @@ -55,7 +55,7 @@ struct CommunityReplyBar: View { if isAnonymous { ZStack { RoundedRectangle(cornerRadius: 15.0) - .fill(Color("MainThemeColor")) + .fill(Color("Orange500")) .frame(width: 34, height: 25) Text("익명") .font(.custom("Inter-SemiBold", size: 12)) @@ -64,11 +64,11 @@ struct CommunityReplyBar: View { } else { ZStack { RoundedRectangle(cornerRadius: 15.0) - .stroke(Color("MainThemeColor")) + .stroke(Color("Orange500")) .frame(width: 34, height: 25) Text("익명") .font(.custom("Inter-SemiBold", size: 12)) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Orange500")) } } } @@ -95,7 +95,7 @@ struct CommunityReplyBar: View { } configuration.label - .foregroundColor(configuration.isOn ? Color("MainThemeColor") : Color(hex:0x575757)) + .foregroundColor(configuration.isOn ? Color("Color/Foundation/Orange/500") : Color(hex:0x575757)) } .padding(EdgeInsets(top: 5, leading: 0, bottom: 5, trailing: 0)) .contentShape(Rectangle()) diff --git a/Siksha/Community/CommunityView.swift b/Siksha/Community/CommunityView.swift index 17fa8c57..5111a1b8 100644 --- a/Siksha/Community/CommunityView.swift +++ b/Siksha/Community/CommunityView.swift @@ -10,7 +10,7 @@ import SwiftUI struct CommunityView: View where ViewModel: CommunityViewModelType { @State var tag: Int? = nil @State var needRefresh = false - let dividerColor = Color("DividerColor") + let dividerColor = Color("Color/Foundation/Gray/100") let topPosts: [PostInfo] = (1..<5).map { return PostInfo(title: "name\($0)", @@ -66,7 +66,7 @@ struct CommunityView: View where ViewModel: CommunityViewModelType { } label: { Image("CircleWriteButton") .frame(width:50, height:50) - .background(Color.init("MainThemeColor")) + .background(Color.init("Color/Foundation/Orange/500")) .clipShape(Circle()) } .offset(x: -30, y: -22) @@ -155,10 +155,10 @@ struct CommunityView: View where ViewModel: CommunityViewModelType { } struct CommunityPostPreView: View { - private let contentColor = Color("ReviewHighColor") - private let likeColor = Color("MainThemeColor") - private let replyColor = Color("ReviewMediumColor") - private let defaultImageColor = Color("DefaultImageColor") + private let contentColor = Color("Color/Foundation/Gray/900") + private let likeColor = Color("Color/Foundation/Orange/500") + private let replyColor = Color("Color/Foundation/Gray/700") + private let defaultImageColor = Color("Color/Foundation/Gray/100") let info: PostInfo let boardName: String @@ -199,7 +199,7 @@ struct CommunityPostPreView: View { .frame(width: 4) Text(String(info.commentCount)) .font(.custom("NanumSquareOTFRegular", size: 10)) - .foregroundColor(Color.init("ReviewMediumColor")) + .foregroundColor(Color.init("Color/Foundation/Gray/700")) .frame(height: 11, alignment: .center) } diff --git a/Siksha/ContentView.swift b/Siksha/ContentView.swift index 65754fb1..e388a540 100644 --- a/Siksha/ContentView.swift +++ b/Siksha/ContentView.swift @@ -18,7 +18,7 @@ private extension ContentView { Image((self.selectedTab == item.id ? item.buttonImage[0] : item.buttonImage[1])) .renderingMode(.original) .resizable() - .frame(width: 30, height: 30) + .frame(width: 36, height: 46) } .padding(.bottom, geometry.safeAreaInsets.bottom) .transaction { transaction in diff --git a/Siksha/Domain/KakaoShareManager.swift b/Siksha/Domain/KakaoShareManager.swift index 0672f716..15c0b929 100644 --- a/Siksha/Domain/KakaoShareManager.swift +++ b/Siksha/Domain/KakaoShareManager.swift @@ -17,8 +17,7 @@ class KakaoShareManager: ObservableObject { @Published var showWebView = false @Published var urlToLoad: String? - let kakaoAppKey = (UIApplication.shared.delegate as! AppDelegate).configDict?.object(forKey: "kakao_app_key") as! String - let templateId = Int64((UIApplication.shared.delegate as! AppDelegate).configDict?.object(forKey: "kakao_share_template_id") as! String) ?? 0 + let templateId = Config.shared.kakaoShareTemplateId var kakaoShareInfo: [String: String] = [:] var maxMenus = 0 @@ -29,7 +28,7 @@ class KakaoShareManager: ObservableObject { dateFormatter.dateFormat = "yyyy-MM-dd" let today = dateFormatter.string(from: Date()) kakaoShareInfo["date"] = selectedDateString == today ? "오늘" : selectedDateString - + kakaoShareInfo["restaurant"] = restaurant.nameKr let maxMenus = min(restaurant.menus.count, 5) switch restaurant.menus.count <= 5 { @@ -51,7 +50,7 @@ class KakaoShareManager: ObservableObject { } } } - + func shareKakao(restaurant: Restaurant, selectedDateString: String) { setTempArgs(restaurant: restaurant, selectedDateString: selectedDateString) diff --git a/Siksha/Info.plist b/Siksha/Info.plist index 9c23868b..d34d3497 100644 --- a/Siksha/Info.plist +++ b/Siksha/Info.plist @@ -23,7 +23,7 @@ Editor CFBundleURLSchemes - kakao${kakao_app_key} + kakao$(KAKAO_APP_KEY) @@ -45,7 +45,7 @@ LSRequiresIPhoneOS NMFClientId - $(NMFClientId) + $(NAVER_MAP_CLIENT_ID) NSAppTransportSecurity NSAllowsArbitraryLoads @@ -111,8 +111,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIUserInterfaceStyle - Light UIViewControllerBasedStatusBarAppearance diff --git a/Siksha/Library/Config.swift b/Siksha/Library/Config.swift index 93bd78a7..7072dee4 100644 --- a/Siksha/Library/Config.swift +++ b/Siksha/Library/Config.swift @@ -7,10 +7,59 @@ import Foundation -class Config { +final class Config { static let shared = Config() - private init() {} + let baseURL: String + let googleClientId: String + let naverMapClientId: String + let kakaoAppKey: String + let kakaoShareTemplateId: Int64 - var baseURL: String! = nil + private let envDict: NSDictionary + + private init() { + #if DEBUG + let configKey = "debug" + #else + let configKey = "release" + #endif + + guard let path = Bundle.main.path(forResource: "config", ofType: "plist"), + let fullDict = NSDictionary(contentsOfFile: path), + let envDict = fullDict[configKey] as? NSDictionary else { + fatalError("Failed to load config.plist or parse \(configKey) environment.") + } + + self.envDict = envDict + + self.baseURL = Self.getString(from: envDict, key: .serverURL) + self.googleClientId = Self.getString(from: envDict, key: .googleClientId) + self.naverMapClientId = Self.getString(from: envDict, key: .naverMapClientId) + self.kakaoAppKey = Self.getString(from: envDict, key: .kakaoAppKey) + self.kakaoShareTemplateId = Self.getInt64(from: envDict, key: .kakaoShareTemplateId) + } + + enum Key: String { + case serverURL = "server_url" + case googleClientId = "google_client_id" + case naverMapClientId = "naver_map_client_id" + case kakaoAppKey = "kakao_app_key" + case kakaoShareTemplateId = "kakao_share_template_id" + } + + private static func getString(from dict: NSDictionary, key: Key) -> String { + guard let value = dict[key.rawValue] as? String else { + fatalError("Missing or invalid string for key '\(key.rawValue)' in config.plist.") + } + return value + } + + private static func getInt64(from dict: NSDictionary, key: Key) -> Int64 { + guard let str = dict[key.rawValue] as? String, + let value = Int64(str) else { + fatalError("Missing or invalid Int64 string for key '\(key.rawValue)' in config.plist.") + } + return value + } } diff --git a/Siksha/Library/Enums.swift b/Siksha/Library/Enums.swift index 62018181..2934d50f 100644 --- a/Siksha/Library/Enums.swift +++ b/Siksha/Library/Enums.swift @@ -89,3 +89,84 @@ enum ReviewErrorCode: Int { } } } +enum FontType{ + enum FontWeight: String{ + case Light = "NanumSquareOTFL" + case Regular = "NanumSquareOTFR" + case Bold = "NanumSquareOTFB" + case ExtraBold = "NanumSquareOTFEB" + } + case text11(weight:FontWeight) + case text12(weight:FontWeight) + case text13(weight:FontWeight) + case text14(weight:FontWeight) + case text15(weight:FontWeight) + case text16(weight:FontWeight) + case text18(weight:FontWeight) + case text20(weight:FontWeight) + case text24(weight:FontWeight) + case text28(weight:FontWeight) + case text32(weight:FontWeight) + var fontSize:Int{ + switch self{ + case .text11: + return 11 + case .text12: + return 12 + case .text13: + return 13 + case .text14: + return 14 + case .text15: + return 15 + case .text16: + return 16 + case .text18: + return 18 + case .text20: + return 20 + case .text24: + return 24 + case .text28: + return 28 + case .text32: + return 32 + } + } + var lineHeight:Int{ + switch self{ + case .text14: + return 150 + case .text15: + return 150 + default: + return 140 + } + } + var fontName:String{ + switch self{ + case .text11(let weight): + return weight.rawValue + case .text12(let weight): + return weight.rawValue + case .text13(let weight): + return weight.rawValue + case .text14(let weight): + return weight.rawValue + case .text15(let weight): + return weight.rawValue + case .text16(let weight): + return weight.rawValue + case .text18(let weight): + return weight.rawValue + case .text20(let weight): + return weight.rawValue + case .text24(let weight): + return weight.rawValue + case .text28(let weight): + return weight.rawValue + case .text32(let weight): + return weight.rawValue + } + } +} diff --git a/Siksha/Library/Font.swift b/Siksha/Library/Font.swift new file mode 100644 index 00000000..e4fba6bb --- /dev/null +++ b/Siksha/Library/Font.swift @@ -0,0 +1,23 @@ +// +// Font.swift +// Siksha +// +// Created by 박정헌 on 5/19/25. +// +import SwiftUI +struct CustomFont:ViewModifier{ + var font:FontType + func body(content: Content)-> some View{ + let lineheight = UIFont(name: font.fontName, size: CGFloat(font.fontSize))?.lineHeight ?? 0 + let padding = Float(lineheight) * ((Float(font.lineHeight) - 100) / 100) / 2 + return content + .font(.custom(font.fontName, size: CGFloat(font.fontSize))) + .padding(.vertical, CGFloat(padding)) + .lineSpacing(CGFloat(padding * 2)) + } +} +extension View{ + func customFont(font: FontType) -> some View{ + return self.modifier(CustomFont(font: font)) + } +} diff --git a/Siksha/Library/UIRepresentable/CalendarView.swift b/Siksha/Library/UIRepresentable/CalendarView.swift index 8bf43393..ce10b429 100644 --- a/Siksha/Library/UIRepresentable/CalendarView.swift +++ b/Siksha/Library/UIRepresentable/CalendarView.swift @@ -63,17 +63,17 @@ class CalendarDelegate: NSObject, JTACMonthViewDelegate, JTACMonthViewDataSource formatter.dateFormat = "yyyy-MM-dd" let todayString = formatter.string(from: Date()) - let todayColor = UIColor(white: 223/255, alpha: 1) - let textColor = UIColor(white: 102/255, alpha: 1) - let selectedColor = UIColor(red: 254/255, green: 140/255, blue: 89/255, alpha: 1) + let todayColor = UIColor(named: "Color/Foundation/Gray/200") + let textColor = UIColor(named: "Color/Foundation/Gray/700") + let selectedColor = UIColor(named: "Color/Foundation/Orange/500") if cellState.isSelected { - cell.background.layer.backgroundColor = selectedColor.cgColor + cell.background.layer.backgroundColor = selectedColor!.cgColor cell.dateLabel.font = UIFont(name: "NanumSquareOTFB", size: 14) cell.dateLabel.textColor = .white } else { if formatter.string(from: cellState.date) == todayString { - cell.background.layer.backgroundColor = todayColor.cgColor + cell.background.layer.backgroundColor = todayColor!.cgColor cell.dateLabel.font = UIFont(name: "NanumSquareOTFB", size: 14) cell.dateLabel.textColor = textColor } else { diff --git a/Siksha/Library/UIRepresentable/TextView.swift b/Siksha/Library/UIRepresentable/TextView.swift index 2889133f..5a15ede4 100644 --- a/Siksha/Library/UIRepresentable/TextView.swift +++ b/Siksha/Library/UIRepresentable/TextView.swift @@ -37,7 +37,7 @@ struct TextView: UIViewRepresentable { uiView.textColor = .black } else { uiView.text = self.placeHolder - uiView.textColor = .lightGray + uiView.textColor = UIColor(named: "Color/Foundation/Gray/600") } } diff --git a/Siksha/Library/Utils.swift b/Siksha/Library/Utils.swift index 3831d18a..14d7ff54 100644 --- a/Siksha/Library/Utils.swift +++ b/Siksha/Library/Utils.swift @@ -42,4 +42,11 @@ class Utils { return payload } + + func removeAllUserDefaults(){ + UserDefaults.standard.dictionaryRepresentation().keys.forEach{ + key in + UserDefaults.standard.removeObject(forKey: key) + } + } } diff --git a/Siksha/Library/View Elements/BackButton.swift b/Siksha/Library/View Elements/BackButton.swift index 512771b7..5f667606 100644 --- a/Siksha/Library/View Elements/BackButton.swift +++ b/Siksha/Library/View Elements/BackButton.swift @@ -26,7 +26,7 @@ struct BackButton: View { Text("설정") .font(.custom("NanumSquareOTFB", size: 14)) - .foregroundColor(.init("LightGrayColor")) + .foregroundColor(.init("Color/Foundation/Gray/600")) } } .frame(width: 100, alignment: .leading) diff --git a/Siksha/Library/View Elements/BottomModalView.swift b/Siksha/Library/View Elements/BottomModalView.swift index 1440a83a..8a1a04e6 100644 --- a/Siksha/Library/View Elements/BottomModalView.swift +++ b/Siksha/Library/View Elements/BottomModalView.swift @@ -25,7 +25,7 @@ struct BottomModalView: View { GeometryReader { geometry in VStack { RoundedRectangle(cornerRadius: 25) - .fill(Color.init("LightGrayColor")) + .fill(Color.init("Color/Foundation/Gray/600")) .frame(width: 50, height: 5) .padding(.top, 10) diff --git a/Siksha/Library/View Elements/FilterItem.swift b/Siksha/Library/View Elements/FilterItem.swift index ebd9c6be..f84d41eb 100644 --- a/Siksha/Library/View Elements/FilterItem.swift +++ b/Siksha/Library/View Elements/FilterItem.swift @@ -19,10 +19,10 @@ struct FilterItem: View { } if (isOn) { Text(text) - .font(.custom("NanumSquareOTFB", size: 13)) + .customFont(font: .text13(weight: .Bold)) } else { Text(text) - .font(.custom("NanumSquareOTF", size: 13)) + .customFont(font: .text13(weight: .Regular)) } if (!isCheck) { Image("select") @@ -32,11 +32,11 @@ struct FilterItem: View { } .frame(height: 18) .padding(EdgeInsets(top: 8, leading: 10, bottom: 8, trailing: 10)) - .background(isOn ? Color("MainActiveColor") : .white) + .background(isOn ? Color("Color/Foundation/Orange/100") : .white) .cornerRadius(30) .overlay( RoundedRectangle(cornerRadius: 30) - .strokeBorder(isOn ? Color("MainThemeColor") : Color("Gray200"), lineWidth: 1) + .strokeBorder(isOn ? Color("Color/Foundation/Orange/500") : Color("Color/Foundation/Gray/200"), lineWidth: 1) ) } } diff --git a/Siksha/Library/View Elements/HorizontalGraph.swift b/Siksha/Library/View Elements/HorizontalGraph.swift index 78b5ed5e..1381cc68 100644 --- a/Siksha/Library/View Elements/HorizontalGraph.swift +++ b/Siksha/Library/View Elements/HorizontalGraph.swift @@ -24,7 +24,7 @@ struct HorizontalGraph: View { } } - private let orangeColor = Color.init("main") + private let orangeColor = Color.init("Color/Foundation/Orange/500") var body: some View { diff --git a/Siksha/Library/View Elements/ImagePickerCoordinatorView.swift b/Siksha/Library/View Elements/ImagePickerCoordinatorView.swift index 9c5b3c68..a263e7f2 100644 --- a/Siksha/Library/View Elements/ImagePickerCoordinatorView.swift +++ b/Siksha/Library/View Elements/ImagePickerCoordinatorView.swift @@ -19,7 +19,7 @@ struct ImagePickerCoordinatorView { self.presentationMode.wrappedValue.dismiss() // Navigation Bar 배경색 세팅 - UINavigationBar.changeBackgroundColor(color: UIColor(named: "main") ?? .clear) + UINavigationBar.changeBackgroundColor(color: UIColor(named: "Color/Foundation/Orange/500") ?? .clear) } } diff --git a/Siksha/Library/View Elements/MapView.swift b/Siksha/Library/View Elements/MapView.swift index 8eb20450..61a4d8e2 100644 --- a/Siksha/Library/View Elements/MapView.swift +++ b/Siksha/Library/View Elements/MapView.swift @@ -32,9 +32,11 @@ struct MapView: UIViewRepresentable { view.moveCamera(cameraUpdate) let marker = NMFMarker(position: coordinate, iconImage: .init(name: "mapMarker")) marker.captionText = markerText - marker.captionColor = UIColor(named: "DefaultFontColor") ?? .black + marker.captionColor = UIColor(named: "Color/Foundation/Gray/900") ?? .black marker.captionAligns = [.top] marker.captionOffset = -18 + marker.captionTextSize = 14 + // TODO: APPLY NEW MARKER IMAGE marker.mapView = view } diff --git a/Siksha/Library/View Elements/MealCell.swift b/Siksha/Library/View Elements/MealCell.swift index 2ec45655..a14fd3c1 100644 --- a/Siksha/Library/View Elements/MealCell.swift +++ b/Siksha/Library/View Elements/MealCell.swift @@ -10,10 +10,10 @@ import SwiftUI struct MealCell: View { @ObservedObject var viewModel: MealInfoViewModel private var vegetarian: Bool = false - private let orangeColor = Color.init("main") - private let grayColor = Color.init("ReviewHighColor") - private let lightGrayColor = Color.init("ReviewMediumColor") - private let lighterGrayColor = Color.init("ReviewLowColor") + private let orangeColor = Color.init("Color/Foundation/Orange/500") + private let grayColor = Color.init("Color/Foundation/Gray/900") + private let lightGrayColor = Color.init("Color/Foundation/Gray/700") + private let blackColor = Color.init("Color/Foundation/Base/BlackColor") var formattedPrice: String { let formatter = NumberFormatter() formatter.numberStyle = .decimal @@ -32,39 +32,47 @@ struct MealCell: View { HStack(alignment: .top) { Text("\(viewModel.meal.nameKr)") .multilineTextAlignment(.leading) - .font(.custom("NanumSquareOTFR", size: 15)) - .foregroundColor(.black) - .padding(.top, 3) + .frame(maxWidth: 168,alignment: .leading) + .customFont(font: .text15(weight: .Regular)) + .foregroundColor(blackColor) if vegetarian { Image("Vegetarian") .resizable() .renderingMode(.original) .frame(width: 18, height: 18) - .padding(.top, 3) } Spacer() - - Text(viewModel.meal.price > 0 ? String(formattedPrice) : "-") - .font(.custom("NanumSquareOTFR", size: 14)) - .foregroundColor(.black) - .frame(width: 50) - .padding(.top, 3) + if viewModel.meal.price < 10000{ + Text(viewModel.meal.price > 0 ? String(formattedPrice) : "-") + .customFont(font: .text14(weight:.Regular)) + .foregroundColor(blackColor) + .frame(width: 38) + } + else{ + Text(viewModel.meal.price > 0 ? String(formattedPrice) : "-") + .customFont(font: .text14(weight:.Regular)) + .foregroundColor(blackColor) + } + Spacer() + .frame(width:16) + Text(viewModel.meal.reviewCnt > 0 ? String(format: "%.1f", viewModel.meal.score) : "-") + .customFont(font: .text14(weight: .Regular)) + .foregroundColor(blackColor) + .frame(width:23) + + Spacer() + .frame(width:16) - Text(viewModel.meal.reviewCnt > 0 ? String(format: "%.1f", viewModel.meal.score) : "-") - .font(.custom("NanumSquareOTFB", size: 15)) - .foregroundColor(viewModel.meal.reviewCnt > 0 ? viewModel.meal.score > 4.0 ? grayColor : viewModel.meal.score <= 4.0 && viewModel.meal.score >= 3.0 ? lightGrayColor : lighterGrayColor : lighterGrayColor) - .frame(width: 35, height: 20) - .padding(.top, 0.5) - Button(action: { viewModel.toggleLike() }){ Image(viewModel.meal.isLiked ? "Heart-selected" : "Heart-default") - .frame(width: 35, height: 20) + .frame(width: 24, height: 24) } } + .padding(.zero) .background(Color.white) } } diff --git a/Siksha/Library/View Elements/MenuFilterView.swift b/Siksha/Library/View Elements/MenuFilterView.swift index f562342d..ee67c8c1 100644 --- a/Siksha/Library/View Elements/MenuFilterView.swift +++ b/Siksha/Library/View Elements/MenuFilterView.swift @@ -82,14 +82,14 @@ struct MenuFilterView: View { switch menuFilterType { case .all: Capsule() - .fill(Color("Gray200")) + .fill(Color("Color/Foundation/Gray/200")) .frame(width: 46, height: 4) .padding(.top, 15) .padding(.bottom, 10) ZStack { Text("필터") - .font(.custom("NanumSquareOTFB", size: 14)) + .customFont(font: .text14(weight: .Bold)) HStack { Spacer() @@ -98,7 +98,7 @@ struct MenuFilterView: View { Image("Close") .resizable() .frame(width: 32, height: 32) - .foregroundStyle(Color("Gray900")) + .foregroundStyle(Color("Color/Foundation/Gray/900")) } .padding(.trailing, 16) } @@ -199,41 +199,41 @@ struct MenuFilterView: View { ZStack { if menuFilterType == .all { Rectangle() - .fill(Color.white) + .fill(Color("Color/Foundation/Base/WhiteColor")) .frame(height: 111) - .shadow(color: Color.black.opacity(0.05), radius: 3, y: -1) - .zIndex(0) + .shadow(color: Color("Color/Foundation/Base/BlackColor").opacity(0.05), radius: 3, y: -1) + .zIndex(0) } HStack { Text("초기화") - .font(.custom("NanumSquareOTFB", size: 16)) + .customFont(font: .text16(weight: .Bold)) .frame(maxWidth: .infinity) .frame(height: 38) .foregroundStyle(.white) .background( RoundedRectangle(cornerRadius: 20) - .fill(Color("Gray500")) + .fill(Color("Color/Foundation/Gray/500")) ) .onTapGesture { resetFilters() } Text("적용") - .font(.custom("NanumSquareOTFB", size: 16)) + .customFont(font: .text16(weight: .Bold)) .frame(maxWidth: .infinity) .frame(height: 38) .foregroundStyle(.white) .background( RoundedRectangle(cornerRadius: 20) - .fill(Color("main")) + .fill(Color("Color/Foundation/Orange/500")) ) .onTapGesture { applyFilters() } } .padding(EdgeInsets(top: menuFilterType == .all ? 19 : 0, leading: 16, bottom: menuFilterType == .all ? 54 : 45, trailing: 16)) - .background(Color.white) + .background(Color("Color/Foundation/Base/WhiteColor")) .zIndex(1) } } @@ -349,7 +349,7 @@ fileprivate struct SectionHeader: View { var body: some View { Text(title) - .font(.custom("NanumSquareOTFEB", size: 16)) + .customFont(font: .text16(weight: .ExtraBold)) .frame(height: 27.5) .frame(maxWidth: .infinity, alignment: .leading) } @@ -361,14 +361,14 @@ fileprivate struct CategoryButton: View { var body: some View { RoundedRectangle(cornerRadius: 30) - .stroke(isSelected ? Color("main") : Color("Gray200")) + .stroke(isSelected ? Color("Color/Foundation/Orange/500") : Color("Color/Foundation/Gray/200")) .frame(height: 34) .overlay( Text(category) - .font(.custom("NanumSquareOTFB", size: 13)) - .foregroundColor(.black) + .customFont(font: .text13(weight: .Bold)) + .foregroundColor(Color("Color/Foundation/Base/BlackColor")) ) - .background(isSelected ? Color("MainActiveColor") : .clear, in: RoundedRectangle(cornerRadius: 30)) + .background(isSelected ? Color("Color/Foundation/Orange/100") : .clear, in: RoundedRectangle(cornerRadius: 30)) } } @@ -426,7 +426,7 @@ fileprivate struct MenuFilterViewCloseButtonModifier: ViewModifier { Image("Close") .resizable() .frame(width: 32, height: 32) - .foregroundStyle(Color("Gray900")) + .foregroundStyle(Color("Color/Foundation/Gray/900")) } .padding(.top, 14) .padding(.trailing, 16) diff --git a/Siksha/Library/View Elements/OperatingHoursTable.swift b/Siksha/Library/View Elements/OperatingHoursTable.swift index fdba2835..30b4d934 100644 --- a/Siksha/Library/View Elements/OperatingHoursTable.swift +++ b/Siksha/Library/View Elements/OperatingHoursTable.swift @@ -15,16 +15,16 @@ struct OperatingHoursCell: View { self.type = type if hours.count == 3 { - self.hours.append(("아침", hours[0])) - self.hours.append(("점심", hours[1])) - self.hours.append(("저녁", hours[2])) + self.hours.append(("BreakfastTime", hours[0])) + self.hours.append(("LunchTime", hours[1])) + self.hours.append(("DinnerTime", hours[2])) } else if hours.count == 2 { if isFestivalRestaurant { self.hours.append(("5/13, 5/14", hours[0])) self.hours.append(("5/15", hours[1])) } else { - self.hours.append(("점심", hours[0])) - self.hours.append(("저녁", hours[1])) + self.hours.append(("LunchTime", hours[0])) + self.hours.append(("DinnerTime", hours[1])) } } else if hours.count == 1 { self.hours.append(("", hours[0])) @@ -34,32 +34,29 @@ struct OperatingHoursCell: View { var body: some View { HStack(alignment: .top) { Text(type) - .font(.custom("NanumSquareOTFR", size: 14)) - .padding(EdgeInsets(top: 0, leading: 3, bottom: 0, trailing: 0)) - - + .customFont(font: .text14(weight: .Bold)) Spacer() - + if hours.count > 0 { - VStack(alignment: .trailing, spacing: 8) { + VStack(alignment: .trailing, spacing: 4) { ForEach(hours, id: \.0) { hourType, hour in - HStack(spacing: 10) { - Text(hourType) - .font(.custom("NanumSquareOTFR", size: 12)) - .foregroundColor(.init("main")) - + HStack(spacing: 0.5) { + Image(hourType) + .resizable() + .frame(width:20,height:20) Text(hour) - .font(.custom("NanumSquareOTFR", size: 14)) - .frame(width: 90, alignment: .trailing) + .customFont(font: .text14(weight: .Regular)) } + .padding(.zero) } - } + }.padding(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 6)) } else { Text("정보가 없습니다") - .font(.custom("NanumSquareOTFR", size: 14)) + .customFont(font: .text14(weight: .Regular)) + .padding(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 7)) } } - .padding(EdgeInsets(top: 8, leading: 16, bottom: 8, trailing: 16)) + .padding(EdgeInsets(top: 12, leading: 16, bottom: 12, trailing: 16)) } } @@ -79,7 +76,7 @@ struct OperatingHoursTable: View { } var body: some View { - VStack { + VStack(spacing:0) { OperatingHoursCell(type: "주중", hours: wdHours, isFestivalRestaurant: self.isFestivalRestaurant) dividerColor @@ -106,6 +103,13 @@ struct OperatingHoursTable_Previews: PreviewProvider { operatingHours[1] = "11:30 - 13:30\n17:30 - 18:30" - return OperatingHoursTable(hours: operatingHours, isFestivalRestaurant: false) + return + VStack(spacing:0){ + Color(.black) + .frame(height:1) + .padding(.zero) + OperatingHoursTable(hours: operatingHours, isFestivalRestaurant: false) + } + .preferredColorScheme(.light) } } diff --git a/Siksha/Library/View Elements/RestaurantCell.swift b/Siksha/Library/View Elements/RestaurantCell.swift index 60d62192..adf01309 100644 --- a/Siksha/Library/View Elements/RestaurantCell.swift +++ b/Siksha/Library/View Elements/RestaurantCell.swift @@ -10,20 +10,23 @@ import SwiftUI // MARK: - Restaurant Cell struct RestaurantCell: View { - private let fontColor = Color("DefaultFontColor") - private let titleColor = Color("TitleFontColor") - private let lightGrayColor = Color("LightGrayColor") - private let orangeColor = Color.init("main") + private let fontColor = Color("Color/Foundation/Gray/700") + private let lightGrayColor = Color("Color/Foundation/Gray/600") + private let orangeColor = Color.init("Color/Foundation/Orange/500") var restaurant: Restaurant var meals: [Meal] + var selectedPage:Int + var dayType:Int @State var isFavorite: Bool = false @State var showRestaurant: Bool = false @StateObject private var kakaoShareManager = KakaoShareManager() @Environment(\.menuViewModel) var viewModel: MenuViewModel? - init(_ restaurant: Restaurant) { + init(_ restaurant: Restaurant,_ selectedPage:Int,_ dayType:Int) { self.restaurant = restaurant + self.selectedPage = selectedPage + self.dayType = dayType self.meals = Array(restaurant.menus) self._isFavorite = State(initialValue: UserDefaults.standard.bool(forKey: "fav\(restaurant.id)")) } @@ -33,21 +36,23 @@ struct RestaurantCell: View { // Restaurant Name HStack(alignment: .center) { Text(restaurant.nameKr) - .font(.custom("NanumSquareOTFB", size: 15)) - .foregroundColor(orangeColor) - + .customFont(font: .text16(weight: .ExtraBold)) + .foregroundColor(.black) + Spacer() + .frame(width:6) Button(action: { self.showRestaurant = true }) { Image("Info") .resizable() .renderingMode(.original) - .frame(width: 17, height: 17) + .frame(width: 20, height: 20) } .sheet(isPresented: $showRestaurant, content: { RestaurantInformationView(restaurant) }) - + Spacer() + .frame(width:4) Button(action: { isFavorite.toggle() UserDefaults.standard.set(isFavorite, forKey: "fav\(restaurant.id)") @@ -58,24 +63,26 @@ struct RestaurantCell: View { Image(isFavorite ? "Favorite-selected" : "Favorite-default") .resizable() .renderingMode(.original) - .frame(width: 18, height: 17) + .frame(width: 20, height: 20) }) - + Spacer() + .frame(width:4) Button(action: { kakaoShareManager.shareKakao(restaurant: restaurant, selectedDateString: viewModel?.selectedDate ?? "오늘") + }) { Image(.kakaoShare) .resizable() .renderingMode(.original) - .frame(width: 17, height: 17) + .frame(width: 20, height: 20) .foregroundColor(orangeColor) }.sheet(isPresented: $kakaoShareManager.showWebView) { if let urlString = kakaoShareManager.urlToLoad { KakaoShareWebView(urlString: urlString, showWebView: $kakaoShareManager.showWebView, restaurant: restaurant, selectedDate: viewModel?.selectedDate ?? "오늘") } }.interactiveDismissDisabled(false) - Spacer() + /*Spacer() Text("Price") .font(.custom("NanumSquareOTF", size: 12)) @@ -90,19 +97,54 @@ struct RestaurantCell: View { Text("Like") .font(.custom("NanumSquareOTF", size: 12)) .foregroundColor(orangeColor) - .frame(width: 35) + .frame(width: 35)*/ } - .padding(EdgeInsets(top: 16, leading: 16, bottom: 10, trailing: 16)) - - HStack { + .padding(EdgeInsets(top: 17, leading: 13,bottom: 11.5,trailing: 0)) + HStack(alignment: .center){ + Image(TypeInfo(type:TypeSelection(rawValue: (selectedPage))!).icon) + .resizable() + .renderingMode(.original) + .frame(width: TypeInfo(type:TypeSelection(rawValue: (selectedPage))!).width, height: TypeInfo(type:TypeSelection(rawValue: (selectedPage))!).height) + Spacer() + .frame(width:4) + Text(MenuViewModel.getOperatingHours(restaurant: restaurant,dayType: dayType,selectedPage: selectedPage)) + .customFont(font: .text12(weight: .Bold)) + .foregroundColor(lightGrayColor) + Spacer() + Text("Price") + .customFont(font: .text12(weight: .Regular)) + .multilineTextAlignment(.center) + .frame(width:28) + .foregroundColor(orangeColor) + Spacer() + .frame(width:16) + Text("Rate") + .customFont(font: .text12(weight: .Regular)) + .multilineTextAlignment(.center) + .frame(width:26) + .foregroundColor(orangeColor) + Spacer() + .frame(width:16) + Text("Like") + .customFont(font: .text12(weight: .Regular)) + .multilineTextAlignment(.center) + .foregroundColor(orangeColor) + .frame(width:25) + + }.padding([.leading,.trailing],13) + .padding([.bottom],6.5) + + /*HStack { orangeColor - .frame(height: 1) - .frame(maxWidth: .infinity) - } - .padding([.leading, .trailing], 12) - - - VStack(spacing: 20) { + .frame(maxWidth:.infinity) + .overlay(RoundedRectangle(cornerRadius: 1.5).stroke(orangeColor,lineWidth:1.5 )) + }*/ + Capsule() + .frame(height:1.5) + .foregroundColor(orangeColor) + .padding([.trailing], 14.5) + .padding([.leading],11.5) + VStack(spacing: 13) { if meals.count > 0 { ForEach(meals, id: \.id) { meal in let mealInfoViewModel = MealInfoViewModel(meal: meal) @@ -126,8 +168,9 @@ struct RestaurantCell: View { .padding([.top, .bottom], 12) } } - .padding(EdgeInsets(top: 14, leading: 16, bottom: 16, trailing: 16)) + .padding(EdgeInsets(top: 13, leading: 13, bottom: 17, trailing: 13)) } + .padding(.zero) .background(Color.white) .cornerRadius(8) .overlay( @@ -159,6 +202,6 @@ struct RestaurantCell_Previews: PreviewProvider { nonEmptyRes.menus.append(menu) nonEmptyRes.menus.append(menu2) - return RestaurantCell(nonEmptyRes) + return RestaurantCell(nonEmptyRes,0,0) } } diff --git a/Siksha/Library/View Elements/RestaurantOrderRow.swift b/Siksha/Library/View Elements/RestaurantOrderRow.swift index cd7cc544..6227f417 100644 --- a/Siksha/Library/View Elements/RestaurantOrderRow.swift +++ b/Siksha/Library/View Elements/RestaurantOrderRow.swift @@ -16,7 +16,7 @@ struct RestaurantOrderRow: View { Text(text) .padding(.leading, 15) .font(.custom("NanumSquareOTFB", size: 15)) - .foregroundColor(.init("DefaultFontColor")) + .foregroundColor(.init("Color/Foundation/Gray/700")) } .frame(height: 40) } diff --git a/Siksha/Library/View Elements/SegmentedControlView.swift b/Siksha/Library/View Elements/SegmentedControlView.swift index f08b300d..11c3287e 100644 --- a/Siksha/Library/View Elements/SegmentedControlView.swift +++ b/Siksha/Library/View Elements/SegmentedControlView.swift @@ -31,13 +31,13 @@ struct SegmentedControlView: View { .font(.custom("NanumSquareOTFR", size: 12)) } } - .foregroundColor(self.selected == segment.id ? .white : Color.init("main")) - .background(self.selected == segment.id ? Color.init("main") : .white) - .border(Color.init("main")) + .foregroundColor(self.selected == segment.id ? .white : Color.init("Color/Foundation/Orange/500")) + .background(self.selected == segment.id ? Color.init("Color/Foundation/Orange/500") : .white) + .border(Color.init("Color/Foundation/Orange/500")) } } .overlay(RoundedRectangle(cornerRadius: 25) - .stroke(Color.init("main"), lineWidth: 1) + .stroke(Color.init("Color/Foundation/Orange/500"), lineWidth: 1) .padding(0.5)) .cornerRadius(25.0) diff --git a/Siksha/Library/View Elements/SegmentedPicker.swift b/Siksha/Library/View Elements/SegmentedPicker.swift index db81adac..9277bd18 100644 --- a/Siksha/Library/View Elements/SegmentedPicker.swift +++ b/Siksha/Library/View Elements/SegmentedPicker.swift @@ -15,7 +15,7 @@ struct SegmentedPicker: View { var body: some View { RoundedRectangle(cornerRadius: 30) - .stroke(Color("Gray200")) + .stroke(Color("Color/Foundation/Gray/200")) .frame(height: 34) .overlay( HStack(alignment: .center, spacing: 1) { @@ -23,10 +23,10 @@ struct SegmentedPicker: View { ZStack { if self.selectedOption == option { RoundedRectangle(cornerRadius: 30) - .fill(Color("MainActiveColor")) + .fill(Color("Color/Foundation/Orange/100")) .overlay( RoundedRectangle(cornerRadius: 30) - .stroke(Color("MainThemeColor"), lineWidth: 1) + .stroke(Color("Color/Foundation/Orange/500"), lineWidth: 1) ) } PickerContentView(text: format(option), needStarImage: isRateFilter && format(option) != "전체") @@ -50,7 +50,7 @@ struct PickerContentView: View { var body: some View { HStack { Text(text) - .font(.custom("NanumSquareOTFB", size: 14)) + .customFont(font: .text14(weight: .Bold)) if needStarImage { Image("RateStar") } diff --git a/Siksha/Library/View Elements/Sliders.swift b/Siksha/Library/View Elements/Sliders.swift index df24c089..324333ad 100644 --- a/Siksha/Library/View Elements/Sliders.swift +++ b/Siksha/Library/View Elements/Sliders.swift @@ -12,8 +12,8 @@ struct DistanceSliderView: View { let minValue: Double = 200 let maxValue: Double = 1000 let step: Double = 50 - private let orangeColor = Color("main") - private let sliderBackgroundColor: Color = Color("Gray200") + private let orangeColor = Color("Color/Foundation/Orange/500") + private let sliderBackgroundColor: Color = Color("Color/Foundation/Gray/200") var body: some View { VStack { @@ -81,8 +81,8 @@ struct PriceRangeSliderView: View { let minValue: Double = 2500 let maxValue: Double = 10000 let step: Double = 500 - private let orangeColor = Color("main") - private let sliderBackgroundColor: Color = Color("Gray200") + private let orangeColor = Color("Color/Foundation/Orange/500") + private let sliderBackgroundColor: Color = Color("Color/Foundation/Gray/200") var body: some View { VStack { @@ -179,8 +179,8 @@ struct SliderValueIndicator: View { let sliderWidth: CGFloat let pointerOffset: CGFloat - private let backgroundColor: Color = Color("Gray100") - private let fontColor: Color = Color("Gray700") + private let backgroundColor: Color = Color("Color/Foundation/Gray/100") + private let fontColor: Color = Color("Color/Foundation/Gray/700") @State private var boxWidth: CGFloat = 0 diff --git a/Siksha/LoginView.swift b/Siksha/LoginView.swift index ff57d843..a709704c 100644 --- a/Siksha/LoginView.swift +++ b/Siksha/LoginView.swift @@ -62,7 +62,7 @@ struct LoginView: View { } .frame(width: geometry.size.width, height: geometry.size.height + geometry.safeAreaInsets.bottom + geometry.safeAreaInsets.top) .padding(.top, -geometry.safeAreaInsets.top) - .background(Color("main")) + .background(Color("Color/Foundation/Orange/500")) .alert(isPresented: $viewModel.signInFailed, content: { Alert(title: Text("로그인"), message: Text("로그인을 실패했습니다. 다시 시도해주세요."), dismissButton: .default(Text("확인"))) }) diff --git a/Siksha/Main/FestivalSwitchStyle.swift b/Siksha/Main/FestivalSwitchStyle.swift index 79482b05..6764918e 100644 --- a/Siksha/Main/FestivalSwitchStyle.swift +++ b/Siksha/Main/FestivalSwitchStyle.swift @@ -8,8 +8,8 @@ import SwiftUI struct FestivalSwitchStyle: ToggleStyle { - private let onColor = LinearGradient(colors: [Color("main"), Color(hex: 0xFF9DA4)], startPoint: .leading, endPoint: .trailing) - private let offColor = LinearGradient(colors: [Color("Gray500")], startPoint: .leading, endPoint: .trailing) + private let onColor = LinearGradient(colors: [Color("Color/Foundation/Orange/500"), Color(hex: 0xFF9DA4)], startPoint: .leading, endPoint: .trailing) + private let offColor = LinearGradient(colors: [Color("Color/Foundation/Gray/500")], startPoint: .leading, endPoint: .trailing) func makeBody(configuration: Configuration) -> some View { RoundedRectangle(cornerRadius: 25) diff --git a/Siksha/Main/MenuListView.swift b/Siksha/Main/MenuListView.swift index d7db6ebc..290f66fa 100644 --- a/Siksha/Main/MenuListView.swift +++ b/Siksha/Main/MenuListView.swift @@ -13,9 +13,9 @@ struct MenuListView: View { @State private var isAtLeadingEdge: Bool = true private let backgroundColor = Color("AppBackgroundColor") - private let lightGrayColor = Color("Gray600") - private let orangeColor = Color("main") - private let fontColor = Color("DefaultFontColor") + private let lightGrayColor = Color("Color/Foundation/Gray/600") + private let orangeColor = Color("Color/Foundation/Orange/500") + private let fontColor = Color("Color/Foundation/Gray/700") private let typeInfos: [TypeInfo] = [ TypeInfo(type: .breakfast), TypeInfo(type: .lunch), @@ -34,7 +34,7 @@ struct MenuListView: View { } else if viewModel.restaurantsLists.count > 0 { TabView(selection: $viewModel.selectedPage) { ForEach(viewModel.restaurantsLists.indices, id: \.self) { index in - RestaurantsView(viewModel.restaurantsLists[index]) + RestaurantsView(viewModel.restaurantsLists[index],viewModel.selectedPage,viewModel.selectedMenu?.dateType ?? 0) .tag(index) } } @@ -182,7 +182,7 @@ private extension MenuListView { Rectangle() .foregroundStyle(.clear) .background( - LinearGradient(colors: [Color("Gray50"), Color("Gray50").opacity(0)], startPoint: .leading, endPoint: .trailing) + LinearGradient(colors: [Color("Color/Foundation/Gray/50"), Color("Color/Foundation/Gray/50").opacity(0)], startPoint: .leading, endPoint: .trailing) ) .frame(width: 16, height: 34) } @@ -196,7 +196,7 @@ private extension MenuListView { VStack { Spacer() Text("식단 정보가 없습니다") - .font(.custom("NanumSquareOTFB", size: 15)) + .customFont(font: .text15(weight: .Bold)) .foregroundColor(fontColor) Spacer() } diff --git a/Siksha/Main/MenuView.swift b/Siksha/Main/MenuView.swift index e205914f..90c2a0f9 100644 --- a/Siksha/Main/MenuView.swift +++ b/Siksha/Main/MenuView.swift @@ -14,7 +14,7 @@ struct MenuView: View { @State private var selectedFilterType: MenuFilterType? = nil @State private var viewHeight: CGFloat = 0 - private let lightGrayColor = Color("Gray600") + private let lightGrayColor = Color("Color/Foundation/Gray/600") init(isFavoriteTab: Bool = false) { _viewModel = StateObject(wrappedValue: MenuViewModel(isFavoriteTab: isFavoriteTab)) @@ -44,7 +44,7 @@ struct MenuView: View { } private let dimBackgroundColor = Color(.sRGB, white: 0, opacity: 0.6) - private let orangeColor = Color("main") + private let orangeColor = Color("Color/Foundation/Orange/500") var body: some View { VStack(spacing: 0) { diff --git a/Siksha/Main/MenuViewModel.swift b/Siksha/Main/MenuViewModel.swift index 55eddcc0..6c13fd4d 100644 --- a/Siksha/Main/MenuViewModel.swift +++ b/Siksha/Main/MenuViewModel.swift @@ -577,6 +577,24 @@ final class MenuViewModel: NSObject, ObservableObject { } .store(in: &cancellables) } + static func getOperatingHours(restaurant:Restaurant,dayType:Int,selectedPage:Int)->String{ + + let operatingHours = restaurant.operatingHours[dayType].split(separator: "\n").map { String($0) } + if operatingHours.count == 3{ + return operatingHours[selectedPage] + } + if operatingHours.count == 2{ + if selectedPage == TypeSelection.breakfast.rawValue{ + return "정보 없음" + } + return operatingHours[selectedPage-1] + } + if operatingHours.count == 1{ + return operatingHours[0] + } + return "정보 없음" + + } } extension MenuViewModel: CLLocationManagerDelegate { diff --git a/Siksha/Main/RestaurantsView.swift b/Siksha/Main/RestaurantsView.swift index ba81cf8f..43858692 100644 --- a/Siksha/Main/RestaurantsView.swift +++ b/Siksha/Main/RestaurantsView.swift @@ -9,12 +9,15 @@ import SwiftUI import Combine struct RestaurantsView: View { - private let fontColor = Color("Gray600") + private let fontColor = Color("Color/Foundation/Gray/600") var restaurantsList: [Restaurant] - - init(_ restaurants: [Restaurant]){ + var selectedPage:Int + var dayType:Int + init(_ restaurants: [Restaurant],_ selectedPage:Int,_ dayType:Int){ self.restaurantsList = restaurants + self.selectedPage = selectedPage + self.dayType = dayType } var body: some View { @@ -22,7 +25,7 @@ struct RestaurantsView: View { ScrollView(.vertical) { VStack(spacing: 18) { ForEach(restaurantsList, id: \.id) { restaurant in - RestaurantCell(restaurant) + RestaurantCell(restaurant,selectedPage,dayType) .padding([.leading, .trailing], 8) } } diff --git a/Siksha/MealDetail/MealInfoView.swift b/Siksha/MealDetail/MealInfoView.swift index 32fb3653..7395d56a 100644 --- a/Siksha/MealDetail/MealInfoView.swift +++ b/Siksha/MealDetail/MealInfoView.swift @@ -130,9 +130,9 @@ private extension MealInfoView { } struct MealInfoView: View { - private let darkFontColor = Color.init("DarkFontColor") - private let lightGrayColor = Color.init("LightGrayColor") - private let orangeColor = Color.init("main") + private let darkFontColor = Color.init("Color/Foundation/Base/BlackColor") + private let lightGrayColor = Color.init("Color/Foundation/Gray/600") + private let orangeColor = Color.init("Color/Foundation/Orange/500") @Environment(\.menuViewModel) var menuViewModel: MenuViewModel? @Environment(\.presentationMode) var presentationMode: Binding @@ -176,7 +176,7 @@ struct MealInfoView: View { scoreSummary - Color.init("DarkBackgroundColor") + Color.init("Color/Foundation/Gray/100") .frame(height: 10) .frame(maxWidth: .infinity) .padding(.top, 10) diff --git a/Siksha/MealDetail/MealReviewView.swift b/Siksha/MealDetail/MealReviewView.swift index 4aba916a..f3c084f4 100644 --- a/Siksha/MealDetail/MealReviewView.swift +++ b/Siksha/MealDetail/MealReviewView.swift @@ -165,11 +165,11 @@ private extension MealReviewView { ZStack(alignment: .top) { if viewModel.canSubmit { RoundedRectangle(cornerRadius: 8) - .fill(Color.init("main")) + .fill(Color.init("Color/Foundation/Orange/500")) .frame(width: 343, height: 56) } else { RoundedRectangle(cornerRadius: 8) - .fill(Color.init("LightGrayColor")) + .fill(Color.init("Color/Foundation/Gray/600")) .frame(width: 343, height: 56) } @@ -234,9 +234,9 @@ private extension MealReviewView { // MARK: - Rating View struct MealReviewView: View { - private let darkFontColor = Color("DarkFontColor") - private let fontColor = Color("DefaultFontColor") - private let orangeColor = Color.init("main") + private let darkFontColor = Color("Color/Foundation/Base/BlackColor") + private let fontColor = Color("Color/Foundation/Gray/700") + private let orangeColor = Color.init("Color/Foundation/Orange/500") @Environment(\.menuViewModel) var menuViewModel: MenuViewModel? @Environment(\.viewController) private var viewControllerHolder: UIViewController? diff --git a/Siksha/MealDetail/ReviewListView.swift b/Siksha/MealDetail/ReviewListView.swift index 94e69088..ced107d3 100644 --- a/Siksha/MealDetail/ReviewListView.swift +++ b/Siksha/MealDetail/ReviewListView.swift @@ -8,7 +8,7 @@ import SwiftUI struct ReviewListView: View { - private let lightGrayColor = Color.init("LightGrayColor") + private let lightGrayColor = Color.init("Color/Foundation/Gray/600") @Environment(\.presentationMode) var presentationMode: Binding @StateObject var viewModel = ReviewListViewModel() diff --git a/Siksha/Models/DailyMenu.swift b/Siksha/Models/DailyMenu.swift index 70730341..6a4d9ec5 100644 --- a/Siksha/Models/DailyMenu.swift +++ b/Siksha/Models/DailyMenu.swift @@ -11,6 +11,7 @@ import RealmSwift class DailyMenu: Object { @objc dynamic var date: String = "" + @objc dynamic var dateType:Int = 0 var br = List() var lu = List() var dn = List() @@ -18,11 +19,17 @@ class DailyMenu: Object { convenience init(_ json: JSON){ self.init() self.date = json["date"].stringValue - + switch(json["date_type"]){ + case "WEEKDAY":dateType = Restaurant.OperatingHourType.weekdays.rawValue + case "SATURDAY":dateType = Restaurant.OperatingHourType.saturday.rawValue + case "HOLIDAY":dateType = Restaurant.OperatingHourType.holiday.rawValue + default:dateType = 0 + } addRestaurants(list: br, json["BR"]) addRestaurants(list: lu, json["LU"]) addRestaurants(list: dn, json["DN"]) } + private func addRestaurants(list: List, _ json: JSON){ json.forEach { (str, restJson) in diff --git a/Siksha/Networking/AlamofireNetworking.swift b/Siksha/Networking/AlamofireNetworking.swift index 9f63c9a5..fdeb8a6b 100644 --- a/Siksha/Networking/AlamofireNetworking.swift +++ b/Siksha/Networking/AlamofireNetworking.swift @@ -35,7 +35,7 @@ final class AlamofireNetworking: NetworkModuleProtocol { return request .validate() - .publishData() + .publishData(emptyResponseCodes:[201,200,204]) .tryMap { response in if let error = response.error { throw error diff --git a/Siksha/Networking/SikshaAPI.swift b/Siksha/Networking/SikshaAPI.swift index 78e8ba26..93f8abd8 100644 --- a/Siksha/Networking/SikshaAPI.swift +++ b/Siksha/Networking/SikshaAPI.swift @@ -89,7 +89,7 @@ enum SikshaAPI: URLRequestConvertible { case updateUserProfile(nickname: String?, image: Data?, changeToDefaultImage: Bool) case deleteUser - static var baseURL = Config.shared.baseURL! + static var baseURL = Config.shared.baseURL var needToken: Bool { switch self { diff --git a/Siksha/RestaurantInfo/RestaurantInformationView.swift b/Siksha/RestaurantInfo/RestaurantInformationView.swift index b30db6de..5a42f120 100644 --- a/Siksha/RestaurantInfo/RestaurantInformationView.swift +++ b/Siksha/RestaurantInfo/RestaurantInformationView.swift @@ -32,61 +32,60 @@ struct RestaurantInformationView: View { HStack { Spacer() Text(restaurant.nameKr) - .font(.custom("NanumSquareOTFB", size: 20)) - .foregroundColor(.black) + .customFont(font: .text20(weight: .ExtraBold)) + .foregroundColor(Color("Color/Foundation/Gray/900")) Spacer() } - .padding(EdgeInsets(top: 14, leading: 16, bottom: 10, trailing: 16)) - + .padding(EdgeInsets(top: 23, leading: 0, bottom: 10.73, trailing: 0)) + if position != nil { - Color.init("main") + Color.init("Color/Foundation/Gray/200") //TODO: FIX COLOR .frame(height: 1) .frame(maxWidth: .infinity) - .padding([.leading, .trailing], 16) } ScrollView { - if let position = position { - HStack { - Text("식당 위치") - .font(.custom("NanumSquareOTFR", size: 14)) - .foregroundColor(.black) - Spacer() + VStack(spacing: 0){ + if let position = position { + HStack { + Image("Location") + .resizable() + .frame(width: 24, height: 24) + + Text("식당 위치") + .customFont(font: .text16(weight: .Bold)) + .foregroundColor(.black) + Spacer() + } + .padding(EdgeInsets(top: 13, leading: 16, bottom: 8, trailing: 16)) - Image("Location") + MapView(coordinate: position, markerText: restaurant.addr) + .cornerRadius(10.0) + .frame(height: 250) + .padding(EdgeInsets(top: 0, leading: 16, bottom: 31, trailing: 16)) + Color.init("Color/Foundation/Gray/200") // TODO: FIX COLOR + .frame(height: 10) + .frame(maxWidth: .infinity) + } + + + HStack(alignment: .center, spacing: 0) { + Image("Schedule") .resizable() - .frame(width: 16, height: 16) - Text(restaurant.addr) - .font(.custom("NanumSquareOTFR", size: 14)) - .foregroundColor(Color("LightFontColor")) + .frame(width: 24,height: 24) + Spacer() + .frame(width:4) + Text("영업 시간") + .customFont(font: .text16(weight: .Bold)) + Spacer() } - .padding(EdgeInsets(top: 16, leading: 16, bottom: 12, trailing: 16)) + .padding(EdgeInsets(top: 24, leading: 16, bottom: 8, trailing: 16)) - MapView(coordinate: position, markerText: restaurant.addr) - .cornerRadius(10.0) - .frame(height: 250) - .padding(EdgeInsets(top: 0, leading: 16, bottom: 24, trailing: 16)) - Color.init("DarkBackgroundColor") - .frame(height: 10) - .frame(maxWidth: .infinity) - } - - - HStack(alignment: .center, spacing: 0) { - Text("영업 시간") - .font(.custom("NanumSquareOTFR", size: 14)) - Spacer() + Color.init("Color/Foundation/Orange/500") + .frame(height: 1) + + OperatingHoursTable(hours: Array(restaurant.operatingHours), isFestivalRestaurant: restaurant.nameKr.contains("[축제]")) } - .padding(EdgeInsets(top: 24, leading: 16, bottom: 8, trailing: 16)) - - Color.init("main") - .frame(height: 1) - .frame(maxWidth: .infinity) - .padding([.leading, .trailing], 16) - - OperatingHoursTable(hours: Array(restaurant.operatingHours), isFestivalRestaurant: restaurant.nameKr.contains("[축제]")) - - Spacer() } } .padding(.bottom) diff --git a/Siksha/SceneDelegate.swift b/Siksha/SceneDelegate.swift index 794383a3..8dccba77 100644 --- a/Siksha/SceneDelegate.swift +++ b/Siksha/SceneDelegate.swift @@ -45,20 +45,20 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { break // The Apple ID credential is valid. case .revoked, .notFound: accessToken = nil - UserDefaults.standard.set(nil, forKey: "userToken") + UserDefaults.standard.removeObject(forKey: "userToken") default: break } } } else { accessToken = nil - UserDefaults.standard.set(nil, forKey: "userToken") + UserDefaults.standard.removeObject(forKey: "userToken") } } // Navigation Bar 배경색 세팅 - UINavigationBar.changeBackgroundColor(color: UIColor(named: "main") ?? .clear) - + UINavigationBar.changeBackgroundColor(color: UIColor(named: "Color/Foundation/Orange/500") ?? .clear) + // Use a UIHostingController as window root view controller. if let windowScene = scene as? UIWindowScene { let window = UIWindow(windowScene: windowScene) diff --git a/Siksha/Settings/FavoriteRestaurantOrderView.swift b/Siksha/Settings/FavoriteRestaurantOrderView.swift index 6831ce7e..6ee4e97a 100644 --- a/Siksha/Settings/FavoriteRestaurantOrderView.swift +++ b/Siksha/Settings/FavoriteRestaurantOrderView.swift @@ -44,7 +44,7 @@ struct FavoriteRestaurantOrderView: View { Spacer() Text("우측 손잡이를 드래그하여 순서를 바꿔보세요.") .font(.custom("NanumSquareOTFR", size: 14)) - .foregroundColor(.init("DefaultFontColor")) + .foregroundColor(.init("Color/Foundation/Gray/700")) Spacer() } .padding(.top, 20) @@ -67,7 +67,7 @@ struct FavoriteRestaurantOrderView: View { Text("즐겨찾기에 추가된 식당이 없습니다.") .font(.custom("NanumSquareOTFB", size: 15)) - .foregroundColor(.init("DefaultFontColor")) + .foregroundColor(.init("Color/Foundation/Gray/700")) Spacer() } diff --git a/Siksha/Settings/InformationView.swift b/Siksha/Settings/InformationView.swift index f229489b..445c177e 100644 --- a/Siksha/Settings/InformationView.swift +++ b/Siksha/Settings/InformationView.swift @@ -124,7 +124,7 @@ struct InformationView: View { return } - UserDefaults.standard.set(nil, forKey: "accessToken") + UserDefaults.standard.removeObject(forKey: "accessToken") viewControllerHolder?.present(style: .fullScreen) { LoginView() diff --git a/Siksha/Settings/MyPostView.swift b/Siksha/Settings/MyPostView.swift index 31de33ce..f399477b 100644 --- a/Siksha/Settings/MyPostView.swift +++ b/Siksha/Settings/MyPostView.swift @@ -8,10 +8,10 @@ import SwiftUI struct MyPostPreView: View { - private let contentColor = Color("ReviewHighColor") - private let likeColor = Color("MainThemeColor") - private let replyColor = Color("ReviewMediumColor") - private let defaultImageColor = Color("DefaultImageColor") + private let contentColor = Color("Color/Foundation/Orange/900") + private let likeColor = Color("Color/Foundation/Orange/500") + private let replyColor = Color("Color/Foundation/Gray/700") + private let defaultImageColor = Color("Color/Foundation/Gray/199") let info: PostInfo let boardName: String @@ -49,7 +49,7 @@ struct MyPostPreView: View { .frame(width: 4) Text(String(info.commentCount)) .font(.custom("Inter-Regular", size: 9)) - .foregroundColor(Color.init("ReviewMediumColor")) + .foregroundColor(Color.init("Color/Foundation/Gray/700")) .frame(height: 11, alignment: .center) } @@ -70,7 +70,7 @@ struct MyPostView: View where ViewModel: MyPostViewModelType { @State var tag: Int? = nil @State var needRefresh = false - let dividerColor = Color("ReviewLowColor") + let dividerColor = Color("Color/Foundation/Gray/100") @ObservedObject private var viewModel: ViewModel diff --git a/Siksha/Settings/ProfileEditView.swift b/Siksha/Settings/ProfileEditView.swift index 1f90bc91..927944f4 100644 --- a/Siksha/Settings/ProfileEditView.swift +++ b/Siksha/Settings/ProfileEditView.swift @@ -74,7 +74,7 @@ struct ProfileEditView: View where ViewModel: ProfileEditViewModelTyp RoundedRectangle(cornerRadius: 11) .strokeBorder(lineWidth: 1) .frame(width: 336, height: 49) - .foregroundColor(Color("TextFieldBorderColor")) + .foregroundColor(Color("Color/Foundation/Gray/200")) .overlay( ClearableTextField("닉네임", text: $viewModel.nickname) .padding(.horizontal, 18) @@ -133,12 +133,12 @@ struct ProfileEditView: View where ViewModel: ProfileEditViewModelTyp .foregroundColor(.white) .overlay( Circle() - .stroke(Color("TextFieldBorderColor"), lineWidth: 1) + .stroke(Color("Color/Foundation/Gray/200"), lineWidth: 1) ) Image("Camera") .frame(width: 22.5, height: 18) - .foregroundColor(Color("LightGrayColor")) + .foregroundColor(Color("Color/Foundation/Gray/600")) } } @@ -146,7 +146,7 @@ struct ProfileEditView: View where ViewModel: ProfileEditViewModelTyp Button(action: done) { ZStack(alignment: .center) { RoundedRectangle(cornerRadius: 8.0) - .fill(viewModel.enableDoneButton ? Color("MainThemeColor") : Color("LightGrayColor")) + .fill(viewModel.enableDoneButton ? Color("Color/Foundation/Orange/500") : Color("Color/Foundation/Gray/600")) Text("완료") .font(.custom("NanumSquareOTFB", size: 17)) } @@ -164,7 +164,7 @@ struct ProfileEditView: View where ViewModel: ProfileEditViewModelTyp }) { Text("취소") .font(.custom("NanumSquareOTFB", size: 14)) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) .padding(.leading, 20) } Spacer() @@ -174,13 +174,13 @@ struct ProfileEditView: View where ViewModel: ProfileEditViewModelTyp }) { Text("OK") .font(.custom("NanumSquareOTFB", size: 14)) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) .padding(.trailing, 20) } } .frame(height: 42) .background(Color.white) - .border(Color("TextFieldBorderColor"), width: 1) + .border(Color("Color/Foundation/Gray/200"), width: 1) } private func done() { @@ -206,7 +206,7 @@ struct ProfileEditView: View where ViewModel: ProfileEditViewModelTyp HStack(spacing: 0) { Image("Error") .frame(width: 14, height: 14) - .foregroundColor(Color("MainThemeColor")) + .foregroundColor(Color("Color/Foundation/Orange/500")) .padding(.trailing, 10) Text("이미 존재하는 닉네임입니다.") .font(.custom("NanumSquareOTFB", size: 12)) @@ -239,7 +239,7 @@ struct ClearableTextField: View { if (text != "") { Image(systemName: "xmark.circle.fill") .frame(width: 18, height: 18) - .foregroundColor(Color("LightGrayColor")) + .foregroundColor(Color("Color/Foundation/Gray/600")) .onTapGesture { text = "" } diff --git a/Siksha/Settings/RenewalSettingsView.swift b/Siksha/Settings/RenewalSettingsView.swift index 2a093fa6..33b6fdbd 100644 --- a/Siksha/Settings/RenewalSettingsView.swift +++ b/Siksha/Settings/RenewalSettingsView.swift @@ -206,7 +206,7 @@ struct RenewalSettingsView: View { HStack(alignment: .center) { Text("1:1 문의하기") .font(.custom("NanumSquareOTFR", size: 15)) - .foregroundColor(Color("main")) + .foregroundColor(Color("Color/Foundation/Orange/500")) .padding([.top, .bottom], 15) .padding(.leading, 16) diff --git a/Siksha/Settings/RenewalSettingsViewModel.swift b/Siksha/Settings/RenewalSettingsViewModel.swift index 23fb4189..0a52ef6c 100644 --- a/Siksha/Settings/RenewalSettingsViewModel.swift +++ b/Siksha/Settings/RenewalSettingsViewModel.swift @@ -79,15 +79,7 @@ class RenewalSettingsViewModel: ObservableObject { } .store(in: &cancellables) - $postVOCStatus - .dropFirst() - .sink { [weak self] status in - guard let self = self else { return } - - self.alertMessage = status == .failed ? "전송에 실패했습니다. 다시 시도해주세요." : "전송했습니다." - self.showAlert = true - } - .store(in: &cancellables) + } @@ -105,14 +97,20 @@ class RenewalSettingsViewModel: ObservableObject { } func sendVOC() { + postVOCStatus = .loading repository.submitVOC(comment: vocComment, platform: "iOS") .receive(on: RunLoop.main) .sink(receiveCompletion: { [weak self] completionStatus in switch completionStatus { case .finished: self?.postVOCStatus = .succeeded + self?.alertMessage = "전송했습니다." + self?.showAlert = true case .failure(let error): + self?.postVOCStatus = .failed self?.error = ErrorHelper.categorize(error) + self?.alertMessage = "전송에 실패했습니다. 다시 시도해주세요." + self?.showAlert = true } }, receiveValue: { value in @@ -121,7 +119,7 @@ class RenewalSettingsViewModel: ObservableObject { } func logOutAccount() { - UserDefaults.standard.set(nil, forKey: "accessToken") + UserDefaults.standard.removeObject(forKey: "accessToken") } func removeAccount(completion: @escaping (Bool) -> Void) { @@ -134,7 +132,7 @@ class RenewalSettingsViewModel: ObservableObject { .sink(receiveCompletion: { [weak self] completionStatus in switch completionStatus { case .finished: - UserDefaults.standard.set(nil, forKey: "accessToken") + Utils.shared.removeAllUserDefaults() completion(true) case .failure(let error): self?.error = ErrorHelper.categorize(error) diff --git a/Siksha/Settings/RenewalVOCView.swift b/Siksha/Settings/RenewalVOCView.swift index bf9b98e3..813142e8 100644 --- a/Siksha/Settings/RenewalVOCView.swift +++ b/Siksha/Settings/RenewalVOCView.swift @@ -8,9 +8,9 @@ import SwiftUI struct RenewalVOCView: View { - private let fontColor = Color("DefaultFontColor") - private let orangeColor = Color.init("main") - private let lightGrayColor = Color.init("LightGrayColor") + private let fontColor = Color("Color/Foundation/Gray/700") + private let orangeColor = Color.init("Color/Foundation/Orange/500") + private let lightGrayColor = Color.init("Color/Foundation/Gray/600") @Environment(\.presentationMode) var presentationMode: Binding @ObservedObject var viewModel: RenewalSettingsViewModel @@ -69,14 +69,14 @@ struct RenewalVOCView: View { }, label: { ZStack { RoundedRectangle(cornerRadius: 8) - .foregroundColor(viewModel.vocComment.count > 0 ? orangeColor : lightGrayColor) + .foregroundColor(viewModel.vocComment.count > 0 && viewModel.postVOCStatus == .idle ? orangeColor : lightGrayColor) Text("전송하기") .font(.custom("NanumSquareOTFB", size: 17)) .foregroundColor(.white) } }) - .disabled(viewModel.vocComment.count == 0) + .disabled(viewModel.vocComment.count == 0 || viewModel.postVOCStatus != .idle) .frame(height: 56) .padding(16) } @@ -90,8 +90,12 @@ struct RenewalVOCView: View { Alert(title: Text("1:1 문의하기"), message: Text(viewModel.alertMessage), dismissButton: .default(Text("확인"), action: { if viewModel.postVOCStatus == .succeeded { viewModel.vocComment = "" + viewModel.postVOCStatus = .idle + viewModel.showAlert = false presentationMode.wrappedValue.dismiss() } else { + viewModel.postVOCStatus = .idle + viewModel.showAlert = false return } })) diff --git a/Siksha/Settings/RestaurantOrderView.swift b/Siksha/Settings/RestaurantOrderView.swift index bf64ee44..054c7090 100644 --- a/Siksha/Settings/RestaurantOrderView.swift +++ b/Siksha/Settings/RestaurantOrderView.swift @@ -44,7 +44,7 @@ struct RestaurantOrderView: View { Spacer() Text("우측 손잡이를 드래그하여 순서를 바꿔보세요.") .font(.custom("NanumSquareOTFR", size: 14)) - .foregroundColor(.init("DefaultFontColor")) + .foregroundColor(.init("Color/Foundation/Gray/700")) Spacer() } .padding(.top, 20) diff --git a/Siksha/Settings/SettingsView.swift b/Siksha/Settings/SettingsView.swift index 63cdc54d..b8ec9ad0 100644 --- a/Siksha/Settings/SettingsView.swift +++ b/Siksha/Settings/SettingsView.swift @@ -125,7 +125,7 @@ struct SettingsView: View { }) { Text("1:1 문의하기") .font(.custom("NanumSquareOTFR", size: 15)) - .foregroundColor(Color("main")) + .foregroundColor(Color("Color/Foundation/Orange/500")) } .padding(.bottom, 8) @@ -159,7 +159,7 @@ struct SettingsView: View { message: Text("앱에서 로그아웃합니다."), buttons: [ .destructive(Text("로그아웃"), action: { - UserDefaults.standard.set(nil, forKey: "accessToken") + UserDefaults.standard.removeObject(forKey: "accessToken") viewControllerHolder?.present(style: .fullScreen) { LoginView() } diff --git a/Siksha/Settings/VOCView.swift b/Siksha/Settings/VOCView.swift index 0f1e3483..d97fc51a 100644 --- a/Siksha/Settings/VOCView.swift +++ b/Siksha/Settings/VOCView.swift @@ -9,9 +9,9 @@ import SwiftUI struct VOCView: View { - private let fontColor = Color("DefaultFontColor") - private let orangeColor = Color.init("main") - private let lightGrayColor = Color.init("LightGrayColor") + private let fontColor = Color("Color/Foundation/Gray/700") + private let orangeColor = Color.init("Color/Foundation/Orange/500") + private let lightGrayColor = Color.init("Color/Foundation/Gray/600") @Environment(\.presentationMode) var presentationMode: Binding @ObservedObject var viewModel: SettingsViewModel diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 00000000..4282947e --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,6 @@ +# app_identifier("[[APP_IDENTIFIER]]") # The bundle identifier of your app +# apple_id("[[APPLE_ID]]") # Your Apple Developer Portal username + + +# For more information about the Appfile, see: +# https://docs.fastlane.tools/advanced/#appfile diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 00000000..381783f9 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,29 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:ios) + +platform :ios do + desc "Description of what the lane does" + lane :custom_lane do + # add actions here: https://docs.fastlane.tools/actions + end +end + +lane :register_new_devices do + register_devices( + devices_file: "./devices.txt" + ) +end \ No newline at end of file diff --git a/fastlane/Matchfile b/fastlane/Matchfile new file mode 100644 index 00000000..7342e4bf --- /dev/null +++ b/fastlane/Matchfile @@ -0,0 +1,5 @@ +git_url("git@github.com:wafflestudio/siksha-ios-private.git") + +storage_mode("git") + +username("apple@wafflestudio.com") \ No newline at end of file diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 00000000..5749fd80 --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,43 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +### register_new_devices + +```sh +[bundle exec] fastlane register_new_devices +``` + + + +---- + + +## iOS + +### ios custom_lane + +```sh +[bundle exec] fastlane ios custom_lane +``` + +Description of what the lane does + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).