br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

UI Fixes

Browse Source 
+ Adjusted dark theme colors
+ Moved setting to an activity
+ Code format
+ Changed some icons
+ Minor fixes
This commit is contained in:
dvdandroid
2016-09-29 22:18:41 +02:00
committed by topjohnwu
parent 9eb108f13e
commit d788bd8323
26 changed files with 287 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/com/topjohnwu/magisk/MainActivity.java
View File

@@ -33,7 +33,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private static final String SELECTED_ITEM_ID = "SELECTED_ITEM_ID";
private final Handler mDrawerHandler = new Handler();
private String currentTitle;
@BindView(R.id.toolbar) Toolbar toolbar;
@BindView(R.id.drawer_layout) DrawerLayout drawer;
@@ -85,22 +84,13 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
mSelectedId = savedInstanceState == null ? mSelectedId : savedInstanceState.getInt(SELECTED_ITEM_ID);
navigationView.setCheckedItem(mSelectedId);
if (savedInstanceState == null) {
mDrawerHandler.removeCallbacksAndMessages(null);
mDrawerHandler.postDelayed(() -> navigate(mSelectedId), 250);
}
navigationView.setNavigationItemSelectedListener(this);
Bundle extras = getIntent().getExtras();
if (extras != null) {
String toLaunch = "";
toLaunch = getIntent().getExtras().getString("Relaunch");
if (toLaunch.equals("Settings")) {
Logger.dev("MainActivity: Intent has extras " + getIntent().getExtras().getString("Relaunch"));
mSelectedId = R.id.settings;
}
}
mDrawerHandler.removeCallbacksAndMessages(null);
navigate(mSelectedId);
}
@Override
@@ -130,12 +120,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
return true;
}
@Override
protected void onResume() {
super.onResume();
setTitle(currentTitle);
}
public void navigate(final int itemId) {
Fragment navFragment = null;
String tag = "";
@@ -166,9 +150,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
navFragment = new LogFragment();
break;
case R.id.settings:
setTitle(R.string.settings);
tag = "settings";
navFragment = new SettingsFragment();
startActivity(new Intent(this, SettingsActivity.class));
break;
case R.id.app_about:
startActivity(new Intent(this, AboutActivity.class));
@@ -176,14 +158,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
if (navFragment != null) {
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
try {
toolbar.setElevation(navFragment instanceof ModulesFragment ? 0 : 10);
currentTitle = getTitle().toString();
transaction.replace(R.id.content_frame, navFragment, tag).addToBackStack(currentTitle).commit();
transaction.replace(R.id.content_frame, navFragment, tag).commit();
} catch (IllegalStateException ignored) {
}
}