diff --git a/android/app/build.gradle b/android/app/build.gradle index 83bb4c23..91c4f8f0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -145,8 +145,8 @@ android { applicationId "com.daedongbread" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 23 - versionName "2.0.5" + versionCode 24 + versionName "2.0.6" resValue "string", "build_config_package", "com.daedongbread" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/ios/daedongbread.xcodeproj/project.pbxproj b/ios/daedongbread.xcodeproj/project.pbxproj index 0be8c05c..479d0a92 100644 --- a/ios/daedongbread.xcodeproj/project.pbxproj +++ b/ios/daedongbread.xcodeproj/project.pbxproj @@ -560,10 +560,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = daedongbread/daedongbreadDebug.entitlements; + CODE_SIGN_ENTITLEMENTS = daedongbread/daedongbreadDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = SZ42T8W24M; ENABLE_BITCODE = NO; INFOPLIST_FILE = daedongbread/Info.plist; @@ -573,7 +573,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.9; + MARKETING_VERSION = 2.0.6; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -596,10 +596,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = daedongbread/daedongbreadRelease.entitlements; + CODE_SIGN_ENTITLEMENTS = daedongbread/daedongbreadRelease.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = SZ42T8W24M; INFOPLIST_FILE = daedongbread/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "대동빵지도"; @@ -608,7 +608,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.9; + MARKETING_VERSION = 2.0.6; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -694,7 +694,7 @@ CODE_SIGN_ENTITLEMENTS = daedongbread/daedongbread.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_TEAM = SZ42T8W24M; INFOPLIST_FILE = daedongbread/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "대동빵지도"; @@ -703,7 +703,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.9; + MARKETING_VERSION = 2.0.6; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/daedongbread/Info.plist b/ios/daedongbread/Info.plist index 959d6619..8aad1215 100644 --- a/ios/daedongbread/Info.plist +++ b/ios/daedongbread/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.5 + 2.0.6 CFBundleSignature ???? CFBundleURLTypes diff --git a/package.json b/package.json index 8378f424..c7f33423 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "daedongbread", - "version": "2.0.3", + "version": "2.0.6", "private": true, "scripts": { "postinstall": "patch-package", diff --git a/src/apis/community/types.ts b/src/apis/community/types.ts index 1e3d48ff..cfd97aca 100644 --- a/src/apis/community/types.ts +++ b/src/apis/community/types.ts @@ -14,7 +14,7 @@ export type Post = { bakeryInfo: BakeryInfo; }; -export type PostTopic = 'ALL' | 'BREAD_STORY' | 'EVENT' | 'REVIEW' | 'FREE_TALK'; +export type PostTopic = 'ALL' | 'BREAD_STORY' | 'EVENT' | 'REVIEW' | 'FREE_TALK' | 'EATEN_BREAD'; export type ReportType = PostTopic | 'COMMENT'; export type Comment = { diff --git a/src/components/Community/Post/PostSummary.tsx b/src/components/Community/Post/PostSummary.tsx index 8f301a18..fbc127ba 100644 --- a/src/components/Community/Post/PostSummary.tsx +++ b/src/components/Community/Post/PostSummary.tsx @@ -23,6 +23,7 @@ const topics: any = { BREAD_STORY: '빵 이야기', REVIEW: '리뷰', FREE_TALK: '빵터지는 이야기', + EATEN_BREAD: '먹은 빵 자랑', }; export const PostSummary = ({ post, isFirst, onPressLike, onPressMenu }: Props) => { diff --git a/src/containers/Community/CommunityContainer.tsx b/src/containers/Community/CommunityContainer.tsx index b962595b..8f44606d 100644 --- a/src/containers/Community/CommunityContainer.tsx +++ b/src/containers/Community/CommunityContainer.tsx @@ -23,6 +23,10 @@ const menus: ToggleMenu[] = [ title: '빵이야기', postTopic: 'BREAD_STORY', }, + { + title: '먹은 빵 자랑', + postTopic: 'EATEN_BREAD', + }, { title: '리뷰', postTopic: 'REVIEW', diff --git a/src/containers/Community/PostWriteContainer.tsx b/src/containers/Community/PostWriteContainer.tsx index 39f7d66e..e8e38ded 100644 --- a/src/containers/Community/PostWriteContainer.tsx +++ b/src/containers/Community/PostWriteContainer.tsx @@ -21,6 +21,10 @@ const topics: TopicForm[] = [ postTopic: 'BREAD_STORY', value: '빵 이야기', }, + { + postTopic: 'EATEN_BREAD', + value: '먹은 빵 자랑', + }, { postTopic: 'FREE_TALK', value: '빵터지는 이야기',