Initial implementation of the deactivation of mic only during TTS in WalkieTalkie mode, initial improvements of the manual TTS implementation, fixed some language identification bugs, improved handling of meta text in walkieTalkie mode (previously if the result in a language contained meta text (e.g. [speaking italian]) it was considered and processed as normal text for language recognition)

Author: niedev

app/src/main/java/nie/translator/rtranslator/tools/ImageActivity.java

@@ -53,13 +53,13 @@ protected void onStart() {
         messages.add(new GuiMessage(new Message(this, new Peer(null, "Carlos11", true), "m", "Je vais bien"), false, true));
         messages.add(new GuiMessage(new Message(this, "m", "Moi aussi"), true, true));*/
 
-        mAdapter = new MessagesAdapter(messages, this.getApplication(), new MessagesAdapter.Callback() {
+        mAdapter = new MessagesAdapter(messages, this.getApplication(),  -1, new MessagesAdapter.Callback() {
             @Override
             public void onFirstItemAdded() {
                 mRecyclerView.setVisibility(View.VISIBLE);
             }
             @Override
-            public void onPlayAudio(GuiMessage message, android.widget.ImageView icon) {
+            public void onTTSButtonClick(GuiMessage message, boolean play) {
                 // Do nothing for ImageActivity
             }
         });

app/src/main/java/nie/translator/rtranslator/tools/gui/ButtonMic.java

@@ -281,7 +281,7 @@ public void onAnimationEnd() {
     private Animator updateVolumeLevel(float volumeLevel, CustomAnimator.EndListener listener){
         if(leftLine != null && centerLine != null && rightLine != null && leftLine.getVisibility() == VISIBLE && centerLine.getVisibility() == VISIBLE && rightLine.getVisibility() == VISIBLE && volumeLevel > 0) {
             int duration_ms = 70;
-            Log.d("volume", "volume: " + volumeLevel);
+            //Log.d("volume", "volume: " + volumeLevel);
             float maxLengthLeft = Tools.convertDpToPixels(context, MAX_LENGTH_LEFT_LINE_DP);
             float maxLengthCenter = Tools.convertDpToPixels(context, MAX_LENGTH_CENTER_LINE_DP);
             float maxLengthRight = Tools.convertDpToPixels(context, MAX_LENGTH_RIGHT_LINE_DP);

app/src/main/java/nie/translator/rtranslator/tools/gui/messages/MessagesAdapter.java

@@ -22,6 +22,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -32,7 +33,6 @@
 
 import java.util.ArrayList;
 
-import nie.translator.rtranslator.Global;
 import nie.translator.rtranslator.R;
 
 /** Is used to connect to the RecycleView, which functions as a ListView, a list of strings, which will be inserted in the ViewHolder layout and this will be inserted in the list**/
@@ -42,11 +42,13 @@ public class MessagesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     //private static final int PREVIEW = 2;
     private ArrayList<GuiMessage> mResults = new ArrayList<>();
     private Callback callback;
+    private long playingMessageID = -1;
 
     private static boolean showOriginalTranscriptionMsg;
 
-    public MessagesAdapter(ArrayList<GuiMessage> messages, Application application, @NonNull Callback callback) {
+    public MessagesAdapter(ArrayList<GuiMessage> messages, Application application, long playingMessageID, @NonNull Callback callback) {
         this.callback = callback;
+        this.playingMessageID = playingMessageID;
         if (messages != null) {
             if (messages.size() > 0) {
                 callback.onFirstItemAdded();
@@ -74,12 +76,17 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
         if (holder instanceof MessageHolder) {
             final GuiMessage message = mResults.get(position);
             if (holder instanceof ReceivedHolder && message.getMessage().getSender() != null) {
-                ((ReceivedHolder) holder).text.setVisibility(View.GONE);
+                ((ReceivedHolder) holder).containerNoSender.setVisibility(View.GONE);
                 ((ReceivedHolder) holder).containerSender.setVisibility(View.VISIBLE);
                 ((ReceivedHolder) holder).sender.setText(message.getMessage().getSender().getName());
                 Log.d("recyclerview", "RecyclerView bind sender");
             }
             ((MessageHolder) holder).setText(message.getMessage().getTextToTranslate(), message.getMessage().getText());
+            if(message.getMessageID() == playingMessageID){
+                ((MessageHolder) holder).setIsPlayingTTS(true);
+            }else{
+                ((MessageHolder) holder).setIsPlayingTTS(false);
+            }
             Log.d("recyclerview", "RecyclerView bind text");
             //holder.itemView.requestLayout();
 
@@ -88,7 +95,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                 @Override
                 public void onClick(View v) {
                     if (callback != null && v instanceof android.widget.ImageView) {
-                        callback.onPlayAudio(message, (android.widget.ImageView) v);
+                        boolean play = false;
+                        if(playingMessageID != message.getMessageID()) play = true;
+                        callback.onTTSButtonClick(message, play);
                     }
                 }
             };
@@ -178,25 +187,51 @@ public ArrayList<GuiMessage> getMessages() {
         return mResults;
     }
 
+    public long getPlayingMessageID() {
+        return playingMessageID;
+    }
+
+    public void setPlayingMessageID(long playingMessageID) {
+        long oldPlayingMessageId = this.playingMessageID;
+        this.playingMessageID = playingMessageID;
+        if(oldPlayingMessageId != playingMessageID){
+            if(oldPlayingMessageId != -1) {
+                int index = getMessageIndex(oldPlayingMessageId);
+                notifyItemChanged(index);
+            }
+            if(playingMessageID != -1){
+                int index = getMessageIndex(playingMessageID);
+                notifyItemChanged(index);
+                //todo: I can insert a scroll to the playing message here
+            }
+        }
+    }
+
     /** The layout for each item in the RecicleView list*/
     private static class ReceivedHolder extends RecyclerView.ViewHolder implements MessageHolder {
         TextView originalTextToBeTranslated;
         TextView text;
+        LinearLayout containerNoSender;
         LinearLayout containerSender;
         TextView textSender;
         TextView sender;
+        ImageView ttsButton;
+        ImageView ttsButton2;
 
         ReceivedHolder(LayoutInflater inflater, ViewGroup parent) {
             super(inflater.inflate(R.layout.component_message_received, parent, false));
             originalTextToBeTranslated = itemView.findViewById(R.id.original_text_to_be_translated);
             if (!showOriginalTranscriptionMsg) {
                 originalTextToBeTranslated.setVisibility(View.GONE);
             }
+            containerNoSender = itemView.findViewById(R.id.no_sender_container);
             text = itemView.findViewById(R.id.text_content);
+            ttsButton = itemView.findViewById(R.id.tts_button_content);
 
             containerSender = itemView.findViewById(R.id.sender_container);
             textSender = itemView.findViewById(R.id.text_content2);
             sender = itemView.findViewById(R.id.text_sender);
+            ttsButton2 = itemView.findViewById(R.id.tts_button_content2);
         }
 
         @Override
@@ -205,13 +240,34 @@ public void setText(String originalTextToBeTranslated, String text) {
             this.originalTextToBeTranslated.setText(originalTextToBeTranslated);
             this.text.setText(text);
         }
+
+        @Override
+        public boolean isPlayingTTS() {
+            return ((int) ttsButton.getTag() == R.drawable.stop_icon);
+        }
+
+        @Override
+        public void setIsPlayingTTS(boolean playingTTS) {
+            if(playingTTS) {
+                ttsButton.setImageResource(R.drawable.stop_icon);
+                ttsButton.setTag(R.drawable.stop_icon);
+                ttsButton2.setImageResource(R.drawable.stop_icon);
+                ttsButton2.setTag(R.drawable.stop_icon);
+            }else{
+                ttsButton.setImageResource(R.drawable.sound_icon);
+                ttsButton.setTag(R.drawable.sound_icon);
+                ttsButton2.setImageResource(R.drawable.stop_icon);
+                ttsButton2.setTag(R.drawable.stop_icon);
+            }
+        }
     }
 
     /** The layout for each item in the RecicleView list*/
     private static class SendHolder extends RecyclerView.ViewHolder implements MessageHolder {
         TextView originalTextToBeTranslated;
         TextView text;
         CardView card;
+        ImageView ttsButton;
 
         SendHolder(LayoutInflater inflater, ViewGroup parent) {
             super(inflater.inflate(R.layout.component_message_send, parent, false));
@@ -221,21 +277,40 @@ private static class SendHolder extends RecyclerView.ViewHolder implements Messa
             }
             text = itemView.findViewById(R.id.text);
             card = itemView.findViewById(R.id.card);
+            ttsButton = itemView.findViewById(R.id.tts_button);
         }
 
         @Override
         public void setText(String originalTextToBeTranslated, String text) {
             this.originalTextToBeTranslated.setText(originalTextToBeTranslated);
             this.text.setText(text);
         }
+
+        @Override
+        public boolean isPlayingTTS() {
+            return ((int) ttsButton.getTag() == R.drawable.stop_icon);
+        }
+
+        @Override
+        public void setIsPlayingTTS(boolean playingTTS) {
+            if(playingTTS) {
+                ttsButton.setImageResource(R.drawable.stop_icon);
+                ttsButton.setTag(R.drawable.stop_icon);
+            }else{
+                ttsButton.setImageResource(R.drawable.sound_icon);
+                ttsButton.setTag(R.drawable.sound_icon);
+            }
+        }
     }
 
     interface MessageHolder {
         void setText(String originalTextToBeTranslated, String text);
+        boolean isPlayingTTS();
+        void setIsPlayingTTS(boolean playingTTS);
     }
 
     public interface Callback {
         void onFirstItemAdded();
-        void onPlayAudio(GuiMessage message, android.widget.ImageView icon);
+        void onTTSButtonClick(GuiMessage message, boolean play);
     }
 }

app/src/main/java/nie/translator/rtranslator/voice_translation/TTSEngine.java

@@ -0,0 +1,162 @@
+package nie.translator.rtranslator.voice_translation;
+
+import android.content.Context;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.UtteranceProgressListener;
+import android.util.Log;
+import android.util.Pair;
+
+import java.util.ArrayDeque;
+
+import javax.annotation.Nullable;
+
+import nie.translator.rtranslator.tools.CustomLocale;
+import nie.translator.rtranslator.tools.TTS;
+import nie.translator.rtranslator.tools.gui.messages.GuiMessage;
+
+public class TTSEngine {
+    private final ArrayDeque<Pair<GuiMessage, CustomLocale>> messageQueue = new ArrayDeque<>();
+    @Nullable
+    private GuiMessage executingMessage = null;
+    private boolean speaking = false;
+    @Nullable
+    private final TTS tts;
+    private boolean pause = false;
+    private Context context;
+    @Nullable
+    private TTSEngineListener listener;
+
+
+    public TTSEngine(Context context, @Nullable TTSEngineListener listener) {
+        this.context = context;
+        this.tts = new TTS(context, new TTS.InitListener() {  // tts initialization (to be improved, automatic package installation)
+            @Override
+            public void onInit() {
+                if(TTSEngine.this.tts != null) {
+                    TTSEngine.this.tts.setOnUtteranceProgressListener(new UtteranceProgressListener() {
+                        @Override
+                        public void onDone(String utteranceId) {
+                            if (listener != null) {
+                                boolean isLast = messageQueue.isEmpty();
+                                listener.onUtteranceFinished(executingMessage, isLast);
+                                executingMessage = null;
+                            }
+                            speak();
+                        }
+
+                        @Override
+                        public void onError(String utteranceId) {
+                            stop();
+                        }
+
+                        @Override
+                        public void onStart(String utteranceId) {
+
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onError(int reason) {
+
+            }
+        });
+        this.listener = listener;
+
+    }
+
+
+    public boolean speak(GuiMessage message, CustomLocale language){
+        messageQueue.addLast(new Pair<>(message, language));
+        if (!messageQueue.isEmpty() && !speaking && !pause) {
+            return speak();
+        }
+        return false;
+    }
+
+    private boolean speak(){
+        if(!pause) {
+            boolean wasSpeaking = speaking;
+            speaking = true;
+            Pair<GuiMessage, CustomLocale> pair = messageQueue.pollFirst();
+            if (pair != null && tts != null) {
+                if(listener != null) listener.onUtteranceStarting(pair.first, !wasSpeaking);
+                executingMessage = pair.first;
+                if (tts.getVoice() != null && pair.second.equals(new CustomLocale(tts.getVoice().getLocale()))) {
+                    tts.speak(pair.first.getMessage().getText(), TextToSpeech.QUEUE_ADD, null, String.valueOf(pair.first.getMessageID()));
+                } else {
+                    tts.setLanguage(pair.second, context);
+                    tts.speak(pair.first.getMessage().getText(), TextToSpeech.QUEUE_ADD, null, String.valueOf(pair.first.getMessageID()));
+                }
+                return true;
+            }else{
+                speaking = false;
+                executingMessage = null;
+            }
+        }
+        return false;
+    }
+
+    public void pause() {
+        if(!pause) {
+            Log.i("tts_engine", "tts engine paused");
+            if(tts != null) tts.stop();
+            executingMessage = null;
+            pause = true;
+        }
+    }
+
+    public void resume() {
+        if(pause){
+            Log.i("tts_engine", "tts engine resumed");
+            pause = false;
+            speak();
+        }
+    }
+
+    public boolean isPaused(){
+        return pause;
+    }
+
+    public boolean isEmpty(){
+        return messageQueue.isEmpty();
+    }
+
+    public void stop(){
+        if(tts != null) tts.stop();
+        boolean notify = listener != null && (executingMessage != null || !messageQueue.isEmpty());
+        GuiMessage oldExecutingMessage = executingMessage;
+        executingMessage = null;
+        messageQueue.clear();
+        if(notify){
+            listener.onUtteranceFinished(oldExecutingMessage, true);
+        }
+        speaking = false;
+    }
+
+    @Nullable
+    public GuiMessage getExecutingMessage() {
+        return executingMessage;
+    }
+
+    @Nullable
+    public TTS getTts() {
+        return tts;
+    }
+
+    public void shutdown() {
+        if(tts != null) tts.shutdown();
+    }
+
+    public boolean isActive() {
+        if(tts != null) return tts.isActive();
+        return false;
+    }
+
+    public static abstract class TTSEngineListener {
+        abstract void onUtteranceStarting(GuiMessage message, boolean first);
+        abstract void onUtteranceFinished(@Nullable GuiMessage message, boolean last);
+        abstract void onInitError(int reason);
+    }
+}