Skip to content
This repository was archived by the owner on May 5, 2020. It is now read-only.

Fixes issue #1132. Implemented ConstraintLayout #1360

Open
devanshi7799 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixes issue #1132. Implemented ConstraintLayout #1360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 73 additions & 73 deletions PowerUp/app/src/main/res/layout/gamemap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/map_no_building"
Expand All @@ -21,91 +23,89 @@
android:layout_height="match_parent"
android:background="@drawable/hospital_grayscale"/>

<LinearLayout
<android.support.constraint.ConstraintLayout
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:background="@drawable/house_colored">

<LinearLayout
<ImageView
android:id="@+id/school"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.2"
android:orientation="vertical"
android:paddingBottom="@dimen/map_paddingBottom">
android:layout_height="0dp"
android:clickable="false"
android:scaleType="centerInside"
android:text="@string/house"
app:layout_constraintBottom_toTopOf="@+id/house"
app:layout_constraintEnd_toStartOf="@+id/store"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:clickable="false"
android:id="@+id/school"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.3"
android:text="@string/house"
android:scaleType="centerInside"/>

<ImageView
android:clickable="false"
android:id="@+id/house"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginRight="@dimen/map_marginBottom"
android:layout_marginEnd="@dimen/map_marginBottom"
android:layout_weight="1"
android:alpha="@dimen/map_alpha"
android:text="@string/boyfriend" />
</LinearLayout>
<ImageView
android:id="@+id/house"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginEnd="30dp"
android:layout_marginRight="30dp"
android:layout_marginBottom="68dp"
android:alpha="@dimen/map_alpha"
android:clickable="false"
android:text="@string/boyfriend"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/store"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/school" />

<Button
android:id="@+id/store"
android:layout_width="0dp"
android:layout_height="@dimen/store_height_value"
android:layout_gravity="center"
android:layout_marginBottom="@dimen/map_marginBottom"
android:layout_weight="1"
android:layout_width="109dp"
android:layout_height="176dp"
android:layout_marginTop="100dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="228dp"
android:alpha="@dimen/map_alpha"
android:text="@string/store" />
android:text="@string/store"
app:layout_constraintBottom_toBottomOf="@+id/house"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/library"
app:layout_constraintStart_toEndOf="@+id/house"
app:layout_constraintTop_toTopOf="@+id/school" />

<LinearLayout
<ImageView
android:id="@+id/hospital"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.2"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal">
android:layout_height="0dp"
android:layout_marginBottom="30dp"
android:clickable="false"
android:scaleType="centerInside"
android:text="@string/hospital"
app:layout_constraintBottom_toTopOf="@+id/library"
app:layout_constraintEnd_toStartOf="@+id/home_button"
app:layout_constraintStart_toEndOf="@+id/store"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:clickable="false"
android:id="@+id/hospital"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/map_marginBottom"
android:layout_weight="5"
android:scaleType="centerInside"
android:text="@string/hospital" />

<Button
android:id="@+id/home_button"
android:layout_width="0dp"
android:layout_height="@dimen/home_button_height"
android:layout_gravity="fill_vertical"
android:layout_weight="1"
android:background="@drawable/home_button"
android:scaleType="fitXY" />

</LinearLayout>
<Button
android:id="@+id/home_button"
android:layout_width="38dp"
android:layout_height="41dp"
android:layout_marginBottom="310dp"
android:background="@drawable/home_button"
android:scaleType="fitXY"
app:layout_constraintBottom_toTopOf="@+id/library"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/library"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/library"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/map_marginBottom"
android:layout_weight="1"
android:scaleType="centerInside" />
<ImageView
android:id="@+id/library"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="30dp"
android:scaleType="centerInside"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/home_button"
app:layout_constraintStart_toEndOf="@+id/store"
app:layout_constraintTop_toBottomOf="@+id/home_button" />

</LinearLayout>
</LinearLayout>
</FrameLayout>
</android.support.constraint.ConstraintLayout>
</FrameLayout>