Commit 7d6f7167 authored by Thomas's avatar Thomas
Browse files

Fix colors

parent 1dbf3a05

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

+0 −6
Original line number Diff line number Diff line
@@ -63,12 +63,6 @@ public class MainApplication extends MultiDexApplication { 


        DynamicColors.applyToActivitiesIfAvailable(this);



      /*  HarmonizedColorsOptions options =

                new HarmonizedColorsOptions.Builder()

                        .setColorAttributes(HarmonizedColorAttributes.create(HARMONIZED_MATERIAL_ATTRIBUTES))

                        .setColorAttributeToHarmonizeWith(R.attr.colorAccent)

                        .build();

        HarmonizedColors.applyToContextIfAvailable(this, options);*/



        boolean custom_theme = sharedpreferences.getBoolean("use_custom_theme", false);

        boolean no_theme_set = sharedpreferences.getBoolean("no_theme_set", true);

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

+17 −2
Original line number Diff line number Diff line 
<resources>

<resources xmlns:tools="http://schemas.android.com/tools">



    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">

        <item name="colorPrimary">@color/md_theme_dark_primary</item>
@@ -29,6 +29,12 @@ 
        <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>





        <item name="android:statusBarColor">?attr/background</item>

        <item name="android:navigationBarColor">?attr/background</item>

        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>

        <item name="android:isLightTheme" tools:targetApi="q">false</item>



        <item name="windowNoTitle">true</item>

        <!-- specify enter and exit transitions -->

        <item name="android:windowEnterTransition">@android:transition/explode</item>
@@ -71,7 +77,11 @@ 
        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>

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





        <item name="android:statusBarColor">?attr/background</item>

        <item name="android:navigationBarColor">?attr/background</item>

        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>

        <item name="android:isLightTheme" tools:targetApi="q">false</item>

    </style>
@@ -81,6 +91,11 @@ 
        <item name="android:windowIsFloating">false</item>

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:statusBarColor">?attr/background</item>

        <item name="android:navigationBarColor">?attr/background</item>

        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>

        <item name="android:isLightTheme" tools:targetApi="q">false</item>

    </style>



    <style name="AlertDialog" parent="Theme.Material3.Dark.Dialog.Alert" />

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

+17 −1
Original line number Diff line number Diff line 
<resources>

<resources xmlns:tools="http://schemas.android.com/tools">



    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">

        <item name="colorPrimary">@color/md_theme_light_primary</item>
@@ -28,6 +28,11 @@ 
        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>

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



        <item name="android:statusBarColor">?attr/background</item>

        <item name="android:navigationBarColor">?attr/background</item>

        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>

        <item name="android:isLightTheme" tools:targetApi="q">true</item>



        <item name="windowNoTitle">true</item>

        <!-- specify enter and exit transitions -->
@@ -69,6 +74,12 @@ 
        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>

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

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



        <item name="android:statusBarColor">?attr/background</item>

        <item name="android:navigationBarColor">?attr/background</item>

        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>

        <item name="android:isLightTheme" tools:targetApi="q">true</item>

    </style>
@@ -78,6 +89,11 @@ 
        <item name="android:windowIsFloating">false</item>

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowNoTitle">true</item>

        <item name="android:statusBarColor">?attr/background</item>

        <item name="android:navigationBarColor">?attr/background</item>

        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>

        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>

        <item name="android:isLightTheme" tools:targetApi="q">true</item>

    </style>