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

Merge branch 'audiorecorder-3.3.6'

Browse source
This commit is contained in:
Alexey Kuznetsov 2019-08-25 10:54:15 +03:00
commit 4c647db946
7 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -9,8 +9,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 26
versionCode 330
versionName "3.3.5"
versionCode 331
versionName "3.3.6"
}
signingConfigs {
release {
@ -53,6 +53,6 @@ android {
dependencies {
testImplementation 'junit:junit:4.12'
implementation 'com.github.axet:android-audio-library:1.0.168' // implementation project(':android-audio-library')
implementation 'com.github.axet:android-audio-library:1.0.169' // implementation project(':android-audio-library')
assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' }
}

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

@ -27,10 +27,10 @@ import android.widget.TextView;
import android.widget.Toast;
import com.github.axet.androidlibrary.services.StorageProvider;
import com.github.axet.androidlibrary.widgets.AboutPreferenceCompat;
import com.github.axet.androidlibrary.widgets.AppCompatThemeActivity;
import com.github.axet.androidlibrary.preferences.AboutPreferenceCompat;
import com.github.axet.androidlibrary.activities.AppCompatThemeActivity;
import com.github.axet.androidlibrary.widgets.ErrorDialog;
import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat;
import com.github.axet.androidlibrary.preferences.OptimizationPreferenceCompat;
import com.github.axet.androidlibrary.widgets.SearchView;
import com.github.axet.audiolibrary.app.Storage;
import com.github.axet.audiorecorder.R;

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

@ -36,7 +36,7 @@ import android.widget.TextView;
import com.github.axet.androidlibrary.animations.MarginBottomAnimation;
import com.github.axet.androidlibrary.sound.AudioTrack;
import com.github.axet.androidlibrary.widgets.AppCompatThemeActivity;
import com.github.axet.androidlibrary.activities.AppCompatThemeActivity;
import com.github.axet.androidlibrary.widgets.ErrorDialog;
import com.github.axet.androidlibrary.widgets.OpenFileDialog;
import com.github.axet.androidlibrary.widgets.PopupWindowCompat;

14
app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
View file

@ -1,16 +1,12 @@
package com.github.axet.audiorecorder.activities;
import android.Manifest;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.media.AudioManager;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.preference.PreferenceFragment;
import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.preference.ListPreference;
@ -21,11 +17,11 @@ import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.SwitchPreferenceCompat;
import android.view.MenuItem;
import com.github.axet.androidlibrary.widgets.AppCompatSettingsThemeActivity;
import com.github.axet.androidlibrary.widgets.NameFormatPreferenceCompat;
import com.github.axet.androidlibrary.widgets.SeekBarPreference;
import com.github.axet.androidlibrary.widgets.SilencePreferenceCompat;
import com.github.axet.androidlibrary.widgets.StoragePathPreferenceCompat;
import com.github.axet.androidlibrary.activities.AppCompatSettingsThemeActivity;
import com.github.axet.androidlibrary.preferences.NameFormatPreferenceCompat;
import com.github.axet.androidlibrary.preferences.SeekBarPreference;
import com.github.axet.androidlibrary.preferences.SilencePreferenceCompat;
import com.github.axet.androidlibrary.preferences.StoragePathPreferenceCompat;
import com.github.axet.androidlibrary.widgets.Toast;
import com.github.axet.audiolibrary.app.Sound;
import com.github.axet.audiolibrary.encoders.Factory;

2
app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java
View file

@ -20,7 +20,7 @@ import android.widget.RemoteViews;
import com.github.axet.androidlibrary.app.AlarmManager;
import com.github.axet.androidlibrary.app.ProximityShader;
import com.github.axet.androidlibrary.services.PersistentService;
import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat;
import com.github.axet.androidlibrary.preferences.OptimizationPreferenceCompat;
import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat;
import com.github.axet.androidlibrary.widgets.RemoteViewsCompat;
import com.github.axet.audiolibrary.app.Storage;

8
app/src/main/java/com/github/axet/audiorecorder/services/TileService.java
View file

@ -14,6 +14,7 @@ import com.github.axet.audiorecorder.app.AudioApplication;
@TargetApi(24)
public class TileService extends android.service.quicksettings.TileService {
IntentFilter filters = new IntentFilter();
BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@ -24,10 +25,9 @@ public class TileService extends android.service.quicksettings.TileService {
@Override
public void onCreate() {
super.onCreate();
IntentFilter ff = new IntentFilter();
ff.addAction(RecordingActivity.START_RECORDING);
ff.addAction(RecordingActivity.STOP_RECORDING);
registerReceiver(receiver, ff);
filters.addAction(RecordingActivity.START_RECORDING);
filters.addAction(RecordingActivity.STOP_RECORDING);
registerReceiver(receiver, filters);
}
@Override

4
app/src/main/res/xml/pref_general.xml
View file

@ -1,7 +1,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/pref_recordings">
<com.github.axet.androidlibrary.widgets.StoragePathPreferenceCompat
<com.github.axet.androidlibrary.preferences.StoragePathPreferenceCompat
android:defaultValue="Audio Recorder"
android:key="storage_path"
android:summary="/sdcard/some/"
@ -87,7 +87,7 @@
android:summary="@string/pref_pausecalls_summary"
android:title="@string/pref_pausecalls_title" />
<com.github.axet.androidlibrary.widgets.SilencePreferenceCompat
<com.github.axet.androidlibrary.preferences.SilencePreferenceCompat
android:defaultValue="false"
android:key="silence"
android:summary="@string/pref_silence_summary"