Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JWT 추가 전 데모 #59

Merged
merged 70 commits into from
Jun 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
583ae9a
Chore: 프로젝트 생성
hhyukjin Jan 29, 2024
00ba81d
Removed file that shouldnt be tracked
hhyukjin Jan 29, 2024
9d737da
RINGO-59 Test: commit message test
hhyukjin Jan 29, 2024
98d3870
Chore: 스토리보드 없애기
hhyukjin Jan 30, 2024
0f91f77
Removed file that shouldnt be tracked
hhyukjin Jan 30, 2024
bcf4a12
Create .gitignore
hhyukjin Jan 30, 2024
d5e197d
Merge branch 'iOS' into RINGO-59-login-ui
hhyukjin Jan 30, 2024
06b8a77
add test code
hhyukjin Jan 30, 2024
f5f5d8c
Chore: Snapkit 추가
hhyukjin Jan 30, 2024
169e059
Refactor: snapkit 이용
hhyukjin Jan 30, 2024
1337f44
RINGO-59 Design: 로그인 ui 구현 완료
hhyukjin Jan 30, 2024
14cbb74
RINGO-59 Design: SafeArea 고려
hhyukjin Jan 31, 2024
ebdcb05
RINGO-59 Design: 비밀번호 오류 ui 추가
hhyukjin Jan 31, 2024
dd72f03
RINGO-59 Design: stackView로 변경
hhyukjin Jan 31, 2024
2fc910e
Design: 각 VC 생성
hhyukjin Jan 31, 2024
ff31539
Design: VC title 및 image 추가
hhyukjin Jan 31, 2024
6286b41
Design: 친구목록 ui 구현
hhyukjin Feb 1, 2024
d5ddeee
Merge pull request #12 from tukcomCD2024/RINGO-65-friendlist-ui
hhyukjin Feb 1, 2024
b7c48a8
Design: 통화버튼 추가
hhyukjin Feb 3, 2024
bc4cf4c
Refactor: 통화버튼 코드 수정
hhyukjin Feb 4, 2024
4b5a794
Chore: 다크모드 무시, snapkit dynamic 삭제
hhyukjin Feb 4, 2024
0a79718
Refactor: contactsview
hhyukjin Feb 5, 2024
4344f96
Refactor: 다크모드 고정 해제
hhyukjin Feb 5, 2024
a7f5891
Merge pull request #15 from tukcomCD2024/Refactor-friendlist
hhyukjin Feb 5, 2024
e64817b
Comment: 주석 내용 변경
hhyukjin Feb 5, 2024
486424e
Chore: Alamofire 추가
hhyukjin Feb 5, 2024
4ea0c96
Chore: Starscream 추가
hhyukjin Feb 5, 2024
adfa8da
Chore: webRTC 추가
hhyukjin Feb 5, 2024
a11290c
Rename: screen 분류
hhyukjin Feb 5, 2024
7dd8fcf
Remove: navigationcontroller 삭제
hhyukjin Feb 5, 2024
79fe8b4
model 생성, networkresult 생성
hhyukjin Feb 5, 2024
b267065
로그인 서비스 생성
hhyukjin Feb 5, 2024
b0ecfe3
Add: 통화 연결 ui
hhyukjin Feb 5, 2024
5b0331e
로그인 구현 테스트
hhyukjin Feb 6, 2024
8e88d17
Comment: 로그인 기능 주석 편집
hhyukjin Feb 7, 2024
0abc8dc
Fix: 투명배경 오류 수정
hhyukjin Feb 7, 2024
b74d40b
Design: collectionview 추가
hhyukjin Feb 7, 2024
a3a7e62
Design: 배경 그라데이션 추가
hhyukjin Feb 7, 2024
1f893d2
Design: 색상 변경
hhyukjin Feb 7, 2024
8c9589b
Design: 버튼 추가
hhyukjin Feb 7, 2024
4ccf6ed
Fix: auto layout 경고 수정
hhyukjin Feb 7, 2024
33553fe
Merge pull request #21 from tukcomCD2024/RINGO-82-onThePhone-ui
hhyukjin Feb 7, 2024
8179a90
Add: textfield 첫 영문자 소문자로 고정
hhyukjin Feb 7, 2024
87317fb
Merge branch 'iOS' into RINGO-61-login-service
hhyukjin Feb 7, 2024
014a7dd
Merge pull request #23 from tukcomCD2024/RINGO-61-login-service
hhyukjin Feb 7, 2024
51f84f7
Create: 친구서비스 생성
hhyukjin Feb 8, 2024
fd6ada1
Feat: 친구목록 불러오기 구현
hhyukjin Feb 8, 2024
466c3d4
Merge pull request #28 from tukcomCD2024/RINGO-67-load-friendslist
hhyukjin Feb 8, 2024
e734005
Update: print() 삭제
hhyukjin Feb 8, 2024
61712f4
Feat: 통화 기초 기능 구현
hhyukjin Feb 12, 2024
88be431
Feat: 통화 종료 추가
hhyukjin Feb 15, 2024
e358f51
Design: 로그인뷰 배경색 변경
hhyukjin Feb 16, 2024
f008a21
Design: 탭바 색상 변경
hhyukjin Feb 19, 2024
52eeb87
Merge pull request #35 from tukcomCD2024/RINGO-2-webRTC-iOS
hhyukjin Feb 21, 2024
08ede67
Add: test 뷰 생성
hhyukjin Feb 21, 2024
622ebd5
Add: Speech 프레임워크 추가
hhyukjin Feb 21, 2024
bd17c4c
Add: 권한 추가
hhyukjin Feb 21, 2024
2366a67
Feat: stt 구현 (test)
hhyukjin Feb 21, 2024
7a7b2c1
Feat: 통화 화면 번역 버튼에 stt test 연결
hhyukjin Feb 21, 2024
618a68a
카테고리 수정 테스트
hhyukjin Mar 1, 2024
bc3907a
Merge pull request #36 from tukcomCD2024/RINGO-101-iOS-STT
hhyukjin Mar 1, 2024
692dd6f
store_user test
hhyukjin Mar 2, 2024
3df49f7
Refactor: String으로 서버와 sdp 교환
hhyukjin Mar 10, 2024
970c509
Refactor: ringo 서버와 메시지 구조 통일
hhyukjin Mar 19, 2024
92b4597
Merge pull request #42 from tukcomCD2024/iOS-refactor-webrtc
hhyukjin Mar 20, 2024
7b01916
Feat: 번역 기능 추가
hhyukjin Mar 20, 2024
4165489
Merge pull request #44 from tukcomCD2024/RINGO-110-iOS-translate
hhyukjin Mar 20, 2024
f9bdae5
Fix: 통화음성과 함께 번역음성 듣기
hhyukjin Mar 27, 2024
50e665c
main 브랜치 documents 내용 맞추기
hhyukjin Jun 14, 2024
8268ec0
Merge branch 'main' into iOS
hhyukjin Jun 14, 2024
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
Prev Previous commit
Next Next commit
Chore: 다크모드 무시, snapkit dynamic 삭제
hhyukjin committed Feb 4, 2024
commit 4b5a7947d91210f4a14da430a70c76c94d16489d
Binary file modified iOS/.DS_Store
Binary file not shown.
Binary file modified iOS/Ringo/.DS_Store
Binary file not shown.
18 changes: 6 additions & 12 deletions iOS/Ringo/Ringo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@
945CF9842B67E1CE00396E4E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 945CF9832B67E1CE00396E4E /* Assets.xcassets */; };
945CF9872B67E1CE00396E4E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 945CF9852B67E1CE00396E4E /* LaunchScreen.storyboard */; };
945CF9902B69341800396E4E /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = 945CF98F2B69341800396E4E /* SnapKit */; };
945CF9922B69341800396E4E /* SnapKit-Dynamic in Frameworks */ = {isa = PBXBuildFile; productRef = 945CF9912B69341800396E4E /* SnapKit-Dynamic */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
@@ -48,7 +47,6 @@
buildActionMask = 2147483647;
files = (
945CF9902B69341800396E4E /* SnapKit in Frameworks */,
945CF9922B69341800396E4E /* SnapKit-Dynamic in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -110,7 +108,6 @@
name = Ringo;
packageProductDependencies = (
945CF98F2B69341800396E4E /* SnapKit */,
945CF9912B69341800396E4E /* SnapKit-Dynamic */,
);
productName = Ringo;
productReference = 945CF9772B67E1CD00396E4E /* Ringo.app */;
@@ -249,7 +246,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
@@ -306,7 +303,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@@ -323,6 +320,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = L2MRZPUQGZ;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Ringo/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -334,7 +332,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.icloud.vmak0314.Ringo;
PRODUCT_BUNDLE_IDENTIFIER = com.tukcomCD2024.Ringo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
@@ -349,6 +347,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = L2MRZPUQGZ;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Ringo/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -360,7 +359,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.icloud.vmak0314.Ringo;
PRODUCT_BUNDLE_IDENTIFIER = com.tukcomCD2024.Ringo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
@@ -408,11 +407,6 @@
package = 945CF98E2B69341800396E4E /* XCRemoteSwiftPackageReference "SnapKit" */;
productName = SnapKit;
};
945CF9912B69341800396E4E /* SnapKit-Dynamic */ = {
isa = XCSwiftPackageProductDependency;
package = 945CF98E2B69341800396E4E /* XCRemoteSwiftPackageReference "SnapKit" */;
productName = "SnapKit-Dynamic";
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 945CF96F2B67E1CD00396E4E /* Project object */;
Binary file not shown.
6 changes: 4 additions & 2 deletions iOS/Ringo/Ringo/Info.plist
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
@@ -11,10 +13,10 @@
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneConfigurationName</key>
<string>Default Configuration</string>
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneConfigurationName</key>
<string>Default Configuration</string>
</dict>
</array>
</dict>