Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
e63c0d6
[Package] add "MightyCombine"
insub4067 Nov 25, 2023
788a408
fix : Xcode 14 Preview
realhsb Nov 25, 2023
0eb4233
remove: xcode 15 preview
insub4067 Nov 25, 2023
902e705
feat: MainTabBar wireframe
insub4067 Nov 25, 2023
3cb106f
refactor: MainTabBar hstack -> lazyvgrid
insub4067 Nov 25, 2023
0591566
files: designsystem
insub4067 Nov 25, 2023
e390c33
update: info plist
insub4067 Nov 25, 2023
4a0e11c
update: designsystem color
realhsb Nov 25, 2023
f42e55f
fix: color
realhsb Nov 25, 2023
2788bfc
Merge pull request #2 from 5th-Neordinary-D/feat/designSystem_color
insub4067 Nov 25, 2023
e306801
add: Files
insub4067 Nov 25, 2023
a861edf
font디자인 시스템
Fiddich-Dev Nov 25, 2023
ad02b30
폰트이름 변경
Fiddich-Dev Nov 25, 2023
9bc4e1f
wip
insub4067 Nov 25, 2023
2def61e
fix: color asset name
insub4067 Nov 25, 2023
f452ead
Merge branch 'dev' into feat/SympathyTest
insub4067 Nov 25, 2023
187da33
Merge pull request #3 from 5th-Neordinary-D/feat/designSystem_font
insub4067 Nov 25, 2023
9153b5c
Merge branch 'dev' into feat/SympathyTest
insub4067 Nov 25, 2023
31b8bee
add: Action Sheet View
realhsb Nov 25, 2023
6603b00
add: Category Modal View
realhsb Nov 25, 2023
9951926
add: Custom Alert View
realhsb Nov 25, 2023
34c2ad5
add: Test Complete Modal View
realhsb Nov 25, 2023
1c7ce8e
remove: Custom Modal
realhsb Nov 25, 2023
dfb963b
fix: Action Sheet View 수정
realhsb Nov 25, 2023
f28a5e6
fix: Action Sheet View 수정 2
realhsb Nov 25, 2023
18961f1
Merge pull request #4 from 5th-Neordinary-D/feat/CustomModal
realhsb Nov 25, 2023
e75502a
UI구현중
Fiddich-Dev Nov 25, 2023
0a2be8a
feat: LoginPage, TestPage
insub4067 Nov 25, 2023
6c62dfc
fix: design detail
insub4067 Nov 25, 2023
9bee1ef
Merge branch 'dev' into feat/SympathyTest
insub4067 Nov 25, 2023
6d22472
Merge pull request #5 from 5th-Neordinary-D/feat/SympathyTest
insub4067 Nov 25, 2023
d493d47
프로필 디자인 된데까지 완성
Fiddich-Dev Nov 25, 2023
07795e2
Merge branch 'dev' into feat/profile
Fiddich-Dev Nov 25, 2023
e971d65
fix: Custom Navigation Bar
realhsb Nov 25, 2023
bb44e77
Merge pull request #6 from 5th-Neordinary-D/feat/navigationBar
realhsb Nov 25, 2023
2cdc443
오렌지 색깔 수정
Fiddich-Dev Nov 25, 2023
b7b49ab
Merge branch 'dev' into feat/profile
Fiddich-Dev Nov 25, 2023
af79684
fix: Category
realhsb Nov 25, 2023
ab5f927
Merge pull request #7 from 5th-Neordinary-D/feat/profile
insub4067 Nov 25, 2023
9e2a6b8
fix: Category & Navigation bar
realhsb Nov 25, 2023
eb3bdc2
Merge pull request #8 from 5th-Neordinary-D/feat/category
realhsb Nov 25, 2023
2958294
Revert "Merge pull request #7 from 5th-Neordinary-D/feat/profile"
insub4067 Nov 25, 2023
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
Binary file added DittoCommunity/.DS_Store
Binary file not shown.
302 changes: 291 additions & 11 deletions DittoCommunity/DittoCommunity.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
//
// CustomNavigationBar.swift
// DittoCommunity
//
// Created by Subeen on 2023/11/25.
//

import SwiftUI

struct CustomNavigationBar: View {
let title: String

let isDisplayLeadingBtn: Bool
let isDisplayTrailingBtn: Bool

let leadingItems: [(Icon, () -> Void)]
let trailingItems: [(Icon, () -> Void)]

init(
title: String = "",
isDisplayLeadingBtn: Bool = true,
isDisplayTrailingBtn: Bool = true,
leadingItems: [(Icon, () -> Void)] = [(.chevronLeft, {})],
trailingItems: [(Icon, () -> Void)] = [(.chevronLeft, {}), (.chevronLeft, {})]
) {
self.title = title
self.isDisplayLeadingBtn = isDisplayLeadingBtn
self.isDisplayTrailingBtn = isDisplayTrailingBtn
self.leadingItems = leadingItems
self.trailingItems = trailingItems
}

var body: some View {
HStack(spacing: 0) {
if isDisplayLeadingBtn {
ForEach(leadingItems, id: \.0, content: { item in
Button(
action: {
item.1()
},
label: {
item.0.image
}
)
})
}

Spacer()

Text(title)
.font(.t1)

Spacer()

if isDisplayTrailingBtn {
ForEach(trailingItems, id: \.0, content: { item in
Button(
action: {
item.1()
},
label: {
item.0.image
}
)
.padding(.leading, 18)
})
}
}
.padding(.horizontal, 20)
.frame(height: 44)
}
}

struct CustomNavigationBar_Previews: PreviewProvider {
static var previews: some View {
CustomNavigationBar()
.previewLayout(.sizeThatFits)
}
}
24 changes: 0 additions & 24 deletions DittoCommunity/DittoCommunity/ContentView.swift

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x22",
"green" : "0x22",
"red" : "0x22"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x44",
"green" : "0x44",
"red" : "0x44"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x88",
"green" : "0x88",
"red" : "0x88"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xBD",
"green" : "0xBD",
"red" : "0xBD"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xDD",
"green" : "0xDD",
"red" : "0xDD"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xE9",
"green" : "0xE9",
"red" : "0xE9"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF3",
"green" : "0xF3",
"red" : "0xF3"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "0x2D",
"green" : "0x92",
"red" : "0xFF"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "arrow._right.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "cancle.pdf",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "chevronLeft.pdf",
"idiom" : "iphone"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "complete.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "google.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file not shown.
Loading