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

Fix missing + on id definition for some layouts

Browse source 
If you have it without the + it can cause errors after modifing the layout orders, so it's better to define them with +
This commit is contained in:
Daniel Gomez Rico 2017-10-07 11:55:13 -05:00 committed by Phillip Thelen
parent 00ffd7847e
commit f36fbcaf01
9 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Habitica/res/layout/activity_fixcharacter.xml
View file

@ -58,7 +58,7 @@
android:labelFor="@+id/healthEditText"/> android:labelFor="@+id/healthEditText"/>
<EditText <EditText
android:id="@id/healthEditText" android:id="@+id/healthEditText"
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"
@ -78,7 +78,7 @@
android:labelFor="@+id/experienceEditText" /> android:labelFor="@+id/experienceEditText" />
<EditText <EditText
android:id="@id/experienceEditText" android:id="@+id/experienceEditText"
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"
@ -98,7 +98,7 @@
android:labelFor="@+id/goldEditText"/> android:labelFor="@+id/goldEditText"/>
<EditText <EditText
android:id="@id/goldEditText" android:id="@+id/goldEditText"
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"
@ -118,7 +118,7 @@
android:labelFor="@+id/manaEditText"/> android:labelFor="@+id/manaEditText"/>
<EditText <EditText
android:id="@id/manaEditText" android:id="@+id/manaEditText"
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"
@ -138,7 +138,7 @@
android:labelFor="@+id/levelEditText"/> android:labelFor="@+id/levelEditText"/>
<EditText <EditText
android:id="@id/levelEditText" android:id="@+id/levelEditText"
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"
@ -167,7 +167,7 @@
android:labelFor="@+id/streakEditText"/> android:labelFor="@+id/streakEditText"/>
<EditText <EditText
android:id="@id/streakEditText" android:id="@+id/streakEditText"
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"

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

@ -58,7 +58,8 @@
style="@style/Subheader3" style="@style/Subheader3"
android:textColor="#000" android:textColor="#000"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:gravity="center_vertical"
tools:text="Daily Title" /> tools:text="Daily Title" />
<net.pherth.android.emoji_library.EmojiTextView <net.pherth.android.emoji_library.EmojiTextView

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

@ -15,7 +15,7 @@
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" /> android:layout_height="@dimen/shopitem_image_size" />
<TextView <TextView
android:id="@id/titleTextView" android:id="@+id/titleTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Headline" style="@style/Headline"
@ -24,7 +24,7 @@
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:layout_marginBottom="4dp"/> android:layout_marginBottom="4dp"/>
<TextView <TextView
android:id="@id/notesTextView" android:id="@+id/notesTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Body2" style="@style/Body2"

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

@ -15,7 +15,7 @@
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" /> android:layout_height="@dimen/shopitem_image_size" />
<TextView <TextView
android:id="@id/titleTextView" android:id="@+id/titleTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Headline" style="@style/Headline"
@ -24,7 +24,7 @@
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:layout_marginBottom="4dp"/> android:layout_marginBottom="4dp"/>
<TextView <TextView
android:id="@id/notesTextView" android:id="@+id/notesTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Body2" style="@style/Body2"

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

@ -15,7 +15,7 @@
android:layout_width="@dimen/shopitem_image_size" android:layout_width="@dimen/shopitem_image_size"
android:layout_height="@dimen/shopitem_image_size" /> android:layout_height="@dimen/shopitem_image_size" />
<TextView <TextView
android:id="@id/titleTextView" android:id="@+id/titleTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Headline" style="@style/Headline"
@ -24,7 +24,7 @@
android:layout_marginTop="14dp" android:layout_marginTop="14dp"
android:layout_marginBottom="4dp"/> android:layout_marginBottom="4dp"/>
<TextView <TextView
android:id="@id/notesTextView" android:id="@+id/notesTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Body2" style="@style/Body2"

2
Habitica/res/layout/dialog_yesterdaily_task.xml
View file

@ -47,7 +47,7 @@
android:background="@color/gray_500" android:background="@color/gray_500"
android:visibility="gone"/> android:visibility="gone"/>
<LinearLayout <LinearLayout
android:id="@id/checklistView" android:id="@+id/checklistView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"/> android:orientation="vertical"/>

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

@ -7,7 +7,7 @@
style="@style/RowWrapper" style="@style/RowWrapper"
android:clickable="true"> android:clickable="true">
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@id/imageView" android:id="@+id/imageView"
android:layout_width="@dimen/gear_image_size" android:layout_width="@dimen/gear_image_size"
android:layout_height="@dimen/gear_image_size" android:layout_height="@dimen/gear_image_size"
bind:actualImageScaleType="fitCenter" bind:actualImageScaleType="fitCenter"
@ -18,13 +18,13 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="center_vertical"> android:layout_gravity="center_vertical">
<TextView <TextView
android:id="@id/titleTextView" android:id="@+id/titleTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="Title" tools:text="Title"
style="@style/RowTitle"/> style="@style/RowTitle"/>
<TextView <TextView
android:id="@id/ownedTextView" android:id="@+id/ownedTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="Value" tools:text="Value"

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

@ -71,7 +71,7 @@
android:layout_height="22dp" android:layout_height="22dp"
android:paddingBottom="8dp"/> android:paddingBottom="8dp"/>
<TextView <TextView
android:id="@id/priceLabel" android:id="@+id/priceLabel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/yellow_10" android:textColor="@color/yellow_10"

2
Habitica/res/layout/value_bar.xml
View file

@ -19,7 +19,7 @@
android:contentDescription="Bar Icon" android:contentDescription="Bar Icon"
android:visibility="gone"/> android:visibility="gone"/>
<LinearLayout <LinearLayout
android:id="@id/bar_full" android:id="@+id/bar_full"
android:layout_toRightOf="@id/ic_header" android:layout_toRightOf="@id/ic_header"
android:layout_toEndOf="@id/ic_header" android:layout_toEndOf="@id/ic_header"
android:layout_width="match_parent" android:layout_width="match_parent"