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

fold app-pro into app as we are not going to have an adware version

Browse Source
This commit is contained in:
Adrian Malacoda
2016-09-25 03:55:36 -05:00
parent 401814cb22
commit 871b2cfc11
13 changed files with 0 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/.gitignore → app/app-pro/.gitignore vendored
View File

30
app/build.gradle → app/app-pro/build.gradle
View File

@@ -19,38 +19,20 @@
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"
applicationId "com.maskyn.fileeditorpro"
minSdkVersion 11
targetSdkVersion 22
versionCode 47
versionName "1.19"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
@@ -71,12 +53,8 @@ android {
}
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
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 << {

2
app/proguard-rules.pro → app/app-pro/proguard-rules.pro vendored
View File

@@ -1,6 +1,6 @@
# 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
# 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.
#

2
app/src/androidTest/java/com/vmihalachi/fileeditor/ApplicationTest.java → app/app-pro/src/androidTest/java/com/maskyn/fileeditorpro/ApplicationTest.java
View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.maskyn.fileeditor;
package com.maskyn.fileeditorpro;
import android.app.Application;
import android.test.ApplicationTestCase;

63
app/src/main/AndroidManifest.xml → app/app-pro/src/main/AndroidManifest.xml
View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2014 Vlad Mihalachi
~
@@ -19,12 +18,10 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.maskyn.fileeditor"
package="com.maskyn.fileeditorpro"
android:installLocation="auto">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<supports-screens
android:anyDensity="true"
@@ -46,8 +43,6 @@
<!-- android:alwaysRetainTaskState="true" -->
<!--<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>-->
<activity
android:name=".HomeActivity"
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
@@ -71,18 +66,49 @@
<data android:host="*" />
<data android:pathPattern=".*\\.txt" />
<data android:pathPattern=".*\\.html" />
<data android:pathPattern=".*\\.xml" />
<data android:pathPattern=".*\\.css" />
<data android:pathPattern=".*\\.js" />
<data android:pathPattern=".*\\.md"/>
<data android:pathPattern=".*\\.markdown"/>
<data android:pathPattern=".*\\.php" />
<data android:pathPattern=".*\\.py" />
<data android:pathPattern=".*\\.org" />
<data android:pathPattern=".*\\.script" />
<data android:pathPattern=".*\\.cs" />
<data android:pathPattern=".*\\.java" />
<data android:pathPattern=".*\\.rb" />
<data android:pathPattern=".*\\.aspx" />
<data android:pathPattern=".*\\.cshtml" />
<data android:pathPattern=".*\\.vbhtml" />
<data android:pathPattern=".*\\.go" />
<data android:pathPattern=".*\\.c" />
<data android:pathPattern=".*\\.h" />
<data android:pathPattern=".*\\.cc" />
<data android:pathPattern=".*\\.cpp" />
<data android:pathPattern=".*\\.hh" />
<data android:pathPattern=".*\\.hpp" />
<data android:pathPattern=".*\\.pl" />
<data android:pathPattern=".*\\.pm" />
<data android:pathPattern=".*\\.t" />
<data android:pathPattern=".*\\.pod" />
<data android:pathPattern=".*\\.m" />
<data android:pathPattern=".*\\.f" />
<data android:pathPattern=".*\\.for" />
<data android:pathPattern=".*\\.f90" />
<data android:pathPattern=".*\\.f95" />
<data android:pathPattern=".*\\.asp" />
<data android:pathPattern=".*\\.json" />
<data android:pathPattern=".*\\.wiki" />
<data android:pathPattern=".*\\.lua" />
<data android:pathPattern=".*\\.r" />
<data android:pathPattern=".*\\.key" />
<data android:pathPattern=".*\\.log" />
</intent-filter>
<intent-filter >
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="file" />
<data android:mimeType="text/plain" />
<data android:mimeType="text/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
@@ -94,12 +120,23 @@
android:name="sharedcode.turboeditor.activity.SelectFileActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/open_a_file"
android:exported="true"
android:parentActivityName=".HomeActivity"
android:theme="@style/AppThemeBaseLight">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".HomeActivity" />
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".HomeActivity" />
<intent-filter>
<action android:name="android.intent.action.GET_CONTENT" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.OPENABLE" />
<data android:mimeType="*/*" />
</intent-filter>
</activity>
<meta-data
android:name="com.sec.android.support.multiwindow"
android:value="true" />
@@ -117,9 +154,7 @@
android:value="598.0dip" />
<activity android:name="sharedcode.turboeditor.activity.MarkdownActivity" />
<!--<activity android:name="com.google.android.gms.ads.AdActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>-->
<meta-data android:name="com.crashlytics.ApiKey" android:value="672ab7531ce1e2e83c2ec6d84e8e94f2fa692c2a"/>
</application>
</manifest>

31
app/src/main/java/com/maskyn/fileeditor/HomeActivity.java → app/app-pro/src/main/java/com/maskyn/fileeditorpro/HomeActivity.java
View File

@@ -17,40 +17,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.maskyn.fileeditor;
package com.maskyn.fileeditorpro;
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;
}
// nothing to do here
return false;
}
}

45
app/src/main/java/com/maskyn/fileeditor/AdsHelper.java
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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();
}
}