Commit d60900e2 authored by Thomas's avatar Thomas
Browse files

Fix custom colors for Android 14

parent 0b24f02b

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.database.MatrixCursor;

import android.graphics.PorterDuff;

import android.graphics.drawable.BitmapDrawable;
@@ -214,6 +215,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
    public static BaseAccount currentAccount;

    public static iconLauncher mLauncher = iconLauncher.BUBBLES;

    public static boolean headerMenuOpen;

    public static int currentNightMode;

    Fragment currentFragment;

    private AppBarConfiguration mAppBarConfiguration;

    private ActivityMainBinding binding;

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

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ package app.fedilab.android.mastodon.activities; 
 * see <http://www.gnu.org/licenses>. */





import static app.fedilab.android.BaseMainActivity.currentNightMode;



import android.annotation.SuppressLint;

import android.content.Context;

import android.content.SharedPreferences;
@@ -37,6 +39,7 @@ import org.conscrypt.Conscrypt; 


import java.security.Security;



import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.R;

import app.fedilab.android.mastodon.helper.Helper;

import app.fedilab.android.mastodon.helper.ThemeHelper;
@@ -70,7 +73,7 @@ public class BaseActivity extends AppCompatActivity { 


        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));

        //Default automatic switch

        int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

            switch (currentNightMode) {

                case Configuration.UI_MODE_NIGHT_NO -> {

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

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ package app.fedilab.android.mastodon.activities; 
 * see <http://www.gnu.org/licenses>. */





import static app.fedilab.android.BaseMainActivity.currentNightMode;



import android.annotation.SuppressLint;

import android.content.Context;

import android.content.SharedPreferences;
@@ -65,7 +67,7 @@ public class BaseBarActivity extends AppCompatActivity { 
        }

        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));

        //Default automatic switch

        int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

            switch (currentNightMode) {

                case Configuration.UI_MODE_NIGHT_NO -> {

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

+3 −1
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ package app.fedilab.android.mastodon.activities; 
 * see <http://www.gnu.org/licenses>. */





import static app.fedilab.android.BaseMainActivity.currentNightMode;



import android.annotation.SuppressLint;

import android.content.Context;

import android.content.SharedPreferences;
@@ -65,7 +67,7 @@ public class BaseTransparentActivity extends AppCompatActivity { 
        }

        String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));

        //Default automatic switch

        int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {



            switch (currentNightMode) {

app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ package app.fedilab.android.mastodon.helper; 




import static app.fedilab.android.BaseMainActivity.currentAccount;

import static app.fedilab.android.BaseMainActivity.currentNightMode;



import android.app.Activity;

import android.content.ClipData;
@@ -113,7 +114,6 @@ public class SpannableHelper { 
            return null;

        }

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);

        int currentNightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;

        boolean customLight = sharedpreferences.getBoolean(context.getString(R.string.SET_CUSTOMIZE_LIGHT_COLORS), false);

        boolean customDark = sharedpreferences.getBoolean(context.getString(R.string.SET_CUSTOMIZE_DARK_COLORS), false);

        underlineLinks = sharedpreferences.getBoolean(context.getString(R.string.SET_UNDERLINE_CLICKABLE), false);