From cdfff247e516d1a9a206a0644d568a96141c255b Mon Sep 17 00:00:00 2001
From: npes87184 <npes87184@gmail.com>
Date: Sun, 10 Jun 2018 14:33:30 +0800
Subject: [PATCH] version 1.7.10

---
 .idea/caches/build_file_checksums.ser | Bin 0 -> 539 bytes
 .idea/codeStyles/Project.xml          |  29 ++++++++++++++++++++++++++
 README.md                             |   7 ++++++-
 app/app.iml                           |  15 +++++++++----
 app/build.gradle                      |   6 +++---
 app/release/output.json               |   2 +-
 6 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 .idea/caches/build_file_checksums.ser
 create mode 100644 .idea/codeStyles/Project.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000000000000000000000000000000000000..907600d2004784c4a354db51823fe7773ef3ba6d
GIT binary patch
literal 539
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsNA`Gwz?4?uSbg5>l-a(W(##Th_(
zR`y#54~r#SWM*J;W8likPfT%3OfJbU@?_vF$tX%K&dAS6sVJ~_U;qK0at<IV0K{xS
zi;7cAN;31(i=n<MEn;Abc3SgU{0AFH$O9$@29V7R0?YqN9iEuE^{GZwTyUDcs&okh
zPZG$#FkOWVbqs7Eh0HQrZHiK=rCLsJ_r7QKPNRfDASXXLF$WY{1*t_PnW@F4aK-cY
zc`EAHZ+#kb_NbuUgqoNV1}**2;?$yI{k($IVheLa3ln{)4f=>c$1vuKY|qVphD|Il
z8#rgY`QcPo!XSu8wVdm1PY$=KvE5yFpC)JhIRtcJVnKmEcJCyX7^?q%R=0e~!cUv@
JKc7*m007nGy$=8Y

literal 0
HcmV?d00001

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..30aa626
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 2544054..fadc81d 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,15 @@ An open source android app for transforming Simplified Chinese to Traditional Ch
 
 Latest Version
 ========
-1.7.9
+1.7.10
 
 Changelog
 ========
+### 1.7.10
+* let bubble stick to wall more aggressive
+* add notification channel
+* Update dependent libraries to improve stability.
+
 ### 1.7.9
 * Update dependent libraries to improve stability.
 * Refine navigation side bar.
diff --git a/app/app.iml b/app/app.iml
index 1eed427..37fb927 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -86,19 +86,26 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
@@ -108,10 +115,10 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.github.medyo:android-about-page-1.2.1" level="project" />
     <orderEntry type="library" name="Gradle: com.tumblr:backboard-0.1.2" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.medyo:android-about-page-1.2.4" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 78e0baf..2aaab2d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.npes87184.s2tdroid.donate"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 24
-        versionName "1.7.9"
+        versionCode 25
+        versionName "1.7.10"
     }
     buildTypes {
         release {
@@ -34,5 +34,5 @@ dependencies {
     implementation 'com.facebook.rebound:rebound:0.3.8'
     implementation 'com.tumblr:backboard:0.1.2'
     implementation files('libs/juniversalchardet-1.0.3.jar')
-    implementation 'com.github.medyo:android-about-page:1.2.1'
+    implementation 'com.github.medyo:android-about-page:1.2.4'
 }
diff --git a/app/release/output.json b/app/release/output.json
index a631947..4d2639a 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":23},"path":"app-release.apk","properties":{"packageId":"com.npes87184.s2tdroid.donate","split":"","minSdkVersion":"15"}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":25,"versionName":"1.7.10","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file