From 564b9fa1770eeaac678188d64d25e663d7a3637a Mon Sep 17 00:00:00 2001 From: cryoranger Date: Tue, 20 Mar 2018 18:52:20 +0200 Subject: [PATCH 1/6] minor corrections in greek translation --- app/src/main/res/values-el/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 30db138..524847a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -14,8 +14,8 @@ Bluetooth - Λευκό Θέμα - Σκουρο + Φωτεινό + Σκοτεινό Μονοφωνικό (προεπιλογή) @@ -48,11 +48,11 @@ Παύση κατά τις κλήσεις Διακοπή εγγραφής στην απάντηση και συνέχεια μετά το τέλος της κλήσης Αθόρυβο - Κατά την εγγραφή το τηλέφωνο θα είναι στο \"αθόρυβο" + Κατά την εγγραφή το τηλέφωνο θα είναι στο \"αθόρυβο\" Πλήκτρα ελέγχου Οθόνης Κλειδώματος Εμφάνιση πλήκτρων ελέγχου όταν το τηλέφωνο είναι κλειδωμένο Θέμα εφαρμογής - Επιλογή θέματος εφαρμογής (σκούρο / ανοιχτό) + Επιλογή θέματος εφαρμογής (σκοτεινό / φωτεινό) Εφαρμογή Εγγραφές Άμεση Κωδικοποίηση From 571fe9e226c3658a491d75bba02df78ac35c00ed Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 21 Mar 2018 14:10:48 +0300 Subject: [PATCH 2/6] fix crashes --- app/build.gradle | 2 +- .../activities/RecordingActivity.java | 35 +++++++++++++++++-- .../axet/audiorecorder/app/Storage.java | 16 +++++++++ app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 12 files changed, 58 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d29ffec..2930d32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,5 +55,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.github.axet:android-audio-library:1.0.94' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:1.0.96' // compile project(':android-audio-library') } 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 44d55f4..f76abf2 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 @@ -40,6 +40,7 @@ import android.widget.Toast; 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.widgets.OpenFileDialog; import com.github.axet.audiolibrary.app.RawSamples; import com.github.axet.audiolibrary.app.Sound; import com.github.axet.audiolibrary.encoders.Encoder; @@ -632,7 +633,7 @@ public class RecordingActivity extends AppCompatThemeActivity { @Override public void run() { stopRecording(); - storage.delete(storage.getTempRecording()); + Storage.delete(storage.getTempRecording()); finish(); } }, null); @@ -969,6 +970,7 @@ public class RecordingActivity extends AppCompatThemeActivity { } } catch (RuntimeException e) { Error(e); + return; } } @@ -1001,7 +1003,11 @@ public class RecordingActivity extends AppCompatThemeActivity { if (shared.getBoolean(MainApplication.PREFERENCE_SKIP, false)) encoder.filters.add(new SkipSilenceFilter(getInfo())); - RecordingService.startService(this, Storage.getDocumentName(targetUri), thread != null, encoder != null); + encoding(encoder, fly, last); + } + + void encoding(final FileEncoder encoder, final OnFlyEncoding fly, final Runnable last) { + RecordingService.startService(this, Storage.getDocumentName(fly.targetUri), thread != null, encoder != null); final ProgressDialog d = new ProgressDialog(this); d.setTitle(R.string.encoding_title); @@ -1020,7 +1026,7 @@ public class RecordingActivity extends AppCompatThemeActivity { }, new Runnable() { @Override public void run() { // success - Storage.delete(in); // delete raw recording + Storage.delete(encoder.in); // delete raw recording last.run(); @@ -1087,6 +1093,29 @@ public class RecordingActivity extends AppCompatThemeActivity { finish(); } }); + final File in = storage.getTempRecording(); + if (in.length() > 0) { + builder.setNeutralButton(R.string.save_as_wav, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + final OpenFileDialog d = new OpenFileDialog(RecordingActivity.this, OpenFileDialog.DIALOG_TYPE.FOLDER_DIALOG); + d.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + OnFlyEncoding fly = new OnFlyEncoding(storage, storage.getNewFile(d.getCurrentPath(), "wav"), getInfo()); + FileEncoder encoder = new FileEncoder(RecordingActivity.this, in, fly); + encoding(encoder, fly, new Runnable() { + @Override + public void run() { + finish(); + } + }); + } + }); + d.show(); + } + }); + } builder.show(); } diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java b/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java index 26f32e3..127e29a 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java @@ -50,4 +50,20 @@ public class Storage extends com.github.axet.audiolibrary.app.Storage { } } + public File getNewFile(File path, String ext) { + SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context); + + String format = "%s"; + + format = shared.getString(MainApplication.PREFERENCE_FORMAT, format); + + format = getFormatted(format, new Date()); + + File f = path; + if (!f.exists() && !f.mkdirs()) { + throw new RuntimeException("Unable to create: " + path); + } + return getNextFile(f, format, ext); + } + } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 640eaf8..4c4fca8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -65,4 +65,5 @@ Encoding on fly disable editing, and crash recovery pause (bluetooth disconnected) Search + Save as WAV diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 524847a..e25cd2a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -59,4 +59,5 @@ Η ενεργοποίηση της άμεσης κωδικοποίησης απενεργοποιεί την επεξεργασία και την ανάκτηση από κατάρευση παύση (αποσύνδεση bluetooth) Αναζήτηση + Save as WAV diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 699b5e4..4b0f94d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -65,4 +65,5 @@ Encoding on fly disable editing, and crash recovery pause (bluetooth disconnected) Search + Save as WAV diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2c98ba7..4a5c8ae 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -65,4 +65,5 @@ Encoding on fly disable editing, and crash recovery pause (bluetooth disconnected) Search + Save as WAV diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b178785..4965e2b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -65,4 +65,5 @@ Encoding on fly disable editing, and crash recovery pause (bluetooth disconnected) Search + Save as WAV diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a817173..a335cb0 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -65,4 +65,5 @@ Encoding on fly disable editing, and crash recovery pause (bluetooth disconnected) Search + Save as WAV diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 61de50e..e3db2e5 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -65,4 +65,5 @@ Кодирование на лету Кодирование на лету отключает редактирование и восстановление в случае ошибок Поиск + Save as WAV diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 845311d..f8278f7 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -65,4 +65,5 @@ Encoding on fly disable editing, and crash recovery pause (bluetooth disconnected) Search + Save as WAV diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3534dc9..acfe787 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,4 +102,5 @@ Enabling encoding on fly disables editing, and crash recovery pause (bluetooth disconnected) Search + Save as WAV From bf161f330dd6eb037a983b7f8ee05072340e6d06 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 21 Mar 2018 14:10:57 +0300 Subject: [PATCH 3/6] Bump version audiorecorder-3.2.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2930d32..05048a7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 // 24+ file:// unable to open - versionCode 257 - versionName "3.2.0" + versionCode 258 + versionName "3.2.1" } signingConfigs { release { From 72917a613d63852b25df50eee8d62c47cbab69d5 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Fri, 23 Mar 2018 20:24:31 +0300 Subject: [PATCH 4/6] cleanups --- app/src/main/res/layout/content_main.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 9dfe430..80e9149 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -17,6 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" + android:padding="2dp" android:text="32G free ~ 3 hours left" /> @@ -47,7 +48,7 @@ android:layout_height="wrap_content" android:padding="5dp" android:text="@string/recording_list_is_empty" - android:textAlignment="center"> + android:textAlignment="center" /> + android:paddingBottom="61dp" /> From 44c72575abe4595eee094619a279f925bb9b02d3 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 10 Apr 2018 16:33:57 +0300 Subject: [PATCH 5/6] fix crash --- app/build.gradle | 7 +++---- .../axet/audiorecorder/activities/RecordingActivity.java | 2 +- build.gradle | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 05048a7..18b99a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ import com.android.build.OutputFile android { compileSdkVersion 25 - buildToolsVersion "27.0.1" + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.github.axet.audiorecorder" @@ -53,7 +53,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.github.axet:android-audio-library:1.0.96' // compile project(':android-audio-library') + testImplementation 'junit:junit:4.12' + implementation 'com.github.axet:android-audio-library:1.0.97' // implementation project(':android-audio-library') } 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 f76abf2..c642994 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 @@ -897,7 +897,7 @@ public class RecordingActivity extends AppCompatThemeActivity { e = null; } } catch (RuntimeException e) { - Error(e); + Post(e); } } } diff --git a/build.gradle b/build.gradle index b7b69e8..d2a26a2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' } } @@ -19,7 +19,7 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '4.2.1' + gradleVersion = '4.6' } task clean(type: Delete) { From ae06a05ba6f27450376748f8eca4b822d5477bcd Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 10 Apr 2018 16:34:50 +0300 Subject: [PATCH 6/6] Bump version audiorecorder-3.2.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 18b99a4..a5defeb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 // 24+ file:// unable to open - versionCode 258 - versionName "3.2.1" + versionCode 259 + versionName "3.2.2" } signingConfigs { release {