Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-12 05:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Redo styling

Browse Source
This commit is contained in:
topjohnwu
2017-02-14 16:35:03 +08:00
parent c4afa069df
commit df7a5bf149
8 changed files with 29 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
View File

@ -48,7 +48,7 @@ public class AboutActivity extends Activity {
String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", "");
Logger.dev("AboutActivity: Theme is " + theme);
if (getTopApplication().isDarkTheme) {
setTheme(R.style.AppTheme_dh);
setTheme(R.style.AppTheme_Dark);
}
setContentView(R.layout.activity_about);
ButterKnife.bind(this);

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

@ -7,7 +7,6 @@ import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.app.ActivityCompat;
@ -42,10 +41,10 @@ public class MainActivity extends Activity
@Override
protected void onCreate(final Bundle savedInstanceState) {
prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
prefs = getTopApplication().prefs;
if (getTopApplication().isDarkTheme) {
setTheme(R.style.AppTheme_dh);
setTheme(R.style.AppTheme_Dark);
}
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
@ -81,14 +80,15 @@ public class MainActivity extends Activity
navigationView.setNavigationItemSelectedListener(this);
getTopApplication().reloadMainActivity.register(this);
if (getTopApplication().updateCheckDone.isTriggered)
onTrigger(getTopApplication().updateCheckDone);
}
@Override
protected void onResume() {
super.onResume();
getTopApplication().updateCheckDone.register(this);
// if (getTopApplication().updateCheckDone.isTriggered)
// onTrigger(getTopApplication().updateCheckDone);
checkHideSection();
}

2
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@ -31,7 +31,7 @@ public class SettingsActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getTopApplication().isDarkTheme) {
setTheme(R.style.AppTheme_dh);
setTheme(R.style.AppTheme_Dark);
}
setContentView(R.layout.activity_container);