From b44d06433b1dcfb83c5c7922b3f00fe5f6ad3776 Mon Sep 17 00:00:00 2001
From: Joe Shuff <joe@edenagency.co.uk>
Date: Thu, 3 Oct 2019 16:00:06 +0100
Subject: [PATCH 1/4] Add video duration and add video selector to demo app

---
 .../tedimagepicker/sample/MainActivity.kt     | 11 ++++++-
 app/src/main/res/layout/activity_main.xml     |  6 ++++
 .../tedimagepicker/adapter/MediaAdapter.kt    | 17 ++++++++--
 .../main/res/layout/item_gallery_media.xml    | 31 +++++++++++++++++++
 tedimagepicker/src/main/res/values/colors.xml |  2 +-
 5 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt b/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
index 5bcf7b8..a47cf18 100644
--- a/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
+++ b/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
@@ -13,6 +13,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import gun0912.tedimagepicker.builder.TedImagePicker
 import gun0912.tedimagepicker.builder.TedRxImagePicker
+import gun0912.tedimagepicker.builder.type.MediaType
 import gun0912.tedimagepicker.sample.databinding.ActivityMainBinding
 import gun0912.tedimagepicker.sample.databinding.ItemImageBinding
 
@@ -29,9 +30,9 @@ class MainActivity : AppCompatActivity() {
         setNormalMultiButton()
         setRxSingleButton()
         setRxMultiButton()
+        setRxVideoButton()
     }
 
-
     private fun setNormalSingleButton() {
         binding.btnNormalSingle.setOnClickListener {
             TedImagePicker.with(this)
@@ -39,6 +40,14 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun setRxVideoButton() {
+        binding.btnVideo.setOnClickListener {
+            TedImagePicker.with(this)
+                .mediaType(MediaType.VIDEO)
+                .start { uri -> showSingleImage(uri) }
+        }
+    }
+
     private fun setNormalMultiButton() {
         binding.btnNormalMulti.setOnClickListener {
             TedImagePicker.with(this)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fb04f8e..f096ace 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,6 +37,12 @@
             android:layout_height="wrap_content"
             android:text="Rx - Multi" />
 
+        <Button
+                android:id="@+id/btn_video"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Video" />
+
         <ImageView
             android:id="@+id/iv_image"
             android:layout_width="wrap_content"
diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt
index 8dd1055..fbd2d94 100644
--- a/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt
@@ -1,7 +1,9 @@
 package gun0912.tedimagepicker.adapter
 
 import android.app.Activity
+import android.media.MediaMetadataRetriever
 import android.net.Uri
+import android.text.format.DateUtils
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.app.ActivityOptionsCompat
@@ -15,6 +17,8 @@ import gun0912.tedimagepicker.databinding.ItemGalleryCameraBinding
 import gun0912.tedimagepicker.databinding.ItemGalleryMediaBinding
 import gun0912.tedimagepicker.model.Media
 import gun0912.tedimagepicker.zoom.TedImageZoomActivity
+import kotlinx.android.synthetic.main.item_gallery_media.view.*
+import java.io.File
 
 internal class MediaAdapter(
     private val activity: Activity,
@@ -89,8 +93,17 @@ internal class MediaAdapter(
                     selectedNumber = selectedUriList.indexOf(data.uri) + 1
                 }
 
-                showZoom =
-                    !isSelected && (builder.mediaType == MediaType.IMAGE) && builder.showZoomIndicator
+                showDuration = builder.mediaType == MediaType.VIDEO
+
+                if (showDuration) {
+                    val retriever = MediaMetadataRetriever()
+                    retriever.setDataSource(context, data.uri)
+
+                    val length = (Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)) / 1000).toLong()
+                    itemView.video_duration_textview.text = "${DateUtils.formatElapsedTime(length)}"
+                }
+
+                showZoom = !isSelected && (builder.mediaType == MediaType.IMAGE) && builder.showZoomIndicator
             }
         }
 
diff --git a/tedimagepicker/src/main/res/layout/item_gallery_media.xml b/tedimagepicker/src/main/res/layout/item_gallery_media.xml
index f4c7fe2..747daa1 100644
--- a/tedimagepicker/src/main/res/layout/item_gallery_media.xml
+++ b/tedimagepicker/src/main/res/layout/item_gallery_media.xml
@@ -28,6 +28,10 @@
             name="showZoom"
             type="boolean" />
 
+        <variable
+            name="showDuration"
+            type="boolean" />
+
     </data>
 
     <FrameLayout
@@ -99,6 +103,33 @@
                     android:background="@color/ted_image_picker_zoom_background"
                     android:src="@drawable/ic_zoom_out_24dp" />
             </FrameLayout>
+
+            <FrameLayout
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/ted_image_picker_zoom_size"
+                    android:id="@+id/view_video_duration"
+                    android:visibility="@{showDuration}"
+                    android:layout_marginBottom="@dimen/default_padding_small"
+                    android:layout_marginStart="@dimen/default_padding_xsmall"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/view_zoom_out"
+            >
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:id="@+id/video_duration_textview"
+                        android:background="@color/ted_image_picker_duration_background"
+                        android:text="0:00"
+                        android:layout_gravity="end"
+                        android:ellipsize="marquee"
+                        android:marqueeRepeatLimit="marquee_forever"
+                        android:textColor="@color/white"
+                        android:paddingStart="@dimen/default_padding_small"
+                        android:paddingEnd="@dimen/default_padding_small"/>
+
+            </FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </FrameLayout>
 </layout>
\ No newline at end of file
diff --git a/tedimagepicker/src/main/res/values/colors.xml b/tedimagepicker/src/main/res/values/colors.xml
index f2a1dbe..3da416a 100644
--- a/tedimagepicker/src/main/res/values/colors.xml
+++ b/tedimagepicker/src/main/res/values/colors.xml
@@ -25,5 +25,5 @@
 
     <color name="ted_image_picker_zoom_background">#defafafa</color>
 
-
+    <color name="ted_image_picker_duration_background">#78000000</color>
 </resources>
\ No newline at end of file

From 60862a7266aa05fde445cc0e2ce4e0e178a70f99 Mon Sep 17 00:00:00 2001
From: Joe Shuff <joe@edenagency.co.uk>
Date: Thu, 3 Oct 2019 16:13:11 +0100
Subject: [PATCH 2/4] Default multi select videos in demo app

---
 app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt | 2 +-
 .../main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt b/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
index a47cf18..8285bbf 100644
--- a/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
+++ b/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
@@ -44,7 +44,7 @@ class MainActivity : AppCompatActivity() {
         binding.btnVideo.setOnClickListener {
             TedImagePicker.with(this)
                 .mediaType(MediaType.VIDEO)
-                .start { uri -> showSingleImage(uri) }
+                .startMultiImage { uri -> showSingleImage(uri.first()) }
         }
     }
 
diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt
index fbd2d94..10f463c 100644
--- a/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/adapter/MediaAdapter.kt
@@ -81,6 +81,7 @@ internal class MediaAdapter(
                     startZoomActivity(getItem(adapterPosition))
                 }
                 showZoom = false
+                showDuration = false
             }
 
         }

From 4d3d5c3d65d2c54c45313287b97ec9f35f2f68fb Mon Sep 17 00:00:00 2001
From: Joseph Shufflebotham <joe.shufflebotham13@gmail.com>
Date: Fri, 4 Oct 2019 15:02:02 +0100
Subject: [PATCH 3/4] Add toolbarColor, toolbarTitleColor and backButtonColor
 customisability

---
 .../tedimagepicker/sample/MainActivity.kt     |  3 +++
 .../tedimagepicker/TedImagePickerActivity.kt  |  9 ++++++--
 .../builder/TedImagePickerBaseBuilder.kt      | 21 +++++++++++++++++++
 .../res/layout/activity_ted_image_picker.xml  | 15 ++++++++++++-
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt b/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
index 8285bbf..ac35339 100644
--- a/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
+++ b/app/src/main/java/gun0912/tedimagepicker/sample/MainActivity.kt
@@ -44,6 +44,9 @@ class MainActivity : AppCompatActivity() {
         binding.btnVideo.setOnClickListener {
             TedImagePicker.with(this)
                 .mediaType(MediaType.VIDEO)
+                .toolbarBackgroundColor(R.color.error_color_material_dark)
+                .backButtonColor(R.color.white)
+                .toolbarTitleColor(R.color.white)
                 .startMultiImage { uri -> showSingleImage(uri.first()) }
         }
     }
diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt
index eece34d..5f9dc15 100644
--- a/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt
@@ -6,6 +6,8 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.graphics.PorterDuff
+import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
@@ -71,15 +73,18 @@ internal class TedImagePickerActivity : AppCompatActivity() {
         setupSelectedMediaView()
         setupButton()
         loadMedia()
-
     }
 
     private fun setupToolbar() {
         setSupportActionBar(binding.toolbar)
+        binding.toolbarColor = ContextCompat.getColor(this@TedImagePickerActivity, builder.toolbarColorBackgroundResId)
+        binding.titleTextColor = ContextCompat.getColor(this@TedImagePickerActivity, builder.toolbarTitleColorResId)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setHomeButtonEnabled(true)
         builder.backButtonResId.let {
-            binding.toolbar.setNavigationIcon(it)
+            val drawable = resources.getDrawable(it)
+            drawable.setColorFilter(ContextCompat.getColor(this@TedImagePickerActivity, builder.backButtonColorId), PorterDuff.Mode.SRC_IN)
+            binding.toolbar.navigationIcon = drawable
         }
 
     }
diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt
index 67c080c..e57f60f 100644
--- a/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/builder/TedImagePickerBaseBuilder.kt
@@ -39,6 +39,10 @@ open class TedImagePickerBaseBuilder<out B : TedImagePickerBaseBuilder<B>>(
     internal var titleResId: Int = R.string.ted_image_picker_title,
     internal var buttonGravity: ButtonGravity = ButtonGravity.TOP,
     internal var buttonText: String? = null,
+    @ColorRes
+    internal var toolbarColorBackgroundResId: Int = R.color.white,
+    @ColorRes
+    internal var toolbarTitleColorResId: Int = R.color.black,
     @DrawableRes
     internal var buttonBackgroundResId: Int = R.drawable.btn_done_button,
     @ColorRes
@@ -48,6 +52,8 @@ open class TedImagePickerBaseBuilder<out B : TedImagePickerBaseBuilder<B>>(
     internal var selectedUriList: List<Uri>? = null,
     @DrawableRes
     internal var backButtonResId: Int = R.drawable.ic_arrow_back_black_24dp,
+    @ColorRes
+    internal var backButtonColorId: Int = R.color.black,
     internal var maxCount: Int = Int.MAX_VALUE,
     internal var maxCountMessage: String? = null,
     @StringRes
@@ -149,6 +155,16 @@ open class TedImagePickerBaseBuilder<out B : TedImagePickerBaseBuilder<B>>(
         return this as B
     }
 
+    fun toolbarBackgroundColor(@ColorRes colorId: Int) : B {
+        this.toolbarColorBackgroundResId = colorId
+        return this as B
+    }
+
+    fun toolbarTitleColor(@ColorRes colorId: Int): B {
+        this.toolbarTitleColorResId = colorId
+        return this as B
+    }
+
     fun buttonGravity(buttonGravity: ButtonGravity): B {
         this.buttonGravity = buttonGravity
         return this as B
@@ -184,6 +200,11 @@ open class TedImagePickerBaseBuilder<out B : TedImagePickerBaseBuilder<B>>(
         return this as B
     }
 
+    fun backButtonColor(@ColorRes backButtonColorResId: Int) : B {
+        backButtonColorId = backButtonColorResId
+        return this as B
+    }
+
     fun max(maxCount: Int, maxCountMessage: String): B {
         this.maxCount = maxCount
         this.maxCountMessage = maxCountMessage
diff --git a/tedimagepicker/src/main/res/layout/activity_ted_image_picker.xml b/tedimagepicker/src/main/res/layout/activity_ted_image_picker.xml
index a1b83aa..13cecb8 100644
--- a/tedimagepicker/src/main/res/layout/activity_ted_image_picker.xml
+++ b/tedimagepicker/src/main/res/layout/activity_ted_image_picker.xml
@@ -17,6 +17,18 @@
             name="buttonGravity"
             type="ButtonGravity" />
 
+        <variable
+            name="toolbarColor"
+            type="Integer"/>
+
+        <variable
+            name="backButtonColor"
+            type="Integer"/>
+
+        <variable
+                name="titleTextColor"
+                type="Integer"/>
+
         <variable
             name="showButton"
             type="boolean" />
@@ -45,7 +57,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@color/ted_image_picker_toolbar_background"
+            app:titleTextColor="@{titleTextColor}"
+            android:background="@{toolbarColor}"
             app:contentInsetStartWithNavigation="0dp">
 
 

From c75172cd4ea2ce5d3b2b9edcf3e100c7d84de436 Mon Sep 17 00:00:00 2001
From: Joseph Shufflebotham <joe.shufflebotham13@gmail.com>
Date: Fri, 4 Oct 2019 15:32:11 +0100
Subject: [PATCH 4/4] If API>=21, set the status bar color to a darker version
 of toolbarColor

---
 .../tedimagepicker/TedImagePickerActivity.kt   | 14 +++++++++-----
 .../extenstion/ObjectExtensions.kt             | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 tedimagepicker/src/main/java/gun0912/tedimagepicker/extenstion/ObjectExtensions.kt

diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt
index 5f9dc15..5035ed4 100644
--- a/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/TedImagePickerActivity.kt
@@ -9,6 +9,7 @@ import android.content.Intent
 import android.graphics.PorterDuff
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
@@ -31,10 +32,7 @@ import gun0912.tedimagepicker.base.BaseRecyclerViewAdapter
 import gun0912.tedimagepicker.builder.TedImagePickerBaseBuilder
 import gun0912.tedimagepicker.builder.type.SelectType
 import gun0912.tedimagepicker.databinding.ActivityTedImagePickerBinding
-import gun0912.tedimagepicker.extenstion.close
-import gun0912.tedimagepicker.extenstion.isOpen
-import gun0912.tedimagepicker.extenstion.setLock
-import gun0912.tedimagepicker.extenstion.toggle
+import gun0912.tedimagepicker.extenstion.*
 import gun0912.tedimagepicker.model.Album
 import gun0912.tedimagepicker.model.Media
 import gun0912.tedimagepicker.util.GalleryUtil
@@ -77,8 +75,14 @@ internal class TedImagePickerActivity : AppCompatActivity() {
 
     private fun setupToolbar() {
         setSupportActionBar(binding.toolbar)
-        binding.toolbarColor = ContextCompat.getColor(this@TedImagePickerActivity, builder.toolbarColorBackgroundResId)
+        val toolbarColor = ContextCompat.getColor(this@TedImagePickerActivity, builder.toolbarColorBackgroundResId)
+        binding.toolbarColor = toolbarColor
         binding.titleTextColor = ContextCompat.getColor(this@TedImagePickerActivity, builder.toolbarTitleColorResId)
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            window.statusBarColor = toolbarColor.manipulate(factor = 0.95f)
+        }
+
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setHomeButtonEnabled(true)
         builder.backButtonResId.let {
diff --git a/tedimagepicker/src/main/java/gun0912/tedimagepicker/extenstion/ObjectExtensions.kt b/tedimagepicker/src/main/java/gun0912/tedimagepicker/extenstion/ObjectExtensions.kt
new file mode 100644
index 0000000..fac62ba
--- /dev/null
+++ b/tedimagepicker/src/main/java/gun0912/tedimagepicker/extenstion/ObjectExtensions.kt
@@ -0,0 +1,18 @@
+package gun0912.tedimagepicker.extenstion
+
+import android.graphics.Color
+import kotlin.math.min
+import kotlin.math.round
+
+fun Int.manipulate(factor: Float = 1f, alpha: Float = 1f): Int {
+    val a = (255f * alpha).toInt()
+    val r = round((Color.red(this) * factor)).toInt()
+    val g = round((Color.green(this) * factor)).toInt()
+    val b = round((Color.blue(this) * factor)).toInt()
+
+    return Color.argb(a,
+        min(r, 255),
+        min(g, 255),
+        min(b, 255)
+    )
+}
\ No newline at end of file