Skip to content

Commit

Permalink
[Feature/#357] 로딩 인디케이터 변경된 디자인 반영 #358
Browse files Browse the repository at this point in the history
  • Loading branch information
JongHoooon authored Nov 9, 2024
1 parent 0f02a2d commit fb8a51a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"assets":[],"ddd":0,"fr":60,"h":100,"ip":0,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"progress","hd":false,"sr":1,"ks":{"a":{"a":0,"k":[30,30]},"o":{"a":0,"k":100},"p":{"a":0,"k":[50,50]},"r":{"a":1,"k":[{"t":0,"s":[0],"i":{"x":0.88,"y":0.77},"o":{"x":0.5,"y":0}},{"t":7.2,"s":[90],"i":{"x":0.75,"y":0.75},"o":{"x":0.25,"y":0.25}},{"t":14.4,"s":[180],"i":{"x":0.75,"y":0.75},"o":{"x":0.25,"y":0.25}},{"t":21.6,"s":[270],"i":{"x":0.75,"y":0.75},"o":{"x":0.25,"y":0.25}},{"t":28.8,"s":[360],"i":{"x":0,"y":0},"o":{"x":1,"y":1}}]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}},"ao":0,"ip":0,"op":30,"st":0,"bm":0,"shapes":[{"ty":"el","hd":false,"nm":"progress","p":{"a":0,"k":[30,30]},"s":{"a":0,"k":[60,60]},"d":1},{"ty":"gs","hd":false,"bm":0,"o":{"a":0,"k":100},"e":{"a":0,"k":[66.00000236034398,25.500000196695332]},"g":{"p":2,"k":{"a":0,"k":[0,0.306,0.396,0.945,1,0.306,0.396,0.945,0,0,1,1]}},"t":1,"a":{"a":0,"k":0},"h":{"a":0,"k":0},"s":{"a":0,"k":[-2.93843085448443e-14,25.500000196695332]},"lc":2,"lj":3,"ml":28.96,"w":{"a":0,"k":10}},{"ty":"tm","hd":false,"bm":0,"e":{"a":0,"k":20},"o":{"a":0,"k":0},"s":{"a":0,"k":0},"m":1}]},{"ddd":0,"ind":2,"ty":4,"nm":"oval bg","hd":true,"sr":1,"ks":{"a":{"a":0,"k":[40,40]},"o":{"a":0,"k":100},"p":{"a":0,"k":[180,320]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}},"ao":0,"ip":0,"op":30,"st":0,"bm":0,"shapes":[{"ty":"el","hd":true,"nm":"oval bg","p":{"a":0,"k":[40,40]},"s":{"a":0,"k":[80,80]},"d":1},{"ty":"st","hd":false,"bm":0,"c":{"a":0,"k":[0.961,0.961,0.961]},"lc":2,"lj":1,"ml":28.96,"o":{"a":0,"k":100},"w":{"a":0,"k":20}}]},{"ddd":0,"ind":3,"ty":4,"nm":"Screen","hd":false,"sr":1,"ks":{"a":{"a":0,"k":[50,50]},"o":{"a":0,"k":100},"p":{"a":0,"k":[50,50]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}},"ao":0,"ip":0,"op":30,"st":0,"bm":0,"shapes":[{"ty":"gr","hd":false,"nm":"Screen Group","bm":0,"it":[{"ty":"rc","hd":false,"nm":"Screen","d":1,"p":{"a":0,"k":[50,50]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]}},{"ty":"fl","hd":false,"bm":0,"c":{"a":0,"k":[1,1,1]},"r":1,"o":{"a":0,"k":0}},{"ty":"tr","nm":"Transform","a":{"a":0,"k":[0,0]},"o":{"a":0,"k":100},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0}}],"np":0}]}],"meta":{"g":"@phase-software/lottie-exporter 0.7.0"},"nm":"","op":29,"v":"5.6.0","w":100}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"data" : [
{
"filename" : "ProgressIndicator.lottie",
"filename" : "Bottle_loading_ellipse.json",
"idiom" : "universal"
}
],
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@ public struct LoadingIndicator: View {

public var body: some View {
ZStack {
Color(.black)
.opacity(0.5)
ColorToken.background(.primary).color

LottieView(animation: try? .from(data: SharedDesignSystemAsset.Lotties.progressIndicator.data.data))
LottieView(animation: try? .from(data: SharedDesignSystemAsset.Lotties.bottleLoadingEllipse.data.data))
.looping()
.frame(width: 150.0, height: 84.0)
.frame(width: 100.0, height: 100.0)
}
.ignoresSafeArea()
}
Expand Down

0 comments on commit fb8a51a

Please sign in to comment.