From 839cb6b058af5d5ded3590f21441e517ff5a2b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=8D=E3=82=80=E3=81=AD=E3=81=93?= Date: Mon, 18 Dec 2023 13:12:49 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"Transition=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 051a6e582f9cababd1c4630512da6aa3837e9263. --- app/src/main/java/one/nem/lacerta/MainActivity.java | 10 +++------- .../one/nem/lacerta/feature/home/HomeTopFragment.java | 8 -------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/one/nem/lacerta/MainActivity.java b/app/src/main/java/one/nem/lacerta/MainActivity.java index 8e18957e..404debd0 100644 --- a/app/src/main/java/one/nem/lacerta/MainActivity.java +++ b/app/src/main/java/one/nem/lacerta/MainActivity.java @@ -2,17 +2,16 @@ package one.nem.lacerta; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; import androidx.navigation.NavController; import androidx.navigation.fragment.NavHostFragment; import androidx.navigation.ui.NavigationUI; import android.os.Bundle; -import android.transition.Transition; import android.widget.Toast; import com.google.android.material.bottomnavigation.BottomNavigationView; -import com.google.android.material.transition.MaterialSharedAxis; + + import dagger.hilt.android.AndroidEntryPoint; @@ -30,12 +29,9 @@ public class MainActivity extends AppCompatActivity { FragmentManager supportFragmentManager = getSupportFragmentManager(); NavHostFragment navHostFragment = (NavHostFragment) supportFragmentManager.findFragmentById(R.id.nav_host_fragment); - - // Animation - + NavController navController = navHostFragment.getNavController(); BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_nav); - NavController navController = navHostFragment.getNavController(); NavigationUI.setupWithNavController(bottomNavigationView, navController); Toast.makeText(this, "testMessage", Toast.LENGTH_SHORT).show(); diff --git a/feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java b/feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java index a2023a02..4bc07490 100644 --- a/feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java +++ b/feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java @@ -2,11 +2,8 @@ package one.nem.lacerta.feature.home; import android.os.Bundle; -import android.transition.TransitionInflater; - import androidx.fragment.app.Fragment; -import android.transition.TransitionManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -52,14 +49,9 @@ public class HomeTopFragment extends Fragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Transition - TransitionInflater inflater = TransitionInflater.from(requireContext()); - setEnterTransition(inflater.inflateTransition(android.R.transition.slide_top)); - setExitTransition(inflater.inflateTransition(android.R.transition.slide_bottom)); if (getArguments() != null) { mParam1 = getArguments().getString(ARG_PARAM1); mParam2 = getArguments().getString(ARG_PARAM2); - } else { } }