Skip to content

Commit

Permalink
Alert 이미지 수정 및 위젯 카운팅 순서 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
ghkdemrdus committed Oct 27, 2024
1 parent 8ca5f7b commit 2f3f317
Show file tree
Hide file tree
Showing 21 changed files with 47 additions and 83 deletions.
2 changes: 1 addition & 1 deletion App/Moda/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.0</string>
<string>1.2.0</string>
<key>CFBundleVersion</key>
<string>1.2.0.0</string>
<key>GoogleServiceFileName</key>
Expand Down
3 changes: 3 additions & 0 deletions App/Moda/Sources/Root/MainTab/MainTabView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ private extension MainTabView {
if store.selectedTab == .bookmark, store.showGuideline {
ZStack(alignment: .topLeading) {
Image.imgBookmarkGuideline
.resizable()
.frame(maxWidth: .infinity, maxHeight: .infinity)
.scaledToFill()

PlainButton {
store.showGuideline = false
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions App/ModaWidget/Sources/Common/ModaCountView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ struct ModaCountView: View {
var body: some View {
ZStack(alignment: .center) {
HStack(spacing: 0) {
Text("\(totalCount)/")
.font(.spoqaHans(size: 14))
.foregroundColor(.white)

Text("\(doneCount)")
.font(.spoqaHans(size: 14))
.foregroundColor(Color.fogOrange)

Text("/\(totalCount)")
.font(.spoqaHans(size: 14))
.foregroundColor(.white)
}
.padding(.vertical, 3)
.padding(.horizontal, 8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"scale" : "1x"
},
{
"filename" : "guide_bookmark_day@2x.png",
"filename" : "guide_bookmark_day.png",
"idiom" : "universal",
"scale" : "2x"
},
Expand All @@ -31,7 +31,7 @@
"scale" : "2x"
},
{
"filename" : "guide_bookmark_day@3x.png",
"filename" : "guide_bookmark_day-1.png",
"idiom" : "universal",
"scale" : "3x"
},
Expand All @@ -42,7 +42,7 @@
"value" : "dark"
}
],
"filename" : "guide_bookmark_night@3x.png",
"filename" : "guide_bookmark_night-1.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"images" : [
{
"filename" : "Property 1=update, Property 2=bookmark_day.svg",
"idiom" : "universal"
"idiom" : "universal",
"scale" : "1x"
},
{
"appearances" : [
Expand All @@ -11,8 +11,40 @@
"value" : "dark"
}
],
"filename" : "Property 1=update, Property 2=bookmark_night 1.svg",
"idiom" : "universal"
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Property 1=update, Property 2=bookmark_day@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "Property 1=update, Property 2=bookmark_night@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Property 1=update, Property 2=bookmark_day@3x.png",
"idiom" : "universal",
"scale" : "3x"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "Property 1=update, Property 2=bookmark_night@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
Expand Down

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2f3f317

Please sign in to comment.