From 381cde6fa375672f9d9d75cb08fc2d5ccd12bfff Mon Sep 17 00:00:00 2001 From: fabianrost Date: Sat, 6 Feb 2016 22:00:53 +0100 Subject: [PATCH 01/16] Make sure recroding is done in mono. --- .../main/java/com/danielkim/soundrecorder/RecordingService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java index 5aa935a6..339e5f61 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java +++ b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java @@ -84,6 +84,7 @@ public void startRecording() { mRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4); mRecorder.setOutputFile(mFilePath); mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC); + mRecorder.setAudioChannels(1); try { mRecorder.prepare(); From ab3eb501e0d0760be3156385f1ef6add3515f6b5 Mon Sep 17 00:00:00 2001 From: techwebpd Date: Sat, 9 Apr 2016 22:20:58 +0300 Subject: [PATCH 02/16] Lithuanian translation Lithuanian strings.xml file --- app/src/main/res/values-lt/strings.xml | 41 ++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 app/src/main/res/values-lt/strings.xml diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml new file mode 100644 index 00000000..49be7462 --- /dev/null +++ b/app/src/main/res/values-lt/strings.xml @@ -0,0 +1,41 @@ + + + + + Garso įrašytuvas + Licenzijos + Nustatymai + Įrašyti + Išsaugoti įrašai + + + Įrašymas pradėtas + Įrašymas išsaugotas + %1$s sėkmingai ištrinta + Byla %1$s jau egzisuoja. Prašome pasirinkti kitokį bylos pavadinimą. + + + Įrašoma... + + + Patvirtinkite ištrynimą... + Ar tikrai norite ištrinti šią bylą? + Atviro kodo licenzijos + Pervardinti bylą + Nustatymai + + Pervardinti bylą + Ištrinti bylą + Atšaukti + Gerai + Taip + Ne + + Nėra išsaugotų įrašų + Pristabdyti + Tęsti + Mano įrašas + Paspauskite mygtuką, kad pradėti įrašymą + Įrašoma + + From f0f8e4dff097c184a42d2b56bc05a77c798e5c57 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 29 Jun 2016 14:06:00 -0700 Subject: [PATCH 03/16] Update build tools to latest subversion --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b1906b86..376a8dd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "21.1.1" + buildToolsVersion "21.1.2" defaultConfig { applicationId "com.danielkim.soundrecorder" From 7575d6710cbcd6cc639f19503031089af328914f Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 29 Jun 2016 15:14:58 -0700 Subject: [PATCH 04/16] Add sharing intent Fixes #34. --- app/src/main/AndroidManifest.xml | 9 +++++++++ .../soundrecorder/adapters/FileViewerAdapter.java | 15 ++++++++++++++- app/src/main/res/values/strings.xml | 4 ++++ app/src/main/res/xml/filepaths.xml | 3 +++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/xml/filepaths.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8dac5fba..c68c4eea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,6 +20,15 @@ + + + diff --git a/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java b/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java index 73cd0980..a43d247d 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java +++ b/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java @@ -3,6 +3,8 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; import android.os.Environment; import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentTransaction; @@ -95,6 +97,7 @@ public void onClick(View view) { public boolean onLongClick(View v) { ArrayList entrys = new ArrayList(); + entrys.add(mContext.getString(R.string.dialog_file_share)); entrys.add(mContext.getString(R.string.dialog_file_rename)); entrys.add(mContext.getString(R.string.dialog_file_delete)); @@ -107,8 +110,10 @@ public boolean onLongClick(View v) { builder.setItems(items, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) { if (item == 0) { + shareFileDialog(holder.getPosition()); + } if (item == 1) { renameFileDialog(holder.getPosition()); - } else if (item == 1) { + } else if (item == 2) { deleteFileDialog(holder.getPosition()); } } @@ -225,6 +230,14 @@ public void rename(int position, String name) { } } + public void shareFileDialog(int position) { + Intent shareIntent = new Intent(); + shareIntent.setAction(Intent.ACTION_SEND); + shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(getItem(position).getFilePath()))); + shareIntent.setType("audio/mp4"); + mContext.startActivity(Intent.createChooser(shareIntent, mContext.getText(R.string.send_to))); + } + public void renameFileDialog (final int position) { // File rename dialog AlertDialog.Builder renameFileBuilder = new AlertDialog.Builder(mContext); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc052913..aa5b2a46 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,9 +21,11 @@ Confirm Delete... Are you sure you would like to delete this file? Open Source Licenses + Share File Rename File Options + Share File Rename File Delete File Cancel @@ -38,4 +40,6 @@ Tap the button to start recording Recording + Send to + diff --git a/app/src/main/res/xml/filepaths.xml b/app/src/main/res/xml/filepaths.xml new file mode 100644 index 00000000..51d645d9 --- /dev/null +++ b/app/src/main/res/xml/filepaths.xml @@ -0,0 +1,3 @@ + + + From 019c746281e5e5edeee36af63ea18697b2c6eb04 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Thu, 30 Jun 2016 07:07:26 -0700 Subject: [PATCH 05/16] Name recordings with timestamp This has more meaning than a serial number and matches the pattern for photos and videos. --- .../com/danielkim/soundrecorder/RecordingService.java | 8 +++----- app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-he/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 11 files changed, 3 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java index 5aa935a6..613ecf8e 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java +++ b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java @@ -18,6 +18,7 @@ import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Locale; import java.util.Timer; import java.util.TimerTask; @@ -41,6 +42,7 @@ public class RecordingService extends Service { private int mElapsedSeconds = 0; private OnTimerChangedListener onTimerChangedListener = null; private static final SimpleDateFormat mTimerFormat = new SimpleDateFormat("mm:ss", Locale.getDefault()); + private static final SimpleDateFormat mFileFormat = new SimpleDateFormat("yyyy-MM-dd kk.mm.ss", Locale.getDefault()); private Timer mTimer = null; private TimerTask mIncrementTimerTask = null; @@ -99,14 +101,10 @@ public void startRecording() { } public void setFileNameAndPath(){ - int count = 0; File f; do{ - count++; - - mFileName = getString(R.string.default_file_name) - + " #" + (mDatabase.getCount() + count) + ".mp4"; + mFileName = mFileFormat.format(new Date()) + ".mp4"; mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath(); mFilePath += "/SoundRecorder/" + mFileName; diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 525548c0..16c47ea5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -34,7 +34,6 @@ Žádné uložené nahrávky Pauza Pokračovat - Můj záznam Klepněte na tlačítko pro spuštění nahrávání Záznam diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 013e2c1f..28e759d0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -34,7 +34,6 @@ Keine gespeicherten Aufnahmen Pause Fortfahren - Meine Aufzeichnung Berühre den Button, um die Aufzeichnung zu starten Nehme auf diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 5c2f55c1..61d36f26 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -34,7 +34,6 @@ Neniu konservataj registraĵoj Paŭzigi Daŭrigi - Miaj registraĵoj Premi la butonon por ekregistri Registrado diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 465df114..3237dd9a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -34,7 +34,6 @@ Sin grabaciones guardadas Pausar Continuar - Mi grabación Pulse el botón para iniciar la grabación Grabando diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 06c54247..4115da2d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -34,7 +34,6 @@ Ei tallennettuja äänityksiä Tauko Jatka - Äänitykseni Napauta painiketta aloittaaksesi äänittämisen Äänitetään diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 882fb9f3..c5908042 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -34,7 +34,6 @@ Aucun enregistrement Pause Reprendre - Enregistrement Appuyez sur le bouton pour démarrer l\'enregistrement Enregistrement en cours diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index e9f7930e..ba4fe4b5 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -34,7 +34,6 @@ אין הקלטות שמורות השהה חזור - הקלטה הקש על הכפתור כדי להקליט כעת מקליט diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 15fafc5b..fd60e35c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -34,7 +34,6 @@ Nessuna registrazione salvata Pausa Riprendi - Le mie registrazioni Premi il bottone per iniziare a registrare Registrazione in corso diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index cd42ebf7..2cc92b73 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -32,7 +32,6 @@ Нет сохраненных записей Пауза Продолжить - Запись Нажмите на кнопку, чтобы начать запись Запись Настройки diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc052913..07671729 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,7 +34,6 @@ No saved recordings Pause Resume - My Recording Tap the button to start recording Recording From 5dfbd14c7276ff68b662588780d9e5af1eadc05c Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Thu, 30 Jun 2016 17:46:53 -0700 Subject: [PATCH 06/16] Rename file while renaming recording Fixes #21. --- app/src/main/java/com/danielkim/soundrecorder/DBHelper.java | 3 ++- .../danielkim/soundrecorder/adapters/FileViewerAdapter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/danielkim/soundrecorder/DBHelper.java b/app/src/main/java/com/danielkim/soundrecorder/DBHelper.java index 2a7b7dd5..6f0bb7a3 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/DBHelper.java +++ b/app/src/main/java/com/danielkim/soundrecorder/DBHelper.java @@ -132,10 +132,11 @@ public long addRecording(String recordingName, String filePath, long length) { return rowId; } - public void renameItem(RecordingItem item, String recordingName) { + public void renameItem(RecordingItem item, String recordingName, String filePath) { SQLiteDatabase db = getWritableDatabase(); ContentValues cv = new ContentValues(); cv.put(DBHelperItem.COLUMN_NAME_RECORDING_NAME, recordingName); + cv.put(DBHelperItem.COLUMN_NAME_RECORDING_FILE_PATH, filePath); db.update(DBHelperItem.TABLE_NAME, cv, DBHelperItem._ID + "=" + item.getId(), null); diff --git a/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java b/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java index 73cd0980..9e5e6384 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java +++ b/app/src/main/java/com/danielkim/soundrecorder/adapters/FileViewerAdapter.java @@ -220,7 +220,7 @@ public void rename(int position, String name) { //file name is unique, rename file File oldFilePath = new File(getItem(position).getFilePath()); oldFilePath.renameTo(f); - mDatabase.renameItem(getItem(position), name); + mDatabase.renameItem(getItem(position), name, mFilePath); notifyItemChanged(position); } } From e621a196a4c3b98d1c2c594db366a371d559ce35 Mon Sep 17 00:00:00 2001 From: fabianrost Date: Fri, 1 Jul 2016 10:13:34 +0200 Subject: [PATCH 07/16] German translation for Share file --- app/src/main/res/values-de/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 013e2c1f..5e0d1f0f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -21,9 +21,11 @@ Löschen bestätigen... Möchtest du diese Datei wirklich löschen? Open-Source-Lizenzen + Datei teilen Datei umbenennen Optionen + Datei teilen Datei umbenennen Datei löschen Abbrechen From 2a249fbc886d1f308b75d825fa40ebcd01a72226 Mon Sep 17 00:00:00 2001 From: dkim0419 Date: Sun, 9 Oct 2016 00:34:43 -0800 Subject: [PATCH 08/16] Revert "Merge pull request #43 from andrewgaul/file-name" This reverts commit 5c54c05672abc8e5650f97dd5e3f35f52b421aa5, reversing changes made to cc1180c2d7c68354447917bdab1937afaa06ca67. --- .../com/danielkim/soundrecorder/RecordingService.java | 8 +++++--- app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-eo/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-he/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 11 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java index f560c018..339e5f61 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java +++ b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java @@ -18,7 +18,6 @@ import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.Date; import java.util.Locale; import java.util.Timer; import java.util.TimerTask; @@ -42,7 +41,6 @@ public class RecordingService extends Service { private int mElapsedSeconds = 0; private OnTimerChangedListener onTimerChangedListener = null; private static final SimpleDateFormat mTimerFormat = new SimpleDateFormat("mm:ss", Locale.getDefault()); - private static final SimpleDateFormat mFileFormat = new SimpleDateFormat("yyyy-MM-dd kk.mm.ss", Locale.getDefault()); private Timer mTimer = null; private TimerTask mIncrementTimerTask = null; @@ -102,10 +100,14 @@ public void startRecording() { } public void setFileNameAndPath(){ + int count = 0; File f; do{ - mFileName = mFileFormat.format(new Date()) + ".mp4"; + count++; + + mFileName = getString(R.string.default_file_name) + + " #" + (mDatabase.getCount() + count) + ".mp4"; mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath(); mFilePath += "/SoundRecorder/" + mFileName; diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 16c47ea5..525548c0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -34,6 +34,7 @@ Žádné uložené nahrávky Pauza Pokračovat + Můj záznam Klepněte na tlačítko pro spuštění nahrávání Záznam diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 03e91358..5e0d1f0f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -36,6 +36,7 @@ Keine gespeicherten Aufnahmen Pause Fortfahren + Meine Aufzeichnung Berühre den Button, um die Aufzeichnung zu starten Nehme auf diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 61d36f26..5c2f55c1 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -34,6 +34,7 @@ Neniu konservataj registraĵoj Paŭzigi Daŭrigi + Miaj registraĵoj Premi la butonon por ekregistri Registrado diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3237dd9a..465df114 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -34,6 +34,7 @@ Sin grabaciones guardadas Pausar Continuar + Mi grabación Pulse el botón para iniciar la grabación Grabando diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 4115da2d..06c54247 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -34,6 +34,7 @@ Ei tallennettuja äänityksiä Tauko Jatka + Äänitykseni Napauta painiketta aloittaaksesi äänittämisen Äänitetään diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c5908042..882fb9f3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -34,6 +34,7 @@ Aucun enregistrement Pause Reprendre + Enregistrement Appuyez sur le bouton pour démarrer l\'enregistrement Enregistrement en cours diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index ba4fe4b5..e9f7930e 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -34,6 +34,7 @@ אין הקלטות שמורות השהה חזור + הקלטה הקש על הכפתור כדי להקליט כעת מקליט diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index fd60e35c..15fafc5b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -34,6 +34,7 @@ Nessuna registrazione salvata Pausa Riprendi + Le mie registrazioni Premi il bottone per iniziare a registrare Registrazione in corso diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2cc92b73..cd42ebf7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -32,6 +32,7 @@ Нет сохраненных записей Пауза Продолжить + Запись Нажмите на кнопку, чтобы начать запись Запись Настройки diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d883432..aa5b2a46 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,6 +36,7 @@ No saved recordings Pause Resume + My Recording Tap the button to start recording Recording From e2dda6b0909d5d6c1d7b2319b51eeaef080c33fd Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 9 Oct 2016 09:58:23 -0600 Subject: [PATCH 09/16] Update version to 1.2.5 Needed for F-Droid metadata. --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 376a8dd3..d78efb8c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.danielkim.soundrecorder" minSdkVersion 16 targetSdkVersion 21 - versionCode 5 - versionName "1.2.2" + versionCode 6 + versionName "1.2.5" } buildTypes { release { From 32b0b286f266719c3042bd83975f3bcdc830145d Mon Sep 17 00:00:00 2001 From: dkim0419 Date: Wed, 12 Oct 2016 05:24:11 -0800 Subject: [PATCH 10/16] Update build.gradle --- .idea/gradle.xml | 4 +- .idea/misc.xml | 3 +- .idea/modules.xml | 7 +-- .idea/modules/SoundRecorder.iml | 19 +++++++ .idea/modules/app/app.iml | 99 +++++++++++++++++++++++++++++++++ SoundRecorder | 1 + SoundRecorder.iml | 21 ------- app/app.iml | 96 -------------------------------- app/build.gradle | 5 +- 9 files changed, 129 insertions(+), 126 deletions(-) create mode 100644 .idea/modules/SoundRecorder.iml create mode 100644 .idea/modules/app/app.iml create mode 160000 SoundRecorder delete mode 100644 SoundRecorder.iml delete mode 100644 app/app.iml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 2cbb09b0..2a7f5bfc 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,8 +12,8 @@ + - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9076de56..7d21c22c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,5 +6,4 @@ - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 468b0b2b..ab86d572 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,8 @@ - - + + - - + \ No newline at end of file diff --git a/.idea/modules/SoundRecorder.iml b/.idea/modules/SoundRecorder.iml new file mode 100644 index 00000000..e8867bf3 --- /dev/null +++ b/.idea/modules/SoundRecorder.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/app/app.iml b/.idea/modules/app/app.iml new file mode 100644 index 00000000..af2f2f29 --- /dev/null +++ b/.idea/modules/app/app.iml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SoundRecorder b/SoundRecorder new file mode 160000 index 00000000..c0750ba5 --- /dev/null +++ b/SoundRecorder @@ -0,0 +1 @@ +Subproject commit c0750ba59ed02dbad8164a788dcd632d77376a05 diff --git a/SoundRecorder.iml b/SoundRecorder.iml deleted file mode 100644 index 2a022014..00000000 --- a/SoundRecorder.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index e43bf48f..00000000 --- a/app/app.iml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/build.gradle b/app/build.gradle index d78efb8c..375ed4d3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { applicationId "com.danielkim.soundrecorder" minSdkVersion 16 targetSdkVersion 21 - versionCode 6 + versionCode 8 versionName "1.2.5" } buildTypes { @@ -17,6 +17,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions{ + disable 'MissingTranslation' + } } dependencies { From 94bb87689d76766b53f8b0a2dd518e1be4e6761b Mon Sep 17 00:00:00 2001 From: "Daniel Kim (Yehun)" Date: Tue, 28 Mar 2017 10:03:51 -0400 Subject: [PATCH 11/16] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index eef5457d..a1fe2e22 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,9 @@ Easy Sound Recorder Screenshots: ![alt tag](http://i.imgur.com/4W5fj0Il.png) ![alt tag](http://i.imgur.com/7ggcFQzl.png) ![alt tag](http://i.imgur.com/RqD8S3Il.png) ![alt tag](http://i.imgur.com/H6ScO21l.png) + + +Credits / Libraries used: +https://github.com/makovkastar/FloatingActionButton +https://github.com/MohammadAG/Android-SoundRecorder +https://github.com/astuetz/PagerSlidingTabStrip From ece6d0052ca023753cea93dae9183da56f49146e Mon Sep 17 00:00:00 2001 From: "Daniel Kim (Yehun)" Date: Tue, 28 Mar 2017 10:04:12 -0400 Subject: [PATCH 12/16] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a1fe2e22..6e2d0116 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ Screenshots: Credits / Libraries used: + https://github.com/makovkastar/FloatingActionButton + https://github.com/MohammadAG/Android-SoundRecorder + https://github.com/astuetz/PagerSlidingTabStrip + From 140dfa3db2c86053baa4b00eab43595f7e4ca358 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 29 Mar 2017 18:28:55 -0700 Subject: [PATCH 13/16] Update license to GPLv3 SoundRecorder originates from Android-SoundRecorder[1], licensed under the GPLv3 license. We must use its license since this is a derivative work. References #67. [1] https://github.com/MohammadAG/Android-SoundRecorder --- LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++ License.md | 21 -- 2 files changed, 674 insertions(+), 21 deletions(-) create mode 100644 LICENSE delete mode 100644 License.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/License.md b/License.md deleted file mode 100644 index 2e5683d2..00000000 --- a/License.md +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015 Daniel Yehun Kim - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From 4a626848d4132642bce7d5d9c8185b1f9cdd8a1b Mon Sep 17 00:00:00 2001 From: Christoph Haag Date: Mon, 22 May 2017 11:21:49 +0200 Subject: [PATCH 14/16] add menu item for high quality recording also remove # from filename --- .../soundrecorder/RecordingService.java | 10 ++++++++- .../activities/MainActivity.java | 22 +++++++++++++++++++ app/src/main/res/menu/menu_main.xml | 12 +++++++--- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java index 339e5f61..d7a2656f 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java +++ b/app/src/main/java/com/danielkim/soundrecorder/RecordingService.java @@ -6,9 +6,11 @@ import android.app.Service; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.media.MediaRecorder; import android.os.Environment; import android.os.IBinder; +import android.preference.PreferenceManager; import android.support.v4.app.NotificationCompat; import android.util.Log; import android.widget.Toast; @@ -77,6 +79,8 @@ public void onDestroy() { public void startRecording() { + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); + setFileNameAndPath(); mRecorder = new MediaRecorder(); @@ -85,6 +89,10 @@ public void startRecording() { mRecorder.setOutputFile(mFilePath); mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC); mRecorder.setAudioChannels(1); + if (preferences.getBoolean("high_quality", true)) { + mRecorder.setAudioSamplingRate(44100); + mRecorder.setAudioEncodingBitRate(192000); + } try { mRecorder.prepare(); @@ -107,7 +115,7 @@ public void setFileNameAndPath(){ count++; mFileName = getString(R.string.default_file_name) - + " #" + (mDatabase.getCount() + count) + ".mp4"; + + " " + (mDatabase.getCount() + count) + ".mp4"; mFilePath = Environment.getExternalStorageDirectory().getAbsolutePath(); mFilePath += "/SoundRecorder/" + mFileName; diff --git a/app/src/main/java/com/danielkim/soundrecorder/activities/MainActivity.java b/app/src/main/java/com/danielkim/soundrecorder/activities/MainActivity.java index e0f9847c..b7445eec 100644 --- a/app/src/main/java/com/danielkim/soundrecorder/activities/MainActivity.java +++ b/app/src/main/java/com/danielkim/soundrecorder/activities/MainActivity.java @@ -1,6 +1,8 @@ package com.danielkim.soundrecorder.activities; +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; @@ -23,6 +25,8 @@ public class MainActivity extends ActionBarActivity{ private PagerSlidingTabStrip tabs; private ViewPager pager; + public SharedPreferences sharedPref; + private Menu mOptionsMenu; @Override protected void onCreate(Bundle savedInstanceState) { @@ -39,12 +43,18 @@ protected void onCreate(Bundle savedInstanceState) { if (toolbar != null) { setSupportActionBar(toolbar); } + + sharedPref = PreferenceManager.getDefaultSharedPreferences(this); } @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.menu_main, menu); + mOptionsMenu = menu; + + MenuItem high_quality = mOptionsMenu.findItem(R.id.action_high_quality); + high_quality.setChecked(sharedPref.getBoolean("high_quality", true)); return true; } @@ -58,11 +68,23 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.action_licenses: openLicenses(); return true; + case R.id.action_high_quality: + toggleQuality(); + return true; default: return super.onOptionsItemSelected(item); } } + public void toggleQuality() { + SharedPreferences.Editor editor = sharedPref.edit(); + editor.putBoolean("high_quality", !sharedPref.getBoolean("high_quality", true)); + editor.commit(); + + MenuItem high_quality = mOptionsMenu.findItem(R.id.action_high_quality); + high_quality.setChecked(sharedPref.getBoolean("high_quality", true)); + } + public void openLicenses(){ LicensesFragment licensesFragment = new LicensesFragment(); licensesFragment.show(getSupportFragmentManager().beginTransaction(), "dialog_licenses"); diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index fbfa2d6a..420d0bf7 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -5,8 +5,14 @@ tools:context=".MainActivity"> + android:title="@string/action_high_quality" /> + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5e0d1f0f..c4a96e39 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -39,5 +39,6 @@ Meine Aufzeichnung Berühre den Button, um die Aufzeichnung zu starten Nehme auf + Hohe Qualität diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa5b2a46..7b3856a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,5 +41,6 @@ Recording Send to + High Quality From 4f91d9e6a0a2bb9092df4d33db091a3ad56a66e5 Mon Sep 17 00:00:00 2001 From: Daniel Kim Date: Mon, 22 May 2017 15:38:27 -0400 Subject: [PATCH 15/16] add settings activity with hq option, licenses --- .idea/.name | 1 - .idea/misc.xml | 27 ++++ .idea/modules.xml | 4 +- .idea/modules/app/app.iml | 99 --------------- .idea/runConfigurations.xml | 12 ++ .../SoundRecorder.iml => SoundRecorder.iml | 8 +- app/app.iml | 120 ++++++++++++++++++ app/build.gradle | 8 +- app/src/main/AndroidManifest.xml | 9 ++ .../soundrecorder/MySharedPreferences.java | 25 ++++ .../soundrecorder/RecordingService.java | 7 +- .../activities/MainActivity.java | 31 +---- .../activities/SettingsActivity.java | 40 ++++++ .../fragments/SettingsFragment.java | 45 +++++++ .../main/res/layout/activity_preferences.xml | 9 ++ app/src/main/res/layout/fragment_licenses.xml | 7 + app/src/main/res/menu/menu_main.xml | 12 +- app/src/main/res/values/strings.xml | 11 +- app/src/main/res/xml/preferences.xml | 11 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 21 files changed, 336 insertions(+), 156 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/modules/app/app.iml create mode 100644 .idea/runConfigurations.xml rename .idea/modules/SoundRecorder.iml => SoundRecorder.iml (58%) create mode 100644 app/app.iml create mode 100644 app/src/main/java/com/danielkim/soundrecorder/MySharedPreferences.java create mode 100644 app/src/main/java/com/danielkim/soundrecorder/activities/SettingsActivity.java create mode 100644 app/src/main/java/com/danielkim/soundrecorder/fragments/SettingsFragment.java create mode 100644 app/src/main/res/layout/activity_preferences.xml create mode 100644 app/src/main/res/xml/preferences.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 79cabe20..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Sound Recorder \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7d21c22c..b0a270f5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,34 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index ab86d572..eb3197b3 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/.idea/modules/app/app.iml b/.idea/modules/app/app.iml deleted file mode 100644 index af2f2f29..00000000 --- a/.idea/modules/app/app.iml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules/SoundRecorder.iml b/SoundRecorder.iml similarity index 58% rename from .idea/modules/SoundRecorder.iml rename to SoundRecorder.iml index e8867bf3..40b8fc4a 100644 --- a/.idea/modules/SoundRecorder.iml +++ b/SoundRecorder.iml @@ -1,17 +1,17 @@ - + - - - + + diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 00000000..1cdca55a --- /dev/null +++ b/app/app.iml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 375ed4d3..ae3d3494 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "21.1.2" + buildToolsVersion '25.0.0' defaultConfig { applicationId "com.danielkim.soundrecorder" minSdkVersion 16 targetSdkVersion 21 - versionCode 8 - versionName "1.2.5" + versionCode 130 + versionName "1.3.0" } buildTypes { release { @@ -23,7 +23,7 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:21.0.2' + compile 'com.android.support:appcompat-v7:21.0.+' compile 'com.android.support:cardview-v7:21.0.+' compile 'com.android.support:recyclerview-v7:21.0.+' compile 'com.melnykov:floatingactionbutton:1.1.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c68c4eea..3ee713ca 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,6 +20,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_licenses.xml b/app/src/main/res/layout/fragment_licenses.xml index 9c95ccc9..40945993 100644 --- a/app/src/main/res/layout/fragment_licenses.xml +++ b/app/src/main/res/layout/fragment_licenses.xml @@ -16,12 +16,19 @@ android:padding="10dp" android:orientation="vertical"> + + - - + android:title="@string/action_settings" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7b3856a0..5061b9dc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,7 @@ + + Website: github.com/dkim0419/SoundRecorder Sound Recorder @@ -41,6 +43,13 @@ Recording Send to - High Quality + + + pref_high_quality + Enable High Quality Recording + Record in CD Quality + pref_about + About + v%s diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml new file mode 100644 index 00000000..6b806acf --- /dev/null +++ b/app/src/main/res/xml/preferences.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6356aabd..ea98e44f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:2.3.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e760..b111db67 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Mon May 22 14:33:42 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From df0644aeeddddb8afff564b9b2559f73c1d566b5 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 24 May 2017 00:14:21 -0700 Subject: [PATCH 16/16] Remove action_high_quality from German strings Addresses warning: warning: string 'action_high_quality' has no default translation. --- app/src/main/res/values-de/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c4a96e39..5e0d1f0f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -39,6 +39,5 @@ Meine Aufzeichnung Berühre den Button, um die Aufzeichnung zu starten Nehme auf - Hohe Qualität