Skip to content

Commit

Permalink
✨[feat]: 1.0.0 배포
Browse files Browse the repository at this point in the history
  • Loading branch information
Roy-wonji committed Dec 7, 2023
1 parent 5fffa35 commit fd4feb5
Show file tree
Hide file tree
Showing 33 changed files with 77 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ extension String {
}

public static func appBuildVersion() -> String {
let buildVersion: String = "10"
let buildVersion: String = "18"
return buildVersion
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ extension Settings {
"CODE_SIGN_IDENTITY": "iPhone Developer",
"CODE_SIGN_STYLE": "Automatic",
"DEVELOPMENT_TEAM": "N94CS4N6VR",
"VERSIONING_SYSTEM": "apple-generic",
"DEBUG_INFORMATION_FORMAT": "DWARF with dSYM File",
"DEVELOPMENT_ASSET_PATH" : "\"Resources/Preview Content\""]
,configurations: [
Expand Down
4 changes: 2 additions & 2 deletions PingPong/Projects/App/Support/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>(MARKETING_VERSION</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>16</string>
<string>18</string>
<key>FirebaseAppDelegateProxyEnabled</key>
<true/>
<key>INIntentsSupported</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,12 @@ public struct LoginSettingView: View {
Text("다음")
.foregroundColor(viewModel.nicknameValidation == .valid ? .basicWhite : .basicGray5)
.font(.system(size: 16))
.onTapGesture {
commonViewViewModel.viewPath.append(ViewState.isNickNameComplete)
}

}
.disabled(viewModel.nicknameValidation != .valid)
.onTapGesture {
commonViewViewModel.viewPath.append(ViewState.isNickNameComplete)
}

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@ public struct LoginView: View {
.pretendardFont(family: .SemiBold, size: 16)
}
.onTapGesture {
viewModel.isSignUP = true
viewModel.alreadySignUP = false
viewModel.goToLoginRegisterView.toggle()
commonViewViewModel.viewPath.append(ViewState.isStartEnter)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,18 @@ public struct ProfileView: View {
.ignoresSafeArea()
.navigationBarBackButtonHidden()

.task {
.onAppear {
if authViewModel.randomAuthNickName == "" {
await authViewModel.randomNameRequest(commCdTpCd: .userDesc, completion: { model in
authViewModel.randomAuthNickName = model.data?.commCds.randomElement()?.commNm ?? ""
profileViewModel.changeImage(randomNickName: authViewModel.randomAuthNickName)
})
Task {
await authViewModel.randomNameRequest(commCdTpCd: .userDesc, completion: { model in
authViewModel.randomAuthNickName = model.data?.commCds.randomElement()?.commNm ?? ""
profileViewModel.changeImage(randomNickName: authViewModel.randomAuthNickName)
})
}
}
}

.task {
profileViewModel.changeImage(randomNickName: authViewModel.randomAuthNickName)

await authViewModel.loginWithEmail(email: authViewModel.userEmail, succesCompletion: { model in
Expand All @@ -99,8 +104,6 @@ public struct ProfileView: View {
}
}
})

print("\(profileViewModel.randomNickName)")
}

.navigationDestination(isPresented: $profileViewModel.gotoOtherSettingView) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ struct NotificationQuoteView: View {
// let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: false)
//
// let request = UNNotificationRequest(identifier: "notification", content: content, trigger: trigger)
let trigger = UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
let trigger = UNCalendarNotificationTrigger(dateMatching: dateComponents, repeats: true)
let request = UNNotificationRequest(identifier: "notification", content: content, trigger: trigger)
UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)

Expand Down
22 changes: 3 additions & 19 deletions PingPong/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "600"
default_platform(:ios)
platform :ios do


desc "Incrementing Build Number"

lane :increment_build do
version = get_version_number(xcodeproj: "MarketApp.xcodeproj")
current_build_number = latest_testflight_build_number(version: version)
increment_build_number(build_number: current_build_number + 1)
end

desc "Unit test"
lane:unit_Test do
clear_derived_data
Expand Down Expand Up @@ -69,7 +60,7 @@ platform :ios do
configuration: "Release",
workspace: "PingPong.xcworkspace",
output_name: "PingPong.ipa",
scheme: "ChaeviUS",
scheme: "PingPong",
export_method: "app-store",
# xcodebuild_command: "xcodebuild",
# include_bitcode: false,
Expand Down Expand Up @@ -152,23 +143,16 @@ get_certificates
sign(development: true)
end

desc "Description of what the lane does"
desc "Description of what the lane does"
desc "Push a new release build to the App Store"
lane :release do |options|
# ✅ 매개변수를 넣어서
# fastlane release version:"2.1.0"
# 과 같이 사용할 수 있다.
if options[:version]
version = options[:version]
increment_version_number(version_number: options[:version])
version = get_version_number(
xcodeproj: "PingPong.xcodeproj",
target: "PingPong"
)
build = get_build_number
#increment_build_number
#get_certificates
#get_provisioning_profile
unit_Test
build_ipa
upload_to_app_store(
username: "shuwj81@daum.net",
Expand Down
8 changes: 0 additions & 8 deletions PingPong/fastlane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do

## iOS

### ios increment_build

```sh
[bundle exec] fastlane ios increment_build
```

Incrementing Build Number

### ios unit_Test

```sh
Expand Down
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/copyright.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@PingPong
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/apple_tv_privacy_policy.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

32 changes: 32 additions & 0 deletions PingPong/fastlane/metadata/ko/description.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
마음의 위로가 필요할 때,
동기부여를 받고 싶을 때,
새로운 자극이 필요할 때

명언을 찾아본 적 있으신가요?
일상에 활기를 채워주는 빵처럼,
더 나은 삶을 위해 당신을 위한 따끈따끈한 명언을 구워드려요.
오직 당신을 위해, 다음과 같은 기능을 제공해드릴게요.

1.명언카드
당신의 삶에 공감이 될,
또는 당신의 삶을 발전시킬
명언과 명대사를 추천해 드려요.
위인의 명언 뿐만 아닌, 재치있는 예능인들의 명언,
따뜻한 위로를 주는 애니메이션, 드라마의 명대사까지

2.오늘의 명언
유독 평소와 다른 기분이 드는 날이 있어요.
그럴 때 당신만을 위한 따끈따끈한 명언을 구워드릴게요.
당신의 상황에 맞는 문구를 우연히 만나게 될 거에요.

3.푸시알림
원하는 시간에 매일 명언을 배달해드릴게요.
매일 주기적으로 만나는 명언은 당신의 일상을
더 활기차게 만들어 줄 거에요.

3.명언 탐색
평소와 다른 성격의 명언을 만나고 싶으신가요?
다양한 필터를 통해 탐색하다보면
색다른 취향을 만나게 될 거에요.

있으면 좀 더 행복한 100g
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/keywords.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
명언제과점, 명언, 명대사, 동기부여, 용기, 위로, 확언, 킬링 메시지, motivation, 마인드셋, 자기계발, 제과점, 빵집, 베이커리,
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/marketing_url.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://zircon-throne-197.notion.site/c339bd214a4f43d3babcbe4781c4230e?pvs=4
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/name.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
명언제과점
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/privacy_url.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://zircon-throne-197.notion.site/efb487f2e8ac49938034b3c32114e754
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/promotional_text.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/release_notes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/subtitle.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
있으면 좀 더 행복한 100g
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/ko/support_url.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://zircon-throne-197.notion.site/efb487f2e8ac49938034b3c32114e754
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/primary_category.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PRODUCTIVITY
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/primary_first_sub_category.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/primary_second_sub_category.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@home0530
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shuwj81@daum.net
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shuwj81@daum.net
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
원지
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/review_information/notes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
회원가입후 진행 해주세요!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
+821092835187
1 change: 1 addition & 0 deletions PingPong/fastlane/metadata/secondary_category.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BUSINESS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

0 comments on commit fd4feb5

Please sign in to comment.