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

Jump to bottom

created modifier for ripple spinner view #27

Merged
merged 1 commit into from
Jun 26, 2024
Merged

created modifier for ripple spinner view #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions mobile-courier-app.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
1B6D75192C23BFB30067BB56 /* RoundedIndicatorViewModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6D75182C23BFB30067BB56 /* RoundedIndicatorViewModifier.swift */; };
1B6D751C2C23DF910067BB56 /* ShipmentDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6D751B2C23DF910067BB56 /* ShipmentDetailView.swift */; };
1B6F7C312C2BA621005F0476 /* Data+Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6F7C302C2BA621005F0476 /* Data+Data.swift */; };
1B6F7C332C2BA9D6005F0476 /* RippleSpinnerModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6F7C322C2BA9D6005F0476 /* RippleSpinnerModifier.swift */; };
1B821F192C1AA50600ED1795 /* CustomSessionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B821F182C1AA50600ED1795 /* CustomSessionDelegate.swift */; };
1B85000E2C10033D006E96A0 /* ToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B85000D2C10033D006E96A0 /* ToastView.swift */; };
1B8500102C1004D0006E96A0 /* ToastModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B85000F2C1004D0006E96A0 /* ToastModifier.swift */; };
Expand Down Expand Up @@ -156,6 +157,7 @@
1B6D75182C23BFB30067BB56 /* RoundedIndicatorViewModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoundedIndicatorViewModifier.swift; sourceTree = "<group>"; };
1B6D751B2C23DF910067BB56 /* ShipmentDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShipmentDetailView.swift; sourceTree = "<group>"; };
1B6F7C302C2BA621005F0476 /* Data+Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Data.swift"; sourceTree = "<group>"; };
1B6F7C322C2BA9D6005F0476 /* RippleSpinnerModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RippleSpinnerModifier.swift; sourceTree = "<group>"; };
1B821F182C1AA50600ED1795 /* CustomSessionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomSessionDelegate.swift; sourceTree = "<group>"; };
1B85000D2C10033D006E96A0 /* ToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastView.swift; sourceTree = "<group>"; };
1B85000F2C1004D0006E96A0 /* ToastModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToastModifier.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -346,6 +348,7 @@
1B85000F2C1004D0006E96A0 /* ToastModifier.swift */,
1B6D75182C23BFB30067BB56 /* RoundedIndicatorViewModifier.swift */,
1B40471C2C27C3CB00101DF4 /* GroupedPackageStyleModifier.swift */,
1B6F7C322C2BA9D6005F0476 /* RippleSpinnerModifier.swift */,
);
path = Modifiers;
sourceTree = "<group>";
Expand Down Expand Up @@ -490,10 +493,10 @@
1B6D75152C23BDA40067BB56 /* PackagesForWithdrawal */,
1B2DDEF02C1E652A003EC97C /* WithdrawnPackages */,
1B8500132C100DE2006E96A0 /* Profile */,
1BD17E612C0EB42B009B6C67 /* Navigation */,
1BE58CB12C0585B400C7DF63 /* Home */,
1B07BC8B2BFD676100D8B149 /* Helpers */,
1B58EFA12BE6BF870066F447 /* Login */,
1BD17E612C0EB42B009B6C67 /* Navigation */,
1B07BC8B2BFD676100D8B149 /* Helpers */,
1BE58CA42C05725500C7DF63 /* Previews */,
);
path = Presentation;
Expand Down Expand Up @@ -814,6 +817,7 @@
1BFD1EB32C2A7927002E4232 /* ShipmentStatus.swift in Sources */,
1B40471B2C27854200101DF4 /* AddressEntityMock.swift in Sources */,
1B8500152C100DF1006E96A0 /* ProfileView.swift in Sources */,
1B6F7C332C2BA9D6005F0476 /* RippleSpinnerModifier.swift in Sources */,
1B6D751C2C23DF910067BB56 /* ShipmentDetailView.swift in Sources */,
1B85E8EA2BFC4E85003040CC /* AuthRepository.swift in Sources */,
1B9274CD2C1158E0008F4FA3 /* AddressEndpoints.swift in Sources */,
Expand Down
32 changes: 32 additions & 0 deletions mobile-courier-app/Presentation/Helpers/Modifiers/RippleSpinnerModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//
// RippleSpinnerModifier.swift
// mobile-courier-app
//
// Created by Vladimir Espinola on 2024-06-25.
//

import SwiftUI

struct RippleSpinnerModifier: ViewModifier {
@Binding var isLoading: Bool

func body(content: Content) -> some View {
if isLoading {
ZStack {
content

if isLoading {
RippleSpinnerView()
}
}
} else {
content
}
}
}

extension View {
func showRippleSpinner(isLoading: Binding<Bool>) -> some View {
self.modifier(RippleSpinnerModifier(isLoading: isLoading))
}
}
81 changes: 38 additions & 43 deletions mobile-courier-app/Presentation/Login/LoginView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,57 +18,52 @@ struct LoginView: View {
@EnvironmentObject var coordinator: Coordinator

public var body: some View {
ZStack {
VStack(spacing: 16) {
Spacer()
Image("logo")
.resizable()
.renderingMode(.template)
.foregroundStyle(.accent)
.aspectRatio(contentMode: .fit)
.padding(.bottom, 16)
VStack(spacing: 16) {
Spacer()
Image("logo")
.resizable()
.renderingMode(.template)
.foregroundStyle(.accent)
.aspectRatio(contentMode: .fit)
.padding(.bottom, 16)

TextField("Email", text: $viewModel.email)
.focused($focusField, equals: .email)
.textFieldStyle(CourierTextFieldStyle())
.keyboardType(.emailAddress)
.autocorrectionDisabled()
.autocapitalization(.none)
.submitLabel(.next)
.onSubmit {
focusField = .password
}

SecureField("Password", text: $viewModel.password)
.focused($focusField, equals: .password)
.textFieldStyle(CourierTextFieldStyle())
.submitLabel(.done)
.textContentType(.password)
.onSubmit {
navigateToLogin()
}
TextField("Email", text: $viewModel.email)
.focused($focusField, equals: .email)
.textFieldStyle(CourierTextFieldStyle())
.keyboardType(.emailAddress)
.autocorrectionDisabled()
.autocapitalization(.none)
.submitLabel(.next)
.onSubmit {
focusField = .password
}

Button("Log In") {
SecureField("Password", text: $viewModel.password)
.focused($focusField, equals: .password)
.textFieldStyle(CourierTextFieldStyle())
.submitLabel(.done)
.textContentType(.password)
.onSubmit {
navigateToLogin()
}
.frame(maxWidth: .infinity, minHeight: 44)
.background(
viewModel.buttonIsEnabled
? .accent
: .accent.opacity(0.6)
)
.foregroundStyle(.white)
.cornerRadius(16)
.disabled(!viewModel.buttonIsEnabled)

Spacer()
Button("Log In") {
navigateToLogin()
}
.padding(20)
.frame(maxWidth: .infinity, minHeight: 44)
.background(
viewModel.buttonIsEnabled
? .accent
: .accent.opacity(0.6)
)
.foregroundStyle(.white)
.cornerRadius(16)
.disabled(!viewModel.buttonIsEnabled)

if viewModel.isLoading {
RippleSpinnerView()
}
Spacer()
}
.padding(20)
.showRippleSpinner(isLoading: $viewModel.isLoading)
.toast(message: $viewModel.toastMessage)
}

Expand Down
5 changes: 1 addition & 4 deletions mobile-courier-app/Presentation/PackagesForWithdrawal/PackagesForWithdrawalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ struct PackagesForWithdrawalView: View {
if let groupedPackagesEntity = viewModel.groupedPackagesEntity {
content(for: groupedPackagesEntity)
}

if viewModel.isLoading {
RippleSpinnerView()
}
}
.onAppear {
Task {
await viewModel.getPackages()
}
}
.showRippleSpinner(isLoading: $viewModel.isLoading)
.toast(message: $viewModel.toastMessage)
}

Expand Down
5 changes: 1 addition & 4 deletions mobile-courier-app/Presentation/WithdrawnPackages/WithdrawnPackagesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ struct WithdrawnPackagesView: View {
if let groupedPackagesEntity = viewModel.groupedPackagesEntity {
content(for: groupedPackagesEntity)
}

if viewModel.isLoading {
RippleSpinnerView()
}
}
.onAppear {
Task {
await viewModel.getPackages()
}
}
.showRippleSpinner(isLoading: $viewModel.isLoading)
.toast(message: $viewModel.toastMessage)
}

Expand Down
Loading