Merge branch 'master' into upgrade-smsmms-group-individual-send-no-wait-appear-delayed-mms-mms-receive-to-worker-send-ack-mmsc

This commit is contained in:
Inhishonor
2025-10-09 18:01:59 -07:00
254 changed files with 2886 additions and 1596 deletions
@@ -46,6 +46,12 @@
android:layout_height="wrap_content"
app:title="@string/blocked_numbers_title" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/messageContentFilters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/message_content_filters_title" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/drop"
android:layout_width="match_parent"
@@ -207,6 +207,7 @@
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingBottom="2dp"
android:text="@string/compose_scheduled_for"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"
@@ -347,6 +348,21 @@
app:tint="?android:textColorSecondary"
tools:visibility="visible" />
<ImageView
android:id="@+id/scheduledSend"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/scheduled_send_cd"
android:src="@drawable/ic_schedule_send_black_24dp"
android:padding="10dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="parent"
app:tint="?android:textColorSecondary"
tools:visibility="visible" />
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
@@ -43,6 +43,13 @@
app:icon="@drawable/ic_notifications_black_24dp"
app:title="@string/info_notifications" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/markUnread"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_markunread_black_24dp"
app:title="@string/main_menu_unread" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/archive"
android:layout_width="match_parent"
@@ -69,7 +69,7 @@
android:ellipsize="end"
android:maxLines="1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/pinned"
app:layout_constraintEnd_toStartOf="@id/scheduled"
app:layout_constraintStart_toStartOf="@id/title"
app:layout_constraintTop_toBottomOf="@id/title"
tools:text="@tools:sample/lorem/random" />
@@ -80,9 +80,23 @@
android:layout_height="16dp"
android:layout_marginTop="2dp"
android:paddingStart="4dp"
android:paddingTop="2dp"
android:src="@drawable/ic_baseline_push_pin_24"
app:tint="?android:attr/textColorTertiary"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@id/scheduled"
app:layout_constraintTop_toTopOf="@id/snippet"
tools:visibility="visible" />
<ImageView
android:id="@+id/scheduled"
android:layout_width="20dp"
android:layout_height="16dp"
android:layout_marginTop="2dp"
android:paddingStart="4dp"
android:src="@drawable/ic_event_black_24dp"
android:tint="?android:attr/textColorTertiary"
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@id/unread"
app:layout_constraintTop_toTopOf="@id/snippet"
tools:visibility="visible" />
@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
~
~ QKSMS is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ QKSMS is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/filter"
style="@style/TextPrimary"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingStart="24dp"
tools:text="value"
android:textDirection="ltr" />
<ImageView
android:id="@+id/caseIcon"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:src="@drawable/ic_format_size_black_24dp"
android:tint="?android:attr/textColorSecondary" />
<ImageView
android:id="@+id/regexIcon"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:src="@drawable/ic_settings_black_24dp"
android:tint="?android:attr/textColorSecondary" />
<ImageView
android:id="@+id/contactsIcon"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorSecondary" />
<ImageView
android:id="@+id/removeFilter"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="?android:attr/selectableItemBackground"
android:padding="12dp"
android:src="@drawable/ic_close_black_24dp"
android:tint="?android:attr/textColorSecondary" />
</LinearLayout>
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
~
~ QKSMS is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ QKSMS is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/add_dialog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:text="@string/message_content_filters_dialog_title"
android:textColor="?android:attr/textColorPrimary"
app:textSize="dialog" />
<dev.octoshrimpy.quik.common.widget.QkEditText
android:id="@+id/input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/message_content_filters_dialog_hint"
android:paddingStart="24dp"
android:paddingTop="16dp"
android:paddingEnd="24dp"
android:paddingBottom="16dp"
android:textColorHint="?android:attr/textColorTertiary"
app:textSize="primary" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/caseSensitivity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/message_content_filters_dialog_case_switch"
app:icon="@drawable/ic_format_size_black_24dp"
app:widget="@layout/settings_switch_widget" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/regexp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/message_content_filters_dialog_regex_switch"
app:icon="@drawable/ic_settings_black_24dp"
app:widget="@layout/settings_switch_widget" />
<dev.octoshrimpy.quik.common.widget.PreferenceView
android:id="@+id/contacts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/message_content_filters_dialog_contacts_switch"
app:icon="@drawable/ic_person_black_24dp"
app:widget="@layout/settings_switch_widget" />
</LinearLayout>
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
~
~ QKSMS is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ QKSMS is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<FrameLayout 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"
android:background="?android:attr/windowBackground"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/filters"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingTop="8dp"
android:paddingBottom="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/message_content_filters_empty"
android:textColor="?android:attr/textColorTertiary" />
<ImageView
android:id="@+id/add"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:background="@drawable/circle_ripple"
android:contentDescription="@string/message_content_filters_add_cd"
android:elevation="8dp"
android:padding="16dp"
android:src="@drawable/ic_add_black_24dp"
android:tint="@color/white"
tools:backgroundTint="@color/tools_theme" />
</FrameLayout>
@@ -79,7 +79,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintBottom_toBottomOf="parent"
android:clipToPadding="false"
android:clipChildren="false">
<dev.octoshrimpy.quik.common.widget.AvatarView
android:id="@+id/avatar"
@@ -89,16 +91,21 @@
app:layout_constraintBottom_toBottomOf="@id/body"
app:layout_constraintStart_toStartOf="parent" />
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:orientation="vertical">
android:clipToPadding="false"
android:clipChildren="false"
android:paddingEnd="4dp"
android:paddingStart="4dp">
<dev.octoshrimpy.quik.common.widget.QkContextMenuRecyclerViewLongMmsPart
android:id="@+id/parts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:nestedScrollingEnabled="false"
android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
@@ -110,6 +117,8 @@
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_below="@id/parts"
android:layout_marginTop="2dp"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
@@ -118,7 +127,38 @@
android:textIsSelectable="true"
tools:backgroundTint="@color/tools_theme"
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
<LinearLayout
android:id="@+id/reactions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/body"
android:layout_alignEnd="@id/body"
android:layout_marginEnd="-12dp"
android:layout_marginBottom="-20dp"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/reactionText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/message_only"
android:backgroundTint="?android:attr/colorBackground"
android:elevation="2dp"
android:maxLines="1"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:text="😂 2"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
@@ -139,4 +179,4 @@
</LinearLayout>
</FrameLayout>
</FrameLayout>
@@ -92,7 +92,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:clipToPadding="false">
<FrameLayout
android:id="@+id/cancelFrame"
@@ -138,24 +139,64 @@
android:layout_height="wrap_content"
android:layout_toStartOf="@id/sendNowIcon"
android:layout_toEndOf="@id/cancelFrame"
android:orientation="horizontal">
android:orientation="horizontal"
android:clipChildren="false"
android:clipToPadding="false">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<dev.octoshrimpy.quik.common.widget.TightTextView
android:id="@+id/body"
style="@style/TextPrimary"
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:backgroundTint="?attr/bubbleColor"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true" />
android:paddingStart="18dp"
android:clipToPadding="false"
android:clipChildren="false">
<dev.octoshrimpy.quik.common.widget.TightTextView
android:id="@+id/body"
style="@style/TextPrimary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="email|phone|web"
android:background="@drawable/message_only"
android:backgroundTint="?attr/bubbleColor"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true" />
<LinearLayout
android:id="@+id/reactions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
android:layout_marginStart="-16dp"
android:layout_marginBottom="-20dp"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/reactionText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/message_only"
android:backgroundTint="?android:attr/colorBackground"
android:elevation="2dp"
android:maxLines="1"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:text="👍"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
<ImageView
@@ -212,4 +253,4 @@
</LinearLayout>
</FrameLayout>
</FrameLayout>
@@ -23,7 +23,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/collapsing_toolbar" />
<include
android:id="@+id/toolbarLayout"
layout="@layout/collapsing_toolbar" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
@@ -262,4 +264,4 @@
android:layout_gravity="bottom"
android:background="?android:attr/divider" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>