mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-09-27 22:46:22 +02:00
Simplifies Zap animation sizes
This commit is contained in:
@@ -135,7 +135,7 @@ import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightWithPadding
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.ReactionRowZapraiser
|
import com.vitorpamplona.amethyst.ui.theme.ReactionRowZapraiser
|
||||||
import com.vitorpamplona.amethyst.ui.theme.ReactionRowZapraiserWithPadding
|
import com.vitorpamplona.amethyst.ui.theme.ReactionRowZapraiserWithPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
|
import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size14dp
|
import com.vitorpamplona.amethyst.ui.theme.Size14Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size18Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size18Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size18dp
|
import com.vitorpamplona.amethyst.ui.theme.Size18dp
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size19Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size19Modifier
|
||||||
@@ -977,7 +977,7 @@ fun ZapReaction(
|
|||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
iconSize: Dp = Size20dp,
|
iconSize: Dp = Size20dp,
|
||||||
iconSizeModifier: Modifier = Size20Modifier,
|
iconSizeModifier: Modifier = Size20Modifier,
|
||||||
animationSize: Dp = Size14dp,
|
animationModifier: Modifier = Size14Modifier,
|
||||||
nav: INav,
|
nav: INav,
|
||||||
) {
|
) {
|
||||||
var wantsToZap by remember { mutableStateOf(false) }
|
var wantsToZap by remember { mutableStateOf(false) }
|
||||||
@@ -1108,7 +1108,7 @@ fun ZapReaction(
|
|||||||
|
|
||||||
CircularProgressIndicator(
|
CircularProgressIndicator(
|
||||||
progress = { animatedProgress },
|
progress = { animatedProgress },
|
||||||
modifier = remember { Modifier.size(animationSize) },
|
modifier = animationModifier,
|
||||||
strokeWidth = 2.dp,
|
strokeWidth = 2.dp,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
|
@@ -658,7 +658,7 @@ class AccountViewModel(
|
|||||||
showErrorIfNoLnAddress = showErrorIfNoLnAddress,
|
showErrorIfNoLnAddress = showErrorIfNoLnAddress,
|
||||||
okHttpClient = ::okHttpClientForMoney,
|
okHttpClient = ::okHttpClientForMoney,
|
||||||
onError = onError,
|
onError = onError,
|
||||||
onProgress = { onProgress(it) },
|
onProgress = onProgress,
|
||||||
onPayViaIntent = onPayViaIntent,
|
onPayViaIntent = onPayViaIntent,
|
||||||
zapType = zapType ?: defaultZapType(),
|
zapType = zapType ?: defaultZapType(),
|
||||||
)
|
)
|
||||||
|
@@ -93,7 +93,6 @@ import com.vitorpamplona.amethyst.ui.theme.HalfFeedPadding
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size35Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size35Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size35dp
|
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size40Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size40Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size40dp
|
import com.vitorpamplona.amethyst.ui.theme.Size40dp
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size55dp
|
import com.vitorpamplona.amethyst.ui.theme.Size55dp
|
||||||
@@ -455,7 +454,7 @@ fun ReactionsColumn(
|
|||||||
accountViewModel = accountViewModel,
|
accountViewModel = accountViewModel,
|
||||||
iconSize = Size40dp,
|
iconSize = Size40dp,
|
||||||
iconSizeModifier = Size40Modifier,
|
iconSizeModifier = Size40Modifier,
|
||||||
animationSize = Size35dp,
|
animationModifier = Size35Modifier,
|
||||||
nav = nav,
|
nav = nav,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@@ -146,6 +146,7 @@ val MaxWidthWithHorzPadding = Modifier.fillMaxWidth().padding(horizontal = 10.dp
|
|||||||
|
|
||||||
val Size5Modifier = Modifier.size(5.dp)
|
val Size5Modifier = Modifier.size(5.dp)
|
||||||
val Size10Modifier = Modifier.size(10.dp)
|
val Size10Modifier = Modifier.size(10.dp)
|
||||||
|
val Size14Modifier = Modifier.size(14.dp)
|
||||||
val Size15Modifier = Modifier.size(15.dp)
|
val Size15Modifier = Modifier.size(15.dp)
|
||||||
val Size16Modifier = Modifier.size(16.dp)
|
val Size16Modifier = Modifier.size(16.dp)
|
||||||
val Size17Modifier = Modifier.size(17.dp)
|
val Size17Modifier = Modifier.size(17.dp)
|
||||||
|
Reference in New Issue
Block a user