Skip to content

Commit 79a99df

Browse files
sowjanyakchAndyScherzinger
sowjanyakch
authored and
AndyScherzinger
committed
layout changes
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
1 parent ead2b60 commit 79a99df

4 files changed

Lines changed: 71 additions & 37 deletions

File tree

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

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:app="http://schemas.android.com/apk/res-auto"
1010
xmlns:tools="http://schemas.android.com/tools"
1111
android:layout_width="match_parent"
12-
android:layout_height="match_parent"
12+
android:layout_height="wrap_content"
1313
android:orientation="vertical"
1414
style="@style/Widget.Material3.BottomSheet"
1515
android:padding="@dimen/standard_padding">
@@ -23,7 +23,7 @@
2323
android:id="@+id/onlineStatusView"
2424
android:layout_width="match_parent"
2525
android:layout_height="wrap_content"
26-
android:layout_marginBottom="@dimen/standard_half_margin"
26+
android:layout_marginBottom="@dimen/standard_margin"
2727
android:text="@string/online_status"
2828
android:textColor="@color/high_emphasis_text"
2929
android:textSize="@dimen/activity_list_item_title_header_text_size"
@@ -46,7 +46,7 @@
4646
android:layout_width="match_parent"
4747
android:layout_height="@dimen/online_status_item_height"
4848
android:layout_gravity="center_vertical"
49-
android:layout_marginBottom="@dimen/standard_half_margin"
49+
android:layout_marginBottom="@dimen/standard_margin"
5050
android:layout_weight="1"
5151
android:checkable="true"
5252
android:orientation="horizontal"
@@ -115,7 +115,7 @@
115115
android:layout_width="match_parent"
116116
android:layout_height="@dimen/online_status_item_height"
117117
android:layout_gravity="center_vertical"
118-
android:layout_marginBottom="@dimen/standard_half_margin"
118+
android:layout_marginBottom="@dimen/standard_margin"
119119
android:layout_weight="1"
120120
android:checkable="true"
121121
android:orientation="horizontal"
@@ -185,7 +185,7 @@
185185
android:layout_width="match_parent"
186186
android:layout_height="@dimen/online_status_item_height"
187187
android:layout_gravity="center_vertical"
188-
android:layout_marginBottom="@dimen/standard_half_margin"
188+
android:layout_marginBottom="@dimen/standard_margin"
189189
android:layout_weight="1"
190190
android:checkable="true"
191191
android:orientation="horizontal"
@@ -242,7 +242,7 @@
242242
android:layout_width="match_parent"
243243
android:layout_height="@dimen/online_status_item_height"
244244
android:layout_gravity="center_vertical"
245-
android:layout_marginBottom="@dimen/standard_half_margin"
245+
android:layout_marginBottom="@dimen/standard_margin"
246246
android:layout_weight="1"
247247
android:checkable="true"
248248
android:orientation="horizontal"
@@ -281,13 +281,23 @@
281281
<TextView
282282
android:id="@+id/dnd_headline"
283283
android:layout_width="match_parent"
284-
android:layout_height="wrap_content"
284+
android:layout_height="match_parent"
285285
android:ellipsize="end"
286286
android:gravity="bottom"
287287
android:maxLines="1"
288288
android:text="@string/dnd"
289289
android:textAppearance="?android:attr/textAppearanceListItem" />
290290

291+
<TextView
292+
android:id="@+id/dnd_info"
293+
android:layout_width="match_parent"
294+
android:layout_height="wrap_content"
295+
android:ellipsize="end"
296+
android:gravity="bottom"
297+
android:maxLines="1"
298+
android:text="@string/mute_all_notifications"
299+
android:textAppearance="?android:attr/textAppearanceSmall" />
300+
291301
</LinearLayout>
292302

293303
</RelativeLayout>
@@ -337,13 +347,23 @@
337347
<TextView
338348
android:id="@+id/invisible_headline"
339349
android:layout_width="match_parent"
340-
android:layout_height="wrap_content"
350+
android:layout_height="match_parent"
341351
android:ellipsize="end"
342352
android:gravity="bottom"
343353
android:maxLines="1"
344354
android:text="@string/invisible"
345355
android:textAppearance="?android:attr/textAppearanceListItem" />
346356

357+
<TextView
358+
android:id="@+id/invisible_info"
359+
android:layout_width="match_parent"
360+
android:layout_height="wrap_content"
361+
android:ellipsize="end"
362+
android:gravity="bottom"
363+
android:maxLines="1"
364+
android:text="@string/appear_offline"
365+
android:textAppearance="?android:attr/textAppearanceSmall" />
366+
347367
</LinearLayout>
348368

349369
</RelativeLayout>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
xmlns:app="http://schemas.android.com/apk/res-auto"
1212
xmlns:tools="http://schemas.android.com/tools"
1313
android:layout_width="match_parent"
14-
android:layout_height="match_parent"
14+
android:layout_height="wrap_content"
1515
android:orientation="vertical"
1616
style="@style/Widget.Material3.BottomSheet"
1717
android:padding="@dimen/standard_padding">
@@ -99,7 +99,7 @@
9999
android:layout_width="match_parent"
100100
android:layout_height="wrap_content"
101101
android:layout_marginTop="@dimen/standard_half_margin"
102-
android:orientation="horizontal">
102+
android:orientation="vertical">
103103

104104
<TextView
105105
android:id="@+id/clearStatusMessageTextView"
@@ -109,9 +109,11 @@
109109
android:textColor="@color/high_emphasis_text" />
110110

111111
<Spinner
112+
android:layout_marginStart="-8dp"
112113
android:id="@+id/clearStatusAfterSpinner"
113-
android:layout_width="match_parent"
114-
android:layout_height="wrap_content" />
114+
android:layout_width="wrap_content"
115+
android:layout_height="wrap_content"
116+
android:paddingTop="@dimen/standard_half_padding"/>
115117

116118
<TextView
117119
android:id="@+id/remainingClearTime"

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

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,61 +6,70 @@
66
~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky <tobias@kaminsky.me>
77
~ SPDX-License-Identifier: GPL-3.0-or-later
88
-->
9-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9+
<LinearLayout
10+
xmlns:android="http://schemas.android.com/apk/res/android"
1011
xmlns:tools="http://schemas.android.com/tools"
1112
android:layout_width="match_parent"
12-
android:layout_height="wrap_content"
13-
android:orientation="horizontal">
14-
15-
<TextView
16-
android:id="@+id/icon"
17-
android:layout_width="48dp"
18-
android:layout_height="match_parent"
19-
android:gravity="center"
20-
android:textSize="25sp"
21-
tools:text="📆" />
13+
android:layout_height="48dp"
14+
android:orientation="horizontal"
15+
android:gravity="center_vertical"
16+
android:paddingHorizontal="8dp">
2217

2318
<LinearLayout
2419
android:layout_width="0dp"
2520
android:layout_height="wrap_content"
26-
android:orientation="vertical"
2721
android:layout_weight="1"
28-
android:paddingStart="8dp"
29-
android:paddingEnd="8dp"
30-
android:paddingTop="8dp"
31-
android:paddingBottom="4dp">
22+
android:orientation="horizontal"
23+
android:gravity="center_vertical">
24+
25+
<TextView
26+
android:id="@+id/icon"
27+
android:layout_width="48dp"
28+
android:layout_height="match_parent"
29+
android:gravity="center"
30+
android:textSize="25sp"
31+
tools:text="📆" />
3232

3333
<TextView
3434
android:id="@+id/name"
3535
android:layout_width="wrap_content"
36-
android:layout_height="wrap_content"
37-
android:gravity="start"
36+
android:layout_height="match_parent"
37+
android:gravity="center_vertical"
3838
android:textAppearance="?android:attr/textAppearanceListItem"
3939
tools:text="In a meeting" />
4040

41+
<TextView
42+
android:id="@+id/divider"
43+
android:layout_width="wrap_content"
44+
android:layout_height="match_parent"
45+
android:layout_margin="@dimen/standard_half_margin"
46+
android:gravity="center_vertical"
47+
android:text="@string/divider"
48+
android:textAppearance="?android:attr/textAppearanceListItem"
49+
android:textColor="?android:attr/textColorSecondary" />
50+
4151
<TextView
4252
android:id="@+id/clearAt"
4353
android:layout_width="wrap_content"
44-
android:layout_height="wrap_content"
45-
android:gravity="start"
46-
android:textAppearance="?android:attr/textAppearanceListItemSecondary"
54+
android:layout_height="match_parent"
55+
android:gravity="center_vertical"
56+
android:textAppearance="?android:attr/textAppearanceListItem"
4757
android:textColor="?android:attr/textColorSecondary"
4858
tools:text="an hour" />
4959
</LinearLayout>
5060

61+
5162
<com.google.android.material.button.MaterialButton
5263
android:id="@+id/reset_status_button"
5364
android:layout_width="wrap_content"
5465
android:layout_height="wrap_content"
5566
android:minWidth="48dp"
5667
android:minHeight="48dp"
57-
android:layout_gravity="center"
5868
android:backgroundTint="@color/secondary_button_background"
5969
android:textColor="@android:color/black"
60-
android:text= "@string/reset_status"
70+
android:text="@string/reset_status"
6171
android:textSize="14sp"
6272
android:padding="8dp"
6373
android:visibility="gone"
6474
tools:visibility="visible"/>
65-
66-
</LinearLayout>
75+
</LinearLayout>

‎app/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,9 @@ How to translate with transifex:
391391
<string name="away">Away</string>
392392
<string name="busy">Busy</string>
393393
<string name="invisible">Invisible</string>
394+
<string name="divider" translatable="false">—</string>
395+
<string name="mute_all_notifications">Mute all notifications</string>
396+
<string name="appear_offline">Appear offline</string>
394397
<string name="default_emoji" translatable="false">😃</string>
395398
<string name="emoji_thumbsUp" translatable="false">👍</string>
396399
<string name="emoji_thumbsDown" translatable="false">👎</string>

0 commit comments

Comments
 (0)