Making the soundrecorder nicer

Author: milovanderlinden

app/src/main/java/org/open311/android/MainActivity.java

@@ -186,6 +186,22 @@ private void setupViewPager(ViewPager viewPager) {
         adapter.addFragment(new ProfileFragment());
         adapter.addFragment(new PolicyFragment());
         viewPager.setAdapter(adapter);
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener(){
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                hideKeyBoard(MainActivity.this);
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
     }
 
     @Override

app/src/main/java/org/open311/android/SoundRecorderActivity.java

@@ -5,13 +5,15 @@
 import android.media.MediaRecorder;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.SystemClock;
+import android.support.design.widget.FloatingActionButton;
+import android.support.v4.content.ContextCompat;
+import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
-import android.widget.ImageButton;
+import android.widget.Chronometer;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-import android.widget.SeekBar;
 import android.widget.TextView;
 
 import java.io.FileDescriptor;
@@ -30,21 +32,14 @@ public class SoundRecorderActivity extends Activity {
     Uri mOutputUri;
     FileDescriptor mOutputFileDescriptor;
 
-    LinearLayout mSoundRecorderLayout;
-
     // Views for recording
     ProgressBar mRecordAudioProgressBar;
-    ImageButton mPlaybackPlayPauseButton;
-
     // Views for playback
-    SeekBar mAudioSeekBar;
-    Button mRecordAudioCancelButton;
-    ImageButton mRecordAudioPlayButton;
+    Chronometer mAudioSeekBar;
 
     // Views for both
-    Button mRecordAudioControlButton;
-    TextView mCurrentRecordTimeCurrentTextView;
-    TextView mCurrentRecordTimeMaxTextView;
+    FloatingActionButton mRecordAudioControlButton;
+    TextView mRecordingStatus;
     Timer mProgressTimer;
 
     // Recorder stuff
@@ -114,16 +109,12 @@ private void setup() {
 
     private void setupViews() {
         Log.d(LOG_TAG, "setupViews");
-        mSoundRecorderLayout = (LinearLayout) findViewById(R.id.sound_recorder_layout);
 
         mRecordAudioProgressBar = (ProgressBar) findViewById(R.id.record_audio_progress);
-        mAudioSeekBar = (SeekBar) findViewById(R.id.audio_seekbar);
-
-        mRecordAudioControlButton = (Button) findViewById(R.id.record_audio_control_button);
-        mRecordAudioCancelButton = (Button) findViewById(R.id.record_audio_cancel_button);
-
-        mCurrentRecordTimeCurrentTextView = (TextView) findViewById(R.id.record_audio_time_current);
-        mCurrentRecordTimeMaxTextView = (TextView) findViewById(R.id.record_audio_time_max);
+        mRecordAudioProgressBar.setMax(MAX_DURATION_MS);
+        mAudioSeekBar = (Chronometer) findViewById(R.id.record_audio_seekbar);
+        mRecordAudioControlButton = (FloatingActionButton) findViewById(R.id.record_audio_control_button);
+        mRecordingStatus = (TextView) findViewById((R.id.recording_status_text));
 
         mOnClickListener = new View.OnClickListener() {
             @Override
@@ -138,101 +129,30 @@ public void onClick(View v) {
                                 tearDownRecording(false);
                                 break;
                             case STOPPED:
+                                setupRecorder();
+                                startRecording();
+                                break;
+                            default:
                                 completeRecording();
                                 break;
                         }
                         break;
-
-                    case R.id.record_audio_cancel_button:
-                        onCancel();
-                        break;
                 }
             }
         };
 
         mRecordAudioControlButton.setOnClickListener(mOnClickListener);
-        mRecordAudioCancelButton.setOnClickListener(mOnClickListener);
-
-        mAudioSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                mCurrentRecordTimeCurrentTextView.setText(getTimeString(progress));
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-
-            }
 
+        mAudioSeekBar.setOnChronometerTickListener(new Chronometer.OnChronometerTickListener() {
             @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
+            public void onChronometerTick(Chronometer chronometer) {
+                long t = SystemClock.elapsedRealtime() - chronometer.getBase();
 
+                mRecordAudioProgressBar.setProgress((int) t);
+                chronometer.setText(DateFormat.format("mm:ss", t));
             }
-
         });
 
-        mRecordAudioProgressBar.setMax(MAX_DURATION_MS);
-    }
-
-    private void setCurrentRecordingState(RecordingState recordingState) {
-        Log.i(LOG_TAG, "setCurrentRecordingState: " + recordingState);
-
-        mCurrentRecordingState = recordingState;
-    }
-
-    private void setupProgressTimer() {
-        mProgressTimer = new Timer();
-    }
-
-    private void startProgressTimer() {
-        if (mProgressTimer == null) {
-            setupProgressTimer();
-        }
-
-        mProgressTimer.schedule(new TimerTask() {
-
-            @Override
-            public void run() {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        int nextMilliSeconds;
-
-                        if (mCurrentRecordingState == RecordingState.STARTED) {
-                            if (mRecordAudioProgressBar.getProgress() < MAX_DURATION_MS) {
-                                nextMilliSeconds = mRecordAudioProgressBar.getProgress() + getProgressIncrement(mRecordAudioProgressBar.getProgress());
-
-                                Log.i(LOG_TAG, "Recording progress " + nextMilliSeconds);
-
-                                mRecordAudioProgressBar.setProgress(nextMilliSeconds);
-                                mCurrentRecordTimeCurrentTextView.setText(getTimeString(nextMilliSeconds));
-                            } else {
-                                //Reached maximum duration. Stopping.
-                                tearDownRecording(false);
-                            }
-                        } else if (mCurrentRecordingState == RecordingState.STOPPED) {
-                            if (mAudioSeekBar.getProgress() < MAX_DURATION_MS) {
-                                nextMilliSeconds = mAudioSeekBar.getProgress() + getProgressIncrement(mAudioSeekBar.getProgress());
-
-                                Log.i(LOG_TAG, "Recording progress " + nextMilliSeconds);
-
-                                mAudioSeekBar.setProgress(nextMilliSeconds);
-                                mCurrentRecordTimeCurrentTextView.setText(getTimeString(nextMilliSeconds));
-                            }
-                        }
-                    }
-                });
-            }
-        }, 0, 1000);
-    }
-
-    private void stopProgressTimer() {
-        if (mProgressTimer != null) {
-            mProgressTimer.cancel();
-            mProgressTimer.purge();
-        }
-
-        mProgressTimer = null;
     }
 
     private void setupRecorder() {
@@ -247,70 +167,48 @@ private void setupRecorder() {
         mMediaRecorder.setMaxDuration(MAX_DURATION_MS);
         mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
         mMediaRecorder.setOutputFile(mOutputFileDescriptor);
-
-
+        mAudioSeekBar.setBase(SystemClock.elapsedRealtime());
         try {
             mMediaRecorder.prepare();
-
-            onSetupRecorder();
+            mCurrentRecordingState = RecordingState.NOT_STARTED;
         } catch (IOException exception) {
             Log.e(LOG_TAG, "Recording preparation failed", exception);
             finish();
         }
     }
 
-    private void onSetupRecorder() {
-        setCurrentRecordingState(RecordingState.NOT_STARTED);
-    }
-
     private void startRecording() {
         try {
             mMediaRecorder.start();
-
-            onStartRecording();
+            mCurrentRecordingState = RecordingState.STARTED;
+            mRecordAudioControlButton.setImageDrawable(ContextCompat.getDrawable(SoundRecorderActivity.this.getApplication().getBaseContext(), R.drawable.ic_stop));
+            mAudioSeekBar.start();
+            mRecordAudioProgressBar.setVisibility(View.VISIBLE);
         } catch (IllegalStateException exception) {
             Log.e(LOG_TAG, "Bad state when starting recording", exception);
         }
     }
 
-    private void onStartRecording() {
-        Log.i(LOG_TAG, "Recording started");
-
-        setCurrentRecordingState(RecordingState.STARTED);
-
-        mRecordAudioControlButton.setText(R.string.stop_dialog);
-        mRecordAudioProgressBar.setVisibility(View.VISIBLE);
-        startProgressTimer();
-    }
-
     private void stopRecording() {
         try {
             mMediaRecorder.stop();
+            mAudioSeekBar.stop();
 
         } catch (IllegalStateException exception) {
             Log.e(LOG_TAG, "Bad state when stopping recording (ignoring)", exception);
         } catch (RuntimeException exception) {
             Log.e(LOG_TAG, "Exception when stopping recording (ignoring)", exception);
         }
 
-        onStopRecording();
-    }
-
-    private void onStopRecording() {
         Log.i(LOG_TAG, "Recording stopped");
-
-        setCurrentRecordingState(RecordingState.STOPPED);
-
-        stopProgressTimer();
+        mCurrentRecordingState = RecordingState.STOPPED;
+        mRecordAudioControlButton.setImageDrawable(ContextCompat.getDrawable(SoundRecorderActivity.this.getApplication().getBaseContext(), R.drawable.ic_mic_white_24dp));
     }
 
+
     private void completeRecording() {
         Log.d(LOG_TAG, "completeRecording");
         tearDownRecording(true);
-        onCompleteRecording();
-    }
-
-    private void onCompleteRecording() {
         Intent returnIntent = new Intent();
         returnIntent.setData(mOutputUri);
         setResult(RESULT_OK, returnIntent);
@@ -335,59 +233,15 @@ private void tearDownRecording(boolean fromCancellation) {
         }
 
         if (!fromCancellation) {
-            mRecordAudioControlButton.setText(R.string.okay);
-            mRecordAudioProgressBar.setVisibility(View.INVISIBLE);
-            mAudioSeekBar.setVisibility(View.VISIBLE);
-            mAudioSeekBar.setProgress(0);
+            mRecordingStatus.setText(R.string.record_ready);
         }
     }
 
-    private void onCancel() {
-        tearDownRecording(true);
-        finish();
-    }
-
-    private String getTimeString(int miliSeconds) {
-        int minutes = (int) Math.floor((miliSeconds / 1000.0) / 60);
-        int seconds = miliSeconds / 1000 - minutes * 60;
-
-        return String.format("%01d:%02d", minutes, seconds);
-    }
-
-    private int getNumIncrements(int durationMiliSeconds) {
-        int numIncrements = (int) Math.ceil(durationMiliSeconds / 1000.0);
-
-        if (numIncrements == 0) {
-            return 1;
-        }
-
-        return numIncrements;
-    }
-
-    private int getMaxDuration(int durationMiliSeconds) {
-        int numIncrements = getNumIncrements(durationMiliSeconds) * 1000;
-
-        if (numIncrements > MAX_DURATION_MS) {
-            numIncrements = MAX_DURATION_MS;
-        }
-
-        return numIncrements;
-    }
-
-    private int getProgressIncrement(int durationMiliSeconds) {
-        int numIncrements = getNumIncrements(durationMiliSeconds);
-
-        if (numIncrements == 1) {
-            return 1000;
-        }
-
-        return Math.round(durationMiliSeconds / numIncrements);
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
 
-        onCancel();
+        tearDownRecording(true);
+        finish();
     }
 }

app/src/main/java/org/open311/android/adapters/ServiceListAdapter.java

@@ -0,0 +1,8 @@
+package org.open311.android.adapters;
+
+/**
+ * Created by miblon on 11/12/16.
+ */
+
+public class ServiceListAdapter {
+}

app/src/main/java/org/open311/android/fragments/PolicyFragment.java

@@ -12,10 +12,10 @@
 
 /**
  * Policy {@link Fragment} subclass.
- *
  */
 public class PolicyFragment extends Fragment {
     private static final String LOG_TAG = "PolicyFragment";
+
     public PolicyFragment() {
         // Required empty public constructor
     }