diff --git a/build.gradle b/build.gradle index ba9aef35e..31ae31f64 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ android { applicationId "com.topjohnwu.magisk" minSdkVersion 21 targetSdkVersion 27 - versionCode 108 + versionCode 109 versionName "5.6.2" javaCompileOptions { annotationProcessorOptions { @@ -46,10 +46,10 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':utils') implementation 'com.github.topjohnwu:libsu:1.1.1' - implementation 'com.android.support:recyclerview-v7:27.0.2' - implementation 'com.android.support:cardview-v7:27.0.2' - implementation 'com.android.support:design:27.0.2' - implementation 'com.android.support:support-v4:27.0.2' + implementation 'com.android.support:recyclerview-v7:27.1.0' + implementation 'com.android.support:cardview-v7:27.1.0' + implementation 'com.android.support:design:27.1.0' + implementation 'com.android.support:support-v4:27.1.0' implementation 'com.jakewharton:butterknife:8.8.1' implementation 'com.atlassian.commonmark:commonmark:0.10.0' implementation 'org.kamranzafar:jtar:2.3' diff --git a/src/main/java/com/topjohnwu/magisk/MainActivity.java b/src/main/java/com/topjohnwu/magisk/MainActivity.java index dd46868e4..11bdfae21 100644 --- a/src/main/java/com/topjohnwu/magisk/MainActivity.java +++ b/src/main/java/com/topjohnwu/magisk/MainActivity.java @@ -190,22 +190,22 @@ public class MainActivity extends Activity navigationView.setCheckedItem(itemId); switch (itemId) { case R.id.magisk: - displayFragment(new MagiskFragment(), "magisk", true); + displayFragment(new MagiskFragment(), true); break; case R.id.superuser: - displayFragment(new SuperuserFragment(), "superuser", true); + displayFragment(new SuperuserFragment(), true); break; case R.id.modules: - displayFragment(new ModulesFragment(), "modules", true); + displayFragment(new ModulesFragment(), true); break; case R.id.downloads: - displayFragment(new ReposFragment(), "downloads", true); + displayFragment(new ReposFragment(), true); break; case R.id.magiskhide: - displayFragment(new MagiskHideFragment(), Const.Key.MAGISKHIDE, true); + displayFragment(new MagiskHideFragment(), true); break; case R.id.log: - displayFragment(new LogFragment(), "log", false); + displayFragment(new LogFragment(), false); break; case R.id.settings: startActivity(new Intent(this, SettingsActivity.class)); @@ -218,12 +218,13 @@ public class MainActivity extends Activity } } - private void displayFragment(@NonNull Fragment navFragment, String tag, boolean setElevation) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) { supportInvalidateOptionsMenu(); - transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out); - transaction.replace(R.id.content_frame, navFragment, tag).commitNow(); - if (setElevation) toolbar.setElevation(toolbarElevation); - else toolbar.setElevation(0); + getSupportFragmentManager() + .beginTransaction() + .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) + .replace(R.id.content_frame, navFragment) + .commitNow(); + toolbar.setElevation(setElevation ? toolbarElevation : 0); } }