Skip to content

Commit

Permalink
Merge pull request #94 from tukcomCD2024/DeviOS
Browse files Browse the repository at this point in the history
Dev iOS
  • Loading branch information
realhsb authored Apr 28, 2024
2 parents 75a630d + e35a3a1 commit 9d1c348
Show file tree
Hide file tree
Showing 17 changed files with 549 additions and 139 deletions.
24 changes: 24 additions & 0 deletions iOS/RollTheDice/RollTheDice.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@
6C3237B22B7C385000B699AB /* NewsListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C3237B12B7C385000B699AB /* NewsListViewModel.swift */; };
6C3237B52B7C433D00B699AB /* ChatTypeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C3237B42B7C433D00B699AB /* ChatTypeView.swift */; };
6C3237B72B7C434600B699AB /* ChatType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C3237B62B7C434600B699AB /* ChatType.swift */; };
6C41B8D22BDE696200274FA4 /* NewsType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C41B8D12BDE696200274FA4 /* NewsType.swift */; };
6C41B8D42BDE6D2500274FA4 /* TypePieChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C41B8D32BDE6D2500274FA4 /* TypePieChartView.swift */; };
6C454A782B9DA657006FD9D0 /* SignUpQuestionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C454A772B9DA657006FD9D0 /* SignUpQuestionView.swift */; };
6C454A7A2B9DA67C006FD9D0 /* SignUpViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C454A792B9DA67C006FD9D0 /* SignUpViewModel.swift */; };
6C454A7C2B9DA71C006FD9D0 /* SignUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C454A7B2B9DA71C006FD9D0 /* SignUpView.swift */; };
6C454A7E2B9DAA3F006FD9D0 /* SignUpFinishView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C454A7D2B9DAA3F006FD9D0 /* SignUpFinishView.swift */; };
6C454A822B9DAFA3006FD9D0 /* Path.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C454A812B9DAFA3006FD9D0 /* Path.swift */; };
6C454A842B9DAFCB006FD9D0 /* PathType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C454A832B9DAFCB006FD9D0 /* PathType.swift */; };
6C454A882B9DB6C2006FD9D0 /* CustomNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C454A872B9DB6C2006FD9D0 /* CustomNavigationBar.swift */; };
6C4F7BAB2BDE50C600ED01DA /* DailyReportModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C4F7BAA2BDE50C600ED01DA /* DailyReportModel.swift */; };
6C4F7BAD2BDE510900ED01DA /* DailyReportViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C4F7BAC2BDE510900ED01DA /* DailyReportViewModel.swift */; };
6C77048C2B722686001B17CB /* MainTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C77048B2B722686001B17CB /* MainTabView.swift */; };
6C77048F2B7229B1001B17CB /* NewsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C77048E2B7229B1001B17CB /* NewsListView.swift */; };
6C7704992B722A20001B17CB /* MainTabViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7704982B722A20001B17CB /* MainTabViewModel.swift */; };
Expand Down Expand Up @@ -91,13 +95,17 @@
6C3237B12B7C385000B699AB /* NewsListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsListViewModel.swift; sourceTree = "<group>"; };
6C3237B42B7C433D00B699AB /* ChatTypeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatTypeView.swift; sourceTree = "<group>"; };
6C3237B62B7C434600B699AB /* ChatType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatType.swift; sourceTree = "<group>"; };
6C41B8D12BDE696200274FA4 /* NewsType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsType.swift; sourceTree = "<group>"; };
6C41B8D32BDE6D2500274FA4 /* TypePieChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypePieChartView.swift; sourceTree = "<group>"; };
6C454A772B9DA657006FD9D0 /* SignUpQuestionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpQuestionView.swift; sourceTree = "<group>"; };
6C454A792B9DA67C006FD9D0 /* SignUpViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewModel.swift; sourceTree = "<group>"; };
6C454A7B2B9DA71C006FD9D0 /* SignUpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpView.swift; sourceTree = "<group>"; };
6C454A7D2B9DAA3F006FD9D0 /* SignUpFinishView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpFinishView.swift; sourceTree = "<group>"; };
6C454A812B9DAFA3006FD9D0 /* Path.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Path.swift; sourceTree = "<group>"; };
6C454A832B9DAFCB006FD9D0 /* PathType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PathType.swift; sourceTree = "<group>"; };
6C454A872B9DB6C2006FD9D0 /* CustomNavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomNavigationBar.swift; sourceTree = "<group>"; };
6C4F7BAA2BDE50C600ED01DA /* DailyReportModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyReportModel.swift; sourceTree = "<group>"; };
6C4F7BAC2BDE510900ED01DA /* DailyReportViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyReportViewModel.swift; sourceTree = "<group>"; };
6C77048B2B722686001B17CB /* MainTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabView.swift; sourceTree = "<group>"; };
6C77048E2B7229B1001B17CB /* NewsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsListView.swift; sourceTree = "<group>"; };
6C7704982B722A20001B17CB /* MainTabViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -202,6 +210,14 @@
path = ChatType;
sourceTree = "<group>";
};
6C41B8D02BDE695A00274FA4 /* Report */ = {
isa = PBXGroup;
children = (
6C41B8D12BDE696200274FA4 /* NewsType.swift */,
);
path = Report;
sourceTree = "<group>";
};
6C454A762B9DA62C006FD9D0 /* SignUp */ = {
isa = PBXGroup;
children = (
Expand All @@ -216,6 +232,7 @@
6C454A7F2B9DAF21006FD9D0 /* Model */ = {
isa = PBXGroup;
children = (
6C41B8D02BDE695A00274FA4 /* Report */,
6C454A802B9DAF9F006FD9D0 /* Path */,
);
path = Model;
Expand Down Expand Up @@ -435,6 +452,7 @@
isa = PBXGroup;
children = (
6CE1030B2BD56A4000498AA4 /* TypeReportView.swift */,
6C41B8D32BDE6D2500274FA4 /* TypePieChartView.swift */,
6CE1030D2BD56A5200498AA4 /* TypeReportModel.swift */,
6CE1030F2BD56A5B00498AA4 /* TypeReportViewModel.swift */,
);
Expand All @@ -444,6 +462,8 @@
6CE103112BD56AF700498AA4 /* Daily */ = {
isa = PBXGroup;
children = (
6C4F7BAA2BDE50C600ED01DA /* DailyReportModel.swift */,
6C4F7BAC2BDE510900ED01DA /* DailyReportViewModel.swift */,
6CE103122BD56B1200498AA4 /* DailyReportView.swift */,
6CE103142BD56CA800498AA4 /* DailyBarChartView.swift */,
);
Expand Down Expand Up @@ -633,7 +653,9 @@
6CF130AD2BAB0C4400A437B6 /* AuthenticationViewModel.swift in Sources */,
6CDB29F92BAA07350081037B /* GPTChat.swift in Sources */,
6CDB29FD2BAA07FD0081037B /* GPTChatView.swift in Sources */,
6C41B8D22BDE696200274FA4 /* NewsType.swift in Sources */,
357666102BBD4BF6002C226A /* ReportListView.swift in Sources */,
6C41B8D42BDE6D2500274FA4 /* TypePieChartView.swift in Sources */,
6C3237A12B7C377600B699AB /* BookmarkViewModel.swift in Sources */,
6C3237AC2B7C382200B699AB /* News.swift in Sources */,
6CE1030E2BD56A5200498AA4 /* TypeReportModel.swift in Sources */,
Expand All @@ -643,6 +665,7 @@
6C3237AE2B7C382E00B699AB /* NewsViewModel.swift in Sources */,
6C77048F2B7229B1001B17CB /* NewsListView.swift in Sources */,
357666132BBD54AA002C226A /* SplashView.swift in Sources */,
6C4F7BAD2BDE510900ED01DA /* DailyReportViewModel.swift in Sources */,
6C3237A72B7C37E500B699AB /* BookmarkListViewModel.swift in Sources */,
6C454A822B9DAFA3006FD9D0 /* Path.swift in Sources */,
6C94799E2BD3C00C00D5AEEB /* Image.swift in Sources */,
Expand All @@ -658,6 +681,7 @@
6C32379F2B7C376D00B699AB /* Bookmark.swift in Sources */,
6C454A7E2B9DAA3F006FD9D0 /* SignUpFinishView.swift in Sources */,
6C7704A12B722CEB001B17CB /* ProfileView.swift in Sources */,
6C4F7BAB2BDE50C600ED01DA /* DailyReportModel.swift in Sources */,
6C3237B72B7C434600B699AB /* ChatType.swift in Sources */,
6CE103152BD56CA800498AA4 /* DailyBarChartView.swift in Sources */,
6CE2AC122BD43FB900416A02 /* SignInView.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xD8",
"green" : "0xD0",
"red" : "0x23"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xD8",
"green" : "0xD0",
"red" : "0x23"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x00",
"green" : "0xDE",
"red" : "0x6F"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x00",
"green" : "0xDE",
"red" : "0x6F"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x73",
"green" : "0x47",
"red" : "0xF8"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x73",
"green" : "0x47",
"red" : "0xF8"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0x2B",
"red" : "0xC8"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0x2B",
"red" : "0xC8"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x17",
"green" : "0xCC",
"red" : "0xFF"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x17",
"green" : "0xCC",
"red" : "0xFF"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
52 changes: 52 additions & 0 deletions iOS/RollTheDice/RollTheDice/Source/Model/Report/NewsType.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
//
// NewsReport.swift
// RollTheDice
//
// Created by Subeen on 4/28/24.
//

import Foundation
import SwiftUI

enum NewsType {
case politics // 정치
case economy // 경제
case society // 사회
case living // 생활/문화
case world // 세계
case science // IT/과학

var desciption: String {
switch self {
case .politics:
"정치"
case .economy:
"경제"
case .society:
"사회"
case .living:
"생활/문화"
case .world:
"세계"
case .science:
"IT/과학"
}
}

var color: SwiftUI.Color {
switch self {
case .politics:
Color.reportCyan
case .economy:
Color.reportGreen
case .society:
Color.reportPurple
case .living:
Color.reportYellow
case .world:
Color.primary01
case .science:
Color.reportPink
}
}
}
Loading

0 comments on commit 9d1c348

Please sign in to comment.