From 0c768d5cb8c72d01ca262a6a2dc020ba0aaf402f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 2 Apr 2020 15:56:45 +0200
Subject: [PATCH] adding some coloring related improvements

---
 .../voicerecorder/fragments/PlayerFragment.kt | 24 ++++++++++---------
 app/src/main/res/layout/fragment_player.xml   |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
index f9a32f1..f9a6e42 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
@@ -3,6 +3,7 @@ package com.simplemobiletools.voicerecorder.fragments
 import android.annotation.SuppressLint
 import android.content.Context
 import android.database.Cursor
+import android.graphics.drawable.Drawable
 import android.media.AudioManager
 import android.media.MediaMetadataRetriever
 import android.media.MediaPlayer
@@ -28,7 +29,6 @@ import org.greenrobot.eventbus.ThreadMode
 import java.util.*
 import kotlin.collections.ArrayList
 
-
 class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), RefreshRecordingsListener {
     private val FAST_FORWARD_SKIP_MS = 10000
 
@@ -214,7 +214,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
                 progressTimer.cancel()
                 player_progressbar.progress = player_progressbar.max
                 player_progress_current.text = player_progress_max.text
-                playbackStateChanged(false)
+                play_pause_btn.setImageDrawable(getToggleButtonIcon(false))
             }
 
             setOnPreparedListener {
@@ -234,8 +234,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
             prepare()
         }
 
-        playbackStateChanged(true)
-
+        play_pause_btn.setImageDrawable(getToggleButtonIcon(true))
         player_progressbar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
                 if (fromUser && !playedRecordingIDs.isEmpty()) {
@@ -291,19 +290,19 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
 
     private fun pausePlayback() {
         player?.pause()
-        playbackStateChanged(false)
+        play_pause_btn.setImageDrawable(getToggleButtonIcon(false))
         progressTimer.cancel()
     }
 
     private fun resumePlayback() {
         player?.start()
-        playbackStateChanged(true)
+        play_pause_btn.setImageDrawable(getToggleButtonIcon(true))
         setupProgressTimer()
     }
 
-    private fun playbackStateChanged(isPlaying: Boolean) {
-        val drawable = resources.getDrawable(if (isPlaying) R.drawable.ic_pause_vector else R.drawable.ic_play_vector)
-        play_pause_btn.setImageDrawable(drawable)
+    private fun getToggleButtonIcon(isPlaying: Boolean): Drawable {
+        val drawable = if (isPlaying) R.drawable.ic_pause_vector else R.drawable.ic_play_vector
+        return resources.getColoredDrawableWithColor(drawable, context.getFABIconColor())
     }
 
     private fun skip(forward: Boolean) {
@@ -328,12 +327,15 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
     private fun setupColors() {
         recordings_fastscroller.updatePrimaryColor()
         recordings_fastscroller.updateBubbleColors()
-        context.updateTextColors(player_controls_wrapper)
+        context.updateTextColors(player_holder)
 
         val textColor = context.config.textColor
-        arrayListOf(previous_btn, play_pause_btn, next_btn).forEach {
+        arrayListOf(previous_btn, next_btn).forEach {
             it.applyColorFilter(textColor)
         }
+
+        play_pause_btn.background.applyColorFilter(context.getAdjustedPrimaryColor())
+        play_pause_btn.setImageDrawable(getToggleButtonIcon(false))
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 806e84a..5ec6b16 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -13,11 +13,11 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/activity_margin"
         android:gravity="center"
-        android:padding="@dimen/activity_margin"
         android:lineSpacingExtra="@dimen/medium_margin"
+        android:padding="@dimen/activity_margin"
         android:text="@string/no_recordings_found"
         android:textSize="@dimen/bigger_text_size"
-        android:visibility="visible"/>
+        android:visibility="visible" />
 
     <com.simplemobiletools.commons.views.MyRecyclerView
         android:id="@+id/recordings_list"
@@ -123,7 +123,6 @@
                 android:layout_alignBottom="@+id/play_pause_btn"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@+id/play_pause_btn"
-                android:alpha="0.8"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/previous"
                 android:padding="@dimen/medium_margin"
@@ -151,7 +150,6 @@
                 android:layout_alignBottom="@+id/play_pause_btn"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@+id/play_pause_btn"
-                android:alpha="0.8"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/next"
                 android:padding="@dimen/medium_margin"