Happy Halloween!

vmihalachi · Oct 30, 2014 · 614274c · 614274c
1 parent 78407c2
commit 614274c
Show file tree

Hide file tree

Showing 194 changed files with 1,463 additions and 912 deletions.
diff --git a/app-pro/build.gradle b/app-pro/build.gradle
@@ -27,8 +27,8 @@ android {
         applicationId "com.maskyn.fileeditorpro"
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 31
-        versionName "1.12"
+        versionCode 32
+        versionName "1.13.1"
     }
 
     compileOptions {

diff --git a/app-pro/src/main/AndroidManifest.xml b/app-pro/src/main/AndroidManifest.xml
@@ -39,7 +39,7 @@
         android:hardwareAccelerated="true"
         android:largeHeap="true"
         android:supportsRtl="true"
-        android:name="sharedcode.turboeditor.activity.MyApp"
+        android:name="sharedcode.turboeditor.application.MyApp"
         >
 
         <!-- android:alwaysRetainTaskState="true" -->

diff --git a/app-pro/src/main/java/com/maskyn/fileeditorpro/HomeActivity.java b/app-pro/src/main/java/com/maskyn/fileeditorpro/HomeActivity.java
@@ -19,11 +19,9 @@
 
 package com.maskyn.fileeditorpro;
 
-import android.os.Bundle;
+import sharedcode.turboeditor.activity.MainActivity;
 
-import sharedcode.turboeditor.activity.BaseHomeActivity;
-
-public class HomeActivity extends BaseHomeActivity {
+public class HomeActivity extends MainActivity {
 
     @Override
     public void displayInterstitial() {

diff --git a/app/build.gradle b/app/build.gradle
@@ -46,8 +46,8 @@ android {
         applicationId "com.maskyn.fileeditor"
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 31
-        versionName "1.13"
+        versionCode 32
+        versionName "1.13.1"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
         android:hardwareAccelerated="true"
         android:largeHeap="true"
         android:supportsRtl="true"
-        android:name="sharedcode.turboeditor.activity.MyApp"
+        android:name="sharedcode.turboeditor.application.MyApp"
         >
 
         <!-- android:alwaysRetainTaskState="true" -->

diff --git a/app/src/main/java/com/maskyn/fileeditor/HomeActivity.java b/app/src/main/java/com/maskyn/fileeditor/HomeActivity.java
@@ -24,11 +24,11 @@
 import com.crashlytics.android.Crashlytics;
 
 import io.fabric.sdk.android.Fabric;
-import sharedcode.turboeditor.activity.BaseHomeActivity;
+import sharedcode.turboeditor.activity.MainActivity;
 import sharedcode.turboeditor.preferences.PreferenceHelper;
 import sharedcode.turboeditor.util.ProCheckUtils;
 
-public class HomeActivity extends BaseHomeActivity {
+public class HomeActivity extends MainActivity {
 
     private AdsHelper adsHelper;
 

diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
diff --git a/build/intermediates/model_data.bin b/build/intermediates/model_data.bin
diff --git a/libraries/sharedCode/build.gradle b/libraries/sharedCode/build.gradle
@@ -17,6 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+
 apply plugin: 'com.android.library'
 
 android {
@@ -60,9 +62,9 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':libraries:RootCommands')
     compile project(':libraries:FloatingActionButton')
-    compile('de.greenrobot:eventbus:2.2.1') {
-        exclude module: 'support-v4'
-    }
+    //compile('de.greenrobot:eventbus:2.2.1') {
+    //    exclude module: 'support-v4'
+   // }
     //    compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
     compile 'org.apache.commons:commons-lang3:3.1'
     compile files('libs/juniversalchardet-1.0.3.jar')

diff --git a/libraries/sharedCode/src/main/AndroidManifest.xml b/libraries/sharedCode/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
   ~
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
+  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="sharedcode.turboeditor" >
 

diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/LicensesActivity.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/LicensesActivity.java