From c4990fa4fa51dcf5aa9f90ec0b6c2261fffd9bee Mon Sep 17 00:00:00 2001 From: vishistv Date: Fri, 23 Nov 2018 13:30:24 +0530 Subject: [PATCH 01/11] Update color.xml --- app/src/main/res/values/colors.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ce1f8fd0..167dd21e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,8 +6,9 @@ #212121 #FFC107 #727272 + #C0C0C0 #FFFFFF #FFFFFF #FFFFFF #B42929 - \ No newline at end of file + From 8a9cc10ed6fdb8afa5c7e3045e40bbeba10ff59d Mon Sep 17 00:00:00 2001 From: vishistv Date: Fri, 23 Nov 2018 13:31:31 +0530 Subject: [PATCH 02/11] Update RecordFragment.java Included a pauses button as a fab. --- .../fragments/RecordFragment.java | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/danielkim/soundrecorder/fragments/RecordFragment.java b/app/src/main/java/com/danielkim/soundrecorder/fragments/RecordFragment.java index 151822c0..ae26a0f1 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/fragments/RecordFragment.java +++ b/app/src/main/java/com/danielkim/soundrecorder/fragments/RecordFragment.java @@ -1,6 +1,7 @@ package com.danielkim.soundrecorder.fragments; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.os.Environment; import android.os.SystemClock; @@ -9,7 +10,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.Button; import android.widget.Chronometer; import android.widget.TextView; import android.widget.Toast; @@ -36,7 +36,7 @@ public class RecordFragment extends Fragment { //Recording controls private FloatingActionButton mRecordButton = null; - private Button mPauseButton = null; + private FloatingActionButton mPauseButton = null; private TextView mRecordingPrompt; private int mRecordPromptCount = 0; @@ -91,11 +91,12 @@ public void onClick(View v) { } }); - mPauseButton = (Button) recordView.findViewById(R.id.btnPause); + mPauseButton = (FloatingActionButton) recordView.findViewById(R.id.btnPause); mPauseButton.setVisibility(View.GONE); //hide pause button before recording starts mPauseButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + Toast.makeText(getActivity(),mPauseRecording + "",Toast.LENGTH_SHORT).show(); onPauseRecord(mPauseRecording); mPauseRecording = !mPauseRecording; } @@ -113,7 +114,7 @@ private void onRecord(boolean start){ if (start) { // start recording mRecordButton.setImageResource(R.drawable.ic_media_stop); - //mPauseButton.setVisibility(View.VISIBLE); + mPauseButton.setVisibility(View.VISIBLE); Toast.makeText(getActivity(),R.string.toast_recording_start,Toast.LENGTH_SHORT).show(); File folder = new File(Environment.getExternalStorageDirectory() + "/SoundRecorder"); if (!folder.exists()) { @@ -144,14 +145,16 @@ public void onChronometerTick(Chronometer chronometer) { getActivity().startService(intent); //keep screen on while recording getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - mRecordingPrompt.setText(getString(R.string.record_in_progress) + "."); mRecordPromptCount++; } else { //stop recording mRecordButton.setImageResource(R.drawable.ic_mic_white_36dp); - //mPauseButton.setVisibility(View.GONE); + + mPauseButton.setVisibility(View.GONE); + mPauseRecording = true; + onPauseRecord(!mPauseRecording); mChronometer.stop(); mChronometer.setBase(SystemClock.elapsedRealtime()); timeWhenPaused = 0; @@ -167,18 +170,24 @@ public void onChronometerTick(Chronometer chronometer) { private void onPauseRecord(boolean pause) { if (pause) { //pause recording - mPauseButton.setCompoundDrawablesWithIntrinsicBounds - (R.drawable.ic_media_play ,0 ,0 ,0); + mPauseButton.setImageResource(R.drawable.ic_media_play); + mPauseButton.setColorNormal(Color.parseColor("#FFC107")); + mPauseButton.setColorRipple(Color.parseColor("#C0C0C0")); + mPauseButton.setColorPressed(Color.parseColor("#727272")); mRecordingPrompt.setText((String)getString(R.string.resume_recording_button).toUpperCase()); timeWhenPaused = mChronometer.getBase() - SystemClock.elapsedRealtime(); mChronometer.stop(); } else { //resume recording - mPauseButton.setCompoundDrawablesWithIntrinsicBounds - (R.drawable.ic_media_pause ,0 ,0 ,0); + mPauseButton.setImageResource(R.drawable.ic_media_pause); + mPauseButton.setColorNormal(Color.parseColor("#F44336")); + mPauseButton.setColorRipple(Color.parseColor("#C0C0C0")); + mPauseButton.setColorPressed(Color.parseColor("#727272")); mRecordingPrompt.setText((String)getString(R.string.pause_recording_button).toUpperCase()); mChronometer.setBase(SystemClock.elapsedRealtime() + timeWhenPaused); mChronometer.start(); } } -} \ No newline at end of file + + +} From e9a191779d0c4f4a4d967f340442a294ac6ff82d Mon Sep 17 00:00:00 2001 From: vishistv Date: Fri, 23 Nov 2018 13:32:42 +0530 Subject: [PATCH 03/11] Update fragment_record.xml Added a fab for the pause button --- app/src/main/res/layout/fragment_record.xml | 57 ++++++++++++--------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/app/src/main/res/layout/fragment_record.xml b/app/src/main/res/layout/fragment_record.xml index f5f774bb..4244503b 100644 --- a/app/src/main/res/layout/fragment_record.xml +++ b/app/src/main/res/layout/fragment_record.xml @@ -1,20 +1,46 @@ - + android:gravity="center_horizontal" + android:orientation="horizontal"> + + + + + + + + -