Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b635ce4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Set up framework of methods for RecordButton class Added setTracks()... 

Merge "Set up framework of methods for RecordButton class Added setTracks() method to update RecordButton progress Added getBasePaint() method and initialized track paints Added onSizeChanged method Added main logic for onDraw() method Added onClick method for recording activity Added basic state transition logic for both classes"
parents e47d6dba ffe07399

java/com/android/dialer/voicemail/settings/RecordButton.java

+138 −2
Original line number Diff line number Diff line
@@ -17,21 +17,157 @@ 
package com.android.dialer.voicemail.settings;



import android.content.Context;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.drawable.Drawable;

import android.support.v4.content.ContextCompat;

import android.util.AttributeSet;

import android.widget.Button;

import com.android.dialer.voicemail.settings.RecordVoicemailGreetingActivity.ButtonState;



/** Custom Button View for Dialer voicemail greeting recording */

public class RecordButton extends Button {



  private final float trackWidth = getResources().getDimensionPixelSize(R.dimen.track_width);

  private final int centerIconRadius =

      getResources().getDimensionPixelSize(R.dimen.center_icon_radius);

  private final int secondaryTrackAlpha = 64;



  private float mainTrackFraction;

  private float secondaryTrackFraction;



  private Rect centerIconRect;

  private RectF bodyRect;



  private Drawable readyDrawable;

  private Drawable recordingDrawable;

  private Drawable recordedDrawable;

  private Drawable playingDrawable;

  private Drawable currentCenterDrawable;



  private Paint mainTrackPaint;

  private Paint secondaryTrackPaint;



  public RecordButton(Context context) {

    super(context);

    init();

  }



  public RecordButton(Context context, AttributeSet attrs) {

    super(context, attrs);

    init();

  }



  public RecordButton(Context context, AttributeSet attrs, int defStyle) {

    super(context, attrs, defStyle);

    init();

  }



  /**

   * Updates bounds for main and secondary tracks and the size of the center Drawable based on View

   * resizing

   */

  @Override

  protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {

    // Canvas.drawArc() method draws from center of stroke, so the trackWidth must be accounted for

    float viewRadius = Math.min(width, height) / 2f - trackWidth;

    float centerX = width / 2f;

    float centerY = viewRadius + trackWidth / 2f;



    bodyRect =

        new RectF(

            centerX - viewRadius, centerY - viewRadius, centerX + viewRadius, centerY + viewRadius);



    centerIconRect =

        new Rect(

            (int) centerX - centerIconRadius,

            (int) centerY - centerIconRadius,

            (int) centerX + centerIconRadius,

            (int) centerY + centerIconRadius);

  }



  private void init() {

    readyDrawable = ContextCompat.getDrawable(getContext(), R.drawable.start_recording_drawable);

    recordingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.stop_recording_drawable);

    recordedDrawable = ContextCompat.getDrawable(getContext(), R.drawable.start_playback_drawable);

    playingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.stop_playback_drawable);



    mainTrackPaint = getBasePaint(R.color.dialer_call_green);

    secondaryTrackPaint = getBasePaint(R.color.dialer_call_green);

    secondaryTrackPaint.setAlpha(secondaryTrackAlpha);



    setState(RecordVoicemailGreetingActivity.RECORD_GREETING_INIT);

  }



  /** Returns Paint with base attributes for drawing the main and secondary tracks */

  private Paint getBasePaint(int id) {

    Paint paint = new Paint();

    paint.setAntiAlias(true);

    paint.setStrokeWidth(trackWidth);

    paint.setStrokeCap(Paint.Cap.ROUND);

    paint.setStyle(Paint.Style.STROKE);

    paint.setColor(ContextCompat.getColor(getContext(), id));

    return paint;

  }



  /** Sets the fraction value of progress tracks, this will trigger a redraw of the button. */

  public void setTracks(float mainTrackFraction, float secondaryTrackFraction) {

    this.mainTrackFraction = mainTrackFraction;

    this.secondaryTrackFraction = secondaryTrackFraction;

    invalidate();

  }



  /**

   * Sets internal state of RecordButton. This will also trigger UI refresh of the button to reflect

   * the new state.

   */

  public void setState(@ButtonState int state) {

    switch (state) {

      case RecordVoicemailGreetingActivity.RECORD_GREETING_INIT:

        mainTrackPaint = getBasePaint(R.color.dialer_call_green);

        secondaryTrackPaint = getBasePaint(R.color.dialer_call_green);

        secondaryTrackPaint.setAlpha(secondaryTrackAlpha);

        currentCenterDrawable = readyDrawable;

        break;

      case RecordVoicemailGreetingActivity.RECORD_GREETING_PLAYING_BACK:

        mainTrackPaint = getBasePaint(R.color.google_blue_500);

        secondaryTrackPaint = getBasePaint(R.color.google_blue_50);

        currentCenterDrawable = playingDrawable;

        break;

      case RecordVoicemailGreetingActivity.RECORD_GREETING_RECORDED:

        mainTrackPaint = getBasePaint(R.color.google_blue_500);

        secondaryTrackPaint = getBasePaint(R.color.google_blue_50);

        currentCenterDrawable = recordedDrawable;

        break;

      case RecordVoicemailGreetingActivity.RECORD_GREETING_RECORDING:

        mainTrackPaint = getBasePaint(R.color.dialer_red);

        secondaryTrackPaint = getBasePaint(R.color.dialer_red);

        secondaryTrackPaint.setAlpha(secondaryTrackAlpha);

        currentCenterDrawable = recordingDrawable;

        break;

      default:

        throw new RuntimeException("Invalid button state");

    }

    refreshDrawableState();

    invalidate();

  }



  /**

   * Handles drawing the main and secondary track arcs and the center Drawable image based on track

   * fractions and the Button's current state

   */

  @Override

  protected void onDraw(Canvas canvas) {

    super.onDraw(canvas);



    canvas.drawArc(bodyRect, -90, secondaryTrackFraction * 360, false, secondaryTrackPaint);

    canvas.drawArc(bodyRect, -90, mainTrackFraction * 360, false, mainTrackPaint);



    // TODO(marquelle) - Add pulse



  public RecordButton(Context context, AttributeSet attrs, int defStyleAttrs) {

    super(context, attrs, defStyleAttrs);

    currentCenterDrawable.setBounds(centerIconRect);

    currentCenterDrawable.draw(canvas);

  }

}

java/com/android/dialer/voicemail/settings/RecordVoicemailGreetingActivity.java

+71 −1
Original line number Diff line number Diff line
@@ -18,13 +18,83 @@ package com.android.dialer.voicemail.settings; 


import android.app.Activity;

import android.os.Bundle;

import android.support.annotation.IntDef;

import android.view.View;

import android.view.View.OnClickListener;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;



/** Activity for recording a new voicemail greeting */

public class RecordVoicemailGreetingActivity extends Activity {

public class RecordVoicemailGreetingActivity extends Activity implements OnClickListener {



  /** Possible states of RecordButton and RecordVoicemailGreetingActivity */

  @Retention(RetentionPolicy.SOURCE)

  @IntDef({

    RECORD_GREETING_INIT,

    RECORD_GREETING_RECORDED,

    RECORD_GREETING_RECORDED,

    RECORD_GREETING_PLAYING_BACK

  })

  public @interface ButtonState {}



  public static final int RECORD_GREETING_INIT = 1;

  public static final int RECORD_GREETING_RECORDING = 2;

  public static final int RECORD_GREETING_RECORDED = 3;

  public static final int RECORD_GREETING_PLAYING_BACK = 4;

  public static final int MAX_GREETING_DURATION_MS = 45000;



  private int currentState;

  private int duration;

  private RecordButton recordButton;



  @Override

  protected void onCreate(Bundle savedInstanceState) {

    super.onCreate(savedInstanceState);

    setContentView(R.layout.activity_record_voicemail_greeting);



    duration = 0;

    setState(RECORD_GREETING_INIT);

  }



  @Override

  public void onClick(View v) {

    if (v == recordButton) {

      switch (currentState) {

        case RECORD_GREETING_INIT:

          setState(RECORD_GREETING_RECORDING);

          break;

        case RECORD_GREETING_RECORDED:

          setState(RECORD_GREETING_PLAYING_BACK);

          break;

        case RECORD_GREETING_RECORDING:

        case RECORD_GREETING_PLAYING_BACK:

          setState(RECORD_GREETING_RECORDED);

          break;

        default:

          break;

      }

    }

  }



  private void setState(@ButtonState int state) {

    currentState = state;



    switch (state) {

      case RECORD_GREETING_INIT:

        recordButton.setState(state);

        recordButton.setTracks(0, 0);

        break;

      case RECORD_GREETING_PLAYING_BACK:

      case RECORD_GREETING_RECORDED:

        recordButton.setState(state);

        recordButton.setTracks(0, (float) duration / MAX_GREETING_DURATION_MS);

        break;

      case RECORD_GREETING_RECORDING:

        recordButton.setState(state);

        recordButton.setTracks(0, 1f);

        break;

      default:

        break;

    }

  }

}

java/com/android/dialer/voicemail/settings/res/drawable/start_playback_drawable.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

  <item>

    <shape android:shape="oval">

      <solid android:color="@color/google_blue_500"/>

    </shape>

  </item>

  <item

      android:top="24dp"

      android:bottom="24dp"

      android:left="24dp"

      android:right="24dp"

      android:drawable="@drawable/quantum_ic_play_arrow_vd_theme_24"/>

</layer-list>

java/com/android/dialer/voicemail/settings/res/drawable/start_recording_drawable.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

  <item>

    <shape android:shape="oval">

      <solid android:color="@color/dialer_call_green"/>

    </shape>

  </item>

  <item

      android:top="24dp"

      android:bottom="24dp"

      android:left="24dp"

      android:right="24dp"

      android:drawable="@drawable/quantum_ic_mic_vd_theme_24"/>

</layer-list>

java/com/android/dialer/voicemail/settings/res/drawable/stop_playback_drawable.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

  <item>

    <shape android:shape="oval">

      <solid android:color="@color/google_blue_500"/>

    </shape>

  </item>

  <item

      android:width="24dp"

      android:height="24dp"

      android:gravity="center">

    <shape android:shape="rectangle">

      <solid android:color="@android:color/white"/>

    </shape>

  </item>

</layer-list>