Skip to content

Commit 24c7369

Browse files
Merge pull request #6029 from nextcloud/style/noid/unifyMetaContainers
Unify meta info containers
2 parents a7267d9 + bec4eef commit 24c7369

3 files changed

Lines changed: 25 additions & 19 deletions

File tree

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,10 @@
115115
android:layout_height="wrap_content"
116116
android:visibility="gone"
117117
tools:visibility="visible"
118-
android:layout_margin="8dp"
119-
app:cardCornerRadius="12dp">
118+
android:layout_marginStart="@dimen/standard_quarter_margin"
119+
android:layout_marginEnd="@dimen/standard_quarter_margin"
120+
android:layout_marginTop="@dimen/standard_quarter_margin"
121+
app:cardCornerRadius="@dimen/meta_info_corner_radius">
120122

121123
<include layout="@layout/remainder_to_delete_conversation" />
122124
</com.google.android.material.card.MaterialCardView>
@@ -143,7 +145,9 @@
143145
android:id="@+id/upcoming_event_card"
144146
android:layout_width="match_parent"
145147
android:layout_height="wrap_content"
146-
android:layout_margin="@dimen/standard_quarter_margin"
148+
android:layout_marginStart="@dimen/standard_quarter_margin"
149+
android:layout_marginEnd="@dimen/standard_quarter_margin"
150+
android:layout_marginTop="@dimen/standard_quarter_margin"
147151
android:visibility="gone"
148152
app:cardCornerRadius="@dimen/meta_info_corner_radius"
149153
tools:visibility="visible">
@@ -158,7 +162,7 @@
158162
android:layout_width="match_parent"
159163
android:layout_height="wrap_content"
160164
android:orientation="vertical"
161-
android:padding="@dimen/standard_half_padding"
165+
android:padding="@dimen/standard_quarter_padding"
162166
android:visibility="gone"
163167
android:background="@color/transparent"
164168
tools:visibility="visible">
@@ -174,16 +178,18 @@
174178
android:layout_width="match_parent"
175179
android:layout_height="wrap_content"
176180
android:orientation="vertical"
177-
android:layout_margin="8dp"
178181
android:background="@color/bg_default">
179182

180183
<com.google.android.material.card.MaterialCardView
181184
android:id="@+id/out_of_office_container"
182185
android:layout_width="match_parent"
183186
android:layout_height="wrap_content"
184-
android:visibility="gone"
185187
tools:visibility="visible"
186-
app:cardCornerRadius="12dp">
188+
android:layout_marginStart="@dimen/standard_quarter_margin"
189+
android:layout_marginEnd="@dimen/standard_quarter_margin"
190+
android:layout_marginTop="@dimen/standard_quarter_margin"
191+
android:visibility="gone"
192+
app:cardCornerRadius="@dimen/meta_info_corner_radius">
187193

188194
<include layout="@layout/out_of_office_view" />
189195
</com.google.android.material.card.MaterialCardView>

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
1-
<?xml version="1.0" encoding="utf-8"?><!--
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
23
~ Nextcloud Talk - Android Client
34
~
45
~ SPDX-FileCopyrightText: 2025 Sowjanya Kota <sowjanya.kch@gmail.com>
56
~ SPDX-License-Identifier: GPL-3.0-or-later
6-
-->
7-
8-
7+
-->
98
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
109
xmlns:app="http://schemas.android.com/apk/res-auto"
1110
android:id="@+id/deletion_warning_container"
1211
android:layout_width="match_parent"
1312
android:layout_height="wrap_content"
14-
android:orientation="vertical"
1513
android:gravity="center_horizontal"
16-
android:padding="12dp">
14+
android:orientation="vertical"
15+
android:padding="@dimen/standard_half_padding">
1716

1817
<TextView
1918
android:id="@+id/deletion_message"
2019
android:layout_width="wrap_content"
2120
android:layout_height="wrap_content"
22-
android:textSize="14sp"
23-
android:lineSpacingExtra="4dp"
2421
android:gravity="center"
25-
android:layout_marginBottom="12dp" />
22+
android:lineSpacingExtra="4dp"
23+
android:textSize="14sp" />
2624

2725
<LinearLayout
2826
android:layout_width="wrap_content"
2927
android:layout_height="wrap_content"
30-
android:orientation="horizontal"
31-
android:gravity="center_horizontal">
28+
android:layout_marginTop="@dimen/standard_half_margin"
29+
android:gravity="center_horizontal"
30+
android:orientation="horizontal">
3231

3332
<com.google.android.material.button.MaterialButton
3433
android:id="@+id/delete_now_button"
@@ -53,4 +52,4 @@
5352
app:iconGravity="textStart" />
5453
</LinearLayout>
5554

56-
</LinearLayout>
55+
</LinearLayout>

app/src/main/res/values/dimens.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<dimen name="zero">0dp</dimen>
5757

5858
<dimen name="standard_quarter_margin">4dp</dimen>
59+
<dimen name="standard_quarter_padding">4dp</dimen>
5960
<dimen name="activity_row_layout_height">48dp</dimen>
6061
<dimen name="reaction_bottom_sheet_layout_size">40dp</dimen>
6162
<dimen name="standard_eighth_margin">2dp</dimen>

0 commit comments

Comments
 (0)