Readded the jar, and fixed a keyboard issue
This commit is contained in:
Vlad Mihalachi
parent
2fefb3963c
commit
520c4c53c0
@ -20,13 +20,13 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 20
|
||||
buildToolsVersion "20.0.0"
|
||||
compileSdkVersion 19
|
||||
buildToolsVersion "19.1.0"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.maskyn.fileeditorpro"
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 20
|
||||
targetSdkVersion 19
|
||||
versionCode 26
|
||||
versionName "1.10"
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
android:name=".HomeActivity"
|
||||
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
|
||||
android:launchMode="singleTop"
|
||||
android:windowSoftInputMode="stateUnspecified|adjustPan"
|
||||
android:windowSoftInputMode="stateUnspecified|adjustResize"
|
||||
android:theme="@style/AppTheme.Light.Editor">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
@ -38,12 +38,12 @@ repositories {
|
||||
|
||||
|
||||
android {
|
||||
compileSdkVersion 20
|
||||
buildToolsVersion "20.0.0"
|
||||
compileSdkVersion 19
|
||||
buildToolsVersion "19.1.0"
|
||||
defaultConfig {
|
||||
applicationId "com.maskyn.fileeditor"
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 20
|
||||
targetSdkVersion 19
|
||||
versionCode 26
|
||||
versionName "1.10"
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
android:name=".HomeActivity"
|
||||
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
|
||||
android:launchMode="singleTop"
|
||||
android:windowSoftInputMode="stateUnspecified|adjustPan"
|
||||
android:windowSoftInputMode="stateUnspecified|adjustResize"
|
||||
android:theme="@style/AppTheme.Light.Editor">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
@ -1,23 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2014 Vlad Mihalachi
|
||||
~
|
||||
~ This file is part of Turbo Editor.
|
||||
~
|
||||
~ Turbo Editor is free software: you can redistribute it and/or modify
|
||||
~ it under the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation, either version 3 of the License, or
|
||||
~ (at your option) any later version.
|
||||
~
|
||||
~ Turbo Editor is distributed in the hope that it will be useful,
|
||||
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
~ GNU General Public License for more details.
|
||||
~
|
||||
~ You should have received a copy of the GNU General Public License
|
||||
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<pre-dex-items>
|
||||
|
||||
<item
|
||||
@ -33,11 +14,23 @@
|
||||
revision="20.0.0"
|
||||
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\support-v4-19.0.1-f87b13e7ed00736c2050eda75093bf42b0503c64.jar"
|
||||
jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-v4\19.0.1\support-v4-19.0.1.jar"
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-579992e349b2c32e50f8907b9538ad0aa6df57b4.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.google.android.gms\play-services\5.0.89\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="d71573c9c5ea98a8db47ad6ff993a63d492b3bfa"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-30cc9565ecef1e8ae8577530d7ddd41993d192d7.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="587da9a481ffd341d2fa091704489b89845ddacd"/>
|
||||
sha1="f449c5674e0427708d4fb17c4a2ec74c267e74d6"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\crashlytics-1.1.13-7bbec76a44aa9cc3279ec6bff22b2c929a8abf67.jar"
|
||||
jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.crashlytics.android\crashlytics\1.1.13\e821eafa1bf489a26bdb71f95078c26785b37a1\crashlytics-1.1.13.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\commons-io-2.4-63b64e68cd19031cd252ac65a3ef94421c1bf0f4.jar"
|
||||
jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar"
|
||||
@ -50,6 +43,84 @@
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="2f3117da0016b1126fafe7fb332a45d2f910d76c"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-7a329e7f23515542bf02d96773d08da1d2333a7b.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="c9508d53a0ddc7399493e4c7ad474718c5ed196e"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-9b612f0cb16e63277808158fe971bb4f40c98d29.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-2ad27a3265673aeeb8f40e4322d8e19509329c96.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\release\classes-3e47e18f46719c7bf296f4b49ff03aaa3d406ba6.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="a593d4ce7ccdfa1eac8d97a82db64f23614b59a1"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-bcfe21eb1248db73c27c811996e28274cf39b024.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="e7a26359f635a1353de0aa8492f56f1f47c42c1a"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-82d5b6cab7f16bad663de7c7008673037efb0e1b.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="c9508d53a0ddc7399493e4c7ad474718c5ed196e"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\release\crashlytics-1.1.13-7bbec76a44aa9cc3279ec6bff22b2c929a8abf67.jar"
|
||||
jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.crashlytics.android\crashlytics\1.1.13\e821eafa1bf489a26bdb71f95078c26785b37a1\crashlytics-1.1.13.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-515446996fed08836a9331ef47b508a0383ffa22.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="f449c5674e0427708d4fb17c4a2ec74c267e74d6"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\support-v4-19.1.0-cf7033c44b86e758f85990185111614bac3ecfa8.jar"
|
||||
jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-v4\19.1.0\support-v4-19.1.0.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\juniversalchardet-1.0.3-9db20cdcb8ae72104757d81297c98978c65bd91b.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-65b2b356e3f2da4b67e00aba70923d6321852204.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-91de6979bb6be1b46cde32b462c23831eadd01d4.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\support-v4-19.0.1-f87b13e7ed00736c2050eda75093bf42b0503c64.jar"
|
||||
jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-v4\19.0.1\support-v4-19.0.1.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="587da9a481ffd341d2fa091704489b89845ddacd"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-a52f37b7ca7cde7ab02ff10bba80d1c496284125.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\FloatingActionButton\unspecified\classes.jar"
|
||||
@ -69,17 +140,23 @@
|
||||
revision="20.0.0"
|
||||
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-2ad27a3265673aeeb8f40e4322d8e19509329c96.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-4dd6beddde59ff8bd6c22bd0d65ac974f7e489d2.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
|
||||
revision="19.1.0"
|
||||
sha1="e7a26359f635a1353de0aa8492f56f1f47c42c1a"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-bfc447e4dbe83598b94dbdc8e38492cbbda6ebb2.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\RootCommands\unspecified\classes.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="cdecd8167dfb75d5785decb911fc4516445dd6a6"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\eventbus-2.2.1-32e81c5612ed132ff771b5425053d87f4f6c68c5.jar"
|
||||
jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\de.greenrobot\eventbus\2.2.1\a18ff12a9ab5ae52fd30d42f134517997568231e\eventbus-2.2.1.jar"
|
||||
jumboMode="false"
|
||||
revision="19.1.0"
|
||||
sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\release\classes-579a5ce52888f504a812e0f68758a11f20a21c15.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
|
||||
@ -99,17 +176,11 @@
|
||||
revision="20.0.0"
|
||||
sha1="d71573c9c5ea98a8db47ad6ff993a63d492b3bfa"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\release\classes-3e47e18f46719c7bf296f4b49ff03aaa3d406ba6.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\commons-io-2.4-63b64e68cd19031cd252ac65a3ef94421c1bf0f4.jar"
|
||||
jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="a593d4ce7ccdfa1eac8d97a82db64f23614b59a1"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\release\crashlytics-1.1.13-7bbec76a44aa9cc3279ec6bff22b2c929a8abf67.jar"
|
||||
jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.crashlytics.android\crashlytics\1.1.13\e821eafa1bf489a26bdb71f95078c26785b37a1\crashlytics-1.1.13.jar"
|
||||
jumboMode="false"
|
||||
revision="20.0.0"
|
||||
sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/>
|
||||
revision="19.1.0"
|
||||
sha1="b1b6ea3b7e4aa4f492509a4952029cd8e48019ad"/>
|
||||
<item
|
||||
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-c9a98cf79b48106440348a9fa210060d1b8b2647.jar"
|
||||
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\RootCommands\unspecified\classes.jar"
|
||||
|
||||
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
apply plugin: 'com.android.library'
|
||||
android {
|
||||
compileSdkVersion 19
|
||||
buildToolsVersion "20.0.0"
|
||||
buildToolsVersion '19.1.0'
|
||||
|
||||
defaultConfig {
|
||||
applicationId 'com.faizmalkani.floatingactionbutton'
|
||||
|
||||
Binary file not shown.
@ -15,8 +15,8 @@ dependencies {
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdkVersion 20
|
||||
buildToolsVersion "20.0.0"
|
||||
compileSdkVersion 19
|
||||
buildToolsVersion '19.1.0'
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 7
|
||||
|
||||
@ -24,13 +24,13 @@ android {
|
||||
disable 'MissingTranslation', 'ExtraTranslation'
|
||||
}
|
||||
|
||||
compileSdkVersion 20
|
||||
buildToolsVersion "20.0.0"
|
||||
compileSdkVersion 19
|
||||
buildToolsVersion "19.1.0"
|
||||
|
||||
defaultConfig {
|
||||
applicationId "sharedcode.turboeditor"
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 20
|
||||
targetSdkVersion 19
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
@ -51,12 +51,12 @@ dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
compile project(':libraries:RootCommands')
|
||||
compile project(':libraries:FloatingActionButton')
|
||||
compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
|
||||
compile "com.android.support:support-v4:19.0.+"
|
||||
compile 'com.android.support:support-v4:19.+'
|
||||
compile('de.greenrobot:eventbus:2.2.1') {
|
||||
exclude module: 'support-v4'
|
||||
}
|
||||
// compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
|
||||
compile 'com.github.gabrielemariotti.changeloglib:library:1.5.1'
|
||||
compile 'commons-io:commons-io:2.4'
|
||||
|
||||
compile files('libs/juniversalchardet-1.0.3.jar')
|
||||
}
|
||||
|
||||
BIN
libraries/sharedCode/libs/juniversalchardet-1.0.3.jar
Normal file
BIN
libraries/sharedCode/libs/juniversalchardet-1.0.3.jar
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user