diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index f1bfc33c5..cbca55393 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -25,6 +25,7 @@ import androidx.activity.OnBackPressedCallback import androidx.fragment.app.activityViewModels import androidx.navigation.findNavController import androidx.navigation.fragment.findNavController +import com.google.android.material.transition.MaterialFadeThrough import org.oxycblt.auxio.databinding.FragmentMainBinding import org.oxycblt.auxio.music.Music import org.oxycblt.auxio.music.Song @@ -46,6 +47,12 @@ class MainFragment : ViewBindingFragment() { private val navModel: NavigationViewModel by activityViewModels() private var callback: DynamicBackPressedCallback? = null + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enterTransition = MaterialFadeThrough() + exitTransition = MaterialFadeThrough() + } + override fun onCreateBinding(inflater: LayoutInflater) = FragmentMainBinding.inflate(inflater) override fun onBindingCreated(binding: FragmentMainBinding, savedInstanceState: Bundle?) { diff --git a/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt index e5c6bd114..2e5159447 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/AboutFragment.kt @@ -27,6 +27,7 @@ import androidx.core.net.toUri import androidx.core.view.updatePadding import androidx.navigation.fragment.findNavController import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import com.google.android.material.transition.MaterialFadeThrough import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.FragmentAboutBinding @@ -51,6 +52,12 @@ import org.oxycblt.auxio.util.textSafe class AboutFragment : ViewBindingFragment() { private val homeModel: HomeViewModel by androidActivityViewModels() + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enterTransition = MaterialFadeThrough() + exitTransition = MaterialFadeThrough() + } + override fun onCreateBinding(inflater: LayoutInflater) = FragmentAboutBinding.inflate(inflater) override fun onBindingCreated(binding: FragmentAboutBinding, savedInstanceState: Bundle?) { diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt index 95dd6dc86..f69d58244 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt @@ -21,6 +21,7 @@ import android.os.Bundle import android.view.LayoutInflater import androidx.fragment.app.Fragment import androidx.navigation.fragment.findNavController +import com.google.android.material.transition.MaterialFadeThrough import org.oxycblt.auxio.databinding.FragmentSettingsBinding import org.oxycblt.auxio.ui.fragment.ViewBindingFragment @@ -29,6 +30,12 @@ import org.oxycblt.auxio.ui.fragment.ViewBindingFragment * @author OxygenCobalt */ class SettingsFragment : ViewBindingFragment() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enterTransition = MaterialFadeThrough() + exitTransition = MaterialFadeThrough() + } + override fun onCreateBinding(inflater: LayoutInflater) = FragmentSettingsBinding.inflate(inflater) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0511f9aa5..db6d8919a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,6 @@ android:name="androidx.navigation.fragment.NavHostFragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorSurface" app:defaultNavHost="true" app:navGraph="@navigation/nav_main" tools:layout="@layout/fragment_main" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 3c5e3c6e3..b8e33bcd9 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:background="?attr/colorSurface" tools:context=".settings.AboutFragment"> + android:orientation="vertical" + android:background="?attr/colorSurface"> + app:destination="@id/search_fragment" /> diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml index 2861087fc..18aa26c42 100644 --- a/app/src/main/res/navigation/nav_main.xml +++ b/app/src/main/res/navigation/nav_main.xml @@ -10,21 +10,13 @@ tools:layout="@layout/fragment_main"> + app:destination="@id/queue_fragment" /> + app:destination="@id/about_fragment" />