sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 20:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1760 from HabitRPG/Fixes#1347

Browse source 
Fixes#1347 - Fix line below unfocused text boxes to show correctly
This commit is contained in:
Phillip Thelen 2022-05-09 16:38:57 +02:00 committed by GitHub
commit f606c667ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Habitica/res/color/color_box_stroke.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorBoxStroke" android:state_focused="true"/>
<item android:color="?attr/colorBoxStroke" android:state_hovered="true"/>
<item android:color="?attr/colorBoxStroke"/>
</selector>

6
Habitica/res/color/text_input_box_stroke.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorPrimary" android:state_focused="true"/>
<item android:color="?attr/colorPrimary" android:state_hovered="true"/>
<item android:color="?attr/colorPrimary"/>
</selector>

6
Habitica/res/layout/activity_task_form.xml
View file

@ -45,8 +45,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TaskFormTextInputLayoutAppearance"
app:boxStrokeWidth="3dp"
app:boxStrokeWidthFocused="1dp"
app:boxStrokeWidth="2dp"
app:boxStrokeWidthFocused="2dp"
app:hintTextColor="?colorPrimaryText"
android:backgroundTint="?attr/colorPrimaryText"
android:hint="@string/task_title"
@ -63,7 +63,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TaskFormTextInputLayoutAppearance"
app:boxStrokeWidth="3dp"
app:boxStrokeWidth="2dp"
app:boxStrokeWidthFocused="2dp"
android:backgroundTint="?attr/colorPrimaryText"
app:hintTextColor="?colorPrimaryText"

1
Habitica/res/values/attrs.xml
View file

@ -11,6 +11,7 @@
<attr name="barColor" format="color" />
<attr name="toolbarContentColor" format="color" />
<attr name="colorPrimaryText" format="color" />
<attr name="colorBoxStroke" format="color" />
<attr name="taskFormTint" format="color" />
<attr name="textColorSecondaryDark" format="color" />
<attr name="statsColor" format="color" />

19
Habitica/res/values/styles.xml
View file

@ -51,6 +51,7 @@
<item name="searchViewStyle">@style/SearchViewStyle</item>
<item name="toolbarContentColor">@color/text_primary</item>
<item name="colorPrimaryText">@color/brand_50</item>
<item name="colorBoxStroke">@color/brand_50</item>
<item name="headerBackgroundColor">@color/content_background</item>
<item name="headerOffsetColor">@color/window_background</item>
<item name="headerTextColor">@color/text_primary</item>
@ -62,6 +63,7 @@
<style name="MainAppTheme.Dark">
<item name="colorPrimary">@color/gray_500</item>
<item name="barColor">@color/gray_1</item>
<item name="colorBoxStroke">@color/gray_10</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
</style>
@ -79,6 +81,7 @@
<item name="android:colorPrimary">@color/red_5</item>
<item name="android:colorPrimaryDark">@color/red_1</item>
<item name="android:colorAccent">@color/red_100</item>
<item name="colorBoxStroke">@color/red_10</item>
<item name="colorPrimaryOffset">@color/red_10</item>
<item name="colorPrimaryDistinct">@color/red_500</item>
<item name="colorBadgeBackground">@color/red_100</item>
@ -94,6 +97,7 @@
<style name="MainAppTheme.Red.Dark">
<item name="barColor">@color/gray_1</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="colorBoxStroke">@color/red_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/red_100</item>
</style>
@ -105,6 +109,7 @@
<item name="android:colorPrimary">@color/red_1</item>
<item name="android:colorPrimaryDark">@color/maroon_1</item>
<item name="android:colorAccent">@color/maroon_100</item>
<item name="colorBoxStroke">@color/maroon_10</item>
<item name="colorPrimaryOffset">@color/red_1</item>
<item name="colorPrimaryDistinct">@color/red_500</item>
<item name="colorBadgeBackground">@color/red_10</item>
@ -130,6 +135,7 @@
<item name="android:colorPrimary">@color/orange_10</item>
<item name="android:colorPrimaryDark">@color/orange_5</item>
<item name="android:colorAccent">@color/orange_100</item>
<item name="colorBoxStroke">@color/orange_10</item>
<item name="colorPrimaryOffset">@color/orange_50</item>
<item name="colorPrimaryDistinct">@color/orange_500</item>
<item name="colorBadgeBackground">@color/orange_100</item>
@ -145,6 +151,7 @@
<style name="MainAppTheme.Orange.Dark">
<item name="barColor">@color/gray_1</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="colorBoxStroke">@color/orange_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/orange_100</item>
</style>
@ -156,6 +163,7 @@
<item name="android:colorPrimary">@color/yellow_10</item>
<item name="android:colorPrimaryDark">@color/yellow_5</item>
<item name="android:colorAccent">@color/yellow_100</item>
<item name="colorBoxStroke">@color/yellow_5</item>
<item name="colorPrimaryOffset">@color/yellow_50</item>
<item name="colorPrimaryDistinct">@color/yellow_500</item>
<item name="colorBadgeBackground">@color/yellow_100</item>
@ -171,6 +179,7 @@
<style name="MainAppTheme.Yellow.Dark">
<item name="barColor">@color/gray_1</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="colorBoxStroke">@color/yellow_5</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/yellow_100</item>
</style>
@ -182,6 +191,7 @@
<item name="android:colorPrimary">@color/green_10</item>
<item name="android:colorPrimaryDark">@color/green_5</item>
<item name="android:colorAccent">@color/green_100</item>
<item name="colorBoxStroke">@color/green_10</item>
<item name="colorPrimaryOffset">@color/green_50</item>
<item name="colorPrimaryDistinct">@color/green_500</item>
<item name="colorBadgeBackground">@color/green_100</item>
@ -197,6 +207,7 @@
<style name="MainAppTheme.Green.Dark">
<item name="barColor">@color/gray_1</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="colorBoxStroke">@color/green_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/green_100</item>
</style>
@ -208,6 +219,7 @@
<item name="android:colorPrimary">@color/teal_10</item>
<item name="android:colorPrimaryDark">@color/teal_5</item>
<item name="android:colorAccent">@color/teal_100</item>
<item name="colorBoxStroke">@color/teal_10</item>
<item name="colorPrimaryOffset">@color/teal_50</item>
<item name="colorPrimaryDistinct">@color/teal_500</item>
<item name="colorBadgeBackground">@color/teal_100</item>
@ -223,6 +235,7 @@
<style name="MainAppTheme.Teal.Dark">
<item name="barColor">@color/gray_1</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="colorBoxStroke">@color/teal_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="toolbarContentColor">@color/teal_100</item>
</style>
@ -234,6 +247,7 @@
<item name="android:colorPrimary">@color/blue_10</item>
<item name="android:colorPrimaryDark">@color/blue_5</item>
<item name="android:colorAccent">@color/blue_100</item>
<item name="colorBoxStroke">@color/blue_10</item>
<item name="colorPrimaryOffset">@color/blue_50</item>
<item name="colorPrimaryDistinct">@color/blue_500</item>
<item name="colorBadgeBackground">@color/blue_100</item>
@ -250,6 +264,7 @@
<item name="barColor">@color/gray_1</item>
<item name="colorPrimaryOffset">@color/gray_10</item>
<item name="textColorPrimaryDark">@color/gray_200</item>
<item name="colorBoxStroke">@color/blue_10</item>
<item name="toolbarContentColor">@color/blue_100</item>
</style>
@ -739,7 +754,9 @@
<style name="TaskFormTextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
<!-- reference our hint & error styles -->
<item name="boxBackgroundColor">@color/white</item>
<item name="boxStrokeColor">@color/text_input_box_stroke</item>
<item name="boxStrokeColor">@color/color_box_stroke</item>
<item name="boxStrokeWidth">2dp</item>
<item name="boxStrokeWidthFocused">2dp</item>
<item name="android:textColor">?attr/colorPrimaryText</item>
<item name="android:textColorHint">?colorPrimaryText</item>
<item name="colorControlNormal">?attr/colorPrimary</item>

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,4 +1,4 @@
#Fri Apr 22 14:22:42 CEST 2022
#Sun May 08 23:57:52 EDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists