Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c456790
feat: add custom font system
May 19, 2025
694415d
feat: add new image assets for main tab ui renewal
May 19, 2025
f9304d2
feat: restaurantcell ui renewal
May 19, 2025
e2cc057
chore: add fastlane
cirtuare May 27, 2025
a51934c
chore: change pbxproj for new profiles
cirtuare May 27, 2025
b284347
chore: update Ruby to 3.4.0
cirtuare May 28, 2025
3f52b10
chore: add abbrev gem to support Ruby 3.4.0 compatibility
h9kwon May 28, 2025
0b01cdf
Merge pull request #11 from wafflestudio/chore/10-fastlane-setting
cirtuare May 29, 2025
38273d4
fix: VOC alert not showing
impri2 May 31, 2025
aa472a4
bugfix: resolve KakaoTalk login redirect issue (#13)
h9kwon Jun 2, 2025
c05c8e7
회원탈퇴 시 오류 수정 (#14)
impri2 Jun 12, 2025
b8c2499
chore: 3.4.1 version update
cirtuare Jun 22, 2025
3928731
Merge pull request #16 from wafflestudio/chore/15-3.4.1-release
cirtuare Jun 22, 2025
a9ff803
feature: 다크모드 컬러에셋 추가 (#3)
cirtuare Jun 25, 2025
1b7d809
Merge branch 'develop' into feature/5-main-tab-ui-renewal
impri2 Jun 28, 2025
5db35f3
feat: change tab images
Jun 28, 2025
ac72e78
chore: update name and namespaces of color assets (#24)
h9kwon Jun 29, 2025
8448f6c
Merge branch 'develop' into feature/5-main-tab-ui-renewal
impri2 Jun 30, 2025
b82de1e
chore: fix color asset names in code
Jun 30, 2025
3bd9951
feat: update restaurant info view UI
Jun 30, 2025
d243297
feat: update menu filter view UI
Jul 18, 2025
6848298
feat: update calendar view UI
Jul 19, 2025
4797499
feat: update filter item view UI
Jul 19, 2025
40d187e
fix: fix operating hours table asset name typo
Jul 19, 2025
118d863
fix: fix meal cell unapplied font update
Jul 19, 2025
5d16f74
fix: make meal name length per line at most 15
Jul 19, 2025
1248cdf
feat: show restaurant operating time on main view
Jul 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

source "https://rubygems.org"

gem "fastlane"
gem "abbrev"
229 changes: 229 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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
29 changes: 23 additions & 6 deletions Siksha.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -284,6 +285,7 @@
4E4E22E52ABEC96300A81E47 /* Inter-ExtraBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-ExtraBold.ttf"; sourceTree = "<group>"; };
4E4E22E62ABEC96300A81E47 /* Inter-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Regular.ttf"; sourceTree = "<group>"; };
4E4E22E72ABEC96300A81E47 /* Inter-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Inter-Medium.ttf"; sourceTree = "<group>"; };
4E51987C2DDA2FCE00F85388 /* Font.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Font.swift; sourceTree = "<group>"; };
4E64650F2B1D8DB200A4ABAD /* UserManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserManager.swift; sourceTree = "<group>"; };
4E6465112B1D8EEB00A4ABAD /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
4E74167C2A9B63A00010769F /* CommentCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentCell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -489,6 +491,7 @@
1E3A573825C6FE1600DBB3F4 /* Library */ = {
isa = PBXGroup;
children = (
4E51987C2DDA2FCE00F85388 /* Font.swift */,
BFA4759D2950B53500B41AA7 /* Extensions */,
1ECB250025F16D4D00875E18 /* UIRepresentable */,
1E3A573925C6FE2700DBB3F4 /* Extensions.swift */,
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -1181,20 +1185,27 @@
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;
LD_RUNPATH_SEARCH_PATHS = (
"$(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;
Expand All @@ -1211,20 +1222,26 @@
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;
LD_RUNPATH_SEARCH_PATHS = (
"$(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;
Expand Down
30 changes: 12 additions & 18 deletions Siksha/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -43,15 +30,22 @@ 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
newObject!["isLiked"] = false // Provide a default value for 'isLiked'
newObject!["likeCnt"] = 0 // Provide a default value for 'likeCnt'
}
}

}
)

Expand Down
Loading