Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ More: SLButton & SLImageButton #26

Merged
merged 2 commits into from
Nov 21, 2023
Merged

✨ More: SLButton & SLImageButton #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f12f88
✨ More: SLButton & SLImageButton
N3v1 Nov 21, 2023
e5bf1cb
Merge branch 'main' into auth
N3v1 Nov 21, 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
29 changes: 29 additions & 0 deletions Documentation.docc/tutorials/Chapter1-1.tutorial
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
@Tutorial(time: 10) {
@Intro(title: "Chapter 1.2: Exploring ScribbleLab's targets and configs") {
In this Chatpter you'll get a basic understanding of ScribbleLab's build targets and configs

@Image(source: <#file#>, alt: "<#accessible description#>")
}

@Section(title: "<#text#>") {
@ContentAndMedia {
<#text#>

@Image(source: <#file#>, alt: "<#accessible description#>")
}

@Steps {
@Step {
<#text#>

@Image(source: <#file#>, alt: "<#accessible description#>")
}

@Step {
<#text#>

@Code(name: "<#display name#>", file: <#filename.swift#>)
}
}
}
}
678 changes: 678 additions & 0 deletions LICENSE_AGREEMENT.md
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 37 additions & 1 deletion ScribbleLab.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@
38AE9CB12AD0751100B761E8 /* ScribbleLabTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AE9CB02AD0751100B761E8 /* ScribbleLabTests.swift */; };
38AE9CBB2AD0751100B761E8 /* ScribbleLabUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AE9CBA2AD0751100B761E8 /* ScribbleLabUITests.swift */; };
38AE9CBD2AD0751100B761E8 /* ScribbleLabUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38AE9CBC2AD0751100B761E8 /* ScribbleLabUITestsLaunchTests.swift */; };
38C68B982B0D134300D16E86 /* SLButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38C68B972B0D134300D16E86 /* SLButton.swift */; };
38C68B9A2B0D1CA100D16E86 /* SLButton+Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38C68B992B0D1CA100D16E86 /* SLButton+Image.swift */; };
38D56F062AF59A0000CE3781 /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38D56F052AF59A0000CE3781 /* ImagePicker.swift */; };
38D5C68B2AD28B9D00D943A5 /* SLDarkmodeSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38D5C68A2AD28B9D00D943A5 /* SLDarkmodeSettingsView.swift */; };
38D5C68D2AD28D6F00D943A5 /* SLUpdateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38D5C68C2AD28D6F00D943A5 /* SLUpdateView.swift */; };
Expand All @@ -119,6 +121,7 @@
38EFBE202AD6D1A400CF0ECD /* RedemtionSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38EFBE1F2AD6D1A400CF0ECD /* RedemtionSheetView.swift */; };
38EFBE232AD6E4EF00CF0ECD /* RestartAppView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38EFBE222AD6E4EF00CF0ECD /* RestartAppView.swift */; };
38F59B8B2AEC4E0D00475B0B /* ResetPasswordView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38F59B8A2AEC4E0D00475B0B /* ResetPasswordView.swift */; };
38F9080D2B0920ED0092EC58 /* PageIntro.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38F9080C2B0920ED0092EC58 /* PageIntro.swift */; };
38FFF9322AE3C18B006719E2 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 38FFF9312AE3C18B006719E2 /* FirebaseAuth */; };
38FFF9342AE3C18B006719E2 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 38FFF9332AE3C18B006719E2 /* FirebaseCrashlytics */; };
38FFF9362AE3C18B006719E2 /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = 38FFF9352AE3C18B006719E2 /* FirebaseDatabase */; };
Expand Down Expand Up @@ -294,6 +297,8 @@
38AE9CB62AD0751100B761E8 /* ScribbleLabUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ScribbleLabUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
38AE9CBA2AD0751100B761E8 /* ScribbleLabUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScribbleLabUITests.swift; sourceTree = "<group>"; };
38AE9CBC2AD0751100B761E8 /* ScribbleLabUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScribbleLabUITestsLaunchTests.swift; sourceTree = "<group>"; };
38C68B972B0D134300D16E86 /* SLButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SLButton.swift; sourceTree = "<group>"; };
38C68B992B0D1CA100D16E86 /* SLButton+Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SLButton+Image.swift"; sourceTree = "<group>"; };
38D56F052AF59A0000CE3781 /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
38D5C68A2AD28B9D00D943A5 /* SLDarkmodeSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SLDarkmodeSettingsView.swift; sourceTree = "<group>"; };
38D5C68C2AD28D6F00D943A5 /* SLUpdateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SLUpdateView.swift; sourceTree = "<group>"; };
Expand All @@ -305,6 +310,7 @@
38EFBE1F2AD6D1A400CF0ECD /* RedemtionSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedemtionSheetView.swift; sourceTree = "<group>"; };
38EFBE222AD6E4EF00CF0ECD /* RestartAppView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestartAppView.swift; sourceTree = "<group>"; };
38F59B8A2AEC4E0D00475B0B /* ResetPasswordView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetPasswordView.swift; sourceTree = "<group>"; };
38F9080C2B0920ED0092EC58 /* PageIntro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageIntro.swift; sourceTree = "<group>"; };
38FFF93F2AE3C55F006719E2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
38FFF9412AE3C7C9006719E2 /* SignInWithGoogleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInWithGoogleModel.swift; sourceTree = "<group>"; };
38FFF9442AE3CA6F006719E2 /* Application_utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application_utility.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -460,6 +466,7 @@
38355ED52AD3D50F00392674 /* Componets */ = {
isa = PBXGroup;
children = (
38C68B962B0D133100D16E86 /* Views */,
3852D71D2B054D07007FAFF1 /* Effects */,
3852D7182B053C24007FAFF1 /* Shaders */,
38355ED62AD3D52D00392674 /* IGTextFieldModifier.swift */,
Expand Down Expand Up @@ -690,7 +697,8 @@
385F78B42AD5E9000096E504 /* Tour */ = {
isa = PBXGroup;
children = (
385F78B52AD5E9120096E504 /* TourViewBeginning.swift */,
38F9080B2B0920CE0092EC58 /* View */,
38F9080A2B0920C80092EC58 /* Model */,
);
path = Tour;
sourceTree = "<group>";
Expand Down Expand Up @@ -970,6 +978,15 @@
path = ScribbleLabUITests;
sourceTree = "<group>";
};
38C68B962B0D133100D16E86 /* Views */ = {
isa = PBXGroup;
children = (
38C68B972B0D134300D16E86 /* SLButton.swift */,
38C68B992B0D1CA100D16E86 /* SLButton+Image.swift */,
);
path = Views;
sourceTree = "<group>";
};
38D56F042AF599EA00CE3781 /* Profile */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1145,6 +1162,22 @@
path = AppAuth;
sourceTree = "<group>";
};
38F9080A2B0920C80092EC58 /* Model */ = {
isa = PBXGroup;
children = (
38F9080C2B0920ED0092EC58 /* PageIntro.swift */,
);
path = Model;
sourceTree = "<group>";
};
38F9080B2B0920CE0092EC58 /* View */ = {
isa = PBXGroup;
children = (
385F78B52AD5E9120096E504 /* TourViewBeginning.swift */,
);
path = View;
sourceTree = "<group>";
};
38FFF9432AE3CA52006719E2 /* ViewController */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1467,7 +1500,9 @@
381E0B362ADC136400A2A836 /* PomodoroModel.swift in Sources */,
385F78BE2AD5ED720096E504 /* SLHelpView.swift in Sources */,
38140A642AE3F6D200753FB6 /* LoginViewModel.swift in Sources */,
38C68B982B0D134300D16E86 /* SLButton.swift in Sources */,
381F1F132AD72DD6001B3B10 /* TestView.swift in Sources */,
38F9080D2B0920ED0092EC58 /* PageIntro.swift in Sources */,
38ADB4D92AF6952C0019375B /* Documentation.docc in Sources */,
38140A622AE3F61000753FB6 /* SLAuthService.swift in Sources */,
38E304702AF639F300103D71 /* Crop.swift in Sources */,
Expand All @@ -1489,6 +1524,7 @@
3868A3E32AD2FE6600D4CAEC /* ProfileView.swift in Sources */,
38355ED92AD3D71900392674 /* IGButtonModifier.swift in Sources */,
385F468E2AD31CD100D85410 /* SignUpView.swift in Sources */,
38C68B9A2B0D1CA100D16E86 /* SLButton+Image.swift in Sources */,
38EFBE202AD6D1A400CF0ECD /* RedemtionSheetView.swift in Sources */,
385F78BA2AD5ECC10096E504 /* SLInfoView.swift in Sources */,
38EFBE1D2AD6965C00CF0ECD /* PackageLicense.swift in Sources */,
Expand Down
13 changes: 10 additions & 3 deletions ScribbleLab/Core/Auth/View/LogInView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ struct LogInView: View {

VStack(spacing: 20) {
VStack {
/*
Button {
vm.signInWithGoogle()
} label: {
Expand All @@ -57,9 +58,15 @@ struct LogInView: View {
.fill(Color(red: 248/255, green: 248/255, blue: 248/255))
.strokeBorder(Color(red: 194/255, green: 194/255, blue: 194/255), lineWidth: 0.5)
}
}*/
SLImageButton(text: "Continue With Google", font: .subheadline, backgroundColor: .clear, textColor: .black, cornerRadius: 10, image: Image("google"), imageWidth: 30, imageHeight: 30) {
vm.signInWithGoogle()
}

Button {
SLImageButton(text: "Continue With Apple", font: .subheadline, backgroundColor: .clear, textColor: .black, cornerRadius: 10, image: Image("apple-logo-black"), imageWidth: 30, imageHeight: 30) {
// TODO: Sign In With Apple (SIWA)
print("Sign in with apple")
}
/*Button {

} label: {
HStack {
Expand All @@ -80,7 +87,7 @@ struct LogInView: View {
.fill(Color(red: 248/255, green: 248/255, blue: 248/255))
.strokeBorder(Color(red: 194/255, green: 194/255, blue: 194/255), lineWidth: 0.5)
}
}
}*/
}

Divider()
Expand Down
2 changes: 1 addition & 1 deletion ScribbleLab/Core/Auth/View/SignUpView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct SignUpView: View {
.fontWeight(.semibold)
.foregroundStyle(.black)
}
.padding(.horizontal, 12)
.padding(.horizontal, 18)
.padding(.vertical, 13)
.background {
RoundedRectangle(cornerRadius: 13)
Expand Down
81 changes: 81 additions & 0 deletions ScribbleLab/Core/Componets/Shaders/Shaders.metal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,90 @@
#include <SwiftUI/SwiftUI_Metal.h>
using namespace metal;

// `colorEffect()`
// - half4 name(float2 position, half4 color, args...)
// `distortionEffect()`
// - float2 name(float2 position, args...)
// `layerEffect()`
// - half4 name(float2 position, SwiftUI::Layer layer, args...)

// Grayscale shader
[[ stitchable ]] half4 grayscale(float2 position, SwiftUI::Layer layer) {
half4 originalColor = layer.sample(position);
float grayscaleValue = (originalColor.r + originalColor.g + originalColor.b) / 3.0;
return half4(grayscaleValue, grayscaleValue, grayscaleValue, originalColor.a);
}

[[ stitchable ]] half4 passthrough(float2 pos, half4 color) {
return color;
}

[[ stitchable ]] half4 recolor(float2 pos, half4 color) {
return half4(1, 0, 0, color.a); /// ` half4(r, g, b, a)` r: red, g; green, b: blue, a: alpha (opacity)
}

[[ stitchable ]] half4 invertAlpha(float2 pos, half4 color) {
return half4(1, 0, 0, 1 - color.a);
}

// Gardient fill shader
[[ stitchable ]] half4 gradient(float2 pos, half4 color) {
return half4(
pos.x / pos.y,
0,
pos.y / pos.x,
color.a
);
}

// animated gradient
[[ stitchable ]] half4 rainbow(float2 pos, half4 color, float t, float2 s) { // t: time, s: size
float angle = atan2(pos.y, pos.x) + t;

return half4(
sin(angle),
sin(angle + 2),
sin(angle + 4),
color.a
);
}

[[ stitchable ]] float2 wave(float2 pos, float t, float2 s) {
float2 distance = pos / s;
pos.y += sin(t * 5 + pos.y / 20) * distance.x * 10;
return pos;
}

[[ stitchable ]] half4 loupe(float2 pos, SwiftUI::Layer layer, float2 s, float2 touch) {
float maxDistance = 0.05;

float2 uv = pos / s;
float2 center = touch / s;
float2 delta = uv - center;

float aspectRatio = s.x / s.y;
float distance = (delta.x * delta.x) + (delta.y * delta.y) / aspectRatio;

float totalZoom = 1;

if (distance < maxDistance) {
totalZoom /= 2;
totalZoom += distance * 10;
}

float2 newPos = delta * totalZoom + center;
return layer.sample(newPos * s);
}

[[ stitchable ]] half4 circles(float2 pos, half4 color, float2 s, float ammount) {
float2 uv = pos / s;
float strenght = 20;
float2 f = fract(pos / strenght);
float d = distance(f, 0.5);

if (d + uv.x + uv.y < ammount * 3) {
return color;
} else {
return 0;
}
}
Loading