attachment context menu for save, share, forward and open externally

remove share icons from audio and file attachment types
add forward and open externally to gallery menu so it matches attachment context menu
new icon/button for resend message
This commit is contained in:
gavine99
2025-02-10 22:08:39 +11:00
parent eeea87490d
commit b41c9f7103
35 changed files with 512 additions and 298 deletions
@@ -133,7 +133,7 @@
android:id="@+id/composeBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="messageBackground,attachments,attach,message,counter,send" />
app:constraint_referenced_ids="messageBackground,parts,attach,message,counter,send" />
<View
android:id="@+id/composeDivider"
@@ -211,12 +211,12 @@
android:layout_width="0dp"
android:layout_height="1dp"
android:background="?android:attr/divider"
app:layout_constraintBottom_toTopOf="@id/attachments"
app:layout_constraintBottom_toTopOf="@id/parts"
app:layout_constraintEnd_toEndOf="@id/messageBackground"
app:layout_constraintStart_toStartOf="@id/messageBackground" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
android:id="@+id/parts"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:clipChildren="false"
@@ -95,8 +95,8 @@
android:layout_marginStart="12dp"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
<dev.octoshrimpy.quik.common.widget.QkContextMenuRecyclerViewLongMmsPart
android:id="@+id/parts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
@@ -77,8 +77,8 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/attachments"
<dev.octoshrimpy.quik.common.widget.QkContextMenuRecyclerViewLongMmsPart
android:id="@+id/parts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
@@ -155,8 +155,7 @@
android:backgroundTint="?attr/bubbleColor"
android:gravity="start|center_vertical"
android:minHeight="36dp"
android:textIsSelectable="true"
tools:text="@tools:sample/lorem/random[0]" />
android:textIsSelectable="true" />
</LinearLayout>
<ImageView
@@ -178,18 +177,38 @@
</RelativeLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="4dp"
android:contentDescription="@string/compose_message_attachment"
android:textColor="?android:attr/textColorSecondary"
app:textSize="tertiary"
tools:text="Sending..." />
android:orientation="horizontal">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="12dp"
android:contentDescription="@string/compose_message_attachment"
android:textColor="?android:attr/textColorSecondary"
app:textSize="tertiary"
tools:text="Sending..." />
<ImageView
android:id="@+id/resendIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/circle"
android:backgroundTint="?attr/bubbleColor"
android:baselineAlignBottom="false"
android:contentDescription="@string/compose_message_send_now"
android:padding="6dp"
android:src="@drawable/ic_sync_black_24dp"
android:visibility="gone"
tools:tint="@color/tools_theme"
tools:visibility="visible" />
</LinearLayout>
</LinearLayout>
@@ -92,22 +92,9 @@
android:text="@tools:sample/lorem/random[0]"
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/share"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/playPause" />
<ImageView
android:id="@+id/share"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="bottom"
android:layout_marginEnd="12dp"
android:background="@drawable/circle"
android:elevation="4dp"
android:padding="6dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="?attr/actionModeShareDrawable"
app:tint="@color/tools_theme" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
@@ -17,72 +17,62 @@
~ 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"
<LinearLayout
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="wrap_content"
android:layout_marginTop="2dp">
android:id="@+id/fileBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fileBackground"
<ImageView
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
android:rotation="135"
android:src="@drawable/ic_attachment_black_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?android:attr/textColorSecondary" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="12dp"
android:src="@drawable/ic_attachment_black_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?android:attr/textColorSecondary" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@id/share"
app:layout_constraintStart_toEndOf="@id/icon">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/filename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingTop="8dp"
android:paddingEnd="12dp"
android:textColor="?android:attr/textColorPrimary"
app:textSize="primary"
tools:text="Resume.pdf" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingBottom="8dp"
android:textColor="?android:attr/textColorTertiary"
app:textSize="secondary"
tools:text="35 KB" />
</LinearLayout>
<ImageView
android:id="@+id/share"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="12dp"
android:background="@drawable/circle"
android:padding="6dp"
app:layout_constraintBottom_toBottomOf="parent"
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/filename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingStart="12dp"
android:paddingTop="8dp"
android:paddingEnd="12dp"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/icon"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="?attr/actionModeShareDrawable"
app:tint="@color/tools_theme" />
app:textSize="primary"
tools:text="a test file.pdf" />
</androidx.constraintlayout.widget.ConstraintLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingBottom="8dp"
android:singleLine="true"
android:textColor="?android:attr/textColorTertiary"
app:layout_constraintStart_toEndOf="@id/icon"
app:layout_constraintTop_toBottomOf="@id/filename"
app:textSize="secondary"
tools:text="35 KB" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
@@ -17,56 +17,60 @@
~ 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"
<LinearLayout
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="wrap_content"
android:layout_marginTop="2dp">
android:id="@+id/vCardBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/vCardBackground"
<ImageView
android:id="@+id/vCardAvatar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
android:src="@drawable/ic_person_black_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tint="?android:attr/textColorSecondary" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:paddingStart="12dp"
android:paddingTop="8dp"
android:paddingBottom="8dp">
android:paddingEnd="12dp"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/icon"
app:layout_constraintTop_toTopOf="parent"
app:textSize="primary"
tools:text="Person Name" />
<ImageView
android:id="@+id/vCardAvatar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="12dp"
android:src="@drawable/ic_person_black_24dp"
android:tint="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="@id/vCardBackground"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/vCardBackground" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingBottom="8dp"
android:singleLine="true"
android:text="@string/compose_vcard_label"
android:textColor="?android:attr/textColorTertiary"
app:layout_constraintStart_toEndOf="@id/icon"
app:layout_constraintTop_toBottomOf="@id/filename"
app:textSize="secondary" />
</LinearLayout>
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toEndOf="@id/vCardAvatar"
app:layout_constraintTop_toTopOf="parent"
app:textSize="primary"
tools:text="@tools:sample/full_names" />
<dev.octoshrimpy.quik.common.widget.QkTextView
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:text="@string/compose_vcard_label"
android:textColor="?android:attr/textColorTertiary"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/name"
app:layout_constraintBottom_toBottomOf="parent"
app:textSize="secondary" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
</LinearLayout>