Merge pull request #35 from payan-app/buttons-style

refactor: update button styles
payan-app · Nov 7, 2022 · 6c903d3 · 6c903d3
2 parents d1ad696 + 65d1bc6
commit 6c903d3
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 24 deletions.
diff --git a/PuraceDemo/PuraceDemo/Examples/Basic/ButtonExample.swift b/PuraceDemo/PuraceDemo/Examples/Basic/ButtonExample.swift
@@ -11,16 +11,30 @@ import Purace
 
 struct ButtonExample: View {
     var body: some View {
-        Text("`PuraceButtonView('title', type: .loud)`")
-        PuraceButtonView("Font size: 12", fontSize: 12)
-        PuraceButtonView("Font size: 14", fontSize: 14)
-        PuraceButtonView("Font size: 16", fontSize: 16)
-            .padding(.bottom)
-
-        Text("`PuraceButtonView('title', type: .quiet)`")
-        PuraceButtonView("Font size: 12", fontSize: 12, type: .quiet)
-        PuraceButtonView("Font size: 14", fontSize: 14, type: .quiet)
-        PuraceButtonView("Font size: 16", fontSize: 16, type: .quiet)
-        Spacer()
+        VStack(spacing: 0) {
+            VStack {
+                Text("`PuraceButtonView('title', type: .loud)`")
+                PuraceButtonView("Font size: 12", fontSize: 12)
+                PuraceButtonView("Font size: 14", fontSize: 14)
+                PuraceButtonView("Font size: 16", fontSize: 16)
+                    .padding(.bottom)
+            }
+
+            VStack {
+                Text("`PuraceButtonView('title', type: .quiet)`")
+                PuraceButtonView("Font size: 12", fontSize: 12, type: .quiet)
+                PuraceButtonView("Font size: 14", fontSize: 14, type: .quiet)
+                PuraceButtonView("Font size: 16", fontSize: 16, type: .quiet)
+                    .padding(.bottom)
+            }
+
+            VStack {
+                Text("`PuraceButtonView('title', type: .transparent)`")
+                PuraceButtonView("Font size: 12", fontSize: 12, type: .transparent)
+                PuraceButtonView("Font size: 14", fontSize: 14, type: .transparent)
+                PuraceButtonView("Font size: 16", fontSize: 16, type: .transparent)
+                Spacer()
+            }
+        }
     }
 }
diff --git a/Sources/Purace/Views/Basic/Button/PuraceButtonType.swift b/Sources/Purace/Views/Basic/Button/PuraceButtonType.swift
@@ -9,5 +9,6 @@ import Foundation
 import SwiftUI
 
 public enum PuraceButtonType {
-    case loud, quiet, custom(Color, Color, Color) // 0: background, 1: on pressed, 2: text color
+    case loud, quiet, transparent
+    case custom(Color, Color, Color) // 0: background, 1: on pressed, 2: text color
 }
diff --git a/Sources/Purace/Views/Basic/Button/PuraceButtonView.swift b/Sources/Purace/Views/Basic/Button/PuraceButtonView.swift
@@ -9,9 +9,6 @@ import Foundation
 import SwiftUI
 
 public struct PuraceButtonView: View {
-    @State var backgroundColor: Color = .blue
-    @State var isBeingPressed = false
-
     let title: String
     let fontSize: Int
     let type: PuraceButtonType
@@ -39,9 +36,11 @@ struct PuraceButtonStyle: ButtonStyle {
     private func getBackgroundColor() -> Color {
         switch type {
         case .loud:
-            return PuraceStyle.Color.G2
+            return PuraceStyle.Color.B2
         case .quiet:
-            return .black.opacity(0.05)
+            return PuraceStyle.Color.B5
+        case .transparent:
+            return .white.opacity(0.01)
         case .custom(let backgroundColor, _, _):
             return backgroundColor
         }
@@ -52,7 +51,9 @@ struct PuraceButtonStyle: ButtonStyle {
         case .loud:
             return .white
         case .quiet:
-            return PuraceStyle.Color.G1
+            return PuraceStyle.Color.B1
+        case .transparent:
+            return PuraceStyle.Color.B1
         case .custom(_, _, let textColor):
             return textColor
         }
@@ -61,9 +62,11 @@ struct PuraceButtonStyle: ButtonStyle {
     private func getOnPressedBackgroundColor() -> Color {
         switch type {
         case .loud:
-            return PuraceStyle.Color.G1
+            return PuraceStyle.Color.B1
         case .quiet:
-            return .black.opacity(0.15)
+            return PuraceStyle.Color.B4
+        case .transparent:
+            return PuraceStyle.Color.B5
         case .custom(_, let onPressedColor, _):
             return onPressedColor
         }

diff --git a/Sources/Purace/Views/Complex/Image Viewer/PuraceImageViewer.swift b/Sources/Purace/Views/Complex/Image Viewer/PuraceImageViewer.swift
@@ -70,7 +70,7 @@ public struct PuraceImageViewer: View {
             topBar
 
             TabView(selection: $currentIndex) {
-                ForEach(0..<numberOfImages) { index in
+                ForEach(0..<numberOfImages, id: \.self) { index in
                     PuraceImageView(url: urls[index])
                         .scaledToFit()
                         .tag(index)

diff --git a/Sources/Purace/Views/Complex/Story/PuraceStoryView.swift b/Sources/Purace/Views/Complex/Story/PuraceStoryView.swift
@@ -19,7 +19,7 @@ public struct PuraceStoryView: View {
 
     var indicators: some View {
         HStack(spacing: 3) {
-            ForEach(stories.indices) { index in
+            ForEach(stories.indices, id: \.self) { index in
                 Color.white.opacity(index <= currentIndex ? 0.8 : 0.3)
                     .cornerRadius(1)
             }

diff --git a/Sources/Purace/Views/Complex/Tab/PuraceTabView.swift b/Sources/Purace/Views/Complex/Tab/PuraceTabView.swift
@@ -21,7 +21,7 @@ public struct PuraceTabView<T: View>: View {
 
     func headers(in size: CGSize) -> some View {
         HStack(spacing: 0) {
-            ForEach(0..<titles.count) { index in
+            ForEach(0..<titles.count, id: \.self) { index in
                 PuraceTextView(titles[index], fontSize: 12, textColor: selectedIndex == index ? PuraceStyle.Color.N1 : PuraceStyle.Color.N4, weight: selectedIndex == index ? .medium : .regular)
                     .frame(width: size.width / CGFloat(titles.count))
                     .background(Color.gray.opacity(0.001))
@@ -58,7 +58,7 @@ public struct PuraceTabView<T: View>: View {
                 headers(in: reader.size)
                 indicator(in: reader.size)
                 ZStack {
-                    ForEach(0..<titles.count) { index in
+                    ForEach(0..<titles.count, id: \.self) { index in
                         viewForIndex(index)
                             .opacity(index == selectedIndex ? 1 : 0)
                     }