bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-1.4.26'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-05-02 14:17:42 +03:00
commit 018220db07
3 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 127
versionName "1.4.25"
versionCode 128
versionName "1.4.26"
}
signingConfigs {
release {
@ -43,5 +43,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.github.axet:android-audio-library:0.0.24' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:0.0.29' // compile project(':android-audio-library')
}

16
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -4,23 +4,18 @@ import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@ -236,17 +231,6 @@ public class MainActivity extends AppCompatActivity {
recordings.close();
}
@Override
public void onStart() {
super.onStart();
}
@Override
public void onStop() {
super.onStop();
}
void updateHeader() {
File f = storage.getStoragePath();
long free = storage.getFree(f);

5
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -35,7 +35,6 @@ import android.widget.TextView;
import android.widget.Toast;
import com.github.axet.androidlibrary.animations.MarginBottomAnimation;
import com.github.axet.androidlibrary.app.MainLibrary;
import com.github.axet.audiolibrary.app.RawSamples;
import com.github.axet.audiolibrary.app.Sound;
import com.github.axet.audiolibrary.app.Storage;
@ -721,7 +720,7 @@ public class RecordingActivity extends AppCompatActivity {
void updateSamples(long samplesTime) {
long ms = samplesTime / sampleRate * 1000;
time.setText(MainLibrary.formatDuration(this, ms));
time.setText(MainApplication.formatDuration(this, ms));
}
@Override
@ -790,7 +789,7 @@ public class RecordingActivity extends AppCompatActivity {
final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
String ext = shared.getString(MainApplication.PREFERENCE_ENCODING, "");
e = Factory.getEncoder(ext, info, out);
e = Factory.getEncoder(this, ext, info, out);
encoder = new FileEncoder(this, in, e);