Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TEHIK
hoia
dp3t-app-android
Commits
f08ee677
Commit
f08ee677
authored
Jul 22, 2021
by
Harri Kirik
Browse files
COVAPP-480: Use the correct disabled button style
parent
ba92b323
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/src/main/res/color/color_blue_disableable.xml
View file @
f08ee677
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:color=
"@color/
blue_disabled
"
android:state_enabled=
"false"
/>
<item
android:color=
"@color/
gray2
"
android:state_enabled=
"false"
/>
<item
android:color=
"@color/blue"
/>
</selector>
app/src/main/res/color/color_primary_button.xml
0 → 100644
View file @
f08ee677
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:color=
"@color/white"
/>
</selector>
app/src/main/res/values/colors.xml
View file @
f08ee677
...
...
@@ -14,7 +14,6 @@
<color
name=
"accent"
>
@color/primary
</color>
<color
name=
"darkBlue"
>
#00005A
</color>
<color
name=
"blue"
>
#003CFF
</color>
<color
name=
"blue_disabled"
>
#40003CFF
</color>
<color
name=
"background"
>
#F0F1F2
</color>
<color
name=
"white"
>
#FFFFFF
</color>
<color
name=
"lightYellow"
>
#FCEDC5
</color>
...
...
app/src/main/res/values/styles.xml
View file @
f08ee677
...
...
@@ -264,6 +264,7 @@
<item
name=
"android:paddingEnd"
>
@dimen/size_24
</item>
<item
name=
"android:textSize"
>
@dimen/text_size_12
</item>
<item
name=
"backgroundTint"
>
@color/color_blue_disableable
</item>
<item
name=
"android:textColor"
>
@color/color_primary_button
</item>
</style>
<style
name=
"AppTheme.Button.Short"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment