Merge pull request #1319 from alexbakker/amoled-code-color

Make the code color white for AMOLED
This commit is contained in:
Michael Schättgen 2024-03-20 21:32:09 +01:00 committed by GitHub
commit e70499bcff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 9 additions and 1 deletions

View file

@ -119,7 +119,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:fallbackLineSpacing="false" android:fallbackLineSpacing="false"
android:textSize="34sp" android:textSize="34sp"
android:textColor="?attr/colorPrimary" android:textColor="?attr/colorCode"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"

View file

@ -122,6 +122,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:fallbackLineSpacing="false" android:fallbackLineSpacing="false"
android:textSize="26sp" android:textSize="26sp"
android:textColor="?attr/colorCode"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"

View file

@ -120,6 +120,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:fallbackLineSpacing="false" android:fallbackLineSpacing="false"
android:textSize="26sp" android:textSize="26sp"
android:textColor="?attr/colorCode"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"

View file

@ -117,6 +117,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:fallbackLineSpacing="false" android:fallbackLineSpacing="false"
android:textSize="26sp" android:textSize="26sp"
android:textColor="?attr/colorCode"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:textStyle="normal|bold"/> android:textStyle="normal|bold"/>

View file

@ -6,6 +6,7 @@
<attr name="colorOnDark" /> <attr name="colorOnDark" />
<attr name="colorSuccess" /> <attr name="colorSuccess" />
<attr name="colorOnSurfaceDim" /> <attr name="colorOnSurfaceDim" />
<attr name="colorCode" />
<declare-styleable name="SlideIndicator"> <declare-styleable name="SlideIndicator">
<attr name="dot_radius" format="dimension" /> <attr name="dot_radius" format="dimension" />

View file

@ -53,6 +53,7 @@
<item name="colorOnDark">@android:color/white</item> <item name="colorOnDark">@android:color/white</item>
<item name="colorSuccess">@color/aegis_theme_light_success</item> <item name="colorSuccess">@color/aegis_theme_light_success</item>
<item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item> <item name="colorOnSurfaceDim">@color/aegis_theme_light_onSurfaceDim</item>
<item name="colorCode">?attr/colorPrimary</item>
<!-- Intro colors --> <!-- Intro colors -->
<item name="dot_color">?attr/colorSurfaceVariant</item> <item name="dot_color">?attr/colorSurfaceVariant</item>
<item name="dot_color_selected">?attr/colorOnSurfaceVariant</item> <item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
@ -121,6 +122,7 @@
<item name="colorOnDark">@android:color/white</item> <item name="colorOnDark">@android:color/white</item>
<item name="colorSuccess">@color/aegis_theme_dark_success</item> <item name="colorSuccess">@color/aegis_theme_dark_success</item>
<item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item> <item name="colorOnSurfaceDim">@color/aegis_theme_dark_onSurfaceDim</item>
<item name="colorCode">?attr/colorPrimary</item>
<!-- Intro colors --> <!-- Intro colors -->
<item name="dot_color">?attr/colorSurfaceVariant</item> <item name="dot_color">?attr/colorSurfaceVariant</item>
<item name="dot_color_selected">?attr/colorOnSurfaceVariant</item> <item name="dot_color_selected">?attr/colorOnSurfaceVariant</item>
@ -146,6 +148,7 @@
<item name="colorSurfaceContainerLowest">#000000</item> <item name="colorSurfaceContainerLowest">#000000</item>
<item name="colorSurfaceDim">#000000</item> <item name="colorSurfaceDim">#000000</item>
<item name="colorSurfaceBright">#000000</item> <item name="colorSurfaceBright">#000000</item>
<item name="colorCode">@android:color/white</item>
</style> </style>
<style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark"> <style name="ThemeOverlay.Aegis.Dynamic.Amoled" parent="ThemeOverlay.Material3.DynamicColors.Dark">
@ -159,6 +162,7 @@
<item name="colorSurfaceContainerLowest">#000000</item> <item name="colorSurfaceContainerLowest">#000000</item>
<item name="colorSurfaceDim">#000000</item> <item name="colorSurfaceDim">#000000</item>
<item name="colorSurfaceBright">#000000</item> <item name="colorSurfaceBright">#000000</item>
<item name="colorCode">@android:color/white</item>
</style> </style>
<style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light"> <style name="Theme.Aegis.Light" parent="Base.Theme.Aegis.Light">