Added android 10 dark theme support
This commit is contained in:
parent
46cdedce0b
commit
153f1bd9d0
33 changed files with 372 additions and 352 deletions
|
@ -46,24 +46,33 @@
|
|||
|
||||
|
||||
<declare-styleable name="LrcView">
|
||||
<attr name="lrcTextSize" format="dimension"/>
|
||||
<attr name="lrcLineSpaceSize" format="dimension"/>
|
||||
<attr name="lrcNormalTextColor" format="reference|color"/>
|
||||
<attr name="lrcCurrentTextColor" format="reference|color"/>
|
||||
<attr name="lrcTouchDelay" format="integer"/>
|
||||
<attr name="noLrcTextSize" format="dimension"/>
|
||||
<attr name="noLrcTextColor" format="reference|color"/>
|
||||
<attr name="indicatorLineHeight" format="dimension"/>
|
||||
<attr name="indicatorTextSize" format="dimension"/>
|
||||
<attr name="indicatorTextColor" format="reference|color"/>
|
||||
<attr name="currentIndicateLrcColor" format="reference|color"/>
|
||||
<attr name="indicatorTouchDelay" format="integer"/>
|
||||
<attr name="indicatorLineColor" format="reference|color"/>
|
||||
<attr name="indicatorStartEndMargin" format="dimension"/>
|
||||
<attr name="iconLineGap" format="dimension"/>
|
||||
<attr name="playIconWidth" format="dimension"/>
|
||||
<attr name="playIconHeight" format="dimension"/>
|
||||
<attr name="playIcon" format="reference"/>
|
||||
<attr name="lrcTextSize" format="dimension" />
|
||||
<attr name="lrcLineSpaceSize" format="dimension" />
|
||||
<attr name="lrcNormalTextColor" format="reference|color" />
|
||||
<attr name="lrcCurrentTextColor" format="reference|color" />
|
||||
<attr name="lrcTouchDelay" format="integer" />
|
||||
<attr name="noLrcTextSize" format="dimension" />
|
||||
<attr name="noLrcTextColor" format="reference|color" />
|
||||
<attr name="indicatorLineHeight" format="dimension" />
|
||||
<attr name="indicatorTextSize" format="dimension" />
|
||||
<attr name="indicatorTextColor" format="reference|color" />
|
||||
<attr name="currentIndicateLrcColor" format="reference|color" />
|
||||
<attr name="indicatorTouchDelay" format="integer" />
|
||||
<attr name="indicatorLineColor" format="reference|color" />
|
||||
<attr name="indicatorStartEndMargin" format="dimension" />
|
||||
<attr name="iconLineGap" format="dimension" />
|
||||
<attr name="playIconWidth" format="dimension" />
|
||||
<attr name="playIconHeight" format="dimension" />
|
||||
<attr name="playIcon" format="reference" />
|
||||
</declare-styleable>
|
||||
|
||||
<attr name="lineHeightHint" format="dimension" />
|
||||
|
||||
<declare-styleable name="BaselineGridTextView">
|
||||
<attr name="lineHeightMultiplierHint" format="float" />
|
||||
<attr name="lineHeightHint" />
|
||||
<attr name="maxLinesByHeight" format="boolean" />
|
||||
<attr name="android:textAppearance" />
|
||||
<attr name="android:fontFamily" />
|
||||
</declare-styleable>
|
||||
</resources>
|
|
@ -37,9 +37,10 @@
|
|||
</style>
|
||||
|
||||
|
||||
<style name="ToolbarTextAppearanceSearch">
|
||||
<style name="ToolbarTextAppearanceSearch" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:fontFamily">@font/circular_std_book</item>
|
||||
<item name="android:textColor">?colorOnSurface</item>
|
||||
</style>
|
||||
|
||||
<style name="ToolbarTextAppearanceNormal">
|
||||
|
@ -66,7 +67,7 @@
|
|||
</style>
|
||||
|
||||
<style name="SubTitleTextAppearance">
|
||||
<item name="android:textAppearance">@style/TextViewSubtitle1</item>
|
||||
<item name="android:textAppearance">@style/TextViewOverline</item>
|
||||
<item name="android:layout_gravity">start|center_vertical</item>
|
||||
<item name="android:padding">12dp</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
|
|
|
@ -28,8 +28,6 @@
|
|||
|
||||
<!-- just in case-->
|
||||
<item name="android:windowBackground">@color/dark_color</item>
|
||||
<item name="colorAccent">@android:color/white</item>
|
||||
<item name="colorPrimary">@color/dark_color</item>
|
||||
|
||||
<!-- necessary to find the overflow button later in the layout-->
|
||||
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
|
||||
|
@ -43,11 +41,27 @@
|
|||
<item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
|
||||
<item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="android:textColorPrimary">@color/md_white_1000</item>
|
||||
|
||||
<item name="windowActionBar">false</item>
|
||||
|
||||
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
|
||||
|
||||
<item name="colorPrimary">@color/dark_color</item>
|
||||
<item name="colorPrimaryVariant">@color/black_color</item>
|
||||
<item name="colorOnPrimary">@color/mi_text_color_primary_dark</item>
|
||||
|
||||
<item name="colorAccent">@color/md_deep_purple_A200</item>
|
||||
|
||||
|
||||
<item name="colorSecondary">@color/md_green_500</item>
|
||||
<item name="colorOnSecondary">@color/mi_text_color_secondary_light</item>
|
||||
<item name="colorSecondaryVariant">@color/md_green_A700</item>
|
||||
|
||||
<item name="android:colorBackground">@color/md_white_1000</item>
|
||||
<item name="colorSurface">@color/dark_color</item>
|
||||
<item name="colorOnSurface">@color/mi_text_color_primary_dark</item>
|
||||
<item name="colorOnBackground">@color/mi_text_color_secondary_dark</item>
|
||||
<item name="colorControlNormal">@color/mi_text_color_secondary_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Black" parent="@style/Theme.RetroMusic.Base">
|
||||
|
@ -58,8 +72,6 @@
|
|||
<item name="md_background_color">@color/black_color</item>
|
||||
|
||||
<item name="android:windowBackground">@color/black_color</item>
|
||||
<item name="colorPrimary">@color/black_color</item>
|
||||
<item name="android:colorPrimary">@color/black_color</item>
|
||||
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:windowExitTransition">@transition/grid_exit</item>
|
||||
|
@ -71,6 +83,21 @@
|
|||
|
||||
<item name="windowActionBar">false</item>
|
||||
|
||||
<item name="colorPrimary">@color/black_color</item>
|
||||
<item name="colorPrimaryVariant">@color/black_color</item>
|
||||
<item name="colorOnPrimary">@color/mi_text_color_primary_dark</item>
|
||||
|
||||
<item name="colorAccent">@color/md_deep_purple_A200</item>
|
||||
|
||||
<item name="colorSecondary">@color/md_green_500</item>
|
||||
<item name="colorOnSecondary">@color/mi_text_color_secondary_light</item>
|
||||
<item name="colorSecondaryVariant">@color/md_green_A700</item>
|
||||
|
||||
<item name="android:colorBackground">@color/md_white_1000</item>
|
||||
<item name="colorSurface">@android:color/black</item>
|
||||
<item name="colorOnSurface">@color/mi_text_color_primary_dark</item>
|
||||
<item name="colorOnBackground">@color/mi_text_color_secondary_dark</item>
|
||||
<item name="colorControlNormal">@color/mi_text_color_secondary_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
|
@ -83,7 +110,6 @@
|
|||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
|
||||
|
||||
<item name="roundSelector">@drawable/round_selector</item>
|
||||
<item name="rectSelector">@drawable/rect_selector</item>
|
||||
<item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
|
||||
|
@ -99,8 +125,6 @@
|
|||
|
||||
<!-- just in case-->
|
||||
<item name="android:windowBackground">@color/md_white_1000</item>
|
||||
<item name="colorAccent">@android:color/black</item>
|
||||
<item name="colorPrimary">@color/md_white_1000</item>
|
||||
|
||||
<!-- necessary to find the overflow button later in the layout-->
|
||||
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
|
||||
|
@ -115,11 +139,25 @@
|
|||
<item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
|
||||
<item name="android:textColorPrimary">@color/md_grey_900</item>
|
||||
|
||||
<item name="windowActionBar">false</item>
|
||||
|
||||
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
|
||||
<!--<item name="android:textColorPrimary">@color/md_grey_900</item>-->
|
||||
|
||||
<item name="colorPrimary">@color/md_white_1000</item>
|
||||
<item name="colorOnPrimary">@color/mi_text_color_primary_light</item>
|
||||
<item name="colorPrimaryVariant">@color/md_red_400</item>
|
||||
|
||||
<item name="colorSecondary">@color/md_green_500</item>
|
||||
<item name="colorAccent">@color/md_deep_purple_A200</item>
|
||||
<item name="colorOnSecondary">@color/mi_text_color_secondary_light</item>
|
||||
<item name="colorSecondaryVariant">@color/md_green_A700</item>
|
||||
|
||||
|
||||
<item name="android:colorBackground">@color/md_white_1000</item>
|
||||
<item name="colorSurface">@color/md_white_1000</item>
|
||||
<item name="colorOnSurface">@color/mi_text_color_secondary_light</item>
|
||||
<item name="colorOnBackground">@color/mi_text_color_secondary_light</item>
|
||||
<item name="colorControlNormal">@color/mi_text_color_secondary_light</item>
|
||||
</style>
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue