Merge branch 'fix-43-upgrade-version-to-v2.4.0'

app/build.gradle

@@ -21,6 +21,11 @@ repositories {
 }
 
 android {
+    signingConfigs {
+        config {
+            storeFile file('/Users/louischen/Github/play_store_upload_key_store.jks')
+        }
+    }
     packagingOptions {
         exclude 'META-INF/main.kotlin_module'
     }
@@ -30,8 +35,8 @@ android {
         applicationId "tw.firemaples.onscreenocr"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 61
-        versionName "2.3.3"
+        versionCode 62
+        versionName "2.4.0"
     }
     buildTypes {
         release {
@@ -59,10 +64,9 @@ android {
         }
         prod {
             dimension "tier"
-            signingConfig null
+            signingConfig signingConfigs.config
         }
     }
-
     // Instead, use the bundle block to control which types of configuration APKs
     // you want your app bundle to support.
     bundle {
@@ -89,46 +93,36 @@ dependencies {
     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:1.1.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.0'
-
     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'
+    //    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'
 }
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -110,4 +110,5 @@
     <string name="autoCopyOCRResult">自动複製文字辨识结果至剪贴簿</string>
     <string name="auto_close_app_when_spen_inserted_samsung_note_series_only">插入 Spen 后自动关闭 APP (仅支援三星 Note 系列)</string>
     <string name="service_google_translate">谷歌翻译</string>
+    <string name="error_screenshot_out_of_memory">记忆体不足撷取萤幕失败，请稍后再重试</string>
 </resources>

app/src/main/res/values-zh-rCN/version_history.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="versionMessage_2_4_0">● 增加 Google 翻译\n● 修正错误</string>
     <string name="versionMessage_2_3_0">● 修正浏海手机文字辨识问题\n● 修正小米手机文字辨识问题\n● 支援全萤幕模式(翻译时不再触发导航列)\n● 增加选项 "自动複製文字辨识结果至剪贴簿"\n● 增加选项 "插入 Spen 后自动关闭 APP (仅支援三星 Note 系列)"\n● 变更翻译引擎名称 “停用翻译” 为 “仅文字辨识”</string>
     <string name="versionMessage_2_2_0">● 选择区域可缩放\n● 更新教学\n● 增加圆型图示\n● 储存主浮动视窗最后位置\n● 修正阿拉伯文及北印度语错误</string>
     <string name="versionMessage_2_1_0">● 更新 UI/UX\n● 增加文字辨识档案下载来源选择\n● 增加翻译引擎选择</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -110,4 +110,5 @@
     <string name="service_ocr_only">僅文字辨識</string>
     <string name="ocr_only">僅文字辨識，不做任何翻譯</string>
     <string name="service_google_translate">Google 翻譯</string>
+    <string name="error_screenshot_out_of_memory">記憶體不足擷取螢幕失敗，請稍後再重試</string>
 </resources>

app/src/main/res/values-zh-rTW/version_history.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="versionMessage_2_4_0">● 增加 Google 翻譯\n● 修正錯誤</string>
     <string name="versionMessage_2_3_0">● 修正瀏海手機文字辨識問題\n● 修正小米手機文字辨識問題\n● 支援全螢幕模式(翻譯時不再觸發導航列)\n● 增加選項 "自動複製文字辨識結果至剪貼簿"\n● 增加選項 "插入 Spen 後自動關閉 APP (僅支援三星 Note 系列)"\n● 變更翻譯引擎名稱 “停用翻譯” 為 “僅文字辨識”</string>
     <string name="versionMessage_2_2_0">● 選擇區域可縮放\n● 更新教學\n● 增加圓型圖示\n● 儲存主浮動視窗最後位置\n● 修正阿拉伯文及北印度語錯誤</string>
     <string name="versionMessage_2_1_0">● 更新 UI/UX\n● 增加文字辨識檔案下載來源選擇\n● 增加翻譯引擎選擇</string>

app/src/main/res/values/version_history.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="versionCodes" translatable="false">
+        <item>2.4.0</item>
         <item>2.3.0</item>
         <item>2.2.0</item>
         <item>2.1.0</item>
@@ -10,6 +11,7 @@
         <item>1.7.1</item>
     </string-array>
 
+    <string name="versionMessage_2_4_0">● Add Google Translate service\n● Fix errors</string>
     <string name="versionMessage_2_3_0">● Fix OCR issue on notch device\n● Fix OCR issue on MIUI 10\n● Support for full screen mode (will not trigger navigation bar when translation)\n● Add option "Auto copy OCR result"\n● Add option "Auto close APP when inserting Spen back (Samsung Note series ONLY)"\n● Change the naming of translation provider from "Disable translation" to "OCR only"</string>
     <string name="versionMessage_2_2_0">● Resizable selection area\n● Update readme\n● Add round icon\n● Save last position of floating bar\n● Fix crash for Arabic and Hindi</string>
     <string name="versionMessage_2_1_0">● Update UI/UX\n● Add OCR source site selector\n● Add translation site selector</string>