voussoir/trkpt
1
0
Fork 0
Code Issues Projects Releases Packages Activity

black status bar problems were back after last commit - now fixed again

Browse source
This commit is contained in:
y20k 2018-02-23 20:17:41 +01:00
parent aa8f9e2f2d
commit 2cdfc78d9f
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/org/y20k/trackbook/helpers/NightModeHelper.java
View file

@ -16,11 +16,14 @@
package org.y20k.trackbook.helpers; package org.y20k.trackbook.helpers;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatDelegate; import android.support.v7.app.AppCompatDelegate;
import android.view.View;
/** /**
@ -33,19 +36,22 @@ public final class NightModeHelper implements TrackbookKeys {
/* Switches to opposite theme */ /* Switches to opposite theme */
public static void switchToOpposite(Context context) { public static void switchToOpposite(Activity activity) {
switch (getCurrentNightModeState(context)) { switch (getCurrentNightModeState(activity)) {
case Configuration.UI_MODE_NIGHT_NO: case Configuration.UI_MODE_NIGHT_NO:
// night mode is currently not active - turn on night mode // night mode is currently not active - turn on night mode
activateNightMode(context); displayDefaultStatusBar(activity); // necessary hack :-/
activateNightMode(activity);
break; break;
case Configuration.UI_MODE_NIGHT_YES: case Configuration.UI_MODE_NIGHT_YES:
// night mode is currently active - turn off night mode // night mode is currently active - turn off night mode
deactivateNightMode(context); displayLightStatusBar(activity); // necessary hack :-/
deactivateNightMode(activity);
break; break;
case Configuration.UI_MODE_NIGHT_UNDEFINED: case Configuration.UI_MODE_NIGHT_UNDEFINED:
// don't know what mode is active - turn off night mode // don't know what mode is active - turn off night mode
deactivateNightMode(context); displayLightStatusBar(activity); // necessary hack :-/
deactivateNightMode(activity);
break; break;
} }
} }
@ -84,7 +90,7 @@ public final class NightModeHelper implements TrackbookKeys {
private static void activateNightMode(Context context) { private static void activateNightMode(Context context) {
saveNightModeState(context, Configuration.UI_MODE_NIGHT_YES); saveNightModeState(context, Configuration.UI_MODE_NIGHT_YES);
// switch to Nighh Mode // switch to Night Mode
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
} }
@ -99,6 +105,24 @@ public final class NightModeHelper implements TrackbookKeys {
} }
/* Displays the default status bar */
private static void displayDefaultStatusBar(Activity activity) {
View decorView = activity.getWindow().getDecorView();
decorView.setSystemUiVisibility(0);
}
/* Displays the light (inverted) status bar - if possible */
private static void displayLightStatusBar(Activity activity) {
View decorView = activity.getWindow().getDecorView();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
} else {
decorView.setSystemUiVisibility(0);
}
}
/* Save state of night mode */ /* Save state of night mode */
private static void saveNightModeState(Context context, int currentState) { private static void saveNightModeState(Context context, int currentState) {
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);