💄 Adds animation between activities

This commit is contained in:
2026-04-17 14:58:06 +02:00
parent 5bee2e2947
commit c23dd8d518
9 changed files with 66 additions and 30 deletions
+2 -2
View File
@@ -7,11 +7,11 @@ plugins {
android { android {
namespace = "dev.svitan.antifed" namespace = "dev.svitan.antifed"
compileSdk = 35 compileSdk = 37
defaultConfig { defaultConfig {
applicationId = "dev.svitan.antifed" applicationId = "dev.svitan.antifed"
minSdk = 33 minSdk = 34
targetSdk = 35 targetSdk = 35
versionCode = 1 versionCode = 1
versionName = "1.0" versionName = "1.0"
@@ -17,6 +17,7 @@ class API {
json() json()
} }
} }
val apiDataHolder = APIDataHolder.getInstance() val apiDataHolder = APIDataHolder.getInstance()
val authDataHolder = AuthDataHolder.getInstance() val authDataHolder = AuthDataHolder.getInstance()
@@ -95,6 +95,14 @@ class AuthActivity : ComponentActivity() {
} }
LaunchedEffect(serverUrl) { LaunchedEffect(serverUrl) {
println("SERVER URL CHANGED")
apiDataHolder.serverUrl = serverUrl
prefs.edit {
putString(
getString(R.string.server_url_key), serverUrl
)
}
if (!needToCheckUrl) return@LaunchedEffect if (!needToCheckUrl) return@LaunchedEffect
needToCheckUrl = false needToCheckUrl = false
@@ -114,6 +122,13 @@ class AuthActivity : ComponentActivity() {
} }
LaunchedEffect(token) { LaunchedEffect(token) {
apiDataHolder.token = token
prefs.edit {
putString(
getString(R.string.token_key), token
)
}
if (!needToCheckToken) return@LaunchedEffect if (!needToCheckToken) return@LaunchedEffect
needToCheckToken = false needToCheckToken = false
isTokenOk = false isTokenOk = false
@@ -137,24 +152,6 @@ class AuthActivity : ComponentActivity() {
} }
// saves data to prefs and data holders // saves data to prefs and data holders
LaunchedEffect(serverUrl) {
apiDataHolder.serverUrl = serverUrl
prefs.edit {
putString(
getString(R.string.server_url_key), serverUrl
)
}
}
LaunchedEffect(token) {
apiDataHolder.token = token
prefs.edit {
putString(
getString(R.string.token_key), token
)
}
}
LaunchedEffect(isServerUrlOk) { LaunchedEffect(isServerUrlOk) {
apiDataHolder.isOk = isServerUrlOk && isTokenOk apiDataHolder.isOk = isServerUrlOk && isTokenOk
prefs.edit { prefs.edit {
@@ -219,7 +216,6 @@ class AuthActivity : ComponentActivity() {
onValueChange = { onValueChange = {
serverUrl = it serverUrl = it
needToCheckUrl = true needToCheckUrl = true
}, },
label = { Text(stringResource(R.string.server_url)) }, label = { Text(stringResource(R.string.server_url)) },
singleLine = true, singleLine = true,
@@ -282,4 +278,13 @@ class AuthActivity : ComponentActivity() {
} }
} }
} }
override fun finish() {
super.finish()
overrideActivityTransition(
OVERRIDE_TRANSITION_CLOSE,
R.anim.slide_in_left,
R.anim.slide_out_right
)
}
} }
@@ -1,5 +1,6 @@
package dev.svitan.antifed package dev.svitan.antifed
import android.app.ActivityOptions
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
@@ -33,7 +34,6 @@ import androidx.compose.material3.rememberDrawerState
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import dev.svitan.antifed.ui.theme.AntiFedTheme import dev.svitan.antifed.ui.theme.AntiFedTheme
@@ -44,9 +44,9 @@ class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
enableEdgeToEdge() enableEdgeToEdge()
setContent { setContent {
AntiFedTheme { AntiFedTheme {
val context = LocalContext.current
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed) val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
@@ -113,12 +113,10 @@ class MainActivity : ComponentActivity() {
}, },
actions = { actions = {
IconButton(onClick = { IconButton(onClick = {
context.startActivity( val intent =
Intent( Intent(this@MainActivity, AuthActivity::class.java)
context, startActivity(intent)
AuthActivity::class.java overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left)
)
)
}) { }) {
Icon( Icon(
imageVector = Icons.Outlined.AccountCircle, imageVector = Icons.Outlined.AccountCircle,
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:fromXDelta="-100%"
android:toXDelta="0%"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:duration="250"/>
</set>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:fromXDelta="100%"
android:toXDelta="0%"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:duration="250"/>
</set>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:fromXDelta="0%"
android:toXDelta="-100%"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:duration="250"/>
</set>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate
android:fromXDelta="0%"
android:toXDelta="100%"
android:interpolator="@android:anim/accelerate_decelerate_interpolator"
android:duration="250"/>
</set>
+1 -1
View File
@@ -4,4 +4,4 @@ plugins {
alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.kotlin.serialization) apply false
} }