sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

type tweaks

Browse source
This commit is contained in:
Phillip Thelen 2024-06-06 20:52:36 +02:00
parent 99dd93344d
commit 3b54be0d91
6 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/drawable-night/shop_category_header_background.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#55311D"/> <solid android:color="@color/darkbrown"/>
<corners android:radius="8dp"/> <corners android:radius="8dp"/>
<stroke android:width="3dp" android:color="#EA8C31"/> <stroke android:width="3dp" android:color="#EA8C31"/>
</shape> </shape>

17
Habitica/res/layout/shop_section_header.xml
View file

@ -18,7 +18,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="12dp" android:paddingHorizontal="12dp"
android:paddingVertical="9dp" android:paddingVertical="6dp"
android:gravity="center_vertical"> android:gravity="center_vertical">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -29,8 +29,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
style="@style/Body1" style="@style/SectionTitleText"
tools:text="Section Header" tools:text="BACKGROUNDS"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" /> android:textColor="@color/white" />
<ImageView <ImageView
@ -53,10 +53,10 @@
android:background="@drawable/shop_header_time_background" android:background="@drawable/shop_header_time_background"
android:layout_marginHorizontal="3dp" android:layout_marginHorizontal="3dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:paddingVertical="6dp" android:paddingVertical="4dp"
android:gravity="center" android:gravity="center"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
style="@style/Body1" style="@style/SectionTitleText"
tools:text="Switches in X" tools:text="Switches in X"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
@ -70,16 +70,17 @@
android:layout_marginHorizontal="3dp" android:layout_marginHorizontal="3dp"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingEnd="3dp" android:paddingEnd="3dp"
android:paddingVertical="6dp"> android:paddingVertical="3dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/class_name_label" android:id="@+id/class_name_label"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
style="@style/Body1" style="@style/SectionTitleText"
/> />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -136,4 +136,5 @@
<color name="gray700_gray10">@color/gray_700</color> <color name="gray700_gray10">@color/gray_700</color>
<color name="maroon100_red100">@color/maroon_100</color> <color name="maroon100_red100">@color/maroon_100</color>
<color name="brand_button">@color/brand_400</color> <color name="brand_button">@color/brand_400</color>
<color name="darkbrown">#55311D</color>
</resources> </resources>

8
Habitica/res/values/styles.habitica.xml
View file

@ -56,6 +56,14 @@
<item name="android:textColor">?textColorSecondary</item> <item name="android:textColor">?textColorSecondary</item>
</style> </style>
<style name="SectionTitleText">
<item name="android:fontFamily">@string/font_family_regular</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0.04</item>
<item name="android:lineSpacingExtra">4sp</item>
</style>
<!-- Body --> <!-- Body -->
<style name="Body1"> <style name="Body1">
<item name="android:fontFamily">@string/font_family_medium</item> <item name="android:fontFamily">@string/font_family_medium</item>

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.kt
View file

@ -123,7 +123,7 @@ class SectionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
"healer" -> { "healer" -> {
classSelectionButton?.background = AppCompatResources.getDrawable(context, R.drawable.shop_header_healer_background) classSelectionButton?.background = AppCompatResources.getDrawable(context, R.drawable.shop_header_healer_background)
classSelectionLabel?.text = context.getString(R.string.healer) classSelectionLabel?.text = context.getString(R.string.healer)
textColor = R.color.yellow_1 textColor = R.color.darkbrown
} }
"rogue" -> { "rogue" -> {
classSelectionButton?.background = AppCompatResources.getDrawable(context, R.drawable.shop_header_rogue_background) classSelectionButton?.background = AppCompatResources.getDrawable(context, R.drawable.shop_header_rogue_background)

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.3.7 NAME=4.3.7
CODE=7861 CODE=7881