From f011795e0f9293872dec1c0b2095c03fef19dde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mik=C3=A1=20Kruschel?= <20423069+mikakruschel@users.noreply.github.com> Date: Mon, 17 Apr 2023 20:35:21 +0200 Subject: [PATCH] Only shimmer text if not disabled --- Sources/SlideButton/SlideButton.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/SlideButton/SlideButton.swift b/Sources/SlideButton/SlideButton.swift index 3e3e669..33695c7 100644 --- a/Sources/SlideButton/SlideButton.swift +++ b/Sources/SlideButton/SlideButton.swift @@ -47,7 +47,7 @@ public struct SlideButton: View { .foregroundColor(styling.textColor) .frame(maxWidth: reading.size.width - 2 * styling.indicatorSpacing, alignment: .center) .padding(.horizontal, styling.indicatorSize) - .shimmerEffect(styling.textShimmers) + .shimmerEffect(isEnabled && styling.textShimmers) } else { Text(title) .multilineTextAlignment(styling.textAlignment.textAlignment) @@ -55,7 +55,7 @@ public struct SlideButton: View { .frame(maxWidth: reading.size.width - 2 * styling.indicatorSpacing, alignment: Alignment(horizontal: styling.textAlignment.horizontalAlignment, vertical: .center)) .padding(.trailing, styling.indicatorSpacing) .padding(.leading, styling.indicatorSize) - .shimmerEffect(styling.textShimmers) + .shimmerEffect(isEnabled && styling.textShimmers) } } .opacity(styling.textFadesOpacity ? (1 - progress(from: styling.indicatorSpacing, to: reading.size.width - styling.indicatorSize + styling.indicatorSpacing, current: calculatedOffset)) : 1) @@ -163,10 +163,10 @@ struct SlideButton_Previews: PreviewProvider { SlideButton("Center text and no mask", styling: .init(textHiddenBehindIndicator: false), callback: sliderCallback) SlideButton("Remaining space center", styling: .init(indicatorColor: .red, indicatorSystemName: "trash"), callback: sliderCallback) SlideButton("Trailing and immediate response", styling: .init(textAlignment: .trailing), callback: sliderCallback) - SlideButton("Global center", styling: .init(indicatorColor: .red, indicatorSystemName: "trash", textAlignment: .globalCenter), callback: sliderCallback) + SlideButton("Global center", styling: .init(indicatorColor: .red, indicatorSystemName: "trash", textAlignment: .globalCenter, textShimmers: true), callback: sliderCallback) SlideButton("Spacing 15", styling: .init(indicatorSpacing: 15), callback: sliderCallback) SlideButton("Big", styling: .init(indicatorSize: 100), callback: sliderCallback) - SlideButton("disabled green", styling: .init(indicatorColor: .green, textShimmers: true), callback: sliderCallback) + SlideButton("disabled green", styling: .init(indicatorColor: .green), callback: sliderCallback) .disabled(true) SlideButton("disabled", callback: sliderCallback) .disabled(true)