Skip to content

chore: prepare beta 1.7.0-beta.17 #60

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

Merged
Priveetee merged 1 commit into from
Sep 4, 2026
Merged

chore: prepare beta 1.7.0-beta.17 #60

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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ android {
applicationId = "dev.typetype.android"
minSdk = 23
targetSdk = 37
versionCode = 10715
versionName = "1.7.0-beta.16"
versionCode = 10716
versionName = "1.7.0-beta.17"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
resValue("string", "app_name", "TypeType")
}
Expand Down
91 changes: 91 additions & 0 deletions app/src/main/java/dev/typetype/android/core/ui/components/TypeTypeAuthBackdrop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package dev.typetype.android.core.ui.components

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.size
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.luminance
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import androidx.compose.material3.MaterialTheme
import dev.typetype.android.R

@Composable
fun TypeTypeAuthBackdrop(content: @Composable () -> Unit) {
val background = MaterialTheme.colorScheme.background
val dark = background.luminance() < 0.5f
Box(Modifier.fillMaxSize().background(background)) {
Box(
Modifier
.fillMaxSize()
.graphicsLayer {
rotationZ = -12f
scaleX = 1.18f
scaleY = 1.18f
}
.alpha(if (dark) 0.16f else 0.09f),
) {
Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.SpaceEvenly,
) {
repeat(7) {
Row(
modifier = Modifier.fillMaxWidth().weight(1f),
horizontalArrangement = Arrangement.SpaceEvenly,
) {
repeat(12) {
Image(
painter = painterResource(R.drawable.ic_typetype_brand),
contentDescription = null,
modifier = Modifier.size(132.dp),
)
}
}
}
}
}
Box(
Modifier.fillMaxSize().background(
Brush.radialGradient(
colors = if (dark) {
listOf(Color.Transparent, Color.Black.copy(alpha = 0.46f))
} else {
listOf(Color.Transparent, Color(0xFF64748B).copy(alpha = 0.34f))
},
),
),
)
Box(
Modifier
.size(300.dp)
.offset(x = (-52).dp, y = 36.dp)
.alpha(if (dark) 0.12f else 0.22f)
.background(
Brush.radialGradient(listOf(Color(0xFF7DD3FC), Color.Transparent)),
),
)
Box(
Modifier
.size(340.dp)
.offset(x = 36.dp, y = 440.dp)
.alpha(if (dark) 0.10f else 0.18f)
.background(
Brush.radialGradient(listOf(Color(0xFF22D3EE), Color.Transparent)),
),
)
content()
}
}
65 changes: 8 additions & 57 deletions app/src/main/java/dev/typetype/android/feature/setup/login/LoginScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -24,16 +22,12 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.luminance
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.font.FontWeight
Expand All @@ -42,12 +36,11 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import dev.typetype.android.R
import dev.typetype.android.core.ui.components.SectionHeader
import dev.typetype.android.core.ui.components.TypeTypeCard
import dev.typetype.android.core.ui.components.TypeTypeAuthBackdrop
import dev.typetype.android.core.ui.components.TypeTypePrimaryButton
import dev.typetype.android.core.ui.components.TypeTypeSecondaryButton
import dev.typetype.android.core.ui.components.TypeTypeTextField
Expand Down Expand Up @@ -92,12 +85,8 @@ fun LoginScreen(
onAction: (LoginAction) -> Unit,
) {
val scrollState = rememberScrollState()
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background,
) {
TypeTypeAuthBackdrop {
Box(modifier = Modifier.fillMaxSize()) {
LoginBackdrop()
IconButton(
onClick = { onAction(LoginAction.OnBackClick) },
modifier = Modifier.padding(8.dp),
Expand All @@ -119,22 +108,13 @@ fun LoginScreen(
.verticalScroll(scrollState),
verticalArrangement = Arrangement.Top,
) {
Surface(
Image(
modifier = Modifier
.size(88.dp)
.size(76.dp)
.align(Alignment.CenterHorizontally),
shape = RoundedCornerShape(24.dp),
color = MaterialTheme.colorScheme.surface.copy(alpha = 0.92f),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline),
) {
Box(contentAlignment = Alignment.Center) {
Image(
painter = painterResource(R.drawable.ic_typetype_brand),
contentDescription = null,
modifier = Modifier.size(56.dp),
)
}
}
painter = painterResource(R.drawable.ic_typetype_brand),
contentDescription = stringResource(R.string.about_app_name),
)
Spacer(Modifier.height(20.dp))
SectionHeader(text = stringResource(R.string.setup_section))
Spacer(Modifier.height(8.dp))
Expand Down Expand Up @@ -193,7 +173,7 @@ fun LoginScreen(
}
Spacer(Modifier.height(16.dp))
}
if (state.localLoginEnabled) TypeTypeCard {
if (state.localLoginEnabled) {
TypeTypeTextField(
value = state.identifier,
onValueChange = { onAction(LoginAction.OnIdentifierChange(it)) },
Expand Down Expand Up @@ -291,32 +271,3 @@ fun LoginScreen(
}
}
}

@Composable
private fun LoginBackdrop() {
val colors = MaterialTheme.colorScheme
Canvas(modifier = Modifier.fillMaxSize()) {
val radius = maxOf(size.width, size.height) * 0.7f
drawCircle(
color = colors.primary.copy(alpha = 0.12f),
radius = radius,
center = Offset(size.width * 1.02f, -size.height * 0.08f),
)
drawCircle(
color = colors.tertiary.copy(alpha = 0.09f),
radius = radius * 0.72f,
center = Offset(-size.width * 0.08f, size.height * 0.98f),
)
drawCircle(
color = Color.White.copy(
alpha = if (colors.background.luminance() > 0.5f) {
0.08f
} else {
0.025f
},
),
radius = radius * 0.42f,
center = Offset(size.width * 0.78f, size.height * 0.72f),
)
}
}