diff --git a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java index 383e53d..b6f865e 100644 --- a/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java +++ b/app/src/main/java/com/philliphsu/clock2/timers/TimerViewHolder.java @@ -1,6 +1,8 @@ package com.philliphsu.clock2.timers; import android.animation.ObjectAnimator; +import android.graphics.drawable.Drawable; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; @@ -29,6 +31,8 @@ public class TimerViewHolder extends BaseViewHolder { private final AsyncTimersTableUpdateHandler mAsyncTimersTableUpdateHandler; private TimerController mController; private ObjectAnimator mProgressAnimator; + private final Drawable mStartIcon; + private final Drawable mPauseIcon; @Bind(R.id.label) TextView mLabel; @Bind(R.id.duration) CountdownChronometer mChronometer; @@ -42,6 +46,8 @@ public class TimerViewHolder extends BaseViewHolder { super(parent, R.layout.item_timer, listener); Log.d(TAG, "New TimerViewHolder"); mAsyncTimersTableUpdateHandler = asyncTimersTableUpdateHandler; + mStartIcon = ContextCompat.getDrawable(getContext(), R.drawable.ic_start_24dp); + mPauseIcon = ContextCompat.getDrawable(getContext(), R.drawable.ic_pause_24dp); } @Override @@ -127,8 +133,7 @@ public class TimerViewHolder extends BaseViewHolder { } private void bindButtonControls(Timer timer) { - // TODO: Pause and start icons, resp. -// mStartPause.setImageResource(timer.isRunning() ? 0 : 0); + mStartPause.setImageDrawable(timer.isRunning() ? mPauseIcon : mStartIcon); int visibility = timer.hasStarted() ? View.VISIBLE : View.INVISIBLE; mAddOneMinute.setVisibility(visibility); mStop.setVisibility(visibility); diff --git a/app/src/main/res/drawable/ic_pause_24dp.xml b/app/src/main/res/drawable/ic_pause_24dp.xml index 76f4606..0548b8e 100644 --- a/app/src/main/res/drawable/ic_pause_24dp.xml +++ b/app/src/main/res/drawable/ic_pause_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ab9a21d..b345fd4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,5 +4,7 @@ #303F9F #FF4081 - #66000000 + @color/dark_gray + @color/dark_gray + @color/colorAccent diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 37d3aee..6cd5400 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -14,12 +14,9 @@