Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a pause button #109

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+60 −60
Open

Added a pause button #109

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c4990fa
Update color.xml
vishistv Nov 23, 2018
8a9cc10
Update RecordFragment.java
vishistv Nov 23, 2018
e9a1917
Update fragment_record.xml
vishistv Nov 23, 2018
98ad27c
Update build.gradle
vishistv Nov 23, 2018
082480b
Update styles.xml
vishistv Nov 23, 2018
7b8c19e
Update fragment_record.xml
vishistv Nov 23, 2018
6c9c04b
Update fragment_media_playback.xml
vishistv Nov 23, 2018
37ce59f
Update MainActivity.java
vishistv Nov 23, 2018
30e4788
Update PlaybackFragment.java
vishistv Nov 23, 2018
d018283
Update RecordFragment.java
vishistv Nov 23, 2018
3347f54
Update MainActivity.java
vishistv Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
compileSdkVersion 22
buildToolsVersion '25.0.0'

defaultConfig {
applicationId "com.danielkim.soundrecorder"
minSdkVersion 16
targetSdkVersion 21
targetSdkVersion 22
versionCode 130
versionName "1.3.0"
}
@@ -23,9 +23,9 @@ android {
}

dependencies {
compile 'com.android.support:appcompat-v7:21.0.+'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
compile 'com.android.support:cardview-v7:21.0.+'
compile 'com.android.support:recyclerview-v7:21.0.+'
compile 'com.melnykov:floatingactionbutton:1.1.0'
compile 'com.android.support:recyclerview-v7:22.1.0'
compile 'com.jpardogo.materialtabstrip:library:1.0.6'
}
7 changes: 2 additions & 5 deletions app/src/main/java/com/danielkim/soundrecorder/activities/MainActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
package com.danielkim.soundrecorder.activities;

import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;

import com.astuetz.PagerSlidingTabStrip;
import com.danielkim.soundrecorder.R;
import com.danielkim.soundrecorder.fragments.FileViewerFragment;
import com.danielkim.soundrecorder.fragments.LicensesFragment;
import com.danielkim.soundrecorder.fragments.RecordFragment;


public class MainActivity extends ActionBarActivity{
public class MainActivity extends AppCompatActivity {

private static final String LOG_TAG = MainActivity.class.getSimpleName();

2 changes: 1 addition & 1 deletion app/src/main/java/com/danielkim/soundrecorder/fragments/PlaybackFragment.java
View file
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.DialogFragment;
import android.util.Log;
import android.view.View;
@@ -18,7 +19,6 @@

import com.danielkim.soundrecorder.R;
import com.danielkim.soundrecorder.RecordingItem;
import com.melnykov.fab.FloatingActionButton;

import java.io.IOException;
import java.util.concurrent.TimeUnit;
30 changes: 14 additions & 16 deletions app/src/main/java/com/danielkim/soundrecorder/fragments/RecordFragment.java
View file
Original file line number Diff line number Diff line change
@@ -4,19 +4,18 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.SystemClock;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
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;

import com.danielkim.soundrecorder.R;
import com.danielkim.soundrecorder.RecordingService;
import com.melnykov.fab.FloatingActionButton;

import java.io.File;

@@ -36,7 +35,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;
@@ -81,8 +80,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
mRecordingPrompt = (TextView) recordView.findViewById(R.id.recording_status_text);

mRecordButton = (FloatingActionButton) recordView.findViewById(R.id.btnRecord);
mRecordButton.setColorNormal(getResources().getColor(R.color.primary));
mRecordButton.setColorPressed(getResources().getColor(R.color.primary_dark));
mRecordButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -91,7 +88,7 @@ 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
@@ -105,15 +102,14 @@ public void onClick(View v) {
}

// Recording Start/Stop
//TODO: recording pause
private void onRecord(boolean start){

Intent intent = new Intent(getActivity(), RecordingService.class);

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 +140,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;
@@ -163,22 +161,22 @@ public void onChronometerTick(Chronometer chronometer) {
}
}

//TODO: implement pause recording

private void onPauseRecord(boolean pause) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove TODO, if you've implemented this.

Copy link
Author

@vishistv vishistv Nov 23, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reviewing my PR. I will make the changes. :). I used a device to test.

if (pause) {
//pause recording
mPauseButton.setCompoundDrawablesWithIntrinsicBounds
(R.drawable.ic_media_play ,0 ,0 ,0);
mPauseButton.setImageResource(R.drawable.ic_media_play);
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);;
mRecordingPrompt.setText((String)getString(R.string.pause_recording_button).toUpperCase());
mChronometer.setBase(SystemClock.elapsedRealtime() + timeWhenPaused);
mChronometer.start();
}
}
}


}
9 changes: 3 additions & 6 deletions app/src/main/res/layout/fragment_media_playback.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_gravity="center_vertical"
android:layout_width="fill_parent"
@@ -53,17 +52,15 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />

<com.melnykov.fab.FloatingActionButton
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_media_play"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
app:fab_colorNormal="@color/primary"
app:fab_colorPressed="@color/primary"
app:fab_shadow="false"/>
android:backgroundTint="@color/primary"/>


<TextView
@@ -82,4 +79,4 @@

</android.support.v7.widget.CardView>

</RelativeLayout>
</RelativeLayout>
55 changes: 31 additions & 24 deletions app/src/main/res/layout/fragment_record.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fragment_record"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">

<com.melnykov.fab.FloatingActionButton
android:id="@+id/btnRecord"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:fab_colorNormal="@color/primary"
android:layout_marginBottom="10dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_mic_white_36dp" />
android:gravity="center_horizontal"
android:orientation="horizontal">



<android.support.design.widget.FloatingActionButton
android:id="@+id/btnRecord"
android:layout_marginBottom="10dp"
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/primary"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_mic_white_36dp" />

<android.support.design.widget.FloatingActionButton
android:id="@+id/btnPause"
android:layout_marginBottom="10dp"
android:layout_marginLeft="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/primary"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_media_pause"/>

</LinearLayout>



<Chronometer
android:layout_width="wrap_content"
@@ -40,21 +62,6 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnPause"
android:drawableLeft="@drawable/ic_media_pause"
android:text="@string/pause_recording_button"
android:textAllCaps="true"
android:fontFamily="sans-serif-condensed"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="10dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -68,4 +75,4 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="60dp" />

</RelativeLayout>
</RelativeLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -6,8 +6,9 @@
<color name="primary_text">#212121</color>
<color name="accent">#FFC107</color>
<color name="secondary_text">#727272</color>
<color name="ripple">#C0C0C0</color>
<color name="divider">#FFFFFF</color>
<color name="text">#FFFFFF</color>
<color name="white">#FFFFFF</color>
<color name="tab_strip">#B42929</color>
</resources>
</resources>
4 changes: 2 additions & 2 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<resources>
<style name="AppTheme.Base" parent="Theme.AppCompat.Light"> </style>
<style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> </style>

<style name="AppTheme" parent="AppTheme.Base">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>

<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

</resources>