Merge pull request #172 from niedev/development

Integration and optimization of HY-MT and Madlad

Author: niedev

.gitattributes

@@ -0,0 +1 @@
+*.apk filter=lfs diff=lfs merge=lfs -text

.idea/.gitignore

@@ -0,0 +1,14 @@
+If you want to early test this version of the app, first of all consider that this is a development preview, so it could be pretty unstable, and it will require initial setup, so to try it you need to:
+
+Download from [here](https://github.com/niedev/OnnxModelsEnhancer/releases/tag/v1.0.0-beta) the Mozilla.zip, 
+Madlad.zip, HY-MT.zip. After the download extract these folders (their name should remain "Mozilla", "Madlad" and "HY-MT", with the content of these .zip directly inside the corresponding extracted folders, if you change the structure of these folder the app will not work).
+
+After that create a folder named "models", inside it create a folder named "Translation", and inside it paste all the extracted folders.
+
+Now download one of the apk in this folder, install it, open the app, enable the requested file access and start the download.
+
+After the download has finished, exit the app and enable all its permissions from the Android Settings (Settings -> Applications -> RTranslator).
+
+Then re open the app and everything should work.
+
+By default, the models used for translation are the Mozilla ones, to select the other supported model you can select one from RTranslator's settings, at the bottom (note that probably, to execute Madlad and HY-MT, you will need a phone with at least 12GB of RAM, if the RAM won't be enough the app will crash until you wipe its data).

.idea/caches/deviceStreaming.xml

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59f7525063e66da7efbd9c32dac2a4810fdf0df1d15137af3efaa66d87604553
+size 192110576

.idea/gradle.xml

@@ -42,7 +42,7 @@ android {
                         //bergamot flags
                         '-DANDROID_ABI=arm64-v8a',
                         '-DANDROID_PLATFORM=android-28',
-                        '-DANDROID_STL=c++_static',
+                        '-DANDROID_STL=c++_shared',
                         "-DANDROID_PIE=ON",
                         "-DANDROID_CPP_FEATURES=exceptions",
                         '-DCMAKE_BUILD_TYPE=Release',
@@ -121,6 +121,11 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     //Download library
     implementation 'com.github.amitshekhariitbhu:PRDownloader:1.0.2'
+    // DJL HuggingFace tokenizers wrapper
+    implementation "ai.djl.android:core:0.33.0"
+    implementation "ai.djl.huggingface:tokenizers:0.33.0"
+    implementation "ai.djl.android:tokenizer-native:0.33.0"
+
     //implementation 'androidx.core:core-ktx:1.10.0'
     implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.7'

apks/README.md

@@ -55,7 +55,7 @@
 
 
 public class Global extends Application implements DefaultLifecycleObserver {
-    public static final boolean ONLY_TEXT_TRANSLATION_MODE = true;
+    public static final boolean ONLY_TEXT_TRANSLATION_MODE = false;
     public enum RTranslatorMode {
         TEXT_TRANSLATION_MODE,
         WALKIE_TALKIE_MODE,
@@ -128,7 +128,18 @@ public void restartTranslator(Translator.GeneralListener listener){
         getLanguages(false);
         SharedPreferences sharedPreferences = getSharedPreferences("default", Context.MODE_PRIVATE);
         int mode = sharedPreferences.getInt("selectedTranslationModel", Translator.MOZILLA);
-        translator.restart(mode, listener);
+        translator.restart(mode, new Translator.GeneralListener() {
+            @Override
+            public void onSuccess() {
+                getTranslatorLanguages(false);  //refresh languages
+                listener.onSuccess();
+            }
+
+            @Override
+            public void onFailure(int[] reasons, long value) {
+                listener.onFailure(reasons, value);
+            }
+        });
     }
 
     @Nullable

apks/RTranslator_3.0.0_alpha1.apk

@@ -20,9 +20,13 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.Settings;
 
 import androidx.appcompat.app.AlertDialog;
 import java.util.ArrayList;

app/build.gradle

@@ -18,9 +18,13 @@
 
 import android.Manifest;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
+import android.provider.Settings;
 import android.view.View;
 
 import androidx.fragment.app.Fragment;
@@ -78,6 +82,12 @@ protected void onStart() {
         super.onStart();  //called here because otherwise the onStart of the DownloadFragment is called before this onStart, and this could cause problems.
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        checkAllFilesPermission(); //todo: remove before the final release
+    }
+
     @Override
     protected void onStop() {
         super.onStop();
@@ -151,6 +161,27 @@ public void onBackPressed() {
         }
         super.onBackPressed();
     }
+
+    //todo: remove before the final release
+    private void checkAllFilesPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            if (!Environment.isExternalStorageManager()) {
+                requestAllFilesPermission();
+            }
+        }
+    }
+
+    //todo: remove before the final release
+    private void requestAllFilesPermission() {
+        try {
+            Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
+            intent.setData(Uri.parse("package:" + getPackageName()));
+            startActivityForResult(intent, 100);
+        } catch (Exception e) {
+            Intent intent = new Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION);
+            startActivityForResult(intent, 100);
+        }
+    }
 }