💄 Adds animation between activities
This commit is contained in:
@@ -17,6 +17,7 @@ class API {
|
||||
json()
|
||||
}
|
||||
}
|
||||
|
||||
val apiDataHolder = APIDataHolder.getInstance()
|
||||
val authDataHolder = AuthDataHolder.getInstance()
|
||||
|
||||
|
||||
@@ -95,6 +95,14 @@ class AuthActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
LaunchedEffect(serverUrl) {
|
||||
println("SERVER URL CHANGED")
|
||||
apiDataHolder.serverUrl = serverUrl
|
||||
prefs.edit {
|
||||
putString(
|
||||
getString(R.string.server_url_key), serverUrl
|
||||
)
|
||||
}
|
||||
|
||||
if (!needToCheckUrl) return@LaunchedEffect
|
||||
needToCheckUrl = false
|
||||
|
||||
@@ -114,6 +122,13 @@ class AuthActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
LaunchedEffect(token) {
|
||||
apiDataHolder.token = token
|
||||
prefs.edit {
|
||||
putString(
|
||||
getString(R.string.token_key), token
|
||||
)
|
||||
}
|
||||
|
||||
if (!needToCheckToken) return@LaunchedEffect
|
||||
needToCheckToken = false
|
||||
isTokenOk = false
|
||||
@@ -137,24 +152,6 @@ class AuthActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
// 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) {
|
||||
apiDataHolder.isOk = isServerUrlOk && isTokenOk
|
||||
prefs.edit {
|
||||
@@ -219,7 +216,6 @@ class AuthActivity : ComponentActivity() {
|
||||
onValueChange = {
|
||||
serverUrl = it
|
||||
needToCheckUrl = true
|
||||
|
||||
},
|
||||
label = { Text(stringResource(R.string.server_url)) },
|
||||
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
|
||||
|
||||
import android.app.ActivityOptions
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
@@ -33,7 +34,6 @@ import androidx.compose.material3.rememberDrawerState
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import dev.svitan.antifed.ui.theme.AntiFedTheme
|
||||
@@ -44,9 +44,9 @@ class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
|
||||
setContent {
|
||||
AntiFedTheme {
|
||||
val context = LocalContext.current
|
||||
val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
|
||||
val scope = rememberCoroutineScope()
|
||||
|
||||
@@ -113,12 +113,10 @@ class MainActivity : ComponentActivity() {
|
||||
},
|
||||
actions = {
|
||||
IconButton(onClick = {
|
||||
context.startActivity(
|
||||
Intent(
|
||||
context,
|
||||
AuthActivity::class.java
|
||||
)
|
||||
)
|
||||
val intent =
|
||||
Intent(this@MainActivity, AuthActivity::class.java)
|
||||
startActivity(intent)
|
||||
overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left)
|
||||
}) {
|
||||
Icon(
|
||||
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>
|
||||
Reference in New Issue
Block a user