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

minor fixes

Browse source
This commit is contained in:
Phillip Thelen 2016-02-03 13:56:43 +01:00
parent 7832e4e81b
commit 6099c2c080
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="35"
android:versionCode="36"
android:versionName="0.0.26"
android:screenOrientation="portrait"
android:installLocation="auto" >

4
Habitica/res/layout/activity_intro.xml
View file

@ -27,7 +27,7 @@
android:layout_alignParentTop="true"
android:layout_marginTop="6dp"
android:textColor="@android:color/white"
android:backgroundTint="@color/brand_100" />
android:background="@drawable/rounded_purple_square" />
<Button
android:layout_width="wrap_content"
@ -40,7 +40,7 @@
android:layout_marginRight="6dp"
android:layout_marginEnd="6dp"
android:layout_marginBottom="6dp"
android:backgroundTint="@color/brand_50"
android:background="@drawable/rounded_purple_square"
android:textColor="@android:color/white"
android:visibility="gone" />
</RelativeLayout>

3
Habitica/res/layout/reward_item_card.xml
View file

@ -73,13 +73,16 @@
android:layout_width="80dp"
android:layout_height="45dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:textColor="@color/white"
android:layout_gravity="center_vertical"
android:textSize="15sp"
android:drawableLeft="@drawable/ic_header_gold"
android:drawableStart="@drawable/ic_header_gold"
android:text='@{String.format("%.0f", reward.value)}'
android:background="@drawable/rounded_purple_square"
android:paddingLeft="6dp"
android:paddingStart="6dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />

2
Habitica/src/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
View file

@ -109,7 +109,7 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
private void setGridSpanCount(int width) {
float itemWidth;
if (this.type.equals("background")) {
if (this.type != null && this.type.equals("background")) {
itemWidth = getContext().getResources().getDimension(R.dimen.avatar_width);
} else {
itemWidth = getContext().getResources().getDimension(R.dimen.customization_width);