Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit 7222b0c

Browse files
committed
Fix issue with layout_main_barriers.
1 parent 05655d7 commit 7222b0c

File tree

1 file changed

+55
-60
lines changed

1 file changed

+55
-60
lines changed
Lines changed: 55 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:app="http://schemas.android.com/apk/res-auto"
54
xmlns:tools="http://schemas.android.com/tools"
65
android:id="@+id/activity_main_barriers"
@@ -12,75 +11,75 @@
1211
tools:layout_editor_absoluteY="80dp">
1312

1413
<ImageView
15-
android:src="@drawable/singapore"
14+
android:id="@+id/header"
1615
android:layout_width="0dp"
1716
android:layout_height="0dp"
18-
app:layout_editor_absoluteX="0dp"
19-
app:layout_editor_absoluteY="0dp"
20-
android:id="@+id/header"
21-
android:scaleType="centerCrop"
17+
android:layout_marginBottom="16dp"
2218
android:contentDescription="@string/dummy"
23-
app:layout_constraintLeft_creator="1"
24-
app:layout_constraintTop_creator="1"
25-
app:layout_constraintRight_creator="1"
19+
android:scaleType="centerCrop"
20+
android:src="@drawable/singapore"
2621
app:layout_constraintBottom_creator="1"
27-
tools:layout_editor_absoluteX="0dp"
28-
tools:layout_editor_absoluteY="0dp"
22+
app:layout_constraintBottom_toBottomOf="@+id/favorite"
23+
app:layout_constraintHorizontal_bias="1.0"
24+
app:layout_constraintLeft_creator="1"
2925
app:layout_constraintLeft_toLeftOf="@+id/activity_main_barriers"
30-
tools:layout_constraintLeft_creator="1"
31-
app:layout_constraintTop_toTopOf="@+id/activity_main_barriers"
32-
tools:layout_constraintTop_creator="1"
26+
app:layout_constraintRight_creator="1"
3327
app:layout_constraintRight_toRightOf="@+id/activity_main_barriers"
34-
tools:layout_constraintRight_creator="1"
35-
app:layout_constraintBottom_toBottomOf="@+id/favorite"
36-
android:layout_marginBottom="16dp"
28+
app:layout_constraintTop_creator="1"
29+
app:layout_constraintTop_toTopOf="@+id/activity_main_barriers"
30+
app:layout_constraintVertical_bias="0.0"
31+
app:layout_editor_absoluteX="0dp"
32+
app:layout_editor_absoluteY="0dp"
3733
tools:layout_constraintBottom_creator="1"
38-
app:layout_constraintHorizontal_bias="1.0"
39-
app:layout_constraintVertical_bias="0.0" />
34+
tools:layout_constraintLeft_creator="1"
35+
tools:layout_constraintRight_creator="1"
36+
tools:layout_constraintTop_creator="1"
37+
tools:layout_editor_absoluteX="0dp"
38+
tools:layout_editor_absoluteY="0dp" />
4039

4140
<ImageView
42-
android:src="@drawable/ic_star"
41+
android:id="@+id/favorite"
4342
android:layout_width="36dp"
4443
android:layout_height="36dp"
45-
app:layout_editor_absoluteX="359dp"
46-
app:layout_editor_absoluteY="104dp"
47-
android:id="@+id/favorite"
44+
android:layout_marginBottom="16dp"
45+
android:layout_marginEnd="16dp"
4846
android:background="@drawable/info_background"
49-
android:padding="5dp"
5047
android:contentDescription="@string/dummy"
51-
app:layout_constraintTop_creator="1"
52-
app:layout_constraintRight_creator="1"
48+
android:padding="5dp"
49+
android:src="@drawable/ic_star"
5350
app:layout_constraintBottom_creator="0"
54-
tools:layout_editor_absoluteX="359dp"
55-
tools:layout_editor_absoluteY="104dp"
56-
app:layout_constraintTop_toTopOf="@+id/activity_main_barriers"
57-
tools:layout_constraintTop_creator="0"
58-
app:layout_constraintRight_toRightOf="@+id/activity_main_barriers"
59-
android:layout_marginEnd="16dp"
60-
tools:layout_constraintRight_creator="0"
6151
app:layout_constraintBottom_toBottomOf="@+id/activity_main_barriers"
62-
android:layout_marginBottom="16dp"
52+
app:layout_constraintRight_creator="1"
53+
app:layout_constraintRight_toRightOf="@+id/activity_main_barriers"
54+
app:layout_constraintTop_creator="1"
55+
app:layout_constraintTop_toTopOf="@+id/activity_main_barriers"
56+
app:layout_constraintVertical_bias="0.19"
57+
app:layout_editor_absoluteX="359dp"
58+
app:layout_editor_absoluteY="104dp"
6359
tools:layout_constraintBottom_creator="0"
64-
app:layout_constraintVertical_bias="0.19" />
60+
tools:layout_constraintRight_creator="0"
61+
tools:layout_constraintTop_creator="0"
62+
tools:layout_editor_absoluteX="359dp"
63+
tools:layout_editor_absoluteY="104dp" />
6564

6665
<TextView
67-
android:text="@string/singapore"
66+
android:id="@+id/title"
6867
android:layout_width="wrap_content"
6968
android:layout_height="wrap_content"
70-
app:layout_editor_absoluteX="16dp"
71-
app:layout_editor_absoluteY="140dp"
72-
android:id="@+id/title"
69+
android:layout_marginStart="16dp"
70+
android:layout_marginTop="16dp"
71+
android:text="@string/singapore"
7372
android:textSize="24sp"
7473
app:layout_constraintLeft_creator="1"
75-
app:layout_constraintTop_creator="0"
76-
tools:layout_editor_absoluteX="16dp"
77-
tools:layout_editor_absoluteY="140dp"
7874
app:layout_constraintLeft_toLeftOf="@+id/activity_main_barriers"
79-
android:layout_marginStart="16dp"
80-
tools:layout_constraintLeft_creator="0"
75+
app:layout_constraintTop_creator="0"
8176
app:layout_constraintTop_toBottomOf="@+id/header"
82-
android:layout_marginTop="16dp"
83-
tools:layout_constraintTop_creator="0" />
77+
app:layout_editor_absoluteX="16dp"
78+
app:layout_editor_absoluteY="140dp"
79+
tools:layout_constraintLeft_creator="0"
80+
tools:layout_constraintTop_creator="0"
81+
tools:layout_editor_absoluteX="16dp"
82+
tools:layout_editor_absoluteY="140dp" />
8483

8584
<TextView
8685
android:id="@+id/settingsLabel"
@@ -110,51 +109,47 @@
110109
app:layout_constraintBaseline_creator="1"
111110
app:layout_constraintBaseline_toBaselineOf="@+id/cameraType"
112111
app:layout_constraintLeft_creator="1"
113-
app:layout_constraintLeft_toLeftOf="@+id/activity_main_barriers"
112+
app:layout_constraintStart_toStartOf="parent"
114113
app:layout_editor_absoluteX="16dp"
115114
app:layout_editor_absoluteY="189dp"
116115
tools:layout_constraintBaseline_creator="0"
117-
tools:layout_constraintLeft_creator="0"
118-
tools:layout_editor_absoluteX="16dp"
119-
tools:layout_editor_absoluteY="189dp" />
116+
tools:layout_constraintLeft_creator="0" />
120117

121118
<EditText
122119
android:id="@+id/settings"
123120
android:layout_width="0dp"
124121
android:layout_height="wrap_content"
125-
android:layout_marginEnd="0dp"
122+
android:layout_marginTop="16dp"
126123
android:ems="10"
127124
android:inputType="textPersonName"
128125
android:text="@string/camera_settings"
129126
app:layout_constraintEnd_toEndOf="@+id/cameraType"
127+
app:layout_constraintHorizontal_bias="0.0"
130128
app:layout_constraintStart_toStartOf="@+id/cameraType"
129+
app:layout_constraintTop_toBottomOf="@+id/cameraType"
131130
app:layout_editor_absoluteX="73dp"
132131
app:layout_editor_absoluteY="225dp"
133132
tools:layout_constraintLeft_creator="1"
134133
tools:layout_constraintRight_creator="1"
135-
tools:layout_constraintTop_creator="0"
136-
tools:layout_editor_absoluteY="234dp"
137-
app:layout_constraintTop_toBottomOf="@+id/cameraType"
138-
app:layout_constraintBottom_toBottomOf="parent"
139-
android:layout_marginBottom="332dp" />
134+
tools:layout_constraintTop_creator="0" />
140135

141136
<EditText
142137
android:id="@+id/cameraType"
143138
android:layout_width="0dp"
144139
android:layout_height="wrap_content"
145140
android:layout_marginEnd="16dp"
141+
android:layout_marginStart="8dp"
146142
android:layout_marginTop="8dp"
147143
android:ems="10"
148144
android:inputType="textPersonName"
149145
android:text="@string/camera_value"
150146
app:layout_constraintEnd_toEndOf="parent"
147+
app:layout_constraintStart_toEndOf="@+id/cameraLabel"
151148
app:layout_constraintTop_toBottomOf="@+id/title"
152149
app:layout_editor_absoluteX="73dp"
153150
app:layout_editor_absoluteY="176dp"
154151
tools:layout_constraintLeft_creator="1"
155152
tools:layout_constraintRight_creator="1"
156-
tools:layout_constraintTop_creator="0"
157-
app:layout_constraintStart_toEndOf="@+id/cameraLabel"
158-
android:layout_marginStart="8dp" />
153+
tools:layout_constraintTop_creator="0" />
159154

160155
</android.support.constraint.ConstraintLayout>

0 commit comments

Comments
 (0)