From 8940b05553a02a93c98ee97d111d31431adf0556 Mon Sep 17 00:00:00 2001
From: Infi <wingit@geist.ga>
Date: Mon, 29 May 2023 23:52:27 +0200
Subject: [PATCH] feat: replace two graduated accompanist dependencies

Signed-off-by: Infi <wingit@geist.ga>
---
 app/build.gradle                                       |  2 --
 .../main/java/chat/revolt/activities/MainActivity.kt   | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index aca933d2..be848a95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -130,8 +130,6 @@ dependencies {
     // Accompanist - Jetpack Compose Extensions
     implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
     implementation "com.google.accompanist:accompanist-permissions:$accompanist_version"
-    implementation "com.google.accompanist:accompanist-navigation-animation:$accompanist_version"
-    implementation "com.google.accompanist:accompanist-navigation-material:$accompanist_version"
     implementation "com.google.accompanist:accompanist-flowlayout:$accompanist_version"
 
     // KTOR - HTTP+WebSocket Library
diff --git a/app/src/main/java/chat/revolt/activities/MainActivity.kt b/app/src/main/java/chat/revolt/activities/MainActivity.kt
index b01af9b0..66c9efba 100644
--- a/app/src/main/java/chat/revolt/activities/MainActivity.kt
+++ b/app/src/main/java/chat/revolt/activities/MainActivity.kt
@@ -13,7 +13,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.fragment.app.FragmentActivity
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
 import androidx.navigation.compose.dialog
+import androidx.navigation.compose.rememberNavController
 import chat.revolt.BuildConfig
 import chat.revolt.api.settings.GlobalState
 import chat.revolt.screens.SplashScreen
@@ -33,9 +36,6 @@ import chat.revolt.screens.settings.AppearanceSettingsScreen
 import chat.revolt.screens.settings.DebugSettingsScreen
 import chat.revolt.screens.settings.SettingsScreen
 import chat.revolt.ui.theme.RevoltTheme
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.android.core.SentryAndroid
 
@@ -62,7 +62,7 @@ val RevoltTweenDp: FiniteAnimationSpec<Dp> = tween(400, easing = EaseInOutExpo)
 @OptIn(ExperimentalAnimationApi::class)
 @Composable
 fun AppEntrypoint() {
-    val navController = rememberAnimatedNavController()
+    val navController = rememberNavController()
 
     RevoltTheme(
         requestedTheme = GlobalState.theme,
@@ -71,7 +71,7 @@ fun AppEntrypoint() {
             modifier = Modifier.fillMaxSize(),
             color = MaterialTheme.colorScheme.background
         ) {
-            AnimatedNavHost(
+            NavHost(
                 navController = navController,
                 startDestination = "splash",
                 enterTransition = {