Commit 4fa8959f authored by Thomas's avatar Thomas
Browse files

Fix issue #663 - Support nav & status bar colors for Android 5

parent f4a38504

app/src/main/java/app/fedilab/android/activities/BaseActivity.java

+8 −3
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -32,7 +35,6 @@ import com.vanniktech.emoji.one.EmojiOneProvider; 


import app.fedilab.android.R;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.ThemeHelper;





@SuppressLint("Registered")
@@ -125,8 +127,11 @@ public class BaseActivity extends AppCompatActivity { 
            }

        }

        super.onCreate(savedInstanceState);

        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {

            ThemeHelper.adjustFontScale(this, getResources().getConfiguration());

        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(Color.BLACK);

            window.setNavigationBarColor(Color.BLACK);

        }

        Helper.setLocale(this);

    }

app/src/main/java/app/fedilab/android/activities/BaseBarActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -111,6 +114,12 @@ public class BaseBarActivity extends AppCompatActivity { 
            }

        }

        super.onCreate(savedInstanceState);

        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(Color.BLACK);

            window.setNavigationBarColor(Color.BLACK);

        }

        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {

            ThemeHelper.adjustFontScale(this, getResources().getConfiguration());

        }

app/src/main/java/app/fedilab/android/activities/BaseTransparentActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -111,6 +114,12 @@ public class BaseTransparentActivity extends AppCompatActivity { 
            }

        }

        super.onCreate(savedInstanceState);

        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(Color.BLACK);

            window.setNavigationBarColor(Color.BLACK);

        }

        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {

            ThemeHelper.adjustFontScale(this, getResources().getConfiguration());

        }