mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 20:08:53 +01:00
changes to allow attaching any type of file. mainly for video and audio attachments but nothing to stop any type of file being attached
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
|
||||
|
||||
<path android:fillColor="@android:color/white" android:pathData="M3,10v4c0,0.55 0.45,1 1,1h3l3.29,3.29c0.63,0.63 1.71,0.18 1.71,-0.71L12,6.41c0,-0.89 -1.08,-1.34 -1.71,-0.71L7,9L4,9c-0.55,0 -1,0.45 -1,1zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,4.45v0.2c0,0.38 0.25,0.71 0.6,0.85C17.18,6.53 19,9.06 19,12s-1.82,5.47 -4.4,6.5c-0.36,0.14 -0.6,0.47 -0.6,0.85v0.2c0,0.63 0.63,1.07 1.21,0.85C18.6,19.11 21,15.84 21,12s-2.4,-7.11 -5.79,-8.4c-0.58,-0.23 -1.21,0.22 -1.21,0.85z"/>
|
||||
|
||||
</vector>
|
||||
+11
-1
@@ -37,7 +37,17 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="centerCrop"
|
||||
tools:src="@tools:sample/avatars" />
|
||||
tools:src="@tools:sample/backgrounds/scenic[0]" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/fileName"
|
||||
style="@style/TextPrimary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#ddffffff"
|
||||
android:gravity="center"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
android:layout_height="56dp"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_cancel_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:tint="?android:attr/textColorSecondary"
|
||||
app:layout_constraintBottom_toTopOf="@id/scheduledSeparator"
|
||||
app:layout_constraintEnd_toEndOf="@id/messageBackground" />
|
||||
|
||||
@@ -230,7 +230,7 @@
|
||||
app:layout_constraintBottom_toTopOf="@id/message"
|
||||
app:layout_constraintEnd_toEndOf="@id/messageBackground"
|
||||
app:layout_constraintStart_toStartOf="@id/messageBackground"
|
||||
tools:listitem="@layout/attachment_image_list_item" />
|
||||
tools:listitem="@layout/attachment_file_list_item" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.QkEditText
|
||||
android:id="@+id/message"
|
||||
@@ -262,7 +262,7 @@
|
||||
android:contentDescription="@string/compose_sim_cd"
|
||||
android:padding="8dp"
|
||||
android:src="@drawable/ic_sim_card_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:tint="?android:attr/textColorSecondary"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
|
||||
app:layout_constraintEnd_toEndOf="@id/messageBackground" />
|
||||
@@ -304,7 +304,7 @@
|
||||
android:contentDescription="@string/compose_send_cd"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_send_black_24dp"
|
||||
android:tint="?android:textColorSecondary"
|
||||
app:tint="?android:textColorSecondary"
|
||||
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
@@ -371,7 +371,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,camera,cameraLabel,attachingBackground" />
|
||||
app:constraint_referenced_ids="contact,contactLabel,schedule,scheduleLabel,gallery,galleryLabel,attachAFileIcon,attachAFileLabel,camera,cameraLabel,attachingBackground" />
|
||||
|
||||
<View
|
||||
android:id="@+id/attachingBackground"
|
||||
@@ -395,7 +395,7 @@
|
||||
android:elevation="4dp"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_person_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:tint="?android:attr/textColorSecondary"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toTopOf="@id/schedule"
|
||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||
@@ -429,9 +429,9 @@
|
||||
android:elevation="4dp"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_event_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:tint="?android:attr/textColorSecondary"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toTopOf="@id/gallery"
|
||||
app:layout_constraintBottom_toTopOf="@id/attachAFileIcon"
|
||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||
app:layout_constraintStart_toStartOf="@id/attach" />
|
||||
|
||||
@@ -452,6 +452,43 @@
|
||||
app:layout_constraintStart_toEndOf="@id/schedule"
|
||||
app:layout_constraintTop_toTopOf="@id/schedule" />
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/attachAFileIcon"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="12dp"
|
||||
android:background="@drawable/circle"
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
android:contentDescription="@string/compose_attach_file_cd"
|
||||
android:elevation="4dp"
|
||||
android:padding="10dp"
|
||||
android:rotation="-45"
|
||||
android:src="@drawable/ic_attachment_black_24dp"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toTopOf="@id/gallery"
|
||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||
app:layout_constraintStart_toStartOf="@id/attach"
|
||||
app:tint="?android:attr/textColorSecondary" />
|
||||
|
||||
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||
android:id="@+id/attachAFileLabel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="32dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:background="@drawable/rounded_rectangle_4dp"
|
||||
android:backgroundTint="?attr/bubbleColor"
|
||||
android:elevation="4dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="8dp"
|
||||
android:paddingEnd="8dp"
|
||||
android:text="@string/compose_attach_file_cd"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
app:layout_constraintBottom_toBottomOf="@id/attachAFileIcon"
|
||||
app:layout_constraintStart_toEndOf="@id/attachAFileIcon"
|
||||
app:layout_constraintTop_toTopOf="@id/attachAFileIcon" />
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/gallery"
|
||||
android:layout_width="40dp"
|
||||
@@ -463,7 +500,7 @@
|
||||
android:elevation="4dp"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_insert_photo_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:tint="?android:attr/textColorSecondary"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toTopOf="@id/camera"
|
||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||
@@ -497,7 +534,7 @@
|
||||
android:elevation="4dp"
|
||||
android:padding="10dp"
|
||||
android:src="@drawable/ic_camera_alt_black_24dp"
|
||||
android:tint="?android:attr/textColorSecondary"
|
||||
app:tint="?android:attr/textColorSecondary"
|
||||
android:visibility="visible"
|
||||
app:layout_constraintBottom_toTopOf="@id/attach"
|
||||
app:layout_constraintEnd_toEndOf="@id/attach"
|
||||
|
||||
@@ -19,18 +19,27 @@
|
||||
-->
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_width="56dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginEnd="8dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/thumbnail"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:adjustViewBounds="true"
|
||||
android:background="@drawable/rounded_rectangle_4dp"
|
||||
android:backgroundTint="?android:attr/divider"
|
||||
android:scaleType="centerCrop"
|
||||
tools:src="@tools:sample/backgrounds/scenic" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/fileName"
|
||||
style="@style/TextPrimary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="#ddffffff"
|
||||
android:gravity="center"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
|
||||
</FrameLayout>
|
||||
@@ -250,7 +250,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">Συγχρονισμός μηνυμάτων</string>
|
||||
<string name="settings_sync_summary">Επανασυγχρονισμός μηνυμάτων με τη βάση δεδομένων SMS του Android</string>
|
||||
<string name="settings_about_title">Σχετικά με το QUIK</string>
|
||||
|
||||
@@ -254,7 +254,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">Sync messages</string>
|
||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||
<string name="settings_about_title">About QUIK</string>
|
||||
|
||||
@@ -254,7 +254,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">Sinchronizuoti pranešimus</string>
|
||||
<string name="settings_sync_summary">Iš naujo sinchronizuoti Android pranešimų duomenų bazę</string>
|
||||
<string name="settings_about_title">Apie QUIK</string>
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">Sync messages</string>
|
||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||
<string name="settings_about_title">About QUIK</string>
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">நீண்ட செய்திகளை எம்.எம்.எஸ் ஆக அனுப்பு</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">தகவல்களை ஒத்திசை</string>
|
||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||
<string name="settings_about_title">QUIK பற்றி</string>
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">Sync messages</string>
|
||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||
<string name="settings_about_title">About QUIK</string>
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">Sync messages</string>
|
||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||
<string name="settings_about_title">About QUIK</string>
|
||||
|
||||
@@ -141,6 +141,7 @@
|
||||
<string name="compose_details_delivered">Delivered: %s</string>
|
||||
<string name="compose_details_error_code">Error code: %d</string>
|
||||
<string name="compose_attach_cd">Add an attachment</string>
|
||||
<string name="compose_attach_file_cd">Attach any file</string>
|
||||
<string name="compose_gallery_cd">Attach a photo</string>
|
||||
<string name="compose_camera_cd">Take a photo</string>
|
||||
<string name="compose_schedule_cd">Schedule message</string>
|
||||
@@ -211,6 +212,7 @@
|
||||
<string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
|
||||
<string name="scheduled_compose_cd">Schedule a message</string>
|
||||
<string name="scheduled_options_title">Scheduled message</string>
|
||||
<string name="attachment_missing">Missing</string>
|
||||
<string-array name="scheduled_options">
|
||||
<item>Send now</item>
|
||||
<item>Copy text</item>
|
||||
@@ -284,7 +286,7 @@
|
||||
</plurals>
|
||||
<string name="settings_long_as_mms_title">Send long messages as MMS</string>
|
||||
<string name="settings_long_as_mms_summary">If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS attachments</string>
|
||||
<string name="settings_mms_size_title">Auto-compress MMS image attachments</string>
|
||||
<string name="settings_sync_title">Sync messages</string>
|
||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||
<string name="settings_about_title">About QUIK</string>
|
||||
|
||||
Reference in New Issue
Block a user