diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 41815d1..0000000 --- a/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -manifest-merger-release-report.txt diff --git a/app-pro/.gitignore b/app/app-pro/.gitignore similarity index 100% rename from app-pro/.gitignore rename to app/app-pro/.gitignore diff --git a/app-pro/build.gradle b/app/app-pro/build.gradle similarity index 100% rename from app-pro/build.gradle rename to app/app-pro/build.gradle diff --git a/app-pro/proguard-rules.pro b/app/app-pro/proguard-rules.pro similarity index 100% rename from app-pro/proguard-rules.pro rename to app/app-pro/proguard-rules.pro diff --git a/app-pro/src/androidTest/java/com/maskyn/fileeditorpro/ApplicationTest.java b/app/app-pro/src/androidTest/java/com/maskyn/fileeditorpro/ApplicationTest.java similarity index 100% rename from app-pro/src/androidTest/java/com/maskyn/fileeditorpro/ApplicationTest.java rename to app/app-pro/src/androidTest/java/com/maskyn/fileeditorpro/ApplicationTest.java diff --git a/app-pro/src/main/AndroidManifest.xml b/app/app-pro/src/main/AndroidManifest.xml similarity index 100% rename from app-pro/src/main/AndroidManifest.xml rename to app/app-pro/src/main/AndroidManifest.xml diff --git a/app-pro/src/main/java/com/maskyn/fileeditorpro/HomeActivity.java b/app/app-pro/src/main/java/com/maskyn/fileeditorpro/HomeActivity.java similarity index 100% rename from app-pro/src/main/java/com/maskyn/fileeditorpro/HomeActivity.java rename to app/app-pro/src/main/java/com/maskyn/fileeditorpro/HomeActivity.java diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 6e7260f..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,95 +0,0 @@ -/* - * 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 . - */ - -import java.util.regex.Pattern - -buildscript { - repositories { - mavenCentral() - maven { url 'https://maven.fabric.io/repo' } - } - - dependencies { - classpath 'io.fabric.tools:gradle:1.+' - } - -} - -apply plugin: 'com.android.application' -apply plugin: 'io.fabric' - -repositories { - mavenCentral() - maven { url 'https://maven.fabric.io/repo' } -} - - - -android { - compileSdkVersion 22 - buildToolsVersion '22.0.1' - defaultConfig { - applicationId "com.maskyn.fileeditor" - minSdkVersion 11 - targetSdkVersion 22 - versionCode 47 - versionName "1.19" - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - lintOptions { - abortOnError false - } - packagingOptions { - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE.txt' - } -} - -dependencies { - compile fileTree(dir: 'libs', include: '*.jar') - compile project(':libraries:sharedCode') - //compile 'com.google.android.gms:play-services-ads:6.5.+' - compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') { - transitive = true; - } -} - -task incrementVersionCode << { - println(":incrementVersionCode - Incrementing Version Code...") - def buildGradleFile = file("build.gradle") - def patternVersionCode = Pattern.compile("versionCode (\\d+)") - def buildGradleFileText = buildGradleFile.getText() - def matcherVersionCode = patternVersionCode.matcher(buildGradleFileText) - matcherVersionCode.find() - def mVersionCode = Integer.parseInt(matcherVersionCode.group(1)) - def mNextVersionCode = mVersionCode + 1 - def manifestContent = matcherVersionCode.replaceAll("versionCode " + mNextVersionCode) - println(":incrementVersionCode - current versionCode=" + mVersionCode); - println(":incrementVersionCode - next versionCode=" + mNextVersionCode); - buildGradleFile.write(manifestContent) -} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro deleted file mode 100644 index f65387a..0000000 --- a/app/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in C:\Users\Vlad\AppData\Local\Android\android-sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/app/src/androidTest/java/com/vmihalachi/fileeditor/ApplicationTest.java b/app/src/androidTest/java/com/vmihalachi/fileeditor/ApplicationTest.java deleted file mode 100644 index 689f300..0000000 --- a/app/src/androidTest/java/com/vmihalachi/fileeditor/ApplicationTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 . - */ - -package com.maskyn.fileeditor; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml deleted file mode 100644 index 412bfce..0000000 --- a/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/com/maskyn/fileeditor/AdsHelper.java b/app/src/main/java/com/maskyn/fileeditor/AdsHelper.java deleted file mode 100644 index b9b2b1f..0000000 --- a/app/src/main/java/com/maskyn/fileeditor/AdsHelper.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 . - */ - -package com.maskyn.fileeditor; - -import android.app.Activity; - -/*import com.google.android.gms.ads.AdRequest; -import com.google.android.gms.ads.InterstitialAd;*/ - -public class AdsHelper { - //private InterstitialAd interstitial; - - public AdsHelper(Activity activity) { - - /*interstitial = new InterstitialAd(activity); - interstitial.setAdUnitId("ca-app-pub-5679083452234719/7178038180"); - - // Create ad request. - AdRequest adRequest = new AdRequest.Builder().build(); - - // Begin loading your interstitial. - interstitial.loadAd(adRequest);*/ - } - - public void displayInterstitial() { - //interstitial.show(); - } -} diff --git a/app/src/main/java/com/maskyn/fileeditor/HomeActivity.java b/app/src/main/java/com/maskyn/fileeditor/HomeActivity.java deleted file mode 100644 index a0ff52e..0000000 --- a/app/src/main/java/com/maskyn/fileeditor/HomeActivity.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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 . - */ - -package com.maskyn.fileeditor; - -import android.os.Bundle; - -import com.crashlytics.android.Crashlytics; - -import io.fabric.sdk.android.Fabric; -import sharedcode.turboeditor.activity.MainActivity; - -public class HomeActivity extends MainActivity { - - private AdsHelper adsHelper; - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if(sharedcode.turboeditor.preferences.PreferenceHelper.getSendErrorReports(this)) - Fabric.with(this, new Crashlytics()); - // setup the ads - if(!sharedcode.turboeditor.util.ProCheckUtils.isPro(this)) - adsHelper = new AdsHelper(this); - } - - @Override - public boolean showInterstitial() { - if(adsHelper != null && !sharedcode.turboeditor.util.ProCheckUtils.isPro(this)) { - adsHelper.displayInterstitial(); - return true; - } - else { - return false; - } - } - - -}