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

Code cleanup, fixing thangs...

Browse Source
This commit is contained in:
d8ahazard
2016-09-25 01:16:08 -05:00
parent c56dd4172e
commit 17749bb14a
8 changed files with 64 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@ import android.app.Fragment;
import android.app.FragmentTransaction;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -21,12 +20,10 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageButton;
import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.Utils;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -36,7 +33,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private final Handler mDrawerHandler = new Handler();
private String currentTitle;
private View mView;
@BindView(R.id.toolbar)
Toolbar toolbar;
@@ -51,7 +47,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
@Override
protected void onCreate(final Bundle savedInstanceState) {
String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme","");
String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", "");
Logger.dh("MainActivity: Theme is " + theme);
if (theme.equals("Dark")) {
setTheme(R.style.AppTheme_dh);
@@ -113,8 +109,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
}
);
setSupportActionBar(toolbar);
@@ -145,45 +139,22 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
navigationView.setNavigationItemSelectedListener(this);
mView = getToolbarNavigationButton();
Bundle extras = getIntent().getExtras();
if(extras != null) {
if (extras != null) {
navigate(R.id.settings);
Logger.dh("MainActivity: Intent has extras " + getIntent().getExtras().getString("Relaunch"));
String data = extras.getString("Relaunch"); // retrieve the data using keyName
if (data.contains("Settings")) {
navigate(R.id.settings);
}
}
}
public ImageButton getToolbarNavigationButton() {
int size = toolbar.getChildCount();
for (int i = 0; i < size; i++) {
View child = toolbar.getChildAt(i);
if (child instanceof ImageButton) {
ImageButton btn = (ImageButton) child;
if (btn.getDrawable() == toolbar.getNavigationIcon()) {
return btn;
}
}
}
return null;
}
@Override
protected void onDestroy() {
super.onDestroy();
}
private void startTour() {
navigate(R.id.root);
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);