Merge pull request #28 from DPigeon/integration

V2.4.1: Fast Swap Between Input & Output Language

Author: DPigeon

README.md

@@ -29,3 +29,7 @@ To make sure the build passes, run the test script on the root directory
 <a href="https://www.flaticon.com/authors/vectors-market">Vectors Market: Document Icon</a>
 
 <a href="https://www.flaticon.com/authors/freepik">Freepik: CameraFlash</a>
+
+<a href="https://www.flaticon.com/authors/google">Google: Swap Language Icon</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>
+
+<a href="https://www.flaticon.com/authors/kiranshastry">Kiranshastry: Microphone Icon</a> from <a href="https://www.flaticon.com/" title="Flaticon"> www.flaticon.com</a>

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.seetext"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 3 // Edit when new release
-        versionName "2.4-alpha" // Edit when new release
+        versionCode 4 // Edit when new release
+        versionName "2.4.1-alpha" // Edit when new release
         // To improve image processing performance
         renderscriptTargetApi 21
         renderscriptSupportModeEnabled true
@@ -34,7 +34,10 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
-
+    lintOptions {
+        disable "UnsafeExperimentalUsageError",
+                "UnsafeExperimentalUsageWarning"
+    }
 }
 
 dependencies {
@@ -56,10 +59,10 @@ dependencies {
     implementation 'com.pnikosis:materialish-progress:1.7'
 
     // CameraX core library using the camera2 implementation
-    def camerax_version = "1.0.0-beta07" // was beta06 before
-    implementation "androidx.camera:camera-camera2:${camerax_version}"
+    def cameraX_version = "1.0.0-beta07" // was beta06 before
+    implementation "androidx.camera:camera-camera2:${cameraX_version}"
     // If you want to additionally use the CameraX Lifecycle library
-    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+    implementation "androidx.camera:camera-lifecycle:${cameraX_version}"
     // If you want to additionally use the CameraX View class
     implementation "androidx.camera:camera-view:1.0.0-alpha14"
     // If you want to additionally use the CameraX Extensions library

app/src/androidTest/java/com/seetext/activities/main/MainActivityInstrumentedTest.java

@@ -141,6 +141,24 @@ public void testFrontFlashLight() {
         onView(withId(R.id.frontCameraOverlayImageView))
                 .check(matches(isDisplayed()));
     }
+
+    @Test
+    public void testSwapLanguageButton() {
+        int input = 11; // English
+        int output = 16; // Finnish
+        mainActivity.setInputLanguage(input);
+        mainActivity.setOutputLanguage(output);
+
+        onView(withId(R.id.swapLanguageImageView))
+                .perform(click()); // Swap
+
+        onView(withId(R.id.inputLanguageTextView))
+                .check(matches(withText(Utils.getLanguageByTag(output))));
+        onView(withId(R.id.outputLanguageTextView))
+                .check(matches(withText(Utils.getLanguageByTag(input))));
+        onView(withId(R.id.languageTextView))
+                .check(matches(withText(Utils.getLanguageByTag(input))));
+    }
 }
 
 

app/src/main/java/com/seetext/activities/definition/AbstractDefinitionActivity.java

@@ -1,12 +1,14 @@
 package com.seetext.activities.definition;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.widget.ListView;
 import android.widget.Switch;
 import android.widget.TextView;
 
 import com.seetext.R;
 import com.seetext.activities.AbstractActivity;
+import com.seetext.activities.main.MainActivity;
 import com.seetext.objectdetection.definition.DefinitionListViewAdapter;
 import com.seetext.objectdetection.definition.DefinitionRowItem;
 
@@ -39,4 +41,16 @@ protected void onCreate(Bundle savedInstanceState) {
     protected int getLayoutResourceId() {
         return R.layout.activity_definition;
     }
+
+    @Override
+    public void onBackPressed() {
+        startActivity(new Intent(this, MainActivity.class));
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+        return true;
+    }
 }

app/src/main/java/com/seetext/activities/main/AbstractMainActivity.java

@@ -50,6 +50,8 @@ public abstract class AbstractMainActivity extends AbstractActivity {
     protected abstract void startRecognition();
     protected abstract void stopListeningSpeech();
     protected abstract void goToProfileActivity(String firstTime);
+    protected abstract void setInputLanguage(int number);
+    protected abstract void setOutputLanguage(int number);
     protected abstract int getInputLanguage();
     protected abstract int getOutputLanguage();
     protected abstract boolean connectedToInternet();
@@ -61,9 +63,11 @@ public abstract class AbstractMainActivity extends AbstractActivity {
     protected static final int MY_PERMISSIONS = 100; // Request code response for camera & microphone
     protected int inputLanguage = FirebaseTranslateLanguage.EN;
     protected int outputLanguage = FirebaseTranslateLanguage.EN; // Default is english
-    protected ImageView userProfileImageView, cameraModeImageView, flashLightImageView, languagesImageView, speechDetectionImageView, objectDetectionImageView, faceCheckImageView, audioImageView, frontCameraOverlayImageView;
+    protected ImageView userProfileImageView, cameraModeImageView, flashLightImageView, languagesImageView, speechDetectionImageView, objectDetectionImageView, faceCheckImageView, audioImageView, frontCameraOverlayImageView, swapLanguageImageView;
     protected Spinner languageSpinner;
     protected TextView languageTextView;
+    protected TextView swapInputLanguage;
+    protected TextView swapOutputLanguage;
     protected boolean faceProcessing = false; // For throttling the calls
     protected long animationDuration = 1000; // milliseconds
     protected boolean faceDetected = false; // For face check imageView anim to run once

app/src/main/java/com/seetext/activities/main/AbstractUIMainActivity.java

@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.media.AudioManager;
-import android.os.CountDownTimer;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
@@ -20,6 +19,7 @@
 import com.seetext.Mode;
 import com.seetext.R;
 import com.seetext.profile.Profile;
+import com.seetext.utils.Utils;
 
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
@@ -32,7 +32,6 @@ public abstract class AbstractUIMainActivity extends AbstractMainActivity {
 
     protected abstract void bindPreview(ProcessCameraProvider cameraProvider, int lensFacing);
     protected abstract void rebindPreview();
-    protected abstract void setOutputLanguage(int languageId);
     protected abstract void flashLight(boolean flashLightStatus);
     protected abstract void startTTS(String ttsSentence);
 
@@ -54,6 +53,10 @@ public void setupUI() {
         speechTextView = findViewById(R.id.speechTextView);
         faceCheckImageView = findViewById(R.id.faceCheckImageView);
         frontCameraOverlayImageView = findViewById(R.id.frontCameraOverlayImageView);
+        swapLanguageImageView = findViewById(R.id.swapLanguageImageView);
+        swapInputLanguage = findViewById(R.id.inputLanguageTextView);
+        swapOutputLanguage = findViewById(R.id.outputLanguageTextView);
+
         graphicOverlay = findViewById(R.id.graphicOverlay);
         progressOverlay = findViewById(R.id.progress_overlay);
         languageSpinner = findViewById(R.id.languageSpinner);
@@ -67,6 +70,7 @@ public void setupUI() {
         setOnTouchListener(speechDetectionImageView, R.drawable.speech_detection);
         setOnTouchListener(objectDetectionImageView, R.drawable.objects_detection);
         setOnTouchListener(audioImageView, R.drawable.tts_audio);
+        setOnTouchListener(swapLanguageImageView, R.drawable.swap_language);
 
         ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.languages_array, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -75,6 +79,8 @@ public void setupUI() {
 
         frontCameraOverlayImageView.setVisibility(View.INVISIBLE);
 
+        setSwapLanguageTextViews();
+
         cameraProviderFuture = ProcessCameraProvider.getInstance(this);
         cameraProviderFuture.addListener(() -> {
             try {
@@ -89,6 +95,7 @@ public void setupUI() {
             speechDetectionImageView.setImageResource(R.drawable.speech_detection_enabled);
         } else {
             objectDetectionImageView.setImageResource(R.drawable.objects_detection_enabled);
+            toggleFastSwapLanguages(View.INVISIBLE);
         }
     }
 
@@ -114,6 +121,7 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l)
                     Profile profile = new Profile(getInputLanguage(), getOutputLanguage(), lensFacing, currentMode.ordinal());
                     sharedPreferenceHelper.saveProfile(profile);
                     languageTextView.setText(item);
+                    swapOutputLanguage.setText(item);
                 }
             }
 
@@ -143,6 +151,8 @@ private void touchActions(int action, int drawable, View view) {
                 modeAction(Mode.ObjectDetection, R.drawable.speech_detection, R.drawable.objects_detection_enabled);
             } else if (drawable == R.drawable.tts_audio) {
                 ttsAction();
+            } else if (drawable == R.drawable.swap_language) {
+                swapLanguage();
             }
         }
     }
@@ -177,9 +187,11 @@ private void modeAction(Mode mode, int speechDrawable, int objectDetectionDrawab
             currentMode = mode;
             if (mode == Mode.SpeechRecognition) {
                 faceDetected = false; // Reset and ready to fire the face check anim
+                toggleFastSwapLanguages(View.VISIBLE);
             } else {
                 speechTextView.setVisibility(View.INVISIBLE);
                 audioImageView.setVisibility(View.INVISIBLE);
+                toggleFastSwapLanguages(View.INVISIBLE);
             }
             speechDetectionImageView.setImageResource(speechDrawable);
             objectDetectionImageView.setImageResource(objectDetectionDrawable);
@@ -204,4 +216,28 @@ private void ttsAction() {
             Log.d(TAG, ttsSentence);
         }
     }
+
+    private void setSwapLanguageTextViews() {
+        if (getInputLanguage() > -1 || getOutputLanguage() > -1) {
+            swapInputLanguage.setText(Utils.getLanguageByTag(getInputLanguage()));
+            swapOutputLanguage.setText(Utils.getLanguageByTag(getOutputLanguage()));
+        }
+    }
+
+    private void swapLanguage() {
+        int input = getInputLanguage();
+        setInputLanguage(getOutputLanguage());
+        setOutputLanguage(input);
+        setSwapLanguageTextViews(); // Update both swap in and out language
+        languageTextView.setText(Utils.getLanguageByTag(getOutputLanguage())); // Update language output
+
+        Profile profile = new Profile(getInputLanguage(), getOutputLanguage(), lensFacing, currentMode.ordinal());
+        sharedPreferenceHelper.saveProfile(profile);
+    }
+
+    private void toggleFastSwapLanguages(int state) {
+        swapInputLanguage.setVisibility(state);
+        swapLanguageImageView.setVisibility(state);
+        swapOutputLanguage.setVisibility(state);
+    }
 }

app/src/main/java/com/seetext/activities/profile/AbstractProfileActivity.java

@@ -1,6 +1,7 @@
 package com.seetext.activities.profile;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -12,6 +13,7 @@
 
 import com.seetext.R;
 import com.seetext.activities.AbstractActivity;
+import com.seetext.activities.main.MainActivity;
 import com.seetext.profile.SharedPreferenceHelper;
 
 import java.util.Objects;
@@ -68,4 +70,16 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onBackPressed() {
+        startActivity(new Intent(this, MainActivity.class));
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+        return true;
+    }
 }

app/src/main/java/com/seetext/activities/profile/ProfileActivity.java

@@ -119,5 +119,6 @@ protected void toastMessage(String message) { // Shows a toast message
     void goToActivity() { // Function that goes from the main activity to another one
         Intent intent = new Intent(ProfileActivity.this, MainActivity.class);
         startActivity(intent);
+        overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
     }
 }

app/src/main/java/com/seetext/utils/GraphicOverlay.java

@@ -189,7 +189,7 @@ protected void onDraw(Canvas canvas) {
         }
     }
 
-    /* Performs actions when touching an overlayed object */
+    /* Performs actions when touching an overlay object */
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         super.onTouchEvent(event);
@@ -203,5 +203,4 @@ public boolean onTouchEvent(MotionEvent event) {
         invalidate();
         return true;
     }
-
 }

app/src/main/java/com/seetext/utils/Utils.java

@@ -42,7 +42,10 @@ public static ArrayList<String> getLanguageList() {
     }
 
     public static String getLanguageByTag(int tag) {
-        String language = FirebaseTranslateLanguage.languageCodeForLanguage(tag);
+        String language = "English";
+        if (tag > 0) {
+            language = FirebaseTranslateLanguage.languageCodeForLanguage(tag);
+        }
         return Locale.forLanguageTag(language).getDisplayName();
     }