Skip to content

Commit d1c149c

Browse files
learntodroidlearntodroid
committed
layout updates
1 parent 40d0d42 commit d1c149c

File tree

2 files changed

+118
-93
lines changed

2 files changed

+118
-93
lines changed

‎app/src/main/res/layout/fragment_createalarm.xml‎

Lines changed: 102 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,126 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
45
xmlns:tools="http://schemas.android.com/tools"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent"
78
android:orientation="vertical">
89

9-
<TextView
10+
<androidx.constraintlayout.widget.ConstraintLayout
1011
android:layout_width="match_parent"
11-
android:layout_height="wrap_content"
12-
android:text="Schedule Alarm"
13-
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
14-
android:textAlignment="center"/>
15-
16-
<LinearLayout
17-
android:layout_width="match_parent"
18-
android:layout_height="wrap_content"
19-
android:orientation="horizontal">
12+
android:layout_height="match_parent">
2013

2114
<TextView
22-
android:layout_width="0dp"
23-
android:layout_weight="0.4"
15+
android:id="@+id/fragment_createalarm_scheduleAlarmHeading"
16+
android:layout_width="match_parent"
2417
android:layout_height="wrap_content"
25-
android:text="Alarm Time"
18+
android:text="Schedule Alarm"
2619
android:textAlignment="center"
27-
android:layout_gravity="center"
28-
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
29-
30-
<TimePicker
31-
android:id="@+id/fragment_createalarm_timePicker"
32-
android:layout_width="0dp"
33-
android:layout_weight="0.6"
34-
android:layout_height="wrap_content"
35-
android:timePickerMode="spinner" />
36-
</LinearLayout>
37-
38-
<EditText
39-
android:layout_width="match_parent"
40-
android:layout_height="wrap_content"
41-
android:hint="Alarm Title"
42-
android:id="@+id/fragment_createalarm_title" />
43-
44-
<CheckBox
45-
android:layout_width="match_parent"
46-
android:layout_height="wrap_content"
47-
android:text="Recurring Alarm"
48-
android:id="@+id/fragment_createalarm_recurring"
49-
android:checked="false" />
50-
51-
<LinearLayout
52-
android:layout_width="match_parent"
53-
android:layout_height="wrap_content"
54-
android:orientation="horizontal"
55-
android:id="@+id/fragment_createalarm_recurring_options"
56-
android:visibility="gone">
57-
58-
<CheckBox
59-
android:layout_width="wrap_content"
60-
android:layout_height="wrap_content"
61-
android:text="Mon"
62-
android:id="@+id/fragment_createalarm_checkMon"/>
20+
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
21+
app:layout_constraintTop_toTopOf="parent" />
6322

64-
<CheckBox
65-
android:layout_width="wrap_content"
23+
<LinearLayout
24+
android:id="@+id/fragment_createalarm_timePickerLayout"
25+
android:layout_width="match_parent"
6626
android:layout_height="wrap_content"
67-
android:text="Tue"
68-
android:id="@+id/fragment_createalarm_checkTue"/>
69-
70-
<CheckBox
71-
android:layout_width="wrap_content"
27+
android:orientation="horizontal"
28+
app:layout_constraintTop_toBottomOf="@+id/fragment_createalarm_scheduleAlarmHeading">
29+
30+
<TextView
31+
android:layout_width="0dp"
32+
android:layout_height="wrap_content"
33+
android:layout_gravity="center"
34+
android:layout_weight="0.4"
35+
android:text="Alarm Time"
36+
android:textAlignment="center"
37+
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
38+
39+
<TimePicker
40+
android:id="@+id/fragment_createalarm_timePicker"
41+
android:layout_width="0dp"
42+
android:layout_height="wrap_content"
43+
android:layout_weight="0.6"
44+
android:timePickerMode="spinner" />
45+
</LinearLayout>
46+
47+
<EditText
48+
android:id="@+id/fragment_createalarm_title"
49+
android:layout_width="match_parent"
7250
android:layout_height="wrap_content"
73-
android:text="Wed"
74-
android:id="@+id/fragment_createalarm_checkWed"/>
51+
android:hint="Alarm Title"
52+
app:layout_constraintTop_toBottomOf="@+id/fragment_createalarm_timePickerLayout" />
7553

7654
<CheckBox
77-
android:layout_width="wrap_content"
55+
android:id="@+id/fragment_createalarm_recurring"
56+
android:layout_width="match_parent"
7857
android:layout_height="wrap_content"
79-
android:text="Thu"
80-
android:id="@+id/fragment_createalarm_checkThu"/>
81-
82-
<CheckBox
83-
android:layout_width="wrap_content"
58+
android:checked="false"
59+
android:text="Recurring Alarm"
60+
app:layout_constraintStart_toStartOf="parent"
61+
app:layout_constraintTop_toBottomOf="@+id/fragment_createalarm_title" />
62+
63+
<LinearLayout
64+
android:id="@+id/fragment_createalarm_recurring_options"
65+
android:layout_width="match_parent"
8466
android:layout_height="wrap_content"
85-
android:text="Fri"
86-
android:id="@+id/fragment_createalarm_checkFri"/>
87-
88-
<CheckBox
89-
android:layout_width="wrap_content"
90-
android:layout_height="wrap_content"
91-
android:text="Sat"
92-
android:id="@+id/fragment_createalarm_checkSat"/>
93-
94-
<CheckBox
95-
android:layout_width="wrap_content"
67+
android:orientation="horizontal"
68+
android:visibility="gone"
69+
app:layout_constraintTop_toBottomOf="@+id/fragment_createalarm_recurring">
70+
71+
<CheckBox
72+
android:id="@+id/fragment_createalarm_checkMon"
73+
android:layout_width="wrap_content"
74+
android:layout_height="wrap_content"
75+
android:text="Mon" />
76+
77+
<CheckBox
78+
android:id="@+id/fragment_createalarm_checkTue"
79+
android:layout_width="wrap_content"
80+
android:layout_height="wrap_content"
81+
android:text="Tue" />
82+
83+
<CheckBox
84+
android:id="@+id/fragment_createalarm_checkWed"
85+
android:layout_width="wrap_content"
86+
android:layout_height="wrap_content"
87+
android:text="Wed" />
88+
89+
<CheckBox
90+
android:id="@+id/fragment_createalarm_checkThu"
91+
android:layout_width="wrap_content"
92+
android:layout_height="wrap_content"
93+
android:text="Thu" />
94+
95+
<CheckBox
96+
android:id="@+id/fragment_createalarm_checkFri"
97+
android:layout_width="wrap_content"
98+
android:layout_height="wrap_content"
99+
android:text="Fri" />
100+
101+
<CheckBox
102+
android:id="@+id/fragment_createalarm_checkSat"
103+
android:layout_width="wrap_content"
104+
android:layout_height="wrap_content"
105+
android:text="Sat" />
106+
107+
<CheckBox
108+
android:id="@+id/fragment_createalarm_checkSun"
109+
android:layout_width="wrap_content"
110+
android:layout_height="wrap_content"
111+
android:text="Sun" />
112+
113+
</LinearLayout>
114+
115+
<Button
116+
android:id="@+id/fragment_createalarm_scheduleAlarm"
117+
android:layout_width="match_parent"
96118
android:layout_height="wrap_content"
97-
android:text="Sun"
98-
android:id="@+id/fragment_createalarm_checkSun"/>
99-
100-
</LinearLayout>
119+
android:layout_gravity="center"
120+
android:text="Schedule Alarm"
121+
app:layout_constraintBottom_toBottomOf="parent"
122+
tools:layout_editor_absoluteX="133dp" />
101123

102-
<Button
103-
android:layout_width="wrap_content"
104-
android:layout_height="wrap_content"
105-
android:text="Schedule Alarm"
106-
android:id="@+id/fragment_createalarm_scheduleAlarm" />
124+
</androidx.constraintlayout.widget.ConstraintLayout>
107125

108126
</LinearLayout>

‎app/src/main/res/layout/fragment_listalarms.xml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,39 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
35
android:orientation="vertical"
46
android:layout_width="match_parent"
57
android:layout_height="match_parent">
68

7-
<LinearLayout
9+
<androidx.constraintlayout.widget.ConstraintLayout
810
android:layout_width="match_parent"
9-
android:layout_height="wrap_content"
10-
android:orientation="vertical">
11+
android:layout_height="match_parent">
1112

1213
<TextView
14+
android:id="@+id/fragment_listalarms_myAlarms"
1315
android:layout_width="match_parent"
1416
android:layout_height="wrap_content"
1517
android:text="My Alarms"
18+
android:textAlignment="center"
1619
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
17-
android:textAlignment="center"/>
20+
app:layout_constraintTop_toTopOf="parent" />
1821

1922
<androidx.recyclerview.widget.RecyclerView
23+
android:id="@+id/fragment_listalarms_recylerView"
2024
android:layout_width="match_parent"
2125
android:layout_height="wrap_content"
22-
android:id="@+id/fragment_listalarms_recylerView">
26+
app:layout_constraintTop_toBottomOf="@+id/fragment_listalarms_myAlarms">
27+
2328
</androidx.recyclerview.widget.RecyclerView>
2429

2530
<Button
2631
android:id="@+id/fragment_listalarms_addAlarm"
2732
android:layout_width="match_parent"
2833
android:layout_height="wrap_content"
29-
android:text="Add Alarm" />
34+
android:layout_gravity="bottom"
35+
android:text="Add Alarm"
36+
app:layout_constraintBottom_toBottomOf="parent" />
37+
</androidx.constraintlayout.widget.ConstraintLayout>
3038

31-
</LinearLayout>
32-
</ScrollView>
39+
</LinearLayout>

0 commit comments

Comments
 (0)