- Say-my-texts-commits - mailman.cloud.codelutin.com

01/01: [maven-release-plugin] prepare for next development iteration
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit deefa235d2cf593db7b28646174bfbb5d8cb00d1 Author: Maven Release <maven-release(a)codelutin.com> Date: Sun May 25 18:28:03 2014 +0200 [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1b3e24d..2d827cf 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem.android</groupId> <artifactId>saymytexts</artifactId> - <version>2.0</version> + <version>2.1-SNAPSHOT</version> <packaging>apk</packaging> <name>Say My Texts</name> @@ -71,7 +71,7 @@ scm:git:https://git.chorem.org/say-my-texts.git </developerConnection> <url>http://forge.chorem.org/projects/say-my-texts/repository</url> - <tag>say-my-texts-2.0</tag> + <tag>HEAD</tag> </scm> <distributionManagement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: [maven-release-plugin] prepare release say-my-texts-2.0
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 0f59f5c488a4a169d344dd5e4759ef3f439711fc Author: Maven Release <maven-release(a)codelutin.com> Date: Sun May 25 18:27:38 2014 +0200 [maven-release-plugin] prepare release say-my-texts-2.0 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d721b7a..1b3e24d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem.android</groupId> <artifactId>saymytexts</artifactId> - <version>1.2-SNAPSHOT</version> + <version>2.0</version> <packaging>apk</packaging> <name>Say My Texts</name> @@ -71,6 +71,7 @@ scm:git:https://git.chorem.org/say-my-texts.git </developerConnection> <url>http://forge.chorem.org/projects/say-my-texts/repository</url> + <tag>say-my-texts-2.0</tag> </scm> <distributionManagement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add headers
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 4a678f4b8da01a7e5799622909f93e695cd7db82 Author: Kevin Morin <morin(a)codelutin.com> Date: Sun May 25 18:19:39 2014 +0200 add headers --- .../saymytexts/DictateSmsBroadcastReceiver.java | 24 ++++++++++++++++++++++ src/org/chorem/android/saymytexts/SMS.java | 24 ++++++++++++++++++++++ .../chorem/android/saymytexts/SayMyTextsUtils.java | 24 ++++++++++++++++++++++ .../saymytexts/SayNextActionBroadcastReceiver.java | 24 ++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/src/org/chorem/android/saymytexts/DictateSmsBroadcastReceiver.java b/src/org/chorem/android/saymytexts/DictateSmsBroadcastReceiver.java index 486a9c0..fdaa5a7 100644 --- a/src/org/chorem/android/saymytexts/DictateSmsBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/DictateSmsBroadcastReceiver.java @@ -1,5 +1,29 @@ package org.chorem.android.saymytexts; +/* + * #%L + * Say My Texts + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Code Lutin + * %% + * 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 + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; diff --git a/src/org/chorem/android/saymytexts/SMS.java b/src/org/chorem/android/saymytexts/SMS.java index 920a0b8..951817c 100644 --- a/src/org/chorem/android/saymytexts/SMS.java +++ b/src/org/chorem/android/saymytexts/SMS.java @@ -1,5 +1,29 @@ package org.chorem.android.saymytexts; +/* + * #%L + * Say My Texts + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Code Lutin + * %% + * 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 + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.io.Serializable; /** diff --git a/src/org/chorem/android/saymytexts/SayMyTextsUtils.java b/src/org/chorem/android/saymytexts/SayMyTextsUtils.java index d6adba7..fa9aeb3 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextsUtils.java +++ b/src/org/chorem/android/saymytexts/SayMyTextsUtils.java @@ -1,5 +1,29 @@ package org.chorem.android.saymytexts; +/* + * #%L + * Say My Texts + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Code Lutin + * %% + * 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 + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; diff --git a/src/org/chorem/android/saymytexts/SayNextActionBroadcastReceiver.java b/src/org/chorem/android/saymytexts/SayNextActionBroadcastReceiver.java index a8e1471..46cc22f 100644 --- a/src/org/chorem/android/saymytexts/SayNextActionBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/SayNextActionBroadcastReceiver.java @@ -1,5 +1,29 @@ package org.chorem.android.saymytexts; +/* + * #%L + * Say My Texts + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Code Lutin + * %% + * 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 + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.Context; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add doc
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit ba3e0e5dc924e896b7741ae1438afe0939fbf7f4 Author: Kevin Morin <morin(a)codelutin.com> Date: Sun May 25 17:58:51 2014 +0200 add doc --- src/site/fr/rst/user.rst | 2 +- src/site/rst/user.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/fr/rst/user.rst b/src/site/fr/rst/user.rst index 5059090..67496b0 100644 --- a/src/site/fr/rst/user.rst +++ b/src/site/fr/rst/user.rst @@ -64,7 +64,7 @@ Le lancement de l'application depuis le menu ouvre la configuration de l'applica Vous pouvez : - activer ou désactiver la lecture en fonction du branchement ou non d'un casque ou de la connexion d'un appareil bluetooth -- activer l'intéraction à la réception d'un message +- activer l'intéraction à la réception d'un message (seulement si la reconnaissance vocale est installée) - si l'intéraction est activée, vous pouvez choisir le nombre d'essais de reconnaissance des commandes vocales (3 par défaut) - activer ou désactiver le `mode Heisendroid`_. - vous envoyer un SMS pour tester la lecture diff --git a/src/site/rst/user.rst b/src/site/rst/user.rst index 62b1c6f..6694170 100644 --- a/src/site/rst/user.rst +++ b/src/site/rst/user.rst @@ -60,7 +60,7 @@ When you launch the application from the menu, the settings open. You can: - enable or disable the reading depending if a headset is plugged or not or if a bluetooth device is connected -- enable or disable the interaction with the received messages +- enable or disable the interaction with the received messages (only if a voice recognizer is installed) - if the interaction is enabled, you can configure the maximum number of tries to understand the vocal commands (3 by default) - enable or disable the `Heisendroid mode`_. - send a SMS to yourself to test the reading -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: check if the text recognizer is available.
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit fefdf81fbe945ff0cf869d8297df6fdd8be1ddca Author: Kevin <morin(a)codelutin.com> Date: Sun May 25 17:55:11 2014 +0200 check if the text recognizer is available. --- .../android/saymytexts/SayMyTextService.java | 12 +++++++-- .../chorem/android/saymytexts/SayMyTextsUtils.java | 24 +++++++++++++++++ .../android/saymytexts/SettingsActivity.java | 30 +++++++++++----------- 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java index 0d701a6..f8abad0 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextService.java +++ b/src/org/chorem/android/saymytexts/SayMyTextService.java @@ -77,7 +77,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList public static final String INTENT_EXTRA_ATTEMPT_NUMBER = "attemptNumber"; /** utterance id when the bluetooth device is connected */ - protected static final String BT_UTTERANCE_ID = "btUtteranceId"; +// protected static final String BT_UTTERANCE_ID = "btUtteranceId"; protected static final String BT_ASK_NEXT_ACTION_UTTERANCE_ID = "btAskNextActionUtteranceId"; protected static final String ASK_NEXT_ACTION_UTTERANCE_ID = "askNextActionUtteranceId"; protected static final String OTHER_UTTERANCE_ID = "oherUtteranceId"; @@ -122,7 +122,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList } }; - BluetoothHeadset mBluetoothHeadset; +// BluetoothHeadset mBluetoothHeadset; @Override public void onCreate() { @@ -197,6 +197,9 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList TelephonyManager tm = (TelephonyManager) getSystemService(TELEPHONY_SERVICE); tm.listen(callStateListener, PhoneStateListener.LISTEN_NONE); textToSpeech.shutdown(); + + SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); + sharedPref.unregisterOnSharedPreferenceChangeListener(this); } @Override @@ -208,6 +211,11 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList public int onStartCommand(Intent intent, int flags, int startId) { int result = super.onStartCommand(intent, flags, startId); + if (!SayMyTextsUtils.checkVoiceRecognition(this)) { + SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); + sharedPref.edit().putBoolean(getString(R.string.preference_enable_interaction_key), false).commit(); + } + if (intent != null) { String action = intent.getAction(); Log.d(TAG, "action " + action); diff --git a/src/org/chorem/android/saymytexts/SayMyTextsUtils.java b/src/org/chorem/android/saymytexts/SayMyTextsUtils.java new file mode 100644 index 0000000..d6adba7 --- /dev/null +++ b/src/org/chorem/android/saymytexts/SayMyTextsUtils.java @@ -0,0 +1,24 @@ +package org.chorem.android.saymytexts; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.speech.RecognizerIntent; + +import java.util.List; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class SayMyTextsUtils { + + public static boolean checkVoiceRecognition(Context context) { + // Check if voice recognition is present + PackageManager pm = context.getPackageManager(); + List<ResolveInfo> activities = pm.queryIntentActivities(new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH), 0); + return activities.size() > 0; + } + +} diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index 4908995..d738a9d 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -30,8 +30,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.database.Cursor; -import android.media.AudioManager; import android.net.Uri; import android.os.Bundle; import android.preference.ListPreference; @@ -39,17 +37,10 @@ import android.preference.Preference; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.preference.SwitchPreference; -import android.speech.RecognitionListener; -import android.speech.RecognizerIntent; -import android.speech.SpeechRecognizer; import android.speech.tts.TextToSpeech; import android.telephony.SmsManager; import android.telephony.TelephonyManager; import android.util.Log; -import android.widget.Toast; - -import java.util.ArrayList; -import java.util.Locale; /** * Activity to set settings @@ -109,8 +100,8 @@ public class SettingsActivity extends Activity { } }); + Context context = getActivity(); try { - Context context = getActivity(); String currentVersion = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName; Preference versionPreference = findPreference(getString(R.string.preference_version_key)); versionPreference.setSummary(currentVersion); @@ -131,8 +122,10 @@ public class SettingsActivity extends Activity { key = getString(R.string.preference_enable_interaction_key); SwitchPreference switchPreference = (SwitchPreference) findPreference(key); - boolean enabled = sharedPref.getBoolean(key, switchPreference.isChecked()); - switchPreference.setChecked(enabled); + boolean enabled = SayMyTextsUtils.checkVoiceRecognition(context); + switchPreference.setEnabled(enabled); + boolean interactionEnabled = enabled && sharedPref.getBoolean(key, switchPreference.isChecked()); + switchPreference.setChecked(interactionEnabled); key = getString(R.string.preference_voice_recognizer_max_attempt_number_key); String maxAttemptValue = sharedPref.getString(key, null); @@ -144,17 +137,24 @@ public class SettingsActivity extends Activity { } Preference preference = findPreference(key); preference.setSummary(String.valueOf(maxAttemptNumber)); - preference.setEnabled(enabled); + preference.setEnabled(interactionEnabled); key = getString(R.string.preference_enable_heisendroid_mode_key); switchPreference = (SwitchPreference) findPreference(key); - enabled = sharedPref.getBoolean(key, switchPreference.isChecked()); - switchPreference.setChecked(enabled); + interactionEnabled = sharedPref.getBoolean(key, switchPreference.isChecked()); + switchPreference.setChecked(interactionEnabled); sharedPref.registerOnSharedPreferenceChangeListener(this); } @Override + public void onDestroy() { + super.onDestroy(); + SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getActivity()); + sharedPref.unregisterOnSharedPreferenceChangeListener(this); + } + + @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { if (getString(R.string.preference_reading_profile_key).equals(key)) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: update scm info (new git repo instead of svn) and description
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 332922e1ebf93b948ce74b76db31d7f597ffdf52 Author: kmorin <morin(a)codelutin.com> Date: Sun May 25 16:43:33 2014 +0200 update scm info (new git repo instead of svn) and description --- pom.xml | 73 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 0efac68..d721b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,9 @@ <name>Say My Texts</name> <description> - Android application which reads out loud the new SMS when the headset is plugged. Very useful when your are riding a bike or running. + Say My Texts is an Android application which reads out loud the SMS you receive. + This is particulary useful when you are riding, running or driving. + You also can reply to the sender by calling him or by dictating the reply. </description> <url>https://forge.chorem.org/projects/say-my-texts</url> <inceptionYear>2014</inceptionYear> @@ -64,14 +66,13 @@ </developers> <scm> - <url>https://svn.chorem.org/say-my-texts</url> - <connection> - scm:svn:https://svn.chorem.org/say-my-texts/trunk - </connection> + <connection>scm:git:https://git.chorem.org/say-my-texts.git</connection> <developerConnection> - scm:svn:https://svn.chorem.org/say-my-texts/trunk + scm:git:https://git.chorem.org/say-my-texts.git </developerConnection> + <url>http://forge.chorem.org/projects/say-my-texts/repository</url> </scm> + <distributionManagement> <site> <id>doc.${platform}</id> @@ -106,35 +107,35 @@ </properties> - <repositories> - <repository> - <id>saymytexts-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/say-my-texts-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>saymytexts-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/say-my-texts-group/</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> +  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  <dependencies> @@ -422,4 +423,4 @@ </profile> </profiles> -</project> +</project> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

10/10: upgrade mavenpom
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit dd09ab3894ea0e1502c135243c69697a98944d54 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed May 14 17:54:15 2014 +0000 upgrade mavenpom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6ed9c4..0efac68 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.5</version> + <version>5.0.6</version> </parent> <groupId>org.chorem.android</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

09/10: add doc + remove widget code (it has been moved to a branch)
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit aed491816871f68621e51c73eb4e69a63f9d8467 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed May 14 17:52:04 2014 +0000 add doc + remove widget code (it has been moved to a branch) --- AndroidManifest.xml | 8 -- res/drawable-hdpi-v14/appwidget_bg_pressed.9.png | Bin 798 -> 0 bytes res/drawable-hdpi-v14/appwidget_dark_bg.9.png | Bin 731 -> 0 bytes .../appwidget_dark_bg_focused.9.png | Bin 856 -> 0 bytes res/drawable-hdpi/appwidget_bg_pressed.9.png | Bin 3098 -> 0 bytes res/drawable-hdpi/appwidget_dark_bg.9.png | Bin 2909 -> 0 bytes res/drawable-hdpi/appwidget_dark_bg_focused.9.png | Bin 3273 -> 0 bytes res/drawable-mdpi-v14/appwidget_bg_pressed.9.png | Bin 502 -> 0 bytes res/drawable-mdpi-v14/appwidget_dark_bg.9.png | Bin 467 -> 0 bytes .../appwidget_dark_bg_focused.9.png | Bin 523 -> 0 bytes res/drawable-mdpi/appwidget_bg_pressed.9.png | Bin 1908 -> 0 bytes res/drawable-mdpi/appwidget_dark_bg.9.png | Bin 1784 -> 0 bytes res/drawable-mdpi/appwidget_dark_bg_focused.9.png | Bin 2040 -> 0 bytes res/drawable-xhdpi-v14/appwidget_bg_pressed.9.png | Bin 1098 -> 0 bytes res/drawable-xhdpi-v14/appwidget_dark_bg.9.png | Bin 1005 -> 0 bytes .../appwidget_dark_bg_focused.9.png | Bin 1135 -> 0 bytes res/drawable/appwidget_dark_bg_clickable.xml | 24 ----- res/layout/say_my_texts_widget.xml | 22 ---- res/values/strings.xml | 2 +- res/xml/say_my_texts_widget_info.xml | 9 -- .../saymytexts/SayMyTextsWidgetProvider.java | 111 --------------------- src/site/fr/rst/dev.rst | 4 +- src/site/fr/rst/index.rst | 6 +- src/site/fr/rst/user.rst | 27 ++++- src/site/rst/dev.rst | 4 +- src/site/rst/index.rst | 6 +- src/site/rst/user.rst | 26 ++++- 27 files changed, 58 insertions(+), 191 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index df9b9ab..36af8fc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -57,13 +57,5 @@ android:finishOnTaskLaunch="true" android:configChanges="orientation|screenSize|keyboardHidden"/> - <receiver android:name=".SayMyTextsWidgetProvider" > - <intent-filter> - <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> - </intent-filter> - <meta-data android:name="android.appwidget.provider" - android:resource="@xml/say_my_texts_widget_info" /> - </receiver> - </application> </manifest> diff --git a/res/drawable-hdpi-v14/appwidget_bg_pressed.9.png b/res/drawable-hdpi-v14/appwidget_bg_pressed.9.png deleted file mode 100644 index efacbcf..0000000 Binary files a/res/drawable-hdpi-v14/appwidget_bg_pressed.9.png and /dev/null differ diff --git a/res/drawable-hdpi-v14/appwidget_dark_bg.9.png b/res/drawable-hdpi-v14/appwidget_dark_bg.9.png deleted file mode 100644 index 02ee440..0000000 Binary files a/res/drawable-hdpi-v14/appwidget_dark_bg.9.png and /dev/null differ diff --git a/res/drawable-hdpi-v14/appwidget_dark_bg_focused.9.png b/res/drawable-hdpi-v14/appwidget_dark_bg_focused.9.png deleted file mode 100644 index ccc0177..0000000 Binary files a/res/drawable-hdpi-v14/appwidget_dark_bg_focused.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_bg_pressed.9.png b/res/drawable-hdpi/appwidget_bg_pressed.9.png deleted file mode 100644 index 03ca2a1..0000000 Binary files a/res/drawable-hdpi/appwidget_bg_pressed.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_dark_bg.9.png b/res/drawable-hdpi/appwidget_dark_bg.9.png deleted file mode 100644 index 3b29eae..0000000 Binary files a/res/drawable-hdpi/appwidget_dark_bg.9.png and /dev/null differ diff --git a/res/drawable-hdpi/appwidget_dark_bg_focused.9.png b/res/drawable-hdpi/appwidget_dark_bg_focused.9.png deleted file mode 100644 index 9fae722..0000000 Binary files a/res/drawable-hdpi/appwidget_dark_bg_focused.9.png and /dev/null differ diff --git a/res/drawable-mdpi-v14/appwidget_bg_pressed.9.png b/res/drawable-mdpi-v14/appwidget_bg_pressed.9.png deleted file mode 100644 index 5c03b8a..0000000 Binary files a/res/drawable-mdpi-v14/appwidget_bg_pressed.9.png and /dev/null differ diff --git a/res/drawable-mdpi-v14/appwidget_dark_bg.9.png b/res/drawable-mdpi-v14/appwidget_dark_bg.9.png deleted file mode 100644 index a245d91..0000000 Binary files a/res/drawable-mdpi-v14/appwidget_dark_bg.9.png and /dev/null differ diff --git a/res/drawable-mdpi-v14/appwidget_dark_bg_focused.9.png b/res/drawable-mdpi-v14/appwidget_dark_bg_focused.9.png deleted file mode 100644 index fa2d682..0000000 Binary files a/res/drawable-mdpi-v14/appwidget_dark_bg_focused.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_bg_pressed.9.png b/res/drawable-mdpi/appwidget_bg_pressed.9.png deleted file mode 100644 index d060b77..0000000 Binary files a/res/drawable-mdpi/appwidget_bg_pressed.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_dark_bg.9.png b/res/drawable-mdpi/appwidget_dark_bg.9.png deleted file mode 100644 index afe41b6..0000000 Binary files a/res/drawable-mdpi/appwidget_dark_bg.9.png and /dev/null differ diff --git a/res/drawable-mdpi/appwidget_dark_bg_focused.9.png b/res/drawable-mdpi/appwidget_dark_bg_focused.9.png deleted file mode 100644 index 8b4ce3f..0000000 Binary files a/res/drawable-mdpi/appwidget_dark_bg_focused.9.png and /dev/null differ diff --git a/res/drawable-xhdpi-v14/appwidget_bg_pressed.9.png b/res/drawable-xhdpi-v14/appwidget_bg_pressed.9.png deleted file mode 100644 index 97a3ba0..0000000 Binary files a/res/drawable-xhdpi-v14/appwidget_bg_pressed.9.png and /dev/null differ diff --git a/res/drawable-xhdpi-v14/appwidget_dark_bg.9.png b/res/drawable-xhdpi-v14/appwidget_dark_bg.9.png deleted file mode 100644 index 7ccb762..0000000 Binary files a/res/drawable-xhdpi-v14/appwidget_dark_bg.9.png and /dev/null differ diff --git a/res/drawable-xhdpi-v14/appwidget_dark_bg_focused.9.png b/res/drawable-xhdpi-v14/appwidget_dark_bg_focused.9.png deleted file mode 100644 index da9289e..0000000 Binary files a/res/drawable-xhdpi-v14/appwidget_dark_bg_focused.9.png and /dev/null differ diff --git a/res/drawable/appwidget_dark_bg_clickable.xml b/res/drawable/appwidget_dark_bg_clickable.xml deleted file mode 100644 index 7cfc9d2..0000000 --- a/res/drawable/appwidget_dark_bg_clickable.xml +++ /dev/null @@ -1,24 +0,0 @@ - - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/appwidget_bg_pressed" android:state_pressed="true" /> - <item android:drawable="@drawable/appwidget_dark_bg_focused" - android:state_focused="true" - android:state_enabled="true" - android:state_window_focused="true" /> - <item android:drawable="@drawable/appwidget_dark_bg" /> -</selector> diff --git a/res/layout/say_my_texts_widget.xml b/res/layout/say_my_texts_widget.xml deleted file mode 100644 index f4c634f..0000000 --- a/res/layout/say_my_texts_widget.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/say_my_texts_widget" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center" - android:padding="2dp" - android:background="@drawable/appwidget_dark_bg_clickable"> - - <ImageView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/logo_small"/> - - <ImageView android:id="@+id/say_my_texts_widget_onoff_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="2dp" - android:layout_marginBottom="2dp"/> - -</LinearLayout> \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index f67cb39..ed08936 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -36,7 +36,7 @@ <string name="send_sms_confirmation">You dictated: %s. Would you like to confirm, modify ou cancel?</string> <string name="call_action">call</string> - <string name="answer_action">answer</string> + <string name="answer_action">reply</string> <string name="quit_action">nothing</string> <string name="confirm_action">confirm</string> diff --git a/res/xml/say_my_texts_widget_info.xml b/res/xml/say_my_texts_widget_info.xml deleted file mode 100644 index c8bd497..0000000 --- a/res/xml/say_my_texts_widget_info.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" - android:minWidth="40dp" - android:minHeight="40dp" - android:updatePeriodMillis="0" - android:initialLayout="@layout/say_my_texts_widget" - android:resizeMode="none"> -</appwidget-provider> \ No newline at end of file diff --git a/src/org/chorem/android/saymytexts/SayMyTextsWidgetProvider.java b/src/org/chorem/android/saymytexts/SayMyTextsWidgetProvider.java deleted file mode 100644 index 16bd523..0000000 --- a/src/org/chorem/android/saymytexts/SayMyTextsWidgetProvider.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.chorem.android.saymytexts; - -/* - * #%L - * Say My Texts - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2014 Code Lutin - * %% - * 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 - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import android.app.PendingIntent; -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProvider; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.util.Log; -import android.widget.RemoteViews; - -/** - * @author Kevin Morin (Code Lutin) - * @since x.x - */ -public class SayMyTextsWidgetProvider extends AppWidgetProvider { - - private static final String TAG = "SayMyTextsWidgetProvider"; - - protected static final String CLICK_ACTION = "org.chorem.android.saymytexts.action.APPWIDGET_CLICKED"; - - @Override - public void onUpdate(final Context context, final AppWidgetManager appWidgetManager, int[] appWidgetIds) { - final int N = appWidgetIds.length; - - // Perform this loop procedure for each App Widget that belongs to this provider - for (int i = 0; i < N; i++) { - final int appWidgetId = appWidgetIds[i]; - - // Create an Intent to call this onReceive method - Intent intent = new Intent(context, getClass()); - intent.setAction(CLICK_ACTION); - PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, 0); - - // Get the layout for the App Widget and attach an on-click listener - // to the button - RemoteViews views = updateButtonState(context); - views.setOnClickPendingIntent(R.id.say_my_texts_widget, pendingIntent); - - //TODO - PreferenceManager.getDefaultSharedPreferences(context) - .registerOnSharedPreferenceChangeListener(new SharedPreferences.OnSharedPreferenceChangeListener() { - @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { -// String enableReadingKey = context.getString(R.string.preference_enable_reading_key); -// if (key.equals(enableReadingKey)) { -// RemoteViews views = updateButtonState(context); -// appWidgetManager.updateAppWidget(appWidgetId, views); -// } - } - }); - - // Tell the AppWidgetManager to perform an update on the current app widget - appWidgetManager.updateAppWidget(appWidgetId, views); - } - } - - @Override - public void onReceive(Context context, Intent intent) { - super.onReceive(context, intent); - Log.d(TAG, "on receive " + intent.getAction()); - if (CLICK_ACTION.equals(intent.getAction())) { - SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context); -// String key = context.getString(R.string.preference_enable_reading_key); -// boolean enabled = sharedPref.getBoolean(key, true); -// Log.d(TAG, "enabled " + enabled); -// sharedPref.edit().putBoolean(key, !enabled).commit(); - } - } - - protected RemoteViews updateButtonState(Context context) { - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); -// String key = context.getString(R.string.preference_enable_reading_key); -// -// boolean enabled = sharedPreferences.getBoolean(key, true); -// int drawableId = enabled ? -// android.R.drawable.button_onoff_indicator_on : -// android.R.drawable.button_onoff_indicator_off; -// -// RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.say_my_texts_widget); -// views.setImageViewResource(R.id.say_my_texts_widget_onoff_icon, drawableId); - -// return views; - return null; - } -} diff --git a/src/site/fr/rst/dev.rst b/src/site/fr/rst/dev.rst index 8f97972..b41c186 100644 --- a/src/site/fr/rst/dev.rst +++ b/src/site/fr/rst/dev.rst @@ -27,7 +27,9 @@ Documentation développeur L'application est composée : -- d'un service qui lit les SMS à voix haute +- d'un service qui lit les SMS à voix haute et gère les commandes vocales - d'une activité de configuration - d'un *BroadcastReceiver* qui reçoit les SMS et écoute les connexions bluetooth +- d'un *BroadcastReceiver* qui reçoit les commandes vocales +- d'un *BroadcastReceiver* qui reçoit le texte dicté en réponse - d'une application pour configurer le rapporteur de plantage \ No newline at end of file diff --git a/src/site/fr/rst/index.rst b/src/site/fr/rst/index.rst index 02edd02..b37729c 100644 --- a/src/site/fr/rst/index.rst +++ b/src/site/fr/rst/index.rst @@ -25,6 +25,6 @@ Bienvenue sur le site de Say My Texts ##################################### -Say My Texts est une application Android qui permet de lire à haute voix les SMS que vous recevez -quand des écouteurs sont branchés ou que le téléphone est connecté à un kit mains-libres bluetooth. -Ceci est particulièrement utile en vélo, quand on court ou en voiture. \ No newline at end of file +Say My Texts est une application Android qui permet de lire à haute voix les SMS que vous recevez. +Ceci est particulièrement utile en vélo, quand on court ou en voiture. +Vous pouvez également répondre à l'expéditeur soit en l'appelant soit en dictant la réponse. \ No newline at end of file diff --git a/src/site/fr/rst/user.rst b/src/site/fr/rst/user.rst index df21573..5059090 100644 --- a/src/site/fr/rst/user.rst +++ b/src/site/fr/rst/user.rst @@ -52,6 +52,10 @@ L'application a besoin des permissions suivantes : pour trouver le nom du contact à partir du numéro de l'envoyeur :BLUETOOTH: pour accéder aux appareils bluetooth connectés +:RECORD_AUDIO: + pour les commandes vocales et dicter la réponse +:CALL_PHONE: + pour rappeler l'expéditeur Configuration ~~~~~~~~~~~~~ @@ -59,7 +63,9 @@ Configuration Le lancement de l'application depuis le menu ouvre la configuration de l'application. Vous pouvez : -- activer ou désactiver la lecture +- activer ou désactiver la lecture en fonction du branchement ou non d'un casque ou de la connexion d'un appareil bluetooth +- activer l'intéraction à la réception d'un message +- si l'intéraction est activée, vous pouvez choisir le nombre d'essais de reconnaissance des commandes vocales (3 par défaut) - activer ou désactiver le `mode Heisendroid`_. - vous envoyer un SMS pour tester la lecture @@ -75,7 +81,20 @@ et suivie de "*You're goddamn right!*". Il s'agit là aussi d'une référence à .. _mode Heisendroid: #Mode_Heisendroid -Widget -~~~~~~ +Intéractions +~~~~~~~~~~~~ + +Si l'intéraction est activée, lorsque vous recevez un SMS, l'application vous propose 3 possibilités : + +- appeler l'expéditeur (dîtes "appeler") +- répondre par SMS en dictant la réponse (dîtes "répondre") +- ne rien faire (dîtes "rien") + +Si vous choisissez de répondre par SMS, vous devrez alors dicter la réponse. L'application vous énoncera ce qu'elle a compris. +Vous pourrez alors : + +- confirmer et envoyer la réponse (dîtes "confirmer") +- redicter le SMS (dîtes "corriger") +- annuler la réponse et quitter (dîtes "annuler") -Le widget vous permet d'activer ou désactiver la lecture depuis l'écran d'accueil. \ No newline at end of file +Si l'application ne comprend pas ce que vous avez dit (ce qui arrive malheureusement), elle vous demandera de répéter. \ No newline at end of file diff --git a/src/site/rst/dev.rst b/src/site/rst/dev.rst index a29e401..e041486 100644 --- a/src/site/rst/dev.rst +++ b/src/site/rst/dev.rst @@ -27,7 +27,9 @@ Developer documentation The application is composed of: -- a service which reads the SMS out loud +- a service which reads the SMS out loud and manage the vocal commands - an activity for the settings - a *BroadcastReceiver* which receives the SMS and listens to the bluetooth connections +- a *BroadcastReceiver* which receives the vocal commands +- a *BroadcastReceiver* which receives the dictated reply - an application to setup the crash report \ No newline at end of file diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 152c1f8..49c8d35 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -25,6 +25,6 @@ Welcome to Say My Texts website ############################### -Say My Texts is an Android application which reads out loud the SMS you receive while a headset is plugged -or a bluetooth handfree is connected. -This is particulary useful when you are riding, running or driving. \ No newline at end of file +Say My Texts is an Android application which reads out loud the SMS you receive. +This is particulary useful when you are riding, running or driving. +You also can reply to the sender by calling him or by dictating the reply. \ No newline at end of file diff --git a/src/site/rst/user.rst b/src/site/rst/user.rst index a80cc71..62b1c6f 100644 --- a/src/site/rst/user.rst +++ b/src/site/rst/user.rst @@ -47,6 +47,10 @@ The application needs the following permissions: :MODIFY_AUDIO_SETTINGS: the voice synthetizer needs it :READ_CONTACTS: to match the phone number of the sender with the contact name :BLUETOOTH: to get the connected devices +:RECORD_AUDIO: + pour les commandes vocales et dicter la réponse +:CALL_PHONE: + pour rappeler l'expéditeur Settings @@ -55,7 +59,9 @@ Settings When you launch the application from the menu, the settings open. You can: -- enable or disable the reading +- enable or disable the reading depending if a headset is plugged or not or if a bluetooth device is connected +- enable or disable the interaction with the received messages +- if the interaction is enabled, you can configure the maximum number of tries to understand the vocal commands (3 by default) - enable or disable the `Heisendroid mode`_. - send a SMS to yourself to test the reading @@ -71,8 +77,20 @@ and followed by "*You're goddamn right!*". It is also a reference to one of the .. _Heisendroid mode: #Heisendroid_mode +Interactions +~~~~~~~~~~~~ + +If the interaction is on, when you receive an SMS, the app offers you 3 choices: + +- call the sender (say "call") +- reply by SMS by dictating the message (say "repy") +- do nothing (say "nothing") + +If you choose to reply by SMS, you can then dictate the message. The application will tell what it understands. +You can then: -Widget -~~~~~~ +- confirm and send the reply (say "confirm") +- dictate the text again (say "modify") +- cancel the reply and quit (say "cancel") -The widget permits you to enable or disable the reading from the home screen. \ No newline at end of file +If the app does not understand what you said (it happens), you will be asked to repeat. \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

08/10: add rotation management
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 4ebccb5bab434a240e85faad0d8223a2734e87db Author: Kevin Morin <morin(a)codelutin.com> Date: Thu May 8 20:46:31 2014 +0000 add rotation management --- AndroidManifest.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f9d8f06..df9b9ab 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -29,7 +29,8 @@ <activity android:name=".SettingsActivity" android:label="@string/app_name" - android:launchMode="singleTop"> + android:launchMode="singleTop" + android:configChanges="orientation|screenSize|keyboardHidden"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> @@ -53,7 +54,8 @@ android:theme="@android:style/Theme.Holo.Dialog" android:launchMode="singleInstance" android:excludeFromRecents="true" - android:finishOnTaskLaunch="true" /> + android:finishOnTaskLaunch="true" + android:configChanges="orientation|screenSize|keyboardHidden"/> <receiver android:name=".SayMyTextsWidgetProvider" > <intent-filter> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

07/10: improve preferences + add max number of attempts in the preferences
by chorem.org scm 25 May '14

25 May '14

This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit a8d3d8df4b681cc001f1c89fceed01ee17214e0d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu May 1 17:28:26 2014 +0000 improve preferences + add max number of attempts in the preferences --- res/values-fr/strings.xml | 5 +- res/values/preference_keys.xml | 1 + res/values/strings.xml | 5 +- res/xml/preferences.xml | 8 +- .../android/saymytexts/SayMyTextService.java | 119 +++++++++++---------- .../android/saymytexts/SettingsActivity.java | 45 ++++++-- 6 files changed, 110 insertions(+), 73 deletions(-) diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 6bb82b6..ef69b45 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -9,6 +9,7 @@ <string name="preferences_settings_label">Paramètres</string> <string name="preference_reading_profile_label">Lecture des SMS</string> <string name="preference_enable_interaction_label">Intéraction (appel ou réponse)</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Nombre maximum d\'essais</string> <string name="preference_enable_heisendroid_mode_label">Mode Heisendroid</string> <string name="preference_test_sms_label">Tester en m\'envoyant un SMS</string> <string name="test_sms_content">Heisendroïd</string> @@ -29,13 +30,13 @@ <string name="crash_dialog_ok_toast">Merci !</string>  - <string name="ask_next_action">Que voulez-vous faire ? Appeler, répondre ou quitter ?</string> + <string name="ask_next_action">Que voulez-vous faire ? Appeler, répondre ou rien ?</string> <string name="dictate_sms">Dictez votre réponse</string> <string name="send_sms_confirmation">Vous avez dicté : %s. Voulez-vous confirmer, corriger ou annuler ?</string> <string name="call_action">appeler</string> <string name="answer_action">répondre</string> - <string name="quit_action">quitter</string> + <string name="quit_action">rien</string> <string name="confirm_action">confirmer</string> <string name="modifiy_action">corriger</string> diff --git a/res/values/preference_keys.xml b/res/values/preference_keys.xml index 379b53c..43006d2 100644 --- a/res/values/preference_keys.xml +++ b/res/values/preference_keys.xml @@ -3,6 +3,7 @@ <string name="preference_reading_profile_key">reading_profile</string> <string name="preference_enable_interaction_key">enable_interaction</string> <string name="preference_enable_heisendroid_mode_key">enable_heisendroid_mode</string> + <string name="preference_voice_recognizer_max_attempt_number_key">preference_voice_recognizer_max_attempt_number</string> <string name="preference_test_sms_key">test_sms</string> <string name="preference_version_key">version</string> <string name="preference_documentation_key">documentation</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0410b73..f67cb39 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9,6 +9,7 @@ <string name="preferences_settings_label">Settings</string> <string name="preference_reading_profile_label">SMS reading</string> <string name="preference_enable_interaction_label">Interaction (call or answer)</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Maximum attempt number</string> <string name="preference_enable_heisendroid_mode_label">Heisendroid mode</string> <string name="preference_test_sms_label">Test by sending an SMS to myself</string> <string name="test_sms_content">Heisendroïd</string> @@ -30,13 +31,13 @@ <string name="crash_dialog_ok_toast">Thank you !</string>  - <string name="ask_next_action">What would you like to do? Call, answer or quit?</string> + <string name="ask_next_action">What would you like to do? Call, answer or nothing?</string> <string name="dictate_sms">Dictate your answer</string> <string name="send_sms_confirmation">You dictated: %s. Would you like to confirm, modify ou cancel?</string> <string name="call_action">call</string> <string name="answer_action">answer</string> - <string name="quit_action">quit</string> + <string name="quit_action">nothing</string> <string name="confirm_action">confirm</string> <string name="modifiy_action">modify</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index d3bad81..1afb239 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -10,14 +10,18 @@ android:entryValues="@array/preferences_reading_profile_values" android:defaultValue="anyDeviceConnected"/> - <SwitchPreference android:key="@string/preference_enable_interaction_key" android:title="@string/preference_enable_interaction_label" android:defaultValue="true" /> + <EditTextPreference android:key="@string/preference_voice_recognizer_max_attempt_number_key" + android:title="@string/preference_voice_recognizer_max_attempt_number_label" + android:defaultValue="3" + android:numeric="integer"/> + <SwitchPreference android:key="@string/preference_enable_heisendroid_mode_key" android:title="@string/preference_enable_heisendroid_mode_label" - android:defaultValue="false" /> + android:defaultValue="false"/> <Preference android:key="@string/preference_test_sms_key" android:title="@string/preference_test_sms_label" diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java index acca74a..0d701a6 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextService.java +++ b/src/org/chorem/android/saymytexts/SayMyTextService.java @@ -54,7 +54,7 @@ import java.util.Map; * @author Kevin Morin (Code Lutin) * @since 1.0 */ -public class SayMyTextService extends Service implements TextToSpeech.OnInitListener { +public class SayMyTextService extends Service implements TextToSpeech.OnInitListener, SharedPreferences.OnSharedPreferenceChangeListener { private static final String TAG = "SayMyTextService"; @@ -82,6 +82,14 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList protected static final String ASK_NEXT_ACTION_UTTERANCE_ID = "askNextActionUtteranceId"; protected static final String OTHER_UTTERANCE_ID = "oherUtteranceId"; + protected int maxAttemptNumber; + + protected String readingProfile; + + protected boolean heisendroidModeEnabled; + + protected boolean interactionEnabled; + protected AudioManager audioManager; /** null if the texttospeech is not initialized */ @@ -133,6 +141,27 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList intentFilter = new IntentFilter(DictateSmsBroadcastReceiver.ACTION_DICTATE_SMS); registerReceiver(new DictateSmsBroadcastReceiver(), intentFilter); + SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); + String key = getString(R.string.preference_voice_recognizer_max_attempt_number_key); + String maxAttemptValue = sharedPref.getString(key, null); + try { + maxAttemptNumber = Integer.parseInt(maxAttemptValue); + } catch (NumberFormatException e) { + maxAttemptNumber = 3; + } + + String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); + String readingProfileKey = getString(R.string.preference_reading_profile_key); + readingProfile = sharedPref.getString(readingProfileKey, readingProfileValues[0]); + + String heisendroidModeEnabledKey = getString(R.string.preference_enable_heisendroid_mode_key); + heisendroidModeEnabled = sharedPref.getBoolean(heisendroidModeEnabledKey, true); + + String interactionPrefKey = getString(R.string.preference_enable_interaction_key); + interactionEnabled = sharedPref.getBoolean(interactionPrefKey, true); + + sharedPref.registerOnSharedPreferenceChangeListener(this); + //// Get the default adapter // final BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); // @@ -179,11 +208,6 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList public int onStartCommand(Intent intent, int flags, int startId) { int result = super.onStartCommand(intent, flags, startId); - SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); - String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); - String readingProfileKey = getString(R.string.preference_reading_profile_key); - String readingProfile = sharedPref.getString(readingProfileKey, readingProfileValues[0]); - if (intent != null) { String action = intent.getAction(); Log.d(TAG, "action " + action); @@ -211,39 +235,13 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList break; case ACTION_DICTATE_SMS: -// if (bluetoothDevices.isEmpty()) { - dictateSMS(sms, attemptNumber + 1); -// } else { -// requestBluetoothSpeakingActivation(new Function<Void, Void>() { -// @Override -// public Void apply(Void input) { -// dictateSMS(sms); -// return null; -// } -// }); -// } + dictateSMS(sms, attemptNumber + 1); break; case ACTION_CONFIRM_SMS_SENDING: // if a message has just been dictated final String dictatedMessage = intent.getStringExtra(INTENT_EXTRA_DICTATED_MESSAGE); -// if (!bluetoothDevices.isEmpty()) { -// registerReceiver(new BroadcastReceiver() { -// @Override -// public void onReceive(Context context, Intent intent) { -// int state = intent.getExtras().getInt(AudioManager.EXTRA_SCO_AUDIO_STATE); -// if (state == AudioManager.SCO_AUDIO_STATE_CONNECTED) { -// context.unregisterReceiver(this); -// askSendingConfirmation(dictatedMessage, sms); -// } -// } -// }, new IntentFilter(AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED)); -// audioManager.setMode(AudioManager.MODE_IN_CALL); -// audioManager.startBluetoothSco(); -// -// } else { - askSendingConfirmation(dictatedMessage, sms, ++attemptNumber); -// } + askSendingConfirmation(dictatedMessage, sms, ++attemptNumber); break; case ACTION_READ_NEXT_SMS: @@ -252,8 +250,8 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList default: boolean readingEnabled; + String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); if (readingProfileValues[0].equals(readingProfile)) { - //TODO set speaker on readingEnabled = true; } else if (readingProfileValues[1].equals(readingProfile)) { @@ -382,11 +380,6 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList // disable the reading of the nexts sms while reading the current one setCanSpeak(false); - SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); - String heisendroidModeEnabledKey = getString(R.string.preference_enable_heisendroid_mode_key); - boolean heisendroidModeEnabled = sharedPref.getBoolean(heisendroidModeEnabledKey, true); - - textToSpeech.setOnUtteranceProgressListener(new UtteranceProgressListener() { @Override public void onStart(String utteranceId) { @@ -406,12 +399,6 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList HashMap<String, String> params = new HashMap<>(); params.put(TextToSpeech.Engine.KEY_PARAM_STREAM, String.valueOf(AudioManager.STREAM_VOICE_CALL)); -// if (btConnected) { -// params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, BT_UTTERANCE_ID); -// } - - String interactionPrefKey = getString(R.string.preference_enable_interaction_key); - boolean interaction = sharedPref.getBoolean(interactionPrefKey, true); if (heisendroidModeEnabled) { textToSpeech.setLanguage(Locale.US); @@ -420,7 +407,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList textToSpeech.speak("Say my text.", TextToSpeech.QUEUE_ADD, params); } - if (!interaction && !heisendroidModeEnabled) { + if (!interactionEnabled && !heisendroidModeEnabled) { params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, OTHER_UTTERANCE_ID); } textToSpeech.setLanguage(Locale.getDefault()); @@ -430,7 +417,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList textToSpeech.speak(text, TextToSpeech.QUEUE_ADD, params); if (heisendroidModeEnabled) { - if (interaction) { + if (interactionEnabled) { params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, OTHER_UTTERANCE_ID); } textToSpeech.setLanguage(Locale.US); @@ -439,7 +426,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList textToSpeech.speak("You're goddamn right.", TextToSpeech.QUEUE_ADD, params); } - if (interaction) { + if (interactionEnabled) { askForActionAfterReading(sms, btConnected, 1); } } @@ -457,12 +444,6 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList @Override public void onDone(String utteranceId) { -// if (BT_UTTERANCE_ID.equals(utteranceId)) { -// // when the text has been read by the bluetooth device, stop the connection -// audioManager.stopBluetoothSco(); -// audioManager.setMode(AudioManager.MODE_NORMAL); -// } - if (ASK_NEXT_ACTION_UTTERANCE_ID.equals(utteranceId) || BT_ASK_NEXT_ACTION_UTTERANCE_ID.equals(utteranceId)) { Intent sayaction = new Intent(SayNextActionBroadcastReceiver.ACTION_SAY_NEXT_ACTION); @@ -486,7 +467,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList textToSpeech.speak(getString(R.string.voice_not_recognized), TextToSpeech.QUEUE_ADD, params); } - if (attemptNumber <= 3) { + if (attemptNumber <= maxAttemptNumber) { params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, btConnected ? BT_ASK_NEXT_ACTION_UTTERANCE_ID : ASK_NEXT_ACTION_UTTERANCE_ID); textToSpeech.speak(getString(R.string.ask_next_action), TextToSpeech.QUEUE_ADD, params); @@ -525,7 +506,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList textToSpeech.speak(getString(R.string.voice_not_recognized), TextToSpeech.QUEUE_ADD, params); } - if (attemptNumber <= 3) { + if (attemptNumber <= maxAttemptNumber) { params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, OTHER_UTTERANCE_ID); textToSpeech.setLanguage(Locale.getDefault()); textToSpeech.setSpeechRate(1f); @@ -573,7 +554,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList textToSpeech.speak(getString(R.string.voice_not_recognized), TextToSpeech.QUEUE_ADD, params); } - if (attemptNumber <= 3) { + if (attemptNumber <= maxAttemptNumber) { params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, OTHER_UTTERANCE_ID); String text = getString(R.string.send_sms_confirmation, message); textToSpeech.speak(text, TextToSpeech.QUEUE_ADD, params); @@ -584,4 +565,26 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList } + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { + if (key.equals(getString(R.string.preference_voice_recognizer_max_attempt_number_key))) { + String maxAttemptValue = sharedPreferences.getString(key, null); + try { + maxAttemptNumber = Integer.parseInt(maxAttemptValue); + } catch (NumberFormatException e) { + maxAttemptNumber = 3; + } + + } else if (key.equals(getString(R.string.preference_reading_profile_key))) { + String[] readingProfileValues = + getResources().getStringArray(R.array.preferences_reading_profile_values); + readingProfile = sharedPreferences.getString(key, readingProfileValues[0]); + + } else if (key.equals(getString(R.string.preference_enable_heisendroid_mode_key))) { + heisendroidModeEnabled = sharedPreferences.getBoolean(key, true); + + } else if (key.equals(getString(R.string.preference_enable_interaction_key))) { + interactionEnabled = sharedPreferences.getBoolean(key, true); + } + } } diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index aeaf63f..4908995 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -122,24 +122,30 @@ public class SettingsActivity extends Activity { addWebsitePreferenceClickListener(R.string.preference_documentation_key); addWebsitePreferenceClickListener(R.string.preference_issue_tracker_key); - } - - @Override - public void onResume() { - super.onResume(); - SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getActivity()); String key = getString(R.string.preference_reading_profile_key); - ListPreference preference = (ListPreference) findPreference(key); - CharSequence summary = preference.getEntry(); - preference.setSummary(summary); + ListPreference listPreference = (ListPreference) findPreference(key); + CharSequence summary = listPreference.getEntry(); + listPreference.setSummary(summary); key = getString(R.string.preference_enable_interaction_key); SwitchPreference switchPreference = (SwitchPreference) findPreference(key); boolean enabled = sharedPref.getBoolean(key, switchPreference.isChecked()); switchPreference.setChecked(enabled); + key = getString(R.string.preference_voice_recognizer_max_attempt_number_key); + String maxAttemptValue = sharedPref.getString(key, null); + int maxAttemptNumber; + try { + maxAttemptNumber = Integer.parseInt(maxAttemptValue); + } catch (NumberFormatException e) { + maxAttemptNumber = 3; + } + Preference preference = findPreference(key); + preference.setSummary(String.valueOf(maxAttemptNumber)); + preference.setEnabled(enabled); + key = getString(R.string.preference_enable_heisendroid_mode_key); switchPreference = (SwitchPreference) findPreference(key); enabled = sharedPref.getBoolean(key, switchPreference.isChecked()); @@ -155,6 +161,27 @@ public class SettingsActivity extends Activity { ListPreference preference = (ListPreference) findPreference(key); CharSequence summary = preference.getEntry(); preference.setSummary(summary); + + } else if (getString(R.string.preference_enable_interaction_key).equals(key)) { + SwitchPreference switchPreference = (SwitchPreference) findPreference(key); + boolean enabled = sharedPreferences.getBoolean(key, switchPreference.isChecked()); + switchPreference.setChecked(enabled); + findPreference(getString(R.string.preference_voice_recognizer_max_attempt_number_key)).setEnabled(enabled); + + } else if (getString(R.string.preference_voice_recognizer_max_attempt_number_key).equals(key)) { + String maxAttemptValue = sharedPreferences.getString(key, null); + int maxAttemptNumber; + try { + maxAttemptNumber = Integer.parseInt(maxAttemptValue); + } catch (NumberFormatException e) { + maxAttemptNumber = 3; + } + findPreference(key).setSummary(String.valueOf(maxAttemptNumber)); + + } else if (getString(R.string.preference_enable_heisendroid_mode_key).equals(key)) { + SwitchPreference switchPreference = (SwitchPreference) findPreference(key); + boolean enabled = sharedPreferences.getBoolean(key, switchPreference.isChecked()); + switchPreference.setChecked(enabled); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0