TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-21 20:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update fragment transaction

Browse Source
This commit is contained in:
topjohnwu 2018-03-18 01:04:48 +08:00
parent 5f2c742a5c
commit e3948d295e
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -7,7 +7,7 @@ android {
applicationId "com.topjohnwu.magisk" applicationId "com.topjohnwu.magisk"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 27 targetSdkVersion 27
versionCode 108 versionCode 109
versionName "5.6.2" versionName "5.6.2"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
@ -46,10 +46,10 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':utils') implementation project(':utils')
implementation 'com.github.topjohnwu:libsu:1.1.1' implementation 'com.github.topjohnwu:libsu:1.1.1'
implementation 'com.android.support:recyclerview-v7:27.0.2' implementation 'com.android.support:recyclerview-v7:27.1.0'
implementation 'com.android.support:cardview-v7:27.0.2' implementation 'com.android.support:cardview-v7:27.1.0'
implementation 'com.android.support:design:27.0.2' implementation 'com.android.support:design:27.1.0'
implementation 'com.android.support:support-v4:27.0.2' implementation 'com.android.support:support-v4:27.1.0'
implementation 'com.jakewharton:butterknife:8.8.1' implementation 'com.jakewharton:butterknife:8.8.1'
implementation 'com.atlassian.commonmark:commonmark:0.10.0' implementation 'com.atlassian.commonmark:commonmark:0.10.0'
implementation 'org.kamranzafar:jtar:2.3' implementation 'org.kamranzafar:jtar:2.3'

25
src/main/java/com/topjohnwu/magisk/MainActivity.java
View File

@ -190,22 +190,22 @@ public class MainActivity extends Activity
navigationView.setCheckedItem(itemId); navigationView.setCheckedItem(itemId);
switch (itemId) { switch (itemId) {
case R.id.magisk: case R.id.magisk:
displayFragment(new MagiskFragment(), "magisk", true); displayFragment(new MagiskFragment(), true);
break; break;
case R.id.superuser: case R.id.superuser:
displayFragment(new SuperuserFragment(), "superuser", true); displayFragment(new SuperuserFragment(), true);
break; break;
case R.id.modules: case R.id.modules:
displayFragment(new ModulesFragment(), "modules", true); displayFragment(new ModulesFragment(), true);
break; break;
case R.id.downloads: case R.id.downloads:
displayFragment(new ReposFragment(), "downloads", true); displayFragment(new ReposFragment(), true);
break; break;
case R.id.magiskhide: case R.id.magiskhide:
displayFragment(new MagiskHideFragment(), Const.Key.MAGISKHIDE, true); displayFragment(new MagiskHideFragment(), true);
break; break;
case R.id.log: case R.id.log:
displayFragment(new LogFragment(), "log", false); displayFragment(new LogFragment(), false);
break; break;
case R.id.settings: case R.id.settings:
startActivity(new Intent(this, SettingsActivity.class)); 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) { private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
supportInvalidateOptionsMenu(); supportInvalidateOptionsMenu();
transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out); getSupportFragmentManager()
transaction.replace(R.id.content_frame, navFragment, tag).commitNow(); .beginTransaction()
if (setElevation) toolbar.setElevation(toolbarElevation); .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
else toolbar.setElevation(0); .replace(R.id.content_frame, navFragment)
.commitNow();
toolbar.setElevation(setElevation ? toolbarElevation : 0);
} }
} }