kuschelyagi/text-editor-8000
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Vlad Mihalachi 2014-10-07 18:55:18 +02:00
parent 04faa104ed
commit df5a302129
13 changed files with 321 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app-pro/src/main/AndroidManifest.xml
View File

@ -39,6 +39,7 @@
android:hardwareAccelerated="false" android:hardwareAccelerated="false"
android:largeHeap="true" android:largeHeap="true"
android:supportsRtl="true" android:supportsRtl="true"
android:name="sharedcode.turboeditor.activity.MyApp"
> >
<!-- android:alwaysRetainTaskState="true" --> <!-- android:alwaysRetainTaskState="true" -->

1
app/src/main/AndroidManifest.xml
View File

@ -42,6 +42,7 @@
android:hardwareAccelerated="false" android:hardwareAccelerated="false"
android:largeHeap="true" android:largeHeap="true"
android:supportsRtl="true" android:supportsRtl="true"
android:name="sharedcode.turboeditor.activity.MyApp"
> >
<!-- android:alwaysRetainTaskState="true" --> <!-- android:alwaysRetainTaskState="true" -->

156
build/intermediates/dex-cache/cache.xml
View File

@ -7,6 +7,12 @@
jumboMode="false" jumboMode="false"
revision="20.0.0" revision="20.0.0"
sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/> sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/>
<item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-24b647622164ce26bc5d0be361e05056efc68e13.jar"
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
jumboMode="false"
revision="20.0.0"
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-9b612f0cb16e63277808158fe971bb4f40c98d29.jar" 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" jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
@ -19,6 +25,12 @@
jumboMode="false" jumboMode="false"
revision="19.1.0" revision="19.1.0"
sha1="d71573c9c5ea98a8db47ad6ff993a63d492b3bfa"/> 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="f449c5674e0427708d4fb17c4a2ec74c267e74d6"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\support-annotations-20.0.0-be727b9c9ce08c6ee055559b9506b675c13db989.jar" dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\support-annotations-20.0.0-be727b9c9ce08c6ee055559b9506b675c13db989.jar"
jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-annotations\20.0.0\support-annotations-20.0.0.jar" jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-annotations\20.0.0\support-annotations-20.0.0.jar"
@ -37,6 +49,12 @@
jumboMode="false" jumboMode="false"
revision="19.1.0" revision="19.1.0"
sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/> sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/>
<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="19.1.0"
sha1="90293e557820d96b56a206152f96fd716712b98c"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\commons-io-2.4-63b64e68cd19031cd252ac65a3ef94421c1bf0f4.jar" 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" jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar"
@ -49,6 +67,12 @@
jumboMode="false" jumboMode="false"
revision="20.0.0" revision="20.0.0"
sha1="2f3117da0016b1126fafe7fb332a45d2f910d76c"/> sha1="2f3117da0016b1126fafe7fb332a45d2f910d76c"/>
<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="19.1.0"
sha1="22b92dd8763ce4c1a9bd71a25d6270a6398ac955"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-58cfedaebe3b94ec0eaa2ede4e66aae8dbe309b0.jar" dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-58cfedaebe3b94ec0eaa2ede4e66aae8dbe309b0.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-sources.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-sources.jar"
@ -67,6 +91,12 @@
jumboMode="false" jumboMode="false"
revision="20.0.0" revision="20.0.0"
sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/> 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 <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\release\classes-3e47e18f46719c7bf296f4b49ff03aaa3d406ba6.jar" 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" jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
@ -79,6 +109,24 @@
jumboMode="false" jumboMode="false"
revision="20.0.0" revision="20.0.0"
sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/> sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/>
<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\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="cb3d22565863773944a8c15de408e864e34d6da1"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\juniversalchardet-1.0.3-9db20cdcb8ae72104757d81297c98978c65bd91b.jar" 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" jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
@ -127,12 +175,30 @@
jumboMode="false" jumboMode="false"
revision="20.0.0" revision="20.0.0"
sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/> sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/>
<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="19.1.0"
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
<item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-2e38d54a78dd518320bb6abe3d8931a19ff26792.jar"
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
jumboMode="false"
revision="20.0.0"
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-e7e86cab56b519ef20b4d01792717ffcddcc577b.jar" dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-e7e86cab56b519ef20b4d01792717ffcddcc577b.jar"
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.android.support\support-v4\20.0.0\classes.jar" jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.android.support\support-v4\20.0.0\classes.jar"
jumboMode="false" jumboMode="false"
revision="19.1.0" revision="19.1.0"
sha1="8694693636ab36910c8100ce527c258ff3ebece0"/> sha1="8694693636ab36910c8100ce527c258ff3ebece0"/>
<item
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="19.1.0"
sha1="768b3e680c198fd79098e28fa64b532125e8c3f2"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-bfc447e4dbe83598b94dbdc8e38492cbbda6ebb2.jar" 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" jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\RootCommands\unspecified\classes.jar"
@ -145,90 +211,18 @@
jumboMode="false" jumboMode="false"
revision="19.1.0" revision="19.1.0"
sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/> 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"
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-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="19.1.0"
sha1="cb3d22565863773944a8c15de408e864e34d6da1"/>
<item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-24b647622164ce26bc5d0be361e05056efc68e13.jar"
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.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-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="f449c5674e0427708d4fb17c4a2ec74c267e74d6"/>
<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="19.1.0"
sha1="41e61b62a19d60195de1b91dff0438d2a8e68f1a"/>
<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="19.1.0"
sha1="22b92dd8763ce4c1a9bd71a25d6270a6398ac955"/>
<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\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\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="cb3d22565863773944a8c15de408e864e34d6da1"/>
<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="19.1.0"
sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
<item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-2e38d54a78dd518320bb6abe3d8931a19ff26792.jar"
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.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-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="19.1.0"
sha1="41e61b62a19d60195de1b91dff0438d2a8e68f1a"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\internal_impl-20.0.0-2cc5dec0eb9c4e1671dc84ade9411d50c227e9ae.jar" dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\internal_impl-20.0.0-2cc5dec0eb9c4e1671dc84ade9411d50c227e9ae.jar"
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.android.support\support-v4\20.0.0\libs\internal_impl-20.0.0.jar" jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.android.support\support-v4\20.0.0\libs\internal_impl-20.0.0.jar"
jumboMode="false" jumboMode="false"
revision="19.1.0" revision="19.1.0"
sha1="e40b3078e3fbd353c9f44da8df25a8fc0078209d"/> sha1="e40b3078e3fbd353c9f44da8df25a8fc0078209d"/>
<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"
jumboMode="false"
revision="20.0.0"
sha1="a593d4ce7ccdfa1eac8d97a82db64f23614b59a1"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-0a2ec632e1127b260f2b888ca5539fd41a1a638b.jar" dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-0a2ec632e1127b260f2b888ca5539fd41a1a638b.jar"
jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar" jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
@ -241,6 +235,12 @@
jumboMode="false" jumboMode="false"
revision="20.0.0" revision="20.0.0"
sha1="d71573c9c5ea98a8db47ad6ff993a63d492b3bfa"/> 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="19.1.0"
sha1="cb3d22565863773944a8c15de408e864e34d6da1"/>
<item <item
dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\commons-io-2.4-63b64e68cd19031cd252ac65a3ef94421c1bf0f4.jar" dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\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" jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar"

BIN
build/intermediates/model_data.bin
View File

Binary file not shown.

29
libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/BaseHomeActivity.java
View File

@ -178,22 +178,28 @@ public abstract class BaseHomeActivity extends Activity {
onBackPressed(); onBackPressed();
return true; return true;
} }
else if(keyCode == KeyEvent.KEYCODE_MENU){
return false;
}
else {
if (editor == null)
editor = (EditText) findViewById(R.id.editor);
// this will happen on first key pressed on hard-keyboard only. Once myInputField
// gets the focus again, it will automatically receive further key presses.
if (editor == null) try {
editor = (EditText) findViewById(R.id.editor); if (editor != null && !editor.hasFocus()) {
// this will happen on first key pressed on hard-keyboard only. Once myInputField editor.requestFocus();
// gets the focus again, it will automatically receive further key presses. editor.onKeyDown(keyCode, event);
return true;
}
} catch (NullPointerException ex) {
try {
if (editor != null && !editor.hasFocus()) {
editor.requestFocus();
editor.onKeyDown(keyCode, event);
} }
} catch (NullPointerException ex) {
} }
return true;
return false;
} }
@Override @Override
@ -226,7 +232,6 @@ public abstract class BaseHomeActivity extends Activity {
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
super.onNewIntent(intent); super.onNewIntent(intent);

44
libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/MyApp.java Normal file
View File

@ -0,0 +1,44 @@
/*
* 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/>.
*/
package sharedcode.turboeditor.activity;
import android.app.Application;
import android.view.ViewConfiguration;
import java.lang.reflect.Field;
public class MyApp extends Application {
@Override
public void onCreate() {
super.onCreate();
// force to sow the overflow menu icon
try {
ViewConfiguration config = ViewConfiguration.get(this);
Field menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
if(menuKeyField != null) {
menuKeyField.setAccessible(true);
menuKeyField.setBoolean(config, false);
}
} catch (Exception ex) {
// Ignore
}
}
}

4
libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java
View File

@ -59,9 +59,9 @@ import sharedcode.turboeditor.util.Constants;
import sharedcode.turboeditor.util.RootUtils; import sharedcode.turboeditor.util.RootUtils;
public class SelectFileActivity extends Activity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditDialogFragment.EditDialogListener { public class SelectFileActivity extends Activity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditDialogFragment.EditDialogListener {
private String currentFolder; private String currentFolder = PreferenceHelper.SD_CARD_ROOT;
private ListView listView; private ListView listView;
private boolean wantAFile; private boolean wantAFile = true;
private MenuItem mSearchViewMenuItem; private MenuItem mSearchViewMenuItem;
private SearchView mSearchView; private SearchView mSearchView;

6
libraries/sharedCode/src/main/java/sharedcode/turboeditor/adapter/AdapterDrawer.java
View File

@ -95,10 +95,12 @@ public class AdapterDrawer extends
selectedPath = ""; selectedPath = "";
} }
}); });
if (TextUtils.equals(selectedPath, files.get(position).getAbsolutePath())) if (TextUtils.equals(selectedPath, files.get(position).getAbsolutePath())) {
hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.BOLD); hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.BOLD);
else }
else {
hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.NORMAL); hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.NORMAL);
}
} }
return convertView; return convertView;
} }

133
libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EditorFragment.java
View File

@ -151,11 +151,15 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
String fileText = getArguments().getString("fileText");
if(fileText == null)
fileText = "";
setHasOptionsMenu(true); setHasOptionsMenu(true);
sFilePath = getArguments().getString("filePath"); sFilePath = getArguments().getString("filePath");
pageSystem = new PageSystem(getActivity(), this, getArguments().getString("fileText")); pageSystem = new PageSystem(getActivity(), this, fileText);
currentEncoding = getArguments().getString("encoding"); currentEncoding = getArguments().getString("encoding");
getArguments().remove("fileText");
} }
@ -290,8 +294,18 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
if (searchingText) { if (searchingText) {
MenuItem imReplace = menu.findItem(R.id.im_replace); MenuItem imReplace = menu.findItem(R.id.im_replace);
MenuItem imPrev = menu.findItem(R.id.im_previous_item);
MenuItem imNext = menu.findItem(R.id.im_next_item);
if (imReplace != null) if (imReplace != null)
imReplace.setVisible(searchResult.isReplace); imReplace.setVisible(searchResult.canReplaceSomething());
if (imPrev != null)
imPrev.setVisible(searchResult.hasPrevious());
if (imNext != null)
imNext.setVisible(searchResult.hasNext());
} else { } else {
MenuItem imSave = menu.findItem(R.id.im_save); MenuItem imSave = menu.findItem(R.id.im_save);
@ -344,8 +358,9 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
} }
else if(i == R.id.im_goto_line){ else if(i == R.id.im_goto_line){
int min = mEditor.getLineUtils().firstReadLine();
int max = mEditor.getLineUtils().lastReadLine(); int max = mEditor.getLineUtils().lastReadLine();
SeekbarDialogFragment dialogFrag = SeekbarDialogFragment.newInstance(SeekbarDialogFragment.Actions.GoToLine, 0, 0, max); SeekbarDialogFragment dialogFrag = SeekbarDialogFragment.newInstance(SeekbarDialogFragment.Actions.GoToLine, min, min, max);
dialogFrag.setTargetFragment(EditorFragment.this, 0); dialogFrag.setTargetFragment(EditorFragment.this, 0);
dialogFrag.show(getFragmentManager().beginTransaction(), "dialog"); dialogFrag.show(getFragmentManager().beginTransaction(), "dialog");
} }
@ -368,6 +383,9 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
startActivity(Intent.createChooser(shareIntent, getString(R.string.share))); startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
}
else {
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@ -562,6 +580,8 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
mEditor.setSelection(searchResult.foundIndex.get(searchResult.index), searchResult.foundIndex.get(searchResult.index) + searchResult.textLength); mEditor.setSelection(searchResult.foundIndex.get(searchResult.index), searchResult.foundIndex.get(searchResult.index) + searchResult.textLength);
} }
getActivity().invalidateOptionsMenu();
} }
public void previousResult() { public void previousResult() {
@ -584,12 +604,20 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
mEditor.setSelection(searchResult.foundIndex.get(searchResult.index), searchResult.foundIndex.get(searchResult.index) + searchResult.textLength); mEditor.setSelection(searchResult.foundIndex.get(searchResult.index), searchResult.foundIndex.get(searchResult.index) + searchResult.textLength);
} }
getActivity().invalidateOptionsMenu();
} }
public void replaceText() { public void replaceText() {
mEditor.setText(mEditor.getText().replace(searchResult.foundIndex.get(searchResult.index), searchResult.foundIndex.get(searchResult.index) + searchResult.textLength, searchResult.textToReplace)); mEditor.setText(mEditor.getText().replace(searchResult.foundIndex.get(searchResult.index), searchResult.foundIndex.get(searchResult.index) + searchResult.textLength, searchResult.textToReplace));
searchResult.doneReplace(); searchResult.doneReplace();
nextResult();
getActivity().invalidateOptionsMenu();
if(searchResult.hasNext())
nextResult();
else if(searchResult.hasPrevious())
previousResult();
} }
//endregion //endregion
@ -712,7 +740,7 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
*/ */
private final EditTextChangeListener private final EditTextChangeListener
mChangeListener; mChangeListener;
int lineCount, realLine; private int lineCount, realLine;
private LineUtils lineUtils; private LineUtils lineUtils;
private boolean modified = true; private boolean modified = true;
/** /**
@ -787,7 +815,27 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
@Override @Override
public boolean onKeyUp(int keyCode, KeyEvent event) { public boolean onKeyUp(int keyCode, KeyEvent event) {
return true; if (event.isCtrlPressed()) {
switch (keyCode) {
case KeyEvent.KEYCODE_A:
case KeyEvent.KEYCODE_X:
case KeyEvent.KEYCODE_C:
case KeyEvent.KEYCODE_V:
case KeyEvent.KEYCODE_Z:
case KeyEvent.KEYCODE_Y:
case KeyEvent.KEYCODE_S:
return true;
default:
return false;
}
} else {
switch (keyCode) {
case KeyEvent.KEYCODE_TAB:
return true;
default:
return false;
}
}
} }
@Override @Override
@ -1030,67 +1078,70 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
return editable; return editable;
} }
firstVisibleIndex = 0; int end;
int end = CHARS_TO_COLOR;
int height = getHeight(); int height = getHeight();
if(height > 0) { if(height > 0) {
firstVisibleIndex = getLayout().getLineStart(getLineUtils().getFirstVisibleLine(editorInterface.getVerticalScrollView(), height, getLineCount())); firstVisibleIndex = getLayout().getLineStart(getLineUtils().getFirstVisibleLine(editorInterface.getVerticalScrollView(), height, getLineCount()));
end = getLayout().getLineStart(getLineUtils().getLastVisibleLine(editorInterface.getVerticalScrollView(), height, lineCount, deviceHeight)); end = getLayout().getLineStart(getLineUtils().getLastVisibleLine(editorInterface.getVerticalScrollView(), height, getLineCount(), deviceHeight));
//int end = firstColoredIndex + CHARS_TO_COLOR; } else {
firstVisibleIndex = 0;
end = CHARS_TO_COLOR;
} }
firstColoredIndex = firstVisibleIndex - (CHARS_TO_COLOR / 5); firstColoredIndex = firstVisibleIndex - (CHARS_TO_COLOR / 5);
// normalize
if (firstColoredIndex < 0) if (firstColoredIndex < 0)
firstColoredIndex = 0; firstColoredIndex = 0;
if (end > editable.length()) if (end > editable.length())
end = editable.length(); end = editable.length();
CharSequence textToHiglight = editable.subSequence(firstColoredIndex, end); CharSequence textToHighlight = editable.subSequence(firstColoredIndex, end);
if (fileExtension.contains("htm") if (fileExtension.contains("htm")
|| fileExtension.contains("xml")) { || fileExtension.contains("xml")) {
color(Patterns.HTML_OPEN_TAGS, editable, textToHiglight, firstColoredIndex); color(Patterns.HTML_OPEN_TAGS, editable, textToHighlight, firstColoredIndex);
color(Patterns.HTML_CLOSE_TAGS, editable, textToHiglight, firstColoredIndex); color(Patterns.HTML_CLOSE_TAGS, editable, textToHighlight, firstColoredIndex);
color(Patterns.HTML_ATTRS, editable, textToHiglight, firstColoredIndex); color(Patterns.HTML_ATTRS, editable, textToHighlight, firstColoredIndex);
color(Patterns.GENERAL_STRINGS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_STRINGS, editable, textToHighlight, firstColoredIndex);
color(Patterns.XML_COMMENTS, editable, textToHiglight, firstColoredIndex); color(Patterns.XML_COMMENTS, editable, textToHighlight, firstColoredIndex);
} else if (fileExtension.equals("css")) { } else if (fileExtension.equals("css")) {
//color(CSS_STYLE_NAME, editable); //color(CSS_STYLE_NAME, editable);
color(Patterns.CSS_ATTRS, editable, textToHiglight, firstColoredIndex); color(Patterns.CSS_ATTRS, editable, textToHighlight, firstColoredIndex);
color(Patterns.CSS_ATTR_VALUE, editable, textToHiglight, firstColoredIndex); color(Patterns.CSS_ATTR_VALUE, editable, textToHighlight, firstColoredIndex);
color(Patterns.SYMBOLS, editable, textToHiglight, firstColoredIndex); color(Patterns.SYMBOLS, editable, textToHighlight, firstColoredIndex);
color(Patterns.GENERAL_COMMENTS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_COMMENTS, editable, textToHighlight, firstColoredIndex);
} else if (Arrays.asList(MimeTypes.MIME_CODE).contains(fileExtension)) { } else if (Arrays.asList(MimeTypes.MIME_CODE).contains(fileExtension)) {
if(fileExtension.equals("lua")) if(fileExtension.equals("lua"))
color(Patterns.LUA_KEYWORDS, editable, textToHiglight, firstColoredIndex); color(Patterns.LUA_KEYWORDS, editable, textToHighlight, firstColoredIndex);
else if(fileExtension.equals("py")) else if(fileExtension.equals("py"))
color(Patterns.PY_KEYWORDS, editable, textToHiglight, firstColoredIndex); color(Patterns.PY_KEYWORDS, editable, textToHighlight, firstColoredIndex);
else else
color(Patterns.GENERAL_KEYWORDS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_KEYWORDS, editable, textToHighlight, firstColoredIndex);
color(Patterns.NUMBERS, editable, textToHiglight, firstColoredIndex); color(Patterns.NUMBERS, editable, textToHighlight, firstColoredIndex);
color(Patterns.SYMBOLS, editable, textToHiglight, firstColoredIndex); color(Patterns.SYMBOLS, editable, textToHighlight, firstColoredIndex);
color(Patterns.GENERAL_STRINGS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_STRINGS, editable, textToHighlight, firstColoredIndex);
color(Patterns.GENERAL_COMMENTS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_COMMENTS, editable, textToHighlight, firstColoredIndex);
if (fileExtension.equals("php")) if (fileExtension.equals("php"))
color(Patterns.PHP_VARIABLES, editable, textToHiglight, firstColoredIndex); color(Patterns.PHP_VARIABLES, editable, textToHighlight, firstColoredIndex);
} else if (Arrays.asList(MimeTypes.MIME_SQL).contains(fileExtension)) { } else if (Arrays.asList(MimeTypes.MIME_SQL).contains(fileExtension)) {
color(Patterns.SYMBOLS, editable, textToHiglight, firstColoredIndex); color(Patterns.SYMBOLS, editable, textToHighlight, firstColoredIndex);
color(Patterns.GENERAL_STRINGS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_STRINGS, editable, textToHighlight, firstColoredIndex);
color(Patterns.SQL_KEYWORDS, editable, textToHiglight, firstColoredIndex); color(Patterns.SQL_KEYWORDS, editable, textToHighlight, firstColoredIndex);
} else { } else {
if(!fileExtension.contains("md")) if(!fileExtension.contains("md"))
color(Patterns.GENERAL_KEYWORDS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_KEYWORDS, editable, textToHighlight, firstColoredIndex);
color(Patterns.NUMBERS, editable, textToHiglight, firstColoredIndex); color(Patterns.NUMBERS, editable, textToHighlight, firstColoredIndex);
color(Patterns.SYMBOLS, editable, textToHiglight, firstColoredIndex); color(Patterns.SYMBOLS, editable, textToHighlight, firstColoredIndex);
color(Patterns.GENERAL_STRINGS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_STRINGS, editable, textToHighlight, firstColoredIndex);
if (fileExtension.equals("prop") || fileExtension.contains("conf") || fileExtension.contains("md")) if (fileExtension.equals("prop") || fileExtension.contains("conf") || fileExtension.contains("md"))
color(Patterns.GENERAL_COMMENTS_NO_SLASH, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_COMMENTS_NO_SLASH, editable, textToHighlight, firstColoredIndex);
else else
color(Patterns.GENERAL_COMMENTS, editable, textToHiglight, firstColoredIndex); color(Patterns.GENERAL_COMMENTS, editable, textToHighlight, firstColoredIndex);
if(fileExtension.contains("md")) if(fileExtension.contains("md"))
color(Patterns.LINK, editable, textToHiglight, firstColoredIndex); color(Patterns.LINK, editable, textToHighlight, firstColoredIndex);
} }
return editable; return editable;
@ -1098,7 +1149,7 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
private void color(Pattern pattern, private void color(Pattern pattern,
Editable allText, Editable allText,
CharSequence textToHiglight, CharSequence textToHighlight,
int start) { int start) {
int color = 0; int color = 0;
if (pattern.equals(Patterns.HTML_OPEN_TAGS) if (pattern.equals(Patterns.HTML_OPEN_TAGS)
@ -1128,7 +1179,7 @@ public class EditorFragment extends Fragment implements FindTextDialogFragment.S
color = getResources().getColor(R.color.syntax_variable); color = getResources().getColor(R.color.syntax_variable);
} }
m = pattern.matcher(textToHiglight); m = pattern.matcher(textToHighlight);
while (m.find()) { while (m.find()) {
allText.setSpan( allText.setSpan(

8
libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/LineUtils.java
View File

@ -38,10 +38,6 @@ public class LineUtils {
return scrollView.getChildAt(0).getHeight() / lineCount * line; return scrollView.getChildAt(0).getHeight() / lineCount * line;
} }
public int getFirstVisibleLine(ScrollView scrollView, int lineCount){
return getFirstVisibleLine(scrollView, scrollView.getChildAt(0).getHeight(), lineCount);
}
public int getFirstVisibleLine(ScrollView scrollView, int childHeight, int lineCount) throws ArithmeticException{ public int getFirstVisibleLine(ScrollView scrollView, int childHeight, int lineCount) throws ArithmeticException{
int line = (scrollView.getScrollY() * lineCount) / childHeight; int line = (scrollView.getScrollY() * lineCount) / childHeight;
if (line < 0) line = 0; if (line < 0) line = 0;
@ -108,6 +104,10 @@ public class LineUtils {
return line; return line;
} }
public int firstReadLine() {
return realLines[0];
}
public int lastReadLine() { public int lastReadLine() {
return realLines[realLines.length-1]; return realLines[realLines.length-1];
} }

13
libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/SearchResult.java
View File

@ -22,6 +22,7 @@ package sharedcode.turboeditor.util;
import java.util.LinkedList; import java.util.LinkedList;
public class SearchResult { public class SearchResult {
// list of index
public LinkedList<Integer> foundIndex; public LinkedList<Integer> foundIndex;
public int textLength; public int textLength;
public boolean isReplace; public boolean isReplace;
@ -47,4 +48,16 @@ public class SearchResult {
public int numberOfResults() { public int numberOfResults() {
return foundIndex.size(); return foundIndex.size();
} }
public boolean hasNext() {
return index < foundIndex.size() - 1;
}
public boolean hasPrevious() {
return index > 0;
}
public boolean canReplaceSomething() {
return isReplace && foundIndex.size() > 0;
}
} }

125
libraries/sharedCode/src/main/res/layout/fragment_navigation_drawer.xml
View File

@ -50,7 +50,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="144dp" android:layout_height="104dp"
android:id="@id/drawer_buttons" android:id="@id/drawer_buttons"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="vertical"> android:orientation="vertical">
@ -62,7 +62,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="52dp"
android:orientation="horizontal" android:orientation="horizontal"
> >
@ -97,12 +97,20 @@
android:textColor="@color/navigation_drawer_button_text_color_inverted"/> android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
</LinearLayout> </LinearLayout>
<View
android:background="@color/divider_inverted"
android:layout_width="@dimen/line_dimension"
android:layout_height="match_parent"
android:layout_toLeftOf="@id/ic_add_dark"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"/>
<ImageView <ImageView
android:id="@+id/ic_add_dark" android:id="@+id/ic_add_dark"
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/ic_add_dark" android:src="@drawable/ic_add_dark"
android:padding="12dp" android:padding="14dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:clickable="true" android:clickable="true"
android:onClick="CreateFile" android:onClick="CreateFile"
@ -117,69 +125,64 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/line_dimension"/> android:layout_height="@dimen/line_dimension"/>
<LinearLayout <RelativeLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:clickable="true"
android:gravity="center_vertical"
android:onClick="OpenSettings"
android:background="@drawable/item_background_holo_dark">
<ImageView
android:layout_width="35dp"
android:layout_height="35dp"
android:src="@drawable/ic_settings_dark"
android:paddingStart="16dp"
android:paddingLeft="16dp"/>
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="52dp"
android:text="@string/preferenze" android:orientation="horizontal"
android:paddingStart="20dp" >
android:paddingLeft="20dp"
android:paddingEnd="20dp"
android:paddingRight="20dp"
android:gravity="center_vertical"
android:textSize="12sp"
android:textAllCaps="true"
android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:clickable="true"
android:gravity="center_vertical"
android:onClick="OpenSettings"
android:background="@drawable/item_background_holo_dark"
android:layout_toLeftOf="@+id/ic_info_dark"
>
<ImageView
android:layout_width="35dp"
android:layout_height="35dp"
android:src="@drawable/ic_settings_dark"
android:paddingStart="16dp"
android:paddingLeft="16dp"/>
<View <TextView
android:background="@color/divider_inverted" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_height="@dimen/line_dimension"/> android:text="@string/preferenze"
android:gravity="center_vertical"
android:paddingStart="20dp"
android:paddingLeft="20dp"
android:paddingEnd="20dp"
android:paddingRight="20dp"
android:textSize="12sp"
android:textAllCaps="true"
android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
</LinearLayout>
<LinearLayout <View
android:layout_width="match_parent" android:background="@color/divider_inverted"
android:layout_height="48dp" android:layout_width="@dimen/line_dimension"
android:orientation="horizontal" android:layout_height="match_parent"
android:clickable="true" android:layout_toLeftOf="@id/ic_info_dark"
android:gravity="center_vertical" android:layout_marginTop="10dp"
android:onClick="OpenInfo" android:layout_marginBottom="10dp"/>
android:background="@drawable/item_background_holo_dark">
<ImageView
android:layout_width="35dp"
android:layout_height="35dp"
android:src="@drawable/ic_info_dark"
android:paddingStart="16dp"
android:paddingLeft="16dp"/>
<TextView <ImageView
android:layout_width="match_parent" android:id="@+id/ic_info_dark"
android:layout_height="match_parent" android:layout_width="64dp"
android:text="@string/info" android:layout_height="match_parent"
android:paddingStart="20dp" android:src="@drawable/ic_info_dark"
android:paddingLeft="20dp" android:padding="14dp"
android:paddingEnd="20dp" android:layout_alignParentRight="true"
android:paddingRight="20dp" android:clickable="true"
android:gravity="center_vertical" android:onClick="OpenInfo"
android:textSize="12sp" android:background="@drawable/item_background_holo_dark"
android:textAllCaps="true" />
android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
</LinearLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

2
libraries/sharedCode/src/main/res/layout/item_drawer_list.xml
View File

@ -29,7 +29,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="5" android:layout_weight="5"
android:textSize="20sp" android:textSize="18sp"
android:paddingStart="@dimen/item_drawer_list_padding" android:paddingStart="@dimen/item_drawer_list_padding"
android:paddingEnd="@dimen/item_drawer_list_padding" android:paddingEnd="@dimen/item_drawer_list_padding"
android:paddingLeft="@dimen/item_drawer_list_padding" android:paddingLeft="@dimen/item_drawer_list_padding"