Skip to content

Commit

Permalink
Merge pull request #168 from yuhuitech/master
Browse files Browse the repository at this point in the history 
Fix those occlusion problems
  • Loading branch information
@jaysondc
jaysondc authored Sep 4, 2021
2 parents 4b82a67 + ec03adc commit 2cd97da
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 119 deletions.
245 changes: 127 additions & 118 deletions app/src/main/res/layout/fragment_monster_summary.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,129 +47,138 @@
app:layout_constraintTop_toTopOf="@id/weakness_header"
tools:text="( ) = when covered in mud" />

<TableLayout
android:id="@+id/weakness_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@drawable/divider_stroke"
android:showDividers="middle"
android:stretchColumns="0, 1"
<HorizontalScrollView
android:id="@+id/horizontal_scroll_weakness_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fillViewport="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/weakness_header">

<TableRow
app:layout_constraintTop_toBottomOf="@+id/weakness_header"
>
<TableLayout
android:id="@+id/weakness_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/fire_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_fire"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1">

</com.gatheringhallstudios.mhworlddatabase.components.IconStarCell>
android:divider="@drawable/divider_stroke"
android:showDividers="middle"
android:stretchColumns="0, 1"
>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/fire_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_fire"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1">

</com.gatheringhallstudios.mhworlddatabase.components.IconStarCell>

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/poison_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_poison"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/water_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_water"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/sleep_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_sleep"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/lightning_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_thunder"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="3" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/paralysis_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_paralysis"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1" />
</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/ice_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_ice"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/blast_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_blast"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1">

</com.gatheringhallstudios.mhworlddatabase.components.IconStarCell>
</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/dragon_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_dragon"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/stun_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_stun"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1" />
</TableRow>
</TableLayout>
</HorizontalScrollView>

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/poison_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_poison"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/water_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_water"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/sleep_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_sleep"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/lightning_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_thunder"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="3" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/paralysis_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_paralysis"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1" />
</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/ice_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_ice"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/blast_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_blast"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1">

</com.gatheringhallstudios.mhworlddatabase.components.IconStarCell>
</TableRow>

<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/dragon_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_element_dragon"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="2" />

<com.gatheringhallstudios.mhworlddatabase.components.IconStarCell
android:id="@+id/stun_star_cell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconSrc="@drawable/ic_status_stun"
app:layout_constraintRight_toRightOf="parent"
tools:numStars="1" />
</TableRow>
</TableLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

<com.gatheringhallstudios.mhworlddatabase.components.SectionHeaderCell
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/res/layout/listitem_monster.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
<TextView
android:id="@+id/monster_name"
style="@style/TextHeadlineHigh"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:layout_marginStart="@dimen/margin_large"
android:layout_marginEnd="@dimen/margin_medium"
android:paddingBottom="@dimen/padding_small"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toTopOf="@id/ecology_text"
app:layout_constraintLeft_toRightOf="@id/icon"
app:layout_constraintTop_toTopOf="parent"
Expand Down

0 comments on commit 2cd97da

Please sign in to comment.