Merge pull request #21 from X1nto/master

Color fixes
This commit is contained in:
Tornike Khintibidze 2020-07-29 15:03:17 +04:00 committed by GitHub
commit 1165a67cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -39,7 +39,7 @@
android:paddingLeft="?attr/listPreferredItemPaddingLeft" android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingEnd="?attr/listPreferredItemPaddingEnd" android:paddingEnd="?attr/listPreferredItemPaddingEnd"
android:paddingRight="?attr/listPreferredItemPaddingRight" android:paddingRight="?attr/listPreferredItemPaddingRight"
android:background="@{checked ? android.R.attr.colorControlActivated : (enabled ? android.R.attr.colorButtonNormal : android.R.attr.colorControlHighlight)}" android:background="?attr/colorAccent"
tools:background="?attr/colorControlActivated"> tools:background="?attr/colorControlActivated">
<TextView <TextView
@ -54,7 +54,7 @@
android:paddingLeft="56dp" android:paddingLeft="56dp"
android:text="@{description}" android:text="@{description}"
android:textAppearance="?attr/textAppearanceListItem" android:textAppearance="?attr/textAppearanceListItem"
android:textColor="?android:attr/textColorPrimaryInverse" android:textColor="#ffffff"
tools:text="Enabled" /> tools:text="Enabled" />
<androidx.appcompat.widget.SwitchCompat <androidx.appcompat.widget.SwitchCompat
@ -66,8 +66,8 @@
android:checked="@{checked}" android:checked="@{checked}"
android:enabled="@{enabled}" android:enabled="@{enabled}"
app:onCheckedChangeListener="@{(v, newStatus) -> callback.onChecked(newStatus)}" app:onCheckedChangeListener="@{(v, newStatus) -> callback.onChecked(newStatus)}"
app:thumbTint="?android:attr/textColorPrimaryInverse" app:thumbTint="#ffffff"
app:trackTint="?android:attr/textColorSecondaryInverse" app:trackTint="#e1e2e3"
tools:checked="true" /> tools:checked="true" />
</LinearLayout> </LinearLayout>
</layout> </layout>