Commit 29752106 authored by Thomas's avatar Thomas
Browse files

Add black theme

parent 0c2a6e2a

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

+7 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ public class BaseActivity extends AppCompatActivity { 
        //Default automatic switch

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





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

            switch (currentNightMode) {

                case Configuration.UI_MODE_NIGHT_NO:
@@ -72,6 +71,9 @@ public class BaseActivity extends AppCompatActivity { 
                        case "SOLARIZED_DARK":

                            setTheme(R.style.SolarizedAppTheme);

                            break;

                        case "BLACK":

                            setTheme(R.style.BlackAppTheme);

                            break;

                    }

                    break;

            }
@@ -93,6 +95,10 @@ public class BaseActivity extends AppCompatActivity { 
                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.SolarizedAppTheme);

                    break;

                case "BLACK":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.BlackAppTheme);

                    break;

            }

        }

        super.onCreate(savedInstanceState);

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

+7 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ public class BaseBarActivity extends AppCompatActivity { 
                        case "SOLARIZED_DARK":

                            setTheme(R.style.SolarizedAppThemeBar);

                            break;

                        case "BLACK":

                            setTheme(R.style.BlackAppThemeBar);

                            break;

                    }

                    break;

            }
@@ -92,6 +95,10 @@ public class BaseBarActivity extends AppCompatActivity { 
                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.SolarizedAppThemeBar);

                    break;

                case "BLACK":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.BlackAppThemeBar);

                    break;

            }

        }

        super.onCreate(savedInstanceState);

app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements 
                requireActivity().recreate();

            }

        }

        //TODO: check if can be removed

        Helper.recreateMainActivity(requireActivity());

    }

app/src/main/res/values-night/themes.xml

+65 −0
Original line number Diff line number Diff line
@@ -167,5 +167,70 @@ 
        <item name="colorPrimaryInverse">@color/solarized_md_theme_dark_inversePrimary</item>

    </style>



    <style name="BlackAppTheme" parent="AppTheme">



        <item name="colorPrimary">@color/md_theme_dark_primary</item>

        <item name="colorOnPrimary">@color/white</item>

        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>

        <item name="colorOnPrimaryContainer">@color/white</item>



        <item name="colorSecondary">@color/md_theme_dark_secondary</item>

        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>

        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>

        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>



        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>

        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>

        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>

        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>



        <item name="colorError">@color/solarized_md_theme_dark_error</item>

        <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>

        <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>

        <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>

        <item name="android:colorBackground">@color/black</item>

        <item name="colorOnBackground">@color/white</item>

        <item name="colorSurface">@color/black</item>

        <item name="colorOnSurface">@color/white</item>

        <item name="colorSurfaceVariant">@color/black</item>

        <item name="colorOnSurfaceVariant">@color/white</item>

        <item name="colorOutline">@color/solarized_md_theme_dark_outline</item>

        <item name="colorOnSurfaceInverse">@color/black</item>

        <item name="colorSurfaceInverse">@color/white</item>

        <item name="colorPrimaryInverse">@color/black</item>

    </style>



    <style name="BlackAppThemeBar" parent="AppThemeBar">



        <item name="colorPrimary">@color/md_theme_dark_primary</item>

        <item name="colorOnPrimary">@color/white</item>

        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>

        <item name="colorOnPrimaryContainer">@color/white</item>



        <item name="colorSecondary">@color/md_theme_dark_secondary</item>

        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>

        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>

        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>



        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>

        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>

        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>

        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>



        <item name="colorError">@color/solarized_md_theme_dark_error</item>

        <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>

        <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>

        <item name="colorOnErrorContainer">@color/solarized_md_theme_dark_onErrorContainer</item>

        <item name="android:colorBackground">@color/black</item>

        <item name="colorOnBackground">@color/white</item>

        <item name="colorSurface">@color/black</item>

        <item name="colorOnSurface">@color/white</item>

        <item name="colorSurfaceVariant">@color/black</item>

        <item name="colorOnSurfaceVariant">@color/white</item>

        <item name="colorOutline">@color/solarized_md_theme_dark_outline</item>

        <item name="colorOnSurfaceInverse">@color/black</item>

        <item name="colorSurfaceInverse">@color/white</item>

        <item name="colorPrimaryInverse">@color/black</item>

    </style>



</resources>

app/src/main/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ 
        <item>System default</item>

        <item>Solarized (Light)</item>

        <item>Solarized (Dark)</item>

        <item>Black</item>

    </string-array>

    <string-array name="SET_THEME_MODE_VALUE" translatable="false">

        <item>LIGHT</item>
@@ -709,6 +710,7 @@ 
        <item>SYSTEM</item>

        <item>SOLARIZED_LIGHT</item>

        <item>SOLARIZED_DARK</item>

        <item>BLACK</item>

    </string-array>
@@ -724,10 +726,12 @@ 
    <string-array name="set_default_theme_dark">

        <item>Dark</item>

        <item>Solarized (Dark)</item>

        <item>Black</item>

    </string-array>

    <string-array name="SET_THEME_DEFAULT_DARK" translatable="false">

        <item>DARK</item>

        <item>SOLARIZED_DARK</item>

        <item>BLACK</item>

    </string-array>