empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Animate transitions in icon selection.

Browse source
This commit is contained in:
Greyson Parrelli 2023-05-18 19:15:45 -04:00
parent c963e99dca
commit 0fbab04253
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/AppIconSelectionFragment.kt
View file

@ -6,7 +6,7 @@
package org.thoughtcrime.securesms.components.settings.app.appearance.appicon package org.thoughtcrime.securesms.components.settings.app.appearance.appicon
import android.content.Context import android.content.Context
import androidx.compose.animation.animateContentSize import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
@ -24,6 +24,7 @@ import androidx.compose.foundation.text.ClickableText
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -41,12 +42,12 @@ import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.withStyle import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
import org.signal.core.ui.Scaffolds import org.signal.core.ui.Scaffolds
import org.signal.core.ui.theme.SignalTheme
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.settings.app.appearance.appicon.util.AppIconPreset import org.thoughtcrime.securesms.components.settings.app.appearance.appicon.util.AppIconPreset
@ -230,9 +231,9 @@ class AppIconSelectionFragment : ComposeFragment() {
*/ */
@Composable @Composable
fun AppIcon(preset: AppIconPreset, isSelected: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) { fun AppIcon(preset: AppIconPreset, isSelected: Boolean, onClick: () -> Unit, modifier: Modifier = Modifier) {
val bitmapSize: Dp = if (isSelected) 48.dp else 64.dp val bitmapSize by animateFloatAsState(if (isSelected) 48f else 64f, label = "Icon Size")
val imageModifier = modifier val imageModifier = modifier
.size(bitmapSize) .size(bitmapSize.dp)
.graphicsLayer( .graphicsLayer(
shape = CircleShape, shape = CircleShape,
shadowElevation = if (isSelected) 4f else 8f, shadowElevation = if (isSelected) 4f else 8f,
@ -290,10 +291,24 @@ class AppIconSelectionFragment : ComposeFragment() {
) )
} }
@Preview @Preview(name = "Light Theme")
@Composable @Composable
private fun MainScreenPreview() { private fun MainScreenPreviewLight() {
IconSelectionScreen(AppIconPreset.DEFAULT, onItemConfirmed = {}, onWarningClick = {}) SignalTheme(isDarkMode = false) {
Surface {
IconSelectionScreen(AppIconPreset.DEFAULT, onItemConfirmed = {}, onWarningClick = {})
}
}
}
@Preview(name = "Dark Theme")
@Composable
private fun MainScreenPreviewDark() {
SignalTheme(isDarkMode = true) {
Surface {
IconSelectionScreen(AppIconPreset.DEFAULT, onItemConfirmed = {}, onWarningClick = {})
}
}
} }
companion object { companion object {

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/appearance/appicon/util/AppIconPreset.kt
View file

@ -27,6 +27,6 @@ enum class AppIconPreset(private val componentName: String, @DrawableRes val ico
fun getComponentName(context: Context): ComponentName { fun getComponentName(context: Context): ComponentName {
val applicationContext = context.applicationContext val applicationContext = context.applicationContext
return ComponentName(applicationContext, applicationContext.packageName + componentName) return ComponentName(applicationContext, "org.thoughtcrime.securesms" + componentName)
} }
} }