Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-02 22:53:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace with new custom notifications page.

Browse Source
This commit is contained in:
Alex Hart
2021-08-04 13:21:26 -03:00
parent 3585667fb9
commit fe9b8a9f47
10 changed files with 371 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

255
app/src/main/res/layout/custom_notifications_dialog_fragment.xml
View File

@@ -1,255 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/custom_notifications_toolbar"
android:layout_width="0dp"
android:layout_height="?attr/actionBarSize"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:title="@string/CustomNotificationsDialogFragment__custom_notifications" />
<TextView
android:id="@+id/custom_notifications_message_section_header"
android:layout_width="0dp"
android:layout_height="52dp"
android:gravity="bottom"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:text="@string/CustomNotificationsDialogFragment__messages"
android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
android:textColor="?attr/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_toolbar" />
<LinearLayout
android:id="@+id/custom_notifications_row"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_message_section_header">
<TextView
android:id="@+id/custom_notifications_enable_label"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:gravity="center_vertical|start"
android:text="@string/CustomNotificationsDialogFragment__use_custom_notifications"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/custom_notifications_enable_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
app:layout_constraintBottom_toBottomOf="@id/custom_notifications_enable_label"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/custom_notifications_enable_label"
app:layout_constraintTop_toTopOf="@id/custom_notifications_enable_label" />
</LinearLayout>
<LinearLayout
android:id="@+id/custom_notifications_sound_row"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_row">
<TextView
android:id="@+id/custom_notifications_sound_label"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:enabled="false"
android:gravity="center_vertical|start"
android:text="@string/CustomNotificationsDialogFragment__notification_sound"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" />
<TextView
android:id="@+id/custom_notifications_sound_selection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="?attr/colorAccent"
android:visibility="gone"
tools:text="Default (Popcorn)"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:id="@+id/custom_notifications_message_vibrate_row"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_sound_row">
<TextView
android:id="@+id/custom_notifications_message_vibrate_label"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:enabled="false"
android:gravity="center_vertical|start"
android:text="@string/CustomNotificationsDialogFragment__vibrate"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" />
<TextView
android:id="@+id/custom_notifications_message_vibrate_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="?attr/colorAccent"
android:visibility="gone"
tools:text="Default"
tools:visibility="visible" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/custom_notifications_vibrate_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false" />
</LinearLayout>
<View
android:id="@+id/custom_notifications_divider"
android:layout_width="0dp"
android:layout_height="12dp"
android:background="@drawable/preference_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_message_vibrate_row" />
<TextView
android:id="@+id/custom_notifications_call_settings_section_header"
android:layout_width="0dp"
android:layout_height="52dp"
android:gravity="bottom"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:text="@string/CustomNotificationsDialogFragment__call_settings"
android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
android:textColor="?attr/colorAccent"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_divider"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/custom_notifications_ringtone_row"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_call_settings_section_header"
tools:visibility="visible">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:gravity="center_vertical|start"
android:text="@string/CustomNotificationsDialogFragment__ringtone"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" />
<TextView
android:id="@+id/custom_notifications_ringtone_selection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="?attr/colorAccent"
tools:text="Default" />
</LinearLayout>
<LinearLayout
android:id="@+id/custom_notifications_call_vibrate_row"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/custom_notifications_ringtone_row"
tools:visibility="visible">
<TextView
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:gravity="center_vertical|start"
android:text="@string/CustomNotificationsDialogFragment__vibrate"
android:textAlignment="viewStart"
android:textAppearance="@style/Signal.Text.Body" />
<TextView
android:id="@+id/custom_notifications_call_vibrate_selectior"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="false"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="?attr/colorAccent"
tools:text="Default" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

18
app/src/main/res/navigation/conversation_settings.xml
View File

@@ -85,6 +85,14 @@
android:name="recipient_id"
app:argType="org.thoughtcrime.securesms.recipients.RecipientId" />
<action
android:id="@+id/action_soundsAndNotificationsSettingsFragment_to_customNotificationsSettingsFragment"
app:destination="@id/customNotificationsSettingsFragment"
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit" />
</fragment>
<fragment
@@ -97,6 +105,16 @@
app:nullable="true" />
</fragment>
<fragment
android:id="@+id/customNotificationsSettingsFragment"
android:name="org.thoughtcrime.securesms.components.settings.conversation.sounds.custom.CustomNotificationsSettingsFragment">
<argument
android:name="recipient_id"
app:argType="org.thoughtcrime.securesms.recipients.RecipientId" />
</fragment>
<include app:graph="@navigation/app_settings_expire_timer" />
</navigation>