From bb778a404c8aa5a96b01004cce9671609ffde4a1 Mon Sep 17 00:00:00 2001
From: kongpengfei <kongpf8848@gmail.com>
Date: Fri, 3 Sep 2021 17:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E3=80=91=E5=8F=91=E5=B8=831.1.7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml             | 67 ------------------------
 app/src/main/AndroidManifest.xml         |  2 +
 app/src/main/cpp/sticker/CMakeLists.txt  |  1 -
 buildSrc/src/main/kotlin/Dependencies.kt |  6 +--
 4 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cb6590..7ff1969 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,34 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="FIELD_NAME_PREFIX" value="m" />
-    <option name="PREFER_LONGER_NAMES" value="false" />
-    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-      <value />
-    </option>
-    <option name="IMPORT_LAYOUT_TABLE">
-      <value>
-        <package name="android" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="com" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="junit" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="net" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="org" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="java" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="javax" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="" withSubpackages="true" static="true" />
-        <emptyLine />
-      </value>
-    </option>
     <DBN-PSQL>
       <case-options enabled="true">
         <option name="KEYWORD_CASE" value="lower" />
@@ -53,47 +24,9 @@
         <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
       </formatting-settings>
     </DBN-SQL>
-    <JavaCodeStyleSettings>
-      <option name="FIELD_NAME_PREFIX" value="m" />
-      <option name="PREFER_LONGER_NAMES" value="false" />
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="android" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="com" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="junit" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="net" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="org" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="java" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="javax" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="true" />
-          <emptyLine />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" withSubpackages="false" static="false" />
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-          <package name="io.ktor" withSubpackages="true" static="false" />
-        </value>
-      </option>
-    </JetCodeStyleSettings>
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d788a47..39d7cd8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,8 @@
         android:theme="@style/AppTheme"
         android:name=".TKApplication"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
+        android:largeHeap="true"
         >
         <activity android:name=".activity.SplashActivity" android:screenOrientation="portrait"
             android:theme="@style/SplashActivityTheme"
diff --git a/app/src/main/cpp/sticker/CMakeLists.txt b/app/src/main/cpp/sticker/CMakeLists.txt
index 5059cc8..f95daf2 100644
--- a/app/src/main/cpp/sticker/CMakeLists.txt
+++ b/app/src/main/cpp/sticker/CMakeLists.txt
@@ -1,6 +1,5 @@
 #rlottie base on Telegram 7.9.3
 cmake_minimum_required(VERSION 3.4.1)
-message(+++++++++++++++++++++++++++++++++++++cmake:${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${CMA})
 set(CMAKE_CXX_FLAGS "-std=c++14 -DANDROID")
 set(CMAKE_C_FLAGS "-w -std=c11 -DANDROID -D_LARGEFILE_SOURCE=1")
 set(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index d0c1340..d9d1c4a 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,7 +1,6 @@
 import org.gradle.api.JavaVersion
 
 object Config{
-
     const val compileSdkVersion = 30
     const val buildToolsVersion = "30.0.2"
     const val applicationId="com.github.kongpf8848.animation"
@@ -9,9 +8,8 @@ object Config{
     const val targetSdkVersion = 30
     val sourceCompatibilityVersion = JavaVersion.VERSION_1_8
     val targetCompatibilityVersion = JavaVersion.VERSION_1_8
-    const val versionCode = 8
-    const val versionName = "1.1.6"
-
+    const val versionCode = 9
+    const val versionName = "1.1.7"
 }
 
 object Versions {