Skip to content

Commit 445d6bc

Browse files
or-elseor-else
committed
added explainer for incognito mode
1 parent 7d0af6a commit 445d6bc

13 files changed

Lines changed: 81 additions & 52 deletions

File tree

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

Lines changed: 69 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,88 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:layout_margin="@dimen/activity_default_margin"
66
android:orientation="vertical">
77

8-
<LinearLayout
8+
<!-- Incognito Mode -->
9+
<TextView
10+
android:id="@+id/incognito_mode_label"
911
android:layout_width="match_parent"
1012
android:layout_height="wrap_content"
11-
android:gravity="center_vertical">
13+
android:layout_toStartOf="@+id/switchIncognitoMode"
14+
android:text="@string/incognito_mode_enabled"
15+
android:paddingTop="8dp"
16+
android:paddingBottom="4dp"
17+
android:textAppearance="?android:textAppearanceLarge" />
1218

13-
<TextView
14-
android:layout_width="0dp"
15-
android:layout_height="wrap_content"
16-
android:layout_weight="1"
17-
android:text="@string/incognito_mode_enabled"
18-
android:textAppearance="?android:textAppearanceLarge" />
19+
<TextView
20+
android:id="@+id/incognito_mode_helper"
21+
android:layout_width="match_parent"
22+
android:layout_height="wrap_content"
23+
android:layout_toStartOf="@+id/switchIncognitoMode"
24+
android:layout_below="@id/incognito_mode_label"
25+
android:text="@string/incognito_mode_explainer"
26+
android:paddingBottom="4dp"
27+
android:textAppearance="?android:textAppearanceMedium" />
1928

20-
<androidx.appcompat.widget.SwitchCompat
21-
android:id="@+id/switchIncognitoMode"
22-
android:layout_width="wrap_content"
23-
android:layout_height="wrap_content"
24-
android:minHeight="@dimen/min_touch_height"
25-
android:minWidth="@dimen/min_touch_height"
26-
android:layout_margin="4dp" />
27-
</LinearLayout>
29+
<androidx.appcompat.widget.SwitchCompat
30+
android:id="@+id/switchIncognitoMode"
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:layout_alignTop="@id/incognito_mode_label"
34+
android:layout_alignBottom="@id/incognito_mode_label"
35+
android:layout_alignParentEnd="true"
36+
android:layout_marginStart="8dp"
37+
android:minWidth="@dimen/min_touch_height"
38+
android:minHeight="@dimen/min_touch_height" />
2839

29-
<LinearLayout
40+
<!-- Read Receipts -->
41+
<TextView
42+
android:id="@+id/read_receipts_label"
3043
android:layout_width="match_parent"
3144
android:layout_height="wrap_content"
32-
android:gravity="center_vertical">
33-
34-
<TextView
35-
android:layout_width="0dp"
36-
android:layout_height="wrap_content"
37-
android:layout_weight="1"
38-
android:text="@string/read_receipts_enabled"
39-
android:textAppearance="?android:textAppearanceLarge" />
45+
android:layout_below="@id/incognito_mode_helper"
46+
android:layout_marginTop="8dp"
47+
android:layout_toStartOf="@+id/switchReadReceipts"
48+
android:text="@string/read_receipts_enabled"
49+
android:paddingTop="8dp"
50+
android:paddingBottom="8dp"
51+
android:textAppearance="?android:textAppearanceLarge" />
4052

41-
<androidx.appcompat.widget.SwitchCompat
42-
android:id="@+id/switchReadReceipts"
43-
android:layout_width="wrap_content"
44-
android:layout_height="wrap_content"
45-
android:minHeight="@dimen/min_touch_height"
46-
android:minWidth="@dimen/min_touch_height"
47-
android:layout_margin="4dp" />
48-
</LinearLayout>
53+
<androidx.appcompat.widget.SwitchCompat
54+
android:id="@+id/switchReadReceipts"
55+
android:layout_width="wrap_content"
56+
android:layout_height="wrap_content"
57+
android:layout_alignTop="@id/read_receipts_label"
58+
android:layout_alignBottom="@id/read_receipts_label"
59+
android:layout_alignParentEnd="true"
60+
android:layout_marginStart="8dp"
61+
android:minWidth="@dimen/min_touch_height"
62+
android:minHeight="@dimen/min_touch_height" />
4963

50-
<LinearLayout
64+
<!-- Typing Notifications -->
65+
<TextView
66+
android:id="@+id/typing_notifications_label"
5167
android:layout_width="match_parent"
5268
android:layout_height="wrap_content"
53-
android:gravity="center_vertical">
54-
55-
<TextView
56-
android:layout_width="0dp"
57-
android:layout_height="wrap_content"
58-
android:layout_weight="1"
59-
android:text="@string/typing_notifications_enabled"
60-
android:textAppearance="?android:textAppearanceLarge" />
69+
android:layout_below="@id/read_receipts_label"
70+
android:layout_marginTop="16dp"
71+
android:layout_toStartOf="@+id/switchTypingNotifications"
72+
android:text="@string/typing_notifications_enabled"
73+
android:paddingTop="8dp"
74+
android:paddingBottom="8dp"
75+
android:textAppearance="?android:textAppearanceLarge" />
6176

62-
<androidx.appcompat.widget.SwitchCompat
63-
android:id="@+id/switchTypingNotifications"
64-
android:layout_width="wrap_content"
65-
android:layout_height="wrap_content"
66-
android:minHeight="@dimen/min_touch_height"
67-
android:minWidth="@dimen/min_touch_height"
68-
android:layout_margin="4dp" />
69-
</LinearLayout>
77+
<androidx.appcompat.widget.SwitchCompat
78+
android:id="@+id/switchTypingNotifications"
79+
android:layout_width="wrap_content"
80+
android:layout_height="wrap_content"
81+
android:layout_alignTop="@id/typing_notifications_label"
82+
android:layout_alignBottom="@id/typing_notifications_label"
83+
android:layout_alignParentEnd="true"
84+
android:layout_marginStart="8dp"
85+
android:minWidth="@dimen/min_touch_height"
86+
android:minHeight="@dimen/min_touch_height" />
7087

71-
</LinearLayout>
88+
</RelativeLayout>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,4 +365,5 @@
365365
<string name="alias_already_taken">bereits vergeben</string>
366366
<string name="camera_not_accessible">Kamera nicht erreichbar</string>
367367
<string name="unable_to_open_gallery">Galerie konnte nicht geöffnet werden</string>
368+
<string name="incognito_mode_explainer">Deinen Online-Status verbergen</string>
368369
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,4 +363,5 @@
363363
<string name="alias_already_taken">ya está en uso</string>
364364
<string name="camera_not_accessible">Cámara no accesible</string>
365365
<string name="unable_to_open_gallery">No se pudo abrir la galería</string>
366+
<string name="incognito_mode_explainer">Ocultar tu estado en línea</string>
366367
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,4 +364,5 @@
364364
<string name="alias_already_taken">déjà pris</string>
365365
<string name="camera_not_accessible">Caméra non accessible</string>
366366
<string name="unable_to_open_gallery">Impossible d\'ouvrir la galerie</string>
367+
<string name="incognito_mode_explainer">Masquer votre statut en ligne</string>
367368
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,4 +336,5 @@
336336
<string name="alias_already_taken">पहले से लिया गया</string>
337337
<string name="camera_not_accessible">कैमरा उपलब्ध नहीं है</string>
338338
<string name="unable_to_open_gallery">गैलरी खोलने में असमर्थ</string>
339+
<string name="incognito_mode_explainer">अपनी ऑनलाइन स्थिति छिपाएं</string>
339340
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,4 +363,5 @@
363363
<string name="alias_already_taken">이미 사용됨</string>
364364
<string name="camera_not_accessible">카메라에 액세스할 수 없습니다</string>
365365
<string name="unable_to_open_gallery">갤러리를 열 수 없습니다</string>
366+
<string name="incognito_mode_explainer">온라인 상태 숨기기</string>
366367
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,4 +365,5 @@
365365
<string name="alias_already_taken">já está em uso</string>
366366
<string name="camera_not_accessible">Câmera não acessível</string>
367367
<string name="unable_to_open_gallery">Não foi possível abrir a galeria</string>
368+
<string name="incognito_mode_explainer">Ocultar seu status online</string>
368369
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,4 +365,5 @@
365365
<string name="alias_already_taken">deja folosit</string>
366366
<string name="camera_not_accessible">Camera nu este accesibilă</string>
367367
<string name="unable_to_open_gallery">Imposibil de deschis galeria</string>
368+
<string name="incognito_mode_explainer">Ascunde starea online</string>
368369
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,4 +344,5 @@
344344
<string name="alias_already_taken">уже занят</string>
345345
<string name="camera_not_accessible">Камера недоступна</string>
346346
<string name="unable_to_open_gallery">Не удалось открыть галерею</string>
347+
<string name="incognito_mode_explainer">Скрывать онлайн-статус</string>
347348
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,4 +344,5 @@
344344
<string name="alias_already_taken">вже зайнято</string>
345345
<string name="camera_not_accessible">Камера недоступна</string>
346346
<string name="unable_to_open_gallery">Не вдалося відкрити галерею</string>
347+
<string name="incognito_mode_explainer">Приховувати статус онлайн</string>
347348
</resources>

0 commit comments

Comments
 (0)