Skip to content

Commit ca38b24

Browse files
dnigamerdnigamer
committed
feat: Update layout for access history and dashboard
1 parent 1fd6068 commit ca38b24

2 files changed

Lines changed: 49 additions & 85 deletions

File tree

‎CampusPassApp/app/src/main/res/layout/activity_access_history.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
android:orientation="vertical">
1313

1414
<TextView
15-
android:layout_width="wrap_content"
15+
android:id="@+id/textTitle"
16+
android:layout_width="match_parent"
1617
android:layout_height="wrap_content"
17-
android:layout_gravity="center"
18-
android:layout_marginTop="20dp"
19-
android:layout_marginBottom="20dp"
18+
android:paddingHorizontal="20dp"
19+
android:paddingVertical="16dp"
2020
android:text="Histórico de Acessos"
2121
android:textColor="?attr/colorPrimary"
22-
android:textSize="28sp"
22+
android:textSize="24sp"
2323
android:textStyle="bold" />
2424

2525
<LinearLayout

‎CampusPassApp/app/src/main/res/layout/activity_dashboard.xml‎

Lines changed: 44 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,25 @@
2323
android:textSize="28sp"
2424
android:textStyle="bold" />
2525

26-
<!-- GESTÃO DE ACESSOS -->
27-
<TextView
28-
android:layout_width="wrap_content"
29-
android:layout_height="wrap_content"
30-
android:layout_marginBottom="10dp"
31-
android:text="Controlo e Acessos"
32-
android:textColor="?attr/colorOnSurfaceVariant"
33-
android:textSize="14sp"
34-
android:textStyle="bold" />
35-
3626
<GridLayout
3727
android:layout_width="match_parent"
3828
android:layout_height="wrap_content"
3929
android:columnCount="2"
4030
android:alignmentMode="alignMargins"
4131
android:columnOrderPreserved="false">
4232

33+
<!-- GESTÃO DE ACESSOS -->
34+
<TextView
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:layout_columnSpan="2"
38+
android:layout_marginTop="8dp"
39+
android:layout_marginBottom="8dp"
40+
android:text="Controlo e Acessos"
41+
android:textColor="?attr/colorOnSurfaceVariant"
42+
android:textSize="14sp"
43+
android:textStyle="bold" />
44+
4345
<com.google.android.material.card.MaterialCardView
4446
android:id="@+id/btnManageCards"
4547
style="?attr/materialCardViewElevatedStyle"
@@ -75,28 +77,21 @@
7577
android:textColor="?attr/colorOnSurface"
7678
android:textStyle="bold" />
7779
</com.google.android.material.card.MaterialCardView>
78-
</GridLayout>
7980

80-
<!-- INFRAESTRUTURA -->
81-
<TextView
82-
android:layout_width="wrap_content"
83-
android:layout_height="wrap_content"
84-
android:layout_marginTop="20dp"
85-
android:layout_marginBottom="10dp"
86-
android:text="Infraestrutura"
87-
android:textColor="?attr/colorOnSurfaceVariant"
88-
android:textSize="14sp"
89-
android:textStyle="bold" />
90-
91-
<GridLayout
92-
android:layout_width="match_parent"
93-
android:layout_height="wrap_content"
94-
android:columnCount="2"
95-
android:alignmentMode="alignMargins"
96-
android:columnOrderPreserved="false">
81+
<!-- UNIVERSIDADE -->
82+
<TextView
83+
android:layout_width="wrap_content"
84+
android:layout_height="wrap_content"
85+
android:layout_columnSpan="2"
86+
android:layout_marginTop="16dp"
87+
android:layout_marginBottom="8dp"
88+
android:text="Universidade"
89+
android:textColor="?attr/colorOnSurfaceVariant"
90+
android:textSize="14sp"
91+
android:textStyle="bold" />
9792

9893
<com.google.android.material.card.MaterialCardView
99-
android:id="@+id/btnManageEquipamentos"
94+
android:id="@+id/btnManageUsers"
10095
style="?attr/materialCardViewElevatedStyle"
10196
android:layout_width="0dp"
10297
android:layout_height="100dp"
@@ -107,7 +102,7 @@
107102
android:layout_width="wrap_content"
108103
android:layout_height="wrap_content"
109104
android:layout_gravity="center"
110-
android:text="Equipamentos\n(ESP32)"
105+
android:text="Utilizadores\ne Registo"
111106
android:textAlignment="center"
112107
android:textColor="?attr/colorOnSurface"
113108
android:textStyle="bold" />
@@ -130,70 +125,39 @@
130125
android:textColor="?attr/colorOnSurface"
131126
android:textStyle="bold" />
132127
</com.google.android.material.card.MaterialCardView>
133-
</GridLayout>
134-
135-
<!-- ENSINO -->
136-
<TextView
137-
android:layout_width="wrap_content"
138-
android:layout_height="wrap_content"
139-
android:layout_marginTop="20dp"
140-
android:layout_marginBottom="10dp"
141-
android:text="Ensino"
142-
android:textColor="?attr/colorOnSurfaceVariant"
143-
android:textSize="14sp"
144-
android:textStyle="bold" />
145-
146-
<GridLayout
147-
android:layout_width="match_parent"
148-
android:layout_height="wrap_content"
149-
android:columnCount="2"
150-
android:alignmentMode="alignMargins"
151-
android:columnOrderPreserved="false">
152128

153129
<com.google.android.material.card.MaterialCardView
154130
android:id="@+id/btnManageSessoes"
155131
style="?attr/materialCardViewElevatedStyle"
156-
android:layout_width="0dp"
157-
android:layout_height="100dp"
158-
android:layout_columnWeight="1"
132+
android:layout_width="match_parent"
133+
android:layout_height="80dp"
134+
android:layout_columnSpan="2"
159135
android:layout_margin="4dp"
160136
app:cardCornerRadius="12dp">
161137
<TextView
162138
android:layout_width="wrap_content"
163139
android:layout_height="wrap_content"
164140
android:layout_gravity="center"
165-
android:text="Sessões\nLetivas"
141+
android:text="Sessões Letivas"
166142
android:textAlignment="center"
167143
android:textColor="?attr/colorOnSurface"
168144
android:textStyle="bold" />
169145
</com.google.android.material.card.MaterialCardView>
170146

171-
<View
172-
android:layout_width="0dp"
173-
android:layout_height="0dp"
174-
android:layout_columnWeight="1" />
175-
</GridLayout>
176-
177-
<!-- FERRAMENTAS -->
178-
<TextView
179-
android:layout_width="wrap_content"
180-
android:layout_height="wrap_content"
181-
android:layout_marginTop="20dp"
182-
android:layout_marginBottom="10dp"
183-
android:text="Ferramentas e Utilizadores"
184-
android:textColor="?attr/colorOnSurfaceVariant"
185-
android:textSize="14sp"
186-
android:textStyle="bold" />
187-
188-
<GridLayout
189-
android:layout_width="match_parent"
190-
android:layout_height="wrap_content"
191-
android:columnCount="2"
192-
android:alignmentMode="alignMargins"
193-
android:columnOrderPreserved="false">
147+
<!-- INFRAESTRUTURA -->
148+
<TextView
149+
android:layout_width="wrap_content"
150+
android:layout_height="wrap_content"
151+
android:layout_columnSpan="2"
152+
android:layout_marginTop="16dp"
153+
android:layout_marginBottom="8dp"
154+
android:text="Infraestrutura"
155+
android:textColor="?attr/colorOnSurfaceVariant"
156+
android:textSize="14sp"
157+
android:textStyle="bold" />
194158

195159
<com.google.android.material.card.MaterialCardView
196-
android:id="@+id/btnProgramCard"
160+
android:id="@+id/btnManageEquipamentos"
197161
style="?attr/materialCardViewElevatedStyle"
198162
android:layout_width="0dp"
199163
android:layout_height="100dp"
@@ -204,14 +168,14 @@
204168
android:layout_width="wrap_content"
205169
android:layout_height="wrap_content"
206170
android:layout_gravity="center"
207-
android:text="Programar\nCartão (NFC)"
171+
android:text="Equipamentos\n(ESP32)"
208172
android:textAlignment="center"
209173
android:textColor="?attr/colorOnSurface"
210174
android:textStyle="bold" />
211175
</com.google.android.material.card.MaterialCardView>
212176

213177
<com.google.android.material.card.MaterialCardView
214-
android:id="@+id/btnManageUsers"
178+
android:id="@+id/btnProgramCard"
215179
style="?attr/materialCardViewElevatedStyle"
216180
android:layout_width="0dp"
217181
android:layout_height="100dp"
@@ -222,7 +186,7 @@
222186
android:layout_width="wrap_content"
223187
android:layout_height="wrap_content"
224188
android:layout_gravity="center"
225-
android:text="Utilizadores\ne Registo"
189+
android:text="Programar\nCartão (NFC)"
226190
android:textAlignment="center"
227191
android:textColor="?attr/colorOnSurface"
228192
android:textStyle="bold" />

0 commit comments

Comments
 (0)