Merge branch 'move-back-from-gitlab' into HEAD

firemaples · Jan 21, 2019 · 730df03 · 730df03
2 parents 62ace71 + 0e878aa
commit 730df03
Show file tree

Hide file tree

Showing 366 changed files with 10,524 additions and 4,142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,4 +38,8 @@ build/
 obj/
 
 #Custom
-KeyId.java
+#KeyId.java
+app/debug_config/*
+app/release_config/*
+keys.xml
+google-services.json
diff --git a/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-17-35-15.jpg b/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-17-35-15.jpg
diff --git a/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-17-36-37.jpg b/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-17-36-37.jpg
diff --git a/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-17-37-13.jpg b/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-17-37-13.jpg
diff --git a/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-18-17-23.jpg b/OnScreenTranslator/HowToUse/SmartSelectImage_2018-03-26-18-17-23.jpg
diff --git a/...reenTranslator/HowToUse/SmartSelect_20180527-231334_Samsung Experience Home.jpg b/...reenTranslator/HowToUse/SmartSelect_20180527-231334_Samsung Experience Home.jpg
diff --git a/...reenTranslator/HowToUse/SmartSelect_20180527-231405_Samsung Experience Home.jpg b/...reenTranslator/HowToUse/SmartSelect_20180527-231405_Samsung Experience Home.jpg
diff --git a/OnScreenTranslator/HowToUse/SmartSelect_20180527-231501_Translate.jpg b/OnScreenTranslator/HowToUse/SmartSelect_20180527-231501_Translate.jpg
diff --git a/...reenTranslator/HowToUse/SmartSelect_20180527-231738_Samsung Experience Home.jpg b/...reenTranslator/HowToUse/SmartSelect_20180527-231738_Samsung Experience Home.jpg
diff --git a/...reenTranslator/HowToUse/SmartSelect_20180527-232413_Samsung Experience Home.jpg b/...reenTranslator/HowToUse/SmartSelect_20180527-232413_Samsung Experience Home.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_lite_step1.jpg b/OnScreenTranslator/HowToUse/guide_lite_step1.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_lite_step2.jpg b/OnScreenTranslator/HowToUse/guide_lite_step2.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_lite_step4.jpg b/OnScreenTranslator/HowToUse/guide_lite_step4.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_lite_step5.jpg b/OnScreenTranslator/HowToUse/guide_lite_step5.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_lite_step6.jpg b/OnScreenTranslator/HowToUse/guide_lite_step6.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_step1.jpg b/OnScreenTranslator/HowToUse/guide_step1.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_step2.jpg b/OnScreenTranslator/HowToUse/guide_step2.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_step4.jpg b/OnScreenTranslator/HowToUse/guide_step4.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_step5.jpg b/OnScreenTranslator/HowToUse/guide_step5.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_step6.jpg b/OnScreenTranslator/HowToUse/guide_step6.jpg
diff --git a/OnScreenTranslator/HowToUse/guide_step7.jpg b/OnScreenTranslator/HowToUse/guide_step7.jpg
diff --git a/OnScreenTranslator/HowToUseV2/AreaSelecting.png b/OnScreenTranslator/HowToUseV2/AreaSelecting.png
diff --git a/OnScreenTranslator/HowToUseV2/LangSelector.png b/OnScreenTranslator/HowToUseV2/LangSelector.png
diff --git a/OnScreenTranslator/HowToUseV2/MainBar.png b/OnScreenTranslator/HowToUseV2/MainBar.png
diff --git a/OnScreenTranslator/HowToUseV2/Menu.png b/OnScreenTranslator/HowToUseV2/Menu.png
diff --git a/OnScreenTranslator/HowToUseV2/ResultWindow.png b/OnScreenTranslator/HowToUseV2/ResultWindow.png
diff --git a/OnScreenTranslator/HowToUseV2/guide_1_select_lang.png b/OnScreenTranslator/HowToUseV2/guide_1_select_lang.png
diff --git a/OnScreenTranslator/HowToUseV2/guide_2_lang_selector.jpg b/OnScreenTranslator/HowToUseV2/guide_2_lang_selector.jpg
diff --git a/OnScreenTranslator/HowToUseV2/guide_2_lang_selector.png b/OnScreenTranslator/HowToUseV2/guide_2_lang_selector.png
diff --git a/OnScreenTranslator/HowToUseV2/guide_3_click_to_start_selection.png b/OnScreenTranslator/HowToUseV2/guide_3_click_to_start_selection.png
diff --git a/OnScreenTranslator/HowToUseV2/guide_5_click_to_translate.png b/OnScreenTranslator/HowToUseV2/guide_5_click_to_translate.png
diff --git a/OnScreenTranslator/HowToUseV2/guide_6_result_window.png b/OnScreenTranslator/HowToUseV2/guide_6_result_window.png
diff --git a/OnScreenTranslator/HowToUseV2/guide_ext_menu.png b/OnScreenTranslator/HowToUseV2/guide_ext_menu.png
diff --git a/OnScreenTranslator/HowToUseV3/device-2018-09-28-172042.mp4 b/OnScreenTranslator/HowToUseV3/device-2018-09-28-172042.mp4
diff --git a/OnScreenTranslator/HowToUseV3/guide_4_select_area.gif b/OnScreenTranslator/HowToUseV3/guide_4_select_area.gif
diff --git a/OnScreenTranslator/HowToUseV3/guide_n_move_main_bar_and_open_menu.gif b/OnScreenTranslator/HowToUseV3/guide_n_move_main_bar_and_open_menu.gif
diff --git a/OnScreenTranslator/HowToUseV3/guide_n_move_main_bar_and_open_menu.mp4 b/OnScreenTranslator/HowToUseV3/guide_n_move_main_bar_and_open_menu.mp4
diff --git a/OnScreenTranslator/HowToUseV3/moveMainBar.mp4 b/OnScreenTranslator/HowToUseV3/moveMainBar.mp4
diff --git a/OnScreenTranslator/HowToUseV3/selectAreaFull.mp4 b/OnScreenTranslator/HowToUseV3/selectAreaFull.mp4
diff --git a/OnScreenTranslator/Icons/ic_for_notify/ic_for_notify.zip b/OnScreenTranslator/Icons/ic_for_notify/ic_for_notify.zip
diff --git a/OnScreenTranslator/Icons/ic_launcher_icon/ic_launcher_icon.zip b/OnScreenTranslator/Icons/ic_launcher_icon/ic_launcher_icon.zip
diff --git a/OnScreenTranslator/Icons/ic_launcher_icon/ic_round.png b/OnScreenTranslator/Icons/ic_launcher_icon/ic_round.png
diff --git a/OnScreenTranslator/Icons/ic_launcher_shadow/ic_launcher_shadow.png b/OnScreenTranslator/Icons/ic_launcher_shadow/ic_launcher_shadow.png
diff --git a/OnScreenTranslator/Icons/ic_round/ic_round.png b/OnScreenTranslator/Icons/ic_round/ic_round.png
diff --git a/OnScreenTranslator/Icons/ic_round/ic_round.zip b/OnScreenTranslator/Icons/ic_round/ic_round.zip
diff --git a/OnScreenTranslator/Icons/menu_move/cursor-move-black.png b/OnScreenTranslator/Icons/menu_move/cursor-move-black.png
diff --git a/OnScreenTranslator/Icons/menu_move/cursor-move-white.png b/OnScreenTranslator/Icons/menu_move/cursor-move-white.png
diff --git a/OnScreenTranslator/Icons/menu_move/menu-white.png b/OnScreenTranslator/Icons/menu_move/menu-white.png
diff --git a/OnScreenTranslator/Icons/menu_move/menu.png b/OnScreenTranslator/Icons/menu_move/menu.png
diff --git a/OnScreenTranslator/Icons/menu_move/menu_move.png b/OnScreenTranslator/Icons/menu_move/menu_move.png
diff --git a/OnScreenTranslator/Icons/menu_move/menu_move.psd b/OnScreenTranslator/Icons/menu_move/menu_move.psd
diff --git a/OnScreenTranslator/Icons/ocr_only/ocr_only.png b/OnScreenTranslator/Icons/ocr_only/ocr_only.png
diff --git a/OnScreenTranslator/Icons/ocr_only/ocr_only.psd b/OnScreenTranslator/Icons/ocr_only/ocr_only.psd
diff --git a/OnScreenTranslator/Icons/ocr_only/selection.png b/OnScreenTranslator/Icons/ocr_only/selection.png
diff --git a/OnScreenTranslator/OnlinePhotoshop.txt b/OnScreenTranslator/OnlinePhotoshop.txt
@@ -0,0 +1 @@
+https://www.photopea.com/
diff --git a/OnScreenTranslator/Yandex lang transformer.js b/OnScreenTranslator/Yandex lang transformer.js
@@ -0,0 +1,117 @@
+var arr = [{id:'af', name:'Afrikaans'},
+{id:'am', name:'Amharic'},
+{id:'ar', name:'Arabic'},
+{id:'az', name:'Azerbaijani'},
+{id:'ba', name:'Bashkir'},
+{id:'be', name:'Belarusian'},
+{id:'bg', name:'Bulgarian'},
+{id:'bn', name:'Bengali'},
+{id:'bs', name:'Bosnian'},
+{id:'ca', name:'Catalan'},
+{id:'ceb', name:'Cebuano'},
+{id:'cs', name:'Czech'},
+{id:'cy', name:'Welsh'},
+{id:'da', name:'Danish'},
+{id:'de', name:'German'},
+{id:'el', name:'Greek'},
+{id:'en', name:'English'},
+{id:'eo', name:'Esperanto'},
+{id:'es', name:'Spanish'},
+{id:'et', name:'Estonian'},
+{id:'eu', name:'Basque'},
+{id:'fa', name:'Persian'},
+{id:'fi', name:'Finnish'},
+{id:'fr', name:'French'},
+{id:'ga', name:'Irish'},
+{id:'gd', name:'Scottish Gaelic'},
+{id:'gl', name:'Galician'},
+{id:'gu', name:'Gujarati'},
+{id:'he', name:'Hebrew'},
+{id:'hi', name:'Hindi'},
+{id:'hr', name:'Croatian'},
+{id:'ht', name:'Haitian'},
+{id:'hu', name:'Hungarian'},
+{id:'hy', name:'Armenian'},
+{id:'id', name:'Indonesian'},
+{id:'is', name:'Icelandic'},
+{id:'it', name:'Italian'},
+{id:'ja', name:'Japanese'},
+{id:'jv', name:'Javanese'},
+{id:'ka', name:'Georgian'},
+{id:'kk', name:'Kazakh'},
+{id:'km', name:'Khmer'},
+{id:'kn', name:'Kannada'},
+{id:'ko', name:'Korean'},
+{id:'ky', name:'Kyrgyz'},
+{id:'la', name:'Latin'},
+{id:'lb', name:'Luxembourgish'},
+{id:'lo', name:'Lao'},
+{id:'lt', name:'Lithuanian'},
+{id:'lv', name:'Latvian'},
+{id:'mg', name:'Malagasy'},
+{id:'mhr', name:'Mari'},
+{id:'mi', name:'Maori'},
+{id:'mk', name:'Macedonian'},
+{id:'ml', name:'Malayalam'},
+{id:'mn', name:'Mongolian'},
+{id:'mr', name:'Marathi'},
+{id:'mrj', name:'Hill Mari'},
+{id:'ms', name:'Malay'},
+{id:'mt', name:'Maltese'},
+{id:'my', name:'Burmese'},
+{id:'ne', name:'Nepali'},
+{id:'nl', name:'Dutch'},
+{id:'no', name:'Norwegian'},
+{id:'pa', name:'Punjabi'},
+{id:'pap', name:'Papiamento'},
+{id:'pl', name:'Polish'},
+{id:'pt', name:'Portuguese'},
+{id:'ro', name:'Romanian'},
+{id:'ru', name:'Russian'},
+{id:'si', name:'Sinhalese'},
+{id:'sk', name:'Slovak'},
+{id:'sl', name:'Slovenian'},
+{id:'sq', name:'Albanian'},
+{id:'sr', name:'Serbian'},
+{id:'su', name:'Sundanese'},
+{id:'sv', name:'Swedish'},
+{id:'sw', name:'Swahili'},
+{id:'ta', name:'Tamil'},
+{id:'te', name:'Telugu'},
+{id:'tg', name:'Tajik'},
+{id:'th', name:'Thai'},
+{id:'tl', name:'Tagalog'},
+{id:'tr', name:'Turkish'},
+{id:'tt', name:'Tatar'},
+{id:'udm', name:'Udmurt'},
+{id:'uk', name:'Ukrainian'},
+{id:'ur', name:'Urdu'},
+{id:'uz', name:'Uzbek'},
+{id:'vi', name:'Vietnamese'},
+{id:'xh', name:'Xhosa'},
+{id:'yi', name:'Yiddish'},
+{id:'zh', name:'Chinese'}]
+
+function SortByName(a, b){
+  var aName = a.name.toLowerCase();
+  var bName = b.name.toLowerCase();
+  return ((aName < bName) ? -1 : ((aName > bName) ? 1 : 0));
+}
+
+arr = arr.sort(SortByName);
+
+var langCodes = ""
+var langNames = ""
+$(arr).each(function(i,v){
+	var code = v.id
+  var name = v.name
+
+  langCodes += ("<item>"+code+"</item><!-- "+name+" -->")
+    /* console.log(langCodes) */
+
+    langNames += ("<item>"+name+"</item>")
+    /* console.log(langNames) */
+})
+
+console.log(langCodes)
+console.log(langNames)
diff --git a/OnScreenTranslator/YandexLangTransformer.txt b/OnScreenTranslator/YandexLangTransformer.txt
@@ -0,0 +1,24 @@
+// https://tech.yandex.com/translate/doc/dg/reference/getLangs-docpage/#codes
+
+code:
+
+<Item key="
+<item>
+
+" value="
+</item><!--
+
+" />
+ -->
+
+
+ name:
+
+<Item key="
+<!--
+
+" value="
+ --><item>
+
+ " />
+ </item>
diff --git a/OnScreenTranslator/ic_for_notify.png b/OnScreenTranslator/ic_for_notify.png
diff --git a/OnScreenTranslator/icon.psd b/OnScreenTranslator/icon.psd
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,54 +8,127 @@ buildscript {
     }
 }
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply plugin: 'io.fabric'
-apply plugin: 'android-apt'
+apply plugin: 'com.google.firebase.firebase-perf'
+
+apply from: '../../sign.gradle'
 
 repositories {
     maven { url 'https://maven.fabric.io/public' }
+    mavenCentral()
 }
 
-
 android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
-
+    packagingOptions {
+        exclude 'META-INF/main.kotlin_module'
+    }
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "tw.firemaples.onscreenocr"
         minSdkVersion 21
-        targetSdkVersion 23
-        versionCode 21
-        versionName "1.5.0"
+        targetSdkVersion 28
+        versionCode 60
+        versionName "2.3.2"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
     //https://gist.github.com/keyboardsurfer/a6a5bcf2b62f9aa41ae2
-    applicationVariants.all { variant ->
-        if (variant.buildType.isDebuggable()) {
-            def flavor = variant.mergedFlavor
-            def name = flavor.getVersionName()
-            def versionName = name + '-debug'
-            flavor.versionName = versionName;
+//    applicationVariants.all { variant ->
+//        if (variant.buildType.isDebuggable()) {
+//            def flavor = variant.mergedFlavor
+//            def name = flavor.getVersionName()
+//            def versionName = name + '-debug'
+//            flavor.versionName = versionName;
+//            flavor.applicationId = 'tw.firemaples.onscreenocr_debug'
+//        }
+//    }
+    flavorDimensions "tier"
+    productFlavors {
+        dev {
+            dimension "tier"
+            applicationId "tw.firemaples.onscreenocr_debug"
+            versionCode 100
+            versionName "10.0.0"
+        }
+        prod {
+            dimension "tier"
+            signingConfig signingConfigs.SignConfig
+        }
+    }
+
+    // Instead, use the bundle block to control which types of configuration APKs
+    // you want your app bundle to support.
+    bundle {
+        language {
+            // Specifies that the app bundle should not support
+            // configuration APKs for language resources. These
+            // resources are instead packaged with each base and
+            // dynamic feature APK.
+            enableSplit = false
+        }
+        density {
+            // This property is set to true by default.
+            enableSplit = true
+        }
+        abi {
+            // This property is set to true by default.
+            enableSplit = true
         }
     }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:support-v4:23.2.1'
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:design:23.2.1'
-    compile 'com.rmtheis:tess-two:6.1.1'
-    compile 'com.github.johnpersano:supertoasts:1.3.4@aar'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
-        transitive = true;
-    }
-    compile 'com.android.support:cardview-v7:23.0.0'
-    compile 'io.github.firemaples:microsoft-translator-java-api:0.8.3'
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
+    implementation('com.crashlytics.sdk.android:crashlytics:2.9.7@aar') {
+        transitive = true
+    }
+
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    implementation 'com.google.firebase:firebase-core:16.0.6'
+    implementation 'com.google.firebase:firebase-config:16.1.2'
+    implementation 'com.google.firebase:firebase-perf:16.2.3'
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.27.0-eap13'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.27.0-eap13'
+
+    implementation 'com.rmtheis:tess-two:9.0.0'
+
+    implementation 'com.muddzdev:styleabletoast:2.1.2'
+    implementation 'io.github.firemaples:microsoft-translator-java-api:0.8.6'
+    implementation 'com.google.android.exoplayer:exoplayer:r2.4.0'
+    implementation 'com.amitshekhar.android:android-networking:1.0.0'
+
+    implementation 'com.facebook.stetho:stetho:1.5.0'
+    implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
+
+//    implementation 'com.loopj.android:android-async-http:1.4.9'
+    testImplementation 'junit:junit:4.12'
+
+    //For logger
+    implementation 'com.github.tony19:logback-android-core:1.1.1-4'
+    implementation('com.github.tony19:logback-android-classic:1.1.1-4') {
+        exclude(group: 'xpp3', module: 'xpp3')
+        exclude group: 'com.google.android'
+    }
+    implementation 'org.slf4j:slf4j-api:1.7.22'
+
+    implementation 'org.greenrobot:eventbus:3.1.1'
+
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15'
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/install.sh b/app/install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+DEVICE=""
+
+if [ "$1" != "" ]
+then
+	DEVICE="$1"
+fi
+
+echo " #### adb devices #### "
+adb devices
+
+echo " #### push apk #### "
+adb $DEVICE push ./app-release.apk /data/local/tmp/tw.firemaples.onscreenocr
+
+echo " #### install apk #### "
+adb $DEVICE shell pm install -r "/data/local/tmp/tw.firemaples.onscreenocr"
+
+echo " #### launch app #### "
+adb $DEVICE shell am start -n "tw.firemaples.onscreenocr/tw.firemaples.onscreenocr.MainActivity" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
diff --git a/app/libs/notchtools-release-11d4e6.aar b/app/libs/notchtools-release-11d4e6.aar
diff --git a/app/src/androidTest/java/tw/firemaples/onscreenocr/ApplicationTest.java b/app/src/androidTest/java/tw/firemaples/onscreenocr/ApplicationTest.java
@@ -1,19 +1,3 @@
-/*
- * Copyright 2016-2017 Louis Chen [[email protected]].
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package tw.firemaples.onscreenocr;
 
 import android.app.Application;

diff --git a/app/src/debug/assets/logback.xml b/app/src/debug/assets/logback.xml
@@ -0,0 +1,15 @@
+<configuration>
+    <!-- Create a logcat appender -->
+    <appender name="logcat" class="ch.qos.logback.classic.android.LogcatAppender">
+        <tagEncoder>
+            <pattern>%logger{0}</pattern>
+        </tagEncoder>
+        <encoder>
+            <pattern>[%line][%thread] %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="logcat" />
+    </root>
+</configuration>
diff --git a/app/src/dev/res/values-zh-rCN/strings.xml b/app/src/dev/res/values-zh-rCN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">(Dev)随处翻译</string>
+</resources>
diff --git a/app/src/dev/res/values-zh-rTW/strings.xml b/app/src/dev/res/values-zh-rTW/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">(Dev)隨處翻譯</string>
+</resources>
diff --git a/app/src/dev/res/values/strings.xml b/app/src/dev/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">(Dev)EverTranslator</string>
+</resources>