Add "Choose video" button

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt

@@ -221,7 +221,7 @@ class ThreadActivity : SimpleActivity() {
             addAttachment(capturedImageUri!!)
         } else if (data != null) {
             when (requestCode) {
-                CAPTURE_VIDEO_INTENT, PICK_DOCUMENT_INTENT, CAPTURE_AUDIO_INTENT, PICK_PHOTO_VIDEO_INTENT -> addAttachment(data)
+                CAPTURE_VIDEO_INTENT, PICK_DOCUMENT_INTENT, CAPTURE_AUDIO_INTENT, PICK_PHOTO_INTENT, PICK_VIDEO_INTENT -> addAttachment(data)
                 PICK_CONTACT_INTENT -> addContactAttachment(data)
                 PICK_SAVE_FILE_INTENT -> saveAttachment(resultData)
             }
@@ -828,23 +828,12 @@ class ThreadActivity : SimpleActivity() {
         launchActivityForResult(intent, CAPTURE_AUDIO_INTENT)
     }
 
-    private fun launchPickPhotoVideoIntent() {
-        val mimeTypes = arrayOf("image/*", "video/*")
+    private fun launchGetContentIntent(mimeTypes: Array<String>, requestCode: Int) {
         Intent(Intent.ACTION_GET_CONTENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             type = "*/*"
             putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
-            launchActivityForResult(this, PICK_PHOTO_VIDEO_INTENT)
-        }
-    }
-
-    private fun launchPickDocumentIntent() {
-        val mimeTypes = arrayOf("*/*")
-        Intent(Intent.ACTION_GET_CONTENT).apply {
-            addCategory(Intent.CATEGORY_OPENABLE)
-            type = "*/*"
-            putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
-            launchActivityForResult(this, PICK_DOCUMENT_INTENT)
+            launchActivityForResult(this, requestCode)
         }
     }
 
@@ -1361,6 +1350,7 @@ class ThreadActivity : SimpleActivity() {
     private fun setupAttachmentPickerView() {
         val buttonColors = arrayOf(
             R.color.md_red_500,
+            R.color.md_brown_500,
             R.color.md_pink_500,
             R.color.md_purple_500,
             R.color.md_teal_500,
@@ -1368,19 +1358,38 @@ class ThreadActivity : SimpleActivity() {
             R.color.md_indigo_500,
             R.color.md_blue_500
         ).map { ResourcesCompat.getColor(resources, it, theme) }
-        arrayOf(choose_photo_icon, take_photo_icon, record_video_icon, record_audio_icon, pick_file_icon, pick_contact_icon, schedule_message_icon)
-            .forEachIndexed { index, icon ->
-                val iconColor = buttonColors[index]
-                icon.background.applyColorFilter(iconColor)
-                icon.applyColorFilter(iconColor.getContrastColor())
-            }
+        arrayOf(
+            choose_photo_icon,
+            choose_video_icon,
+            take_photo_icon,
+            record_video_icon,
+            record_audio_icon,
+            pick_file_icon,
+            pick_contact_icon,
+            schedule_message_icon
+        ).forEachIndexed { index, icon ->
+            val iconColor = buttonColors[index]
+            icon.background.applyColorFilter(iconColor)
+            icon.applyColorFilter(iconColor.getContrastColor())
+        }
 
         val textColor = getProperTextColor()
-        arrayOf(choose_photo_text, take_photo_text, record_video_text, record_audio_text, pick_file_text, pick_contact_text, schedule_message_text)
-            .forEach { it.setTextColor(textColor) }
+        arrayOf(
+            choose_photo_text,
+            choose_video_text,
+            take_photo_text,
+            record_video_text,
+            record_audio_text,
+            pick_file_text,
+            pick_contact_text,
+            schedule_message_text
+        ).forEach { it.setTextColor(textColor) }
 
         choose_photo.setOnClickListener {
-            launchPickPhotoVideoIntent()
+            launchGetContentIntent(arrayOf("image/*"), PICK_PHOTO_INTENT)
+        }
+        choose_video.setOnClickListener {
+            launchGetContentIntent(arrayOf("video/*"), PICK_VIDEO_INTENT)
         }
         take_photo.setOnClickListener {
             launchCapturePhotoIntent()
@@ -1392,7 +1401,7 @@ class ThreadActivity : SimpleActivity() {
             launchCaptureAudioIntent()
         }
         pick_file.setOnClickListener {
-            launchPickDocumentIntent()
+            launchGetContentIntent(arrayOf("*/*"), PICK_DOCUMENT_INTENT)
         }
         pick_contact.setOnClickListener {
             launchPickContactIntent()

app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Constants.kt

@@ -67,7 +67,8 @@ const val FILE_SIZE_2_MB = 2_097_152L
 const val MESSAGES_LIMIT = 50
 
 // intent launch request codes
-const val PICK_PHOTO_VIDEO_INTENT = 42
+const val PICK_PHOTO_INTENT = 42
+const val PICK_VIDEO_INTENT = 49
 const val PICK_SAVE_FILE_INTENT = 43
 const val CAPTURE_PHOTO_INTENT = 44
 const val CAPTURE_VIDEO_INTENT = 45

app/src/main/res/drawable/ic_video_camera_vector.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@android:color/white" android:pathData="M18 10.48V6c0-1.1-0.9-2-2-2H4C2.9 4 2 4.9 2 6v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2v-4.48l4 3.98v-11l-4 3.98zM5 16l2.38-3.17L9 15l2.62-3.5L15 16H5z"/>
+</vector>

app/src/main/res/layout/layout_attachment_picker.xml

@@ -8,7 +8,7 @@
     <androidx.constraintlayout.helper.widget.Flow
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:constraint_referenced_ids="choose_photo,take_photo,record_video,record_audio,pick_file,pick_contact,schedule_message"
+        app:constraint_referenced_ids="choose_photo,choose_video,take_photo,record_video,record_audio,pick_file,pick_contact,schedule_message"
         app:flow_verticalGap="@dimen/small_margin"
         app:flow_wrapMode="aligned"
         app:layout_constraintEnd_toEndOf="parent"
@@ -47,6 +47,38 @@
             android:textSize="@dimen/normal_text_size" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/choose_video"
+        android:layout_width="@dimen/attachment_button_width"
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackgroundBorderless"
+        android:minHeight="@dimen/attachment_button_height"
+        android:orientation="vertical"
+        android:paddingHorizontal="@dimen/medium_margin"
+        android:paddingVertical="@dimen/medium_margin">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/choose_video_icon"
+            android:layout_width="@dimen/medium_icon_size"
+            android:layout_height="@dimen/medium_icon_size"
+            android:layout_gravity="center"
+            android:background="@drawable/circle_background"
+            android:backgroundTint="@color/colorPrimary"
+            android:padding="@dimen/medium_margin"
+            android:src="@drawable/ic_video_camera_vector" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/choose_video_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:text="@string/choose_video"
+            android:textAlignment="center"
+            android:textColor="@color/default_text_color"
+            android:textSize="@dimen/normal_text_size" />
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/take_photo"
         android:layout_width="@dimen/attachment_button_width"
@@ -170,7 +202,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/medium_margin"
-            android:text="@string/files"
+            android:text="@string/choose_file"
             android:textAlignment="center"
             android:textColor="@color/default_text_color"
             android:textSize="@dimen/normal_text_size" />
@@ -203,7 +235,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/medium_margin"
-            android:text="@string/contacts_short"
+            android:text="@string/choose_contact"
             android:textAlignment="center"
             android:textColor="@color/default_text_color"
             android:textSize="@dimen/normal_text_size" />