From 33287b8d5224d2e938b895454fd3f02e82bebfe1 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 14 Sep 2016 22:41:13 +0300 Subject: [PATCH 1/3] update gradle --- app/build.gradle | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index deb0450..a77bdc4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,5 +44,5 @@ dependencies { compile 'com.android.support:design:23.2.1' compile 'com.google.android.gms:play-services-appindexing:8.1.0' compile 'org.apache.commons:commons-math3:3.6.1' - compile 'com.github.axet:android-library:1.1.3' // project(':android-library') + compile 'com.github.axet:android-library:1.5.0' // project(':android-library') } diff --git a/build.gradle b/build.gradle index 5bbe099..9ec4ac9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.2.0-rc2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -19,7 +19,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '2.14.1' + gradleVersion = '3.0' } task clean(type: Delete) { From ca54e2baf5dc30051cf324d73cba6c579e77e333 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 24 Sep 2016 13:55:30 +0300 Subject: [PATCH 2/3] encoding disable cancel --- .../axet/audiorecorder/activities/RecordingActivity.java | 5 ++--- build.gradle | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index 1c5351a..1494c27 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -10,7 +10,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.graphics.Point; import android.graphics.drawable.ColorDrawable; import android.media.AudioFormat; import android.media.AudioRecord; @@ -28,7 +27,6 @@ import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.DisplayMetrics; import android.util.Log; -import android.view.Display; import android.view.MotionEvent; import android.view.View; import android.view.WindowManager; @@ -37,8 +35,8 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import com.github.axet.audiorecorder.R; import com.github.axet.androidlibrary.animations.MarginBottomAnimation; +import com.github.axet.audiorecorder.R; import com.github.axet.audiorecorder.app.MainApplication; import com.github.axet.audiorecorder.app.RawSamples; import com.github.axet.audiorecorder.app.Sound; @@ -787,6 +785,7 @@ public class RecordingActivity extends AppCompatActivity { d.setTitle(getString(R.string.encoding_title)); d.setMessage(".../" + targetFile.getName()); d.setMax(100); + d.setCancelable(false); d.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); d.setIndeterminate(false); d.show(); diff --git a/build.gradle b/build.gradle index 9ec4ac9..da6b171 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-rc2' + classpath 'com.android.tools.build:gradle:2.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 163ee370e56e672949cadea7e50a197ff477c8e9 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 24 Sep 2016 13:55:37 +0300 Subject: [PATCH 3/3] Bump version audiorecorder-1.1.49 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a77bdc4..e9d8c19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 16 targetSdkVersion 23 - versionCode 70 - versionName "1.1.48" + versionCode 71 + versionName "1.1.49" } signingConfigs { release {