diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java index 44d3298e6..104628119 100644 --- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java @@ -28,7 +28,7 @@ import butterknife.ButterKnife; public class AboutActivity extends Activity { - private static final String DONATION_URL = "http://topjohnwu.github.io/donate"; + private static final String DONATION_URL = "https://www.paypal.me/topjohnwu"; private static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382"; private static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager"; @@ -44,10 +44,8 @@ public class AboutActivity extends Activity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", ""); - Logger.dev("AboutActivity: Theme is " + theme); if (getApplicationContext().isDarkTheme) { - setTheme(R.style.AppTheme_Dark); + setTheme(R.style.AppTheme_Transparent_Dark); } setContentView(R.layout.activity_about); ButterKnife.bind(this); diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java index bc6fbe2bf..79581dced 100644 --- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java +++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java @@ -30,10 +30,10 @@ public class SettingsActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getApplicationContext().isDarkTheme) { - setTheme(R.style.AppTheme_Dark); + setTheme(R.style.AppTheme_Transparent_Dark); } - setContentView(R.layout.activity_container); + setContentView(R.layout.activity_settings); ButterKnife.bind(this); setSupportActionBar(toolbar); diff --git a/app/src/main/res/layout/activity_container.xml b/app/src/main/res/layout/activity_settings.xml similarity index 100% rename from app/src/main/res/layout/activity_container.xml rename to app/src/main/res/layout/activity_settings.xml diff --git a/app/src/main/res/layout/fragment_magisk.xml b/app/src/main/res/layout/fragment_magisk.xml index 9592aa948..fe8dbc999 100644 --- a/app/src/main/res/layout/fragment_magisk.xml +++ b/app/src/main/res/layout/fragment_magisk.xml @@ -178,7 +178,8 @@ android:layout_centerVertical="true" android:layout_margin="15dp" android:layout_toStartOf="@+id/safetyNet_status" - android:src="@drawable/ic_refresh" /> + android:src="@drawable/ic_refresh" + android:tint="?attr/imageColorTint" /> true + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7327dc4c5..4b67ac85d 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -30,5 +30,6 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 68f9a017d..3aaf0ba5c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,7 +10,7 @@ #F44336 #4CAF50 #9E9E9E - #2196F3 + #2196f3 #FFC107 #dedede diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0fb273ef1..bb15ff547 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,6 +12,7 @@ false true @android:color/transparent + @android:color/background_dark + +