Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion app/src/main/java/dev/leonlatsch/photok/main/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.compose.runtime.getValue
import androidx.core.view.WindowCompat
import androidx.core.view.isVisible
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.navigation.NavOptions
import androidx.navigation.findNavController
import dagger.hilt.android.AndroidEntryPoint
import dev.leonlatsch.photok.R
Expand Down Expand Up @@ -109,7 +110,14 @@ class MainActivity : BindableActivity<ActivityMainBinding>(R.layout.activity_mai
MainMenu(uiState) {
val navController = findNavController(R.id.mainNavHostFragment)
if (navController.currentDestination?.id != it) {
navController.navigate(it)
navController.navigate(
resId = it,
args = null,
navOptions = NavOptions.Builder()
.setEnterAnim(android.R.anim.fade_in)
.setExitAnim(android.R.anim.fade_out)
.build()
)
}
}
}
Expand Down
35 changes: 19 additions & 16 deletions app/src/main/res/navigation/main_nav_graph.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@
<action
android:id="@+id/action_unlockFragment_to_encryptionMigrationFragment"
app:destination="@id/encryptionMigrationFragment"
app:enterAnim="@anim/slide_in_from_right"
app:exitAnim="@anim/slide_out_to_left"
app:popEnterAnim="@anim/slide_in_from_left"
app:popExitAnim="@anim/slide_out_to_right"
app:popUpTo="@id/unlockFragment"
app:popUpToInclusive="true" />
<action
Expand All @@ -101,8 +105,10 @@
<action
android:id="@+id/action_onBoardingFragment_to_setupFragment"
app:destination="@id/setupFragment"
app:enterAnim="@anim/slide_to_top"
app:exitAnim="@anim/nav_default_exit_anim"
app:enterAnim="@anim/slide_in_from_right"
app:exitAnim="@anim/slide_out_to_left"
app:popEnterAnim="@anim/slide_in_from_left"
app:popExitAnim="@anim/slide_out_to_right"
app:popUpTo="@id/onBoardingFragment"
app:popUpToInclusive="true" />
</fragment>
Expand All @@ -113,22 +119,16 @@
<action
android:id="@+id/action_initialFragment_to_unlockFragment"
app:destination="@id/unlockFragment"
app:enterAnim="@anim/slide_to_top"
app:exitAnim="@anim/nav_default_exit_anim"
app:popUpTo="@id/initialFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_initialFragment_to_onBoardingFragment"
app:destination="@id/onBoardingFragment"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popUpTo="@id/initialFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_initialFragment_to_setupFragment"
app:destination="@id/setupFragment"
app:enterAnim="@anim/slide_to_top"
app:exitAnim="@anim/nav_default_exit_anim"
app:popUpTo="@id/initialFragment"
app:popUpToInclusive="true" />
</fragment>
Expand Down Expand Up @@ -161,11 +161,6 @@
android:id="@+id/albumsFragment"
android:name="dev.leonlatsch.photok.gallery.albums.ui.AlbumsFragment"
android:label="GalleryFragment">
<action
android:id="@+id/action_albumsFragment_to_albumDetailFragment"
app:destination="@id/albumDetailFragment"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim" />
</fragment>
<fragment
android:id="@+id/albumDetailFragment"
Expand All @@ -178,12 +173,20 @@
</fragment>
<action
android:id="@+id/action_global_imageViewerFragment"
app:destination="@id/imageViewerFragment" />
app:destination="@id/imageViewerFragment"
app:enterAnim="@anim/slide_in_from_right"
app:exitAnim="@anim/slide_out_to_left"
app:popEnterAnim="@anim/slide_in_from_left"
app:popExitAnim="@anim/slide_out_to_right"
/>
<action
android:id="@+id/action_global_albumDetailFragment"
app:destination="@id/albumDetailFragment"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim" />
app:enterAnim="@anim/slide_in_from_right"
app:exitAnim="@anim/slide_out_to_left"
app:popEnterAnim="@anim/slide_in_from_left"
app:popExitAnim="@anim/slide_out_to_right"
/>
<fragment
android:id="@+id/encryptionMigrationFragment"
android:name="dev.leonlatsch.photok.security.migration.ui.EncryptionMigrationFragment"
Expand Down