remove: self

tsuzukihashi · Aug 15, 2024 · ad5914f · ad5914f
1 parent 2a7f9b1
commit ad5914f
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 60 deletions.
diff --git a/Sources/CustomViews/HighlightableButton.swift b/Sources/CustomViews/HighlightableButton.swift
@@ -19,14 +19,14 @@ public struct HighlightableButton<Label>: View where Label: View {
         DragGesture(minimumDistance: 0.0)
           .onChanged { _ in
             withAnimation {
-              self.isHighlighted = true
+              isHighlighted = true
             }}
           .onEnded { value in
             if abs(value.translation.height) <= 64 {
-              self.action()
+              action()
             }
             withAnimation {
-              self.isHighlighted = false
+              isHighlighted = false
             }}
       )
       .animation(Animation.easeIn(duration: 0.05))

diff --git a/Sources/CustomViews/NeumorphismBindingButton.swift b/Sources/CustomViews/NeumorphismBindingButton.swift
@@ -43,20 +43,20 @@ public struct NeumorphismBindingButton: View {
 
   public var body: some View {
     HighlightableButton(action: {
-      self.isSelected.toggle()
-      self.handler?()
+      isSelected.toggle()
+      handler?()
     }) { isHeighlight in
-      (self.isSelected ? self.selectedImage : self.normalImage)
+      (isSelected ? selectedImage : normalImage)
         .resizable()
         .aspectRatio(contentMode: .fit)
-        .frame(width:self.imageWidth, height: self.imageWidth)
-        .foregroundColor(self.neumorphism.fontColor())
+        .frame(width:imageWidth, height: imageWidth)
+        .foregroundColor(neumorphism.fontColor())
         .background(
           Rectangle()
-            .clipShape(self.shapeType.anyShape)
-            .foregroundColor(self.neumorphism.color)
-            .frame(width: self.width, height: self.height)
-            .modifier(self.isSelected ? NeumorphismShadowModifier(radius: self.shadowRadius, isAnimation: self.isSelected ) : NeumorphismShadowModifier(radius: self.shadowRadius, isAnimation: isHeighlight))
+            .clipShape(shapeType.anyShape)
+            .foregroundColor(neumorphism.color)
+            .frame(width: width, height: height)
+            .modifier(isSelected ? NeumorphismShadowModifier(radius: shadowRadius, isAnimation: isSelected ) : NeumorphismShadowModifier(radius: shadowRadius, isAnimation: isHeighlight))
         )
         .padding()
         .animation(Animation.spring(response: 0.3, dampingFraction: 0.7, blendDuration: 1))

diff --git a/Sources/CustomViews/NeumorphismButton.swift b/Sources/CustomViews/NeumorphismButton.swift
@@ -44,23 +44,23 @@ public struct NeumorphismButton: View {
 
   public var body: some View {
     HighlightableButton(action: {
-      self.isSelected.toggle()
-      self.handler?()
+      isSelected.toggle()
+      handler?()
     }) { isHeighlight in
-      (self.isSelected ? self.selectedImage : self.normalImage)
+      (isSelected ? selectedImage : normalImage)
         .resizable()
         .aspectRatio(contentMode: .fit)
-        .frame(width:self.imageWidth, height: self.imageWidth)
-        .foregroundColor(self.neumorphism.fontColor())
+        .frame(width:imageWidth, height: imageWidth)
+        .foregroundColor(neumorphism.fontColor())
         .background(
           Rectangle()
-            .clipShape(self.shapeType.anyShape)
-            .foregroundColor(self.color ?? self.neumorphism.color)
-            .frame(width: self.width, height: self.height)
+            .clipShape(shapeType.anyShape)
+            .foregroundColor(color ?? neumorphism.color)
+            .frame(width: width, height: height)
             .modifier(
-              self.isSelected
-              ? NeumorphismShadowModifier(baseColor: self.color, radius: self.shadowRadius, isAnimation: isHeighlight)
-              : NeumorphismShadowModifier(baseColor: self.color, radius: self.shadowRadius, isAnimation: isHeighlight)
+              isSelected
+              ? NeumorphismShadowModifier(baseColor: color, radius: shadowRadius, isAnimation: isHeighlight)
+              : NeumorphismShadowModifier(baseColor: color, radius: shadowRadius, isAnimation: isHeighlight)
             )
         )
         .padding()

diff --git a/Sources/CustomViews/NeumorphismCircleDentView.swift b/Sources/CustomViews/NeumorphismCircleDentView.swift
@@ -18,14 +18,14 @@ public struct NeumorphismCircleDentView: View {
 
   public var body: some View {
     Circle()
-      .fill(self.neumorphism.color)
-      .frame(width: self.width, height: self.height)
+      .fill(neumorphism.color)
+      .frame(width: width, height: height)
       .overlay(
         Circle()
-          .stroke(self.neumorphism.color, lineWidth: 4)
-          .shadow(color: self.neumorphism.color.darkerColor(), radius: 4, x: 4, y: 4)
+          .stroke(neumorphism.color, lineWidth: 4)
+          .shadow(color: neumorphism.color.darkerColor(), radius: 4, x: 4, y: 4)
           .clipShape(Circle())
-          .shadow(color: self.neumorphism.color.lighterColor(), radius: 2, x: -2, y: -2)
+          .shadow(color: neumorphism.color.lighterColor(), radius: 2, x: -2, y: -2)
           .clipShape(Circle())
       )
   }

diff --git a/Sources/CustomViews/NeumorphismDentView.swift b/Sources/CustomViews/NeumorphismDentView.swift
@@ -27,8 +27,8 @@ public struct NeumorphismDentView: View {
 
   public var body: some View {
     Rectangle()
-      .fill(self.color ?? self.neumorphism.color)
-      .frame(width: self.width, height: self.height)
+      .fill(color ?? neumorphism.color)
+      .frame(width: width, height: height)
       .neumorphismConcave(shapeType: shapeType, color: color)
   }
 }

diff --git a/Sources/CustomViews/NeumorphismLabelButton.swift b/Sources/CustomViews/NeumorphismLabelButton.swift
@@ -5,6 +5,7 @@ import SwiftUI
 public struct NeumorphismLabelButton: View {
   @EnvironmentObject var neumorphism: NeumorphismManager
   @State var isSelected = false
+
   private var text: String
   private var font: Font?
   private var color: Color?
@@ -34,21 +35,21 @@ public struct NeumorphismLabelButton: View {
 
   public var body: some View {
     HighlightableButton(action: {
-      self.isSelected.toggle()
-      self.handler?()
+      isSelected.toggle()
+      handler?()
     }) { isHeighlight in
       ZStack {
-        RoundedRectangle(cornerRadius: self.cornerRadius)
-          .fill(self.neumorphism.color)
-          .frame(width: self.width, height: self.height)
+        RoundedRectangle(cornerRadius: cornerRadius)
+          .fill(neumorphism.color)
+          .frame(width: width, height: height)
           .modifier(NeumorphismShadowModifier(isAnimation: isHeighlight))
           .padding()
 
 
-        Text(self.text)
-          .font(self.font ?? .title)
+        Text(text)
+          .font(font ?? .title)
           .foregroundColor(
-            isHeighlight ? self.color?.darkerColor() ?? self.neumorphism.fontColor() : self.color ?? self.neumorphism.fontColor())
+            isHeighlight ? color?.darkerColor() ?? neumorphism.fontColor() : color ?? neumorphism.fontColor())
       }
       .animation(Animation.spring(response: 0.3, dampingFraction: 0.7, blendDuration: 1))
     }

diff --git a/Sources/CustomViews/NeumorphismSlider.swift b/Sources/CustomViews/NeumorphismSlider.swift
@@ -4,7 +4,7 @@ import SwiftUI
 @available(macOS 12.0, *)
 public struct NeumorphismSlider: View {
   @EnvironmentObject var neumorphism: NeumorphismManager
-  @Binding var value: Double
+  @Binding var sliderValue: Double
 
   var changeHandler: (() -> Void)?
   var endedHandler: (() -> Void)?
@@ -30,7 +30,7 @@ public struct NeumorphismSlider: View {
     self.tipColor = tipColor
     self.barColor = barColor
     self.showPointer = showPointer
-    self._value = value
+    self._sliderValue = value
     self.changeHandler = changeHandler
     self.endedHandler = endedHandler
     validate()
@@ -44,46 +44,46 @@ public struct NeumorphismSlider: View {
       )
 
       ZStack(alignment: .trailing) {
-        RoundedRectangle(cornerRadius: self.height / 2)
-          .fill(barColor ?? self.neumorphism.color.darkerColor())
+        RoundedRectangle(cornerRadius: height / 2)
+          .fill(barColor ?? neumorphism.color.darkerColor())
           .frame(
-            width: self.width * CGFloat(value),
+            width: width * CGFloat(sliderValue),
             height: height * 0.8,
             alignment: .leading)
           .padding(.init(top: 8, leading: 2, bottom: 8, trailing: 2))
-        if self.showPointer {
+        if showPointer {
           ZStack {
             Circle()
-              .fill(self.neumorphism.color)
-              .frame(width: self.height * 1.5, height: self.height * 1.5)
-              .shadow(color: self.neumorphism.color.darkerColor(), radius: 4, x: 0, y: 0)
+              .fill(neumorphism.color)
+              .frame(width: height * 1.5, height: height * 1.5)
+              .shadow(color: neumorphism.color.darkerColor(), radius: 4, x: 0, y: 0)
           }
         }
       }
     }.gesture(
       DragGesture(minimumDistance: 0)
         .onChanged({ (value) in
-          self.value = Double(value.location.x / self.width)
-          self.validate()
-          self.changeHandler?()
+          sliderValue = Double(value.location.x / width)
+          validate()
+          changeHandler?()
         })
         .onEnded({ (value) in
-          self.value = Double(value.location.x / self.width)
-          self.validate()
-          self.endedHandler?()
+          sliderValue = Double(value.location.x / width)
+          validate()
+          endedHandler?()
         })
     )
   }
 
   private func validate() {
-    if self.value > 1.0 {
+    if sliderValue > 1.0 {
       DispatchQueue.main.async {
-        self.value = 1.0
+        sliderValue = 1.0
       }
     }
-    if self.value < 0 {
+    if sliderValue < 0 {
       DispatchQueue.main.async {
-        self.value = 0
+        sliderValue = 0
       }
     }
   }

diff --git a/Sources/Extensions/ViewExtension.swift b/Sources/Extensions/ViewExtension.swift
@@ -10,7 +10,7 @@ public extension View {
     y: CGFloat = 8,
     isAnimation: Bool = false
   ) -> some View {
-    self.modifier(NeumorphismShadowModifier(
+    modifier(NeumorphismShadowModifier(
       baseColor: baseColor,
       radius: radius,
       x: x,
@@ -23,7 +23,7 @@ public extension View {
     shapeType: ShapeType = .circle,
     color: Color? = nil
   ) -> some View {
-    self.modifier(NeumorphismConcaveModifier(
+    modifier(NeumorphismConcaveModifier(
       shapeType: shapeType, color: color
     ))
   }

diff --git a/Tests/Mock/NeumorphismManagerMock.swift b/Tests/Mock/NeumorphismManagerMock.swift
@@ -1,5 +1,4 @@
 import SwiftUI
-@testable import NeumorphismUI
 
 @available(iOS 13.0, *)
 class NeumorphismManagerMock: NeumorphismManagable {