Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.core.graphics.createBitmap
import androidx.core.net.toUri
import androidx.core.text.bold
import androidx.core.text.buildSpannedString
import androidx.core.util.TypedValueCompat
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.recyclerview.widget.LinearLayoutManager
Expand Down Expand Up @@ -448,7 +449,7 @@ class AppDetailAdapter(private val callbacks: Callbacks) :

val actionTintNormal = button.context.getColorFromAttr(android.R.attr.colorPrimary)
val actionTintOnNormal = button.context.getColorFromAttr(MaterialR.attr.colorOnPrimary)
val actionTintCancel = button.context.getColorFromAttr(android.R.attr.colorError)
val actionTintCancel = button.context.getColorFromAttr(R.attr.colorError)
val actionTintOnCancel = button.context.getColorFromAttr(MaterialR.attr.colorOnError)
val actionTintDisabled = button.context.getColorFromAttr(MaterialR.attr.colorOutline)
val actionTintOnDisabled = button.context.getColorFromAttr(android.R.attr.colorBackground)
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-night-v26/base_theme.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MainTheme" parent="Base.MainTheme.Night">
<item name="colorError">?android:attr/colorError</item>
</style>
</resources>
5 changes: 4 additions & 1 deletion app/src/main/res/values-night/base_theme.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MainTheme" parent="Theme.Material3.DayNight.NoActionBar">
<style name="Base.MainTheme.Night" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:colorBackground">@color/md_theme_d_background</item>
<item name="colorSurface">?android:attr/colorBackground</item>
<item name="android:colorPrimaryDark">?android:attr/colorBackground</item>
</style>
<style name="MainTheme" parent="Base.MainTheme.Night">
<item name="colorError">@color/md_theme_d_error</item>
</style>
</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/values-v26/base_theme.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MainTheme" parent="Base.MainTheme.Light">
<item name="colorError">?android:attr/colorError</item>
</style>
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values/attrs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="colorError" format="color|reference"/>
</resources>
7 changes: 5 additions & 2 deletions app/src/main/res/values/base_theme.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="MainTheme" parent="Theme.Material3.DayNight.NoActionBar">
<item name="android:colorBackground">@color/md_theme_l_background</item>
<style name="Base.MainTheme.Light" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorSurface">?android:attr/colorBackground</item>
<item name="android:colorPrimaryDark">?android:attr/colorBackground</item>
<item name="android:colorBackground">@color/md_theme_l_background</item>
</style>
<style name="MainTheme" parent="Base.MainTheme.Light">
<item name="colorError">@color/md_theme_l_error</item>
</style>
</resources>
Loading