Skip to content

Commit 1471194

Browse files
fixed layout errors
1 parent fb5c555 commit 1471194

File tree

6 files changed

+22
-46
lines changed

6 files changed

+22
-46
lines changed

app/debug/app-debug.apk

80.8 MB
Binary file not shown.

app/src/main/res/layout/activity_channel1_med_list.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
android:layout_width="wrap_content"
3333
android:layout_height="wrap_content"
3434
android:layout_centerHorizontal="true"
35-
android:layout_marginTop="20sp"
3635
android:textColor="#4F7282"
3736
android:text="Channel 1"
3837
android:textStyle="bold"

app/src/main/res/layout/activity_environment_list.xml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
3333
android:layout_centerHorizontal="true"
34-
android:layout_marginTop="20sp"
3534
android:textColor="#4F7282"
3635
android:text="Channel 1"
3736
android:textStyle="bold"
@@ -71,8 +70,8 @@
7170
android:layout_height="wrap_content">
7271

7372
<ImageView
74-
android:layout_width="150sp"
75-
android:layout_height="150sp"
73+
android:layout_width="100sp"
74+
android:layout_height="100sp"
7675
android:scaleType="centerCrop"
7776
android:src="@drawable/hills"/>
7877

@@ -120,8 +119,8 @@
120119
android:layout_height="wrap_content">
121120

122121
<ImageView
123-
android:layout_width="150sp"
124-
android:layout_height="150sp"
122+
android:layout_width="100sp"
123+
android:layout_height="100sp"
125124
android:scaleType="centerCrop"
126125
android:src="@drawable/mountain"/>
127126

@@ -168,8 +167,8 @@
168167
android:layout_height="wrap_content">
169168

170169
<ImageView
171-
android:layout_width="150sp"
172-
android:layout_height="150sp"
170+
android:layout_width="100sp"
171+
android:layout_height="100sp"
173172
android:scaleType="centerCrop"
174173
android:src="@drawable/space"/>
175174

@@ -216,8 +215,8 @@
216215
android:layout_height="wrap_content">
217216

218217
<ImageView
219-
android:layout_width="150sp"
220-
android:layout_height="150sp"
218+
android:layout_width="100sp"
219+
android:layout_height="100sp"
221220
android:scaleType="centerCrop"
222221
android:src="@drawable/android"/>
223222

@@ -240,8 +239,6 @@
240239

241240
</RelativeLayout>
242241

243-
244-
245242
</androidx.cardview.widget.CardView>
246243

247244
<androidx.cardview.widget.CardView
@@ -265,8 +262,8 @@
265262
android:layout_height="wrap_content">
266263

267264
<ImageView
268-
android:layout_width="150sp"
269-
android:layout_height="150sp"
265+
android:layout_width="100sp"
266+
android:layout_height="100sp"
270267
android:scaleType="centerCrop"
271268
android:src="@drawable/android"/>
272269

@@ -312,8 +309,8 @@
312309
android:layout_height="wrap_content">
313310

314311
<ImageView
315-
android:layout_width="150sp"
316-
android:layout_height="150sp"
312+
android:layout_width="100sp"
313+
android:layout_height="100sp"
317314
android:scaleType="centerCrop"
318315
android:src="@drawable/android"/>
319316

app/src/main/res/layout/activity_yoga_channel1_list.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
android:layout_height="wrap_content"
3333
android:layout_below="@+id/yoga_toolbar"
3434
android:layout_centerHorizontal="true"
35-
android:layout_marginTop="20sp"
3635
android:textColor="#4F7282"
3736
android:text="Basic Poses for beginners"
3837
android:textStyle="bold"

app/src/main/res/layout/activity_yoga_channel2_list.xml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
android:layout_width="wrap_content"
3232
android:layout_height="wrap_content"
3333
android:layout_centerHorizontal="true"
34-
android:layout_marginTop="20sp"
3534
android:layout_below="@+id/yoga_toolbar"
3635
android:textColor="#4F7282"
3736
android:text="Instructor"
@@ -69,9 +68,7 @@
6968
<androidx.cardview.widget.CardView
7069
android:layout_width="wrap_content"
7170
android:layout_height="wrap_content"
72-
android:id="@+id/yoga1_image"
73-
app:cardCornerRadius="80sp"
74-
app:cardElevation="20sp">
71+
android:id="@+id/yoga1_image">
7572

7673
<ImageView
7774
android:layout_width="100sp"
@@ -118,9 +115,7 @@
118115
<androidx.cardview.widget.CardView
119116
android:layout_width="wrap_content"
120117
android:layout_height="wrap_content"
121-
android:id="@+id/yoga2_image"
122-
app:cardCornerRadius="80sp"
123-
app:cardElevation="20sp">
118+
android:id="@+id/yoga2_image">
124119

125120
<ImageView
126121
android:layout_width="100sp"
@@ -166,9 +161,7 @@
166161
<androidx.cardview.widget.CardView
167162
android:layout_width="wrap_content"
168163
android:layout_height="wrap_content"
169-
android:id="@+id/yoga3_image"
170-
app:cardCornerRadius="80sp"
171-
app:cardElevation="20sp">
164+
android:id="@+id/yoga3_image">
172165

173166
<ImageView
174167
android:layout_width="100sp"
@@ -214,9 +207,7 @@
214207
<androidx.cardview.widget.CardView
215208
android:layout_width="wrap_content"
216209
android:layout_height="wrap_content"
217-
android:id="@+id/yoga4_image"
218-
app:cardCornerRadius="80sp"
219-
app:cardElevation="20sp">
210+
android:id="@+id/yoga4_image">
220211

221212
<ImageView
222213
android:layout_width="100sp"
@@ -261,9 +252,7 @@
261252
<androidx.cardview.widget.CardView
262253
android:layout_width="wrap_content"
263254
android:layout_height="wrap_content"
264-
android:id="@+id/yoga5_image"
265-
app:cardCornerRadius="80sp"
266-
app:cardElevation="20sp">
255+
android:id="@+id/yoga5_image">
267256

268257
<ImageView
269258
android:layout_width="100sp"
@@ -309,9 +298,7 @@
309298
<androidx.cardview.widget.CardView
310299
android:layout_width="wrap_content"
311300
android:layout_height="wrap_content"
312-
android:id="@+id/yoga6_image"
313-
app:cardCornerRadius="80sp"
314-
app:cardElevation="20sp">
301+
android:id="@+id/yoga6_image">
315302

316303
<ImageView
317304
android:layout_width="100sp"
@@ -357,9 +344,7 @@
357344
<androidx.cardview.widget.CardView
358345
android:layout_width="wrap_content"
359346
android:layout_height="wrap_content"
360-
android:id="@+id/yoga7_image"
361-
app:cardCornerRadius="80sp"
362-
app:cardElevation="20sp">
347+
android:id="@+id/yoga7_image">
363348

364349
<ImageView
365350
android:layout_width="100sp"
@@ -405,15 +390,13 @@
405390
<androidx.cardview.widget.CardView
406391
android:layout_width="wrap_content"
407392
android:layout_height="wrap_content"
408-
android:id="@+id/yoga8_image"
409-
app:cardCornerRadius="80sp"
410-
app:cardElevation="20sp">
393+
android:id="@+id/yoga8_image">
411394

412395
<ImageView
413396
android:layout_width="100sp"
414397
android:layout_height="100sp"
415398
android:scaleType="centerCrop"
416-
android:src="@drawable/tadasana"/>
399+
android:src="@drawable/mindfullness"/>
417400
</androidx.cardview.widget.CardView>
418401

419402
<TextView
@@ -453,9 +436,7 @@
453436
<androidx.cardview.widget.CardView
454437
android:layout_width="wrap_content"
455438
android:layout_height="wrap_content"
456-
android:id="@+id/yoga9_image"
457-
app:cardCornerRadius="80sp"
458-
app:cardElevation="20sp">
439+
android:id="@+id/yoga9_image">
459440

460441
<ImageView
461442
android:layout_width="100sp"
2.19 KB
Binary file not shown.

0 commit comments

Comments
 (0)