Version 1.13

This commit is contained in:
Vlad Mihalachi
2014-10-18 15:20:23 +02:00
parent bf4dcd51b8
commit 4b16119b53
98 changed files with 6678 additions and 3057 deletions

View File

@@ -38,14 +38,14 @@ repositories {
android {
compileSdkVersion 19
buildToolsVersion "19.1.0"
compileSdkVersion 20
buildToolsVersion '20.0.0'
defaultConfig {
applicationId "com.maskyn.fileeditor"
minSdkVersion 10
minSdkVersion 11
targetSdkVersion 19
versionCode 29
versionName "1.12"
versionCode 30
versionName "1.13"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
@@ -57,6 +57,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
lintOptions {
abortOnError false
}
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
}
}
dependencies {
@@ -64,5 +71,4 @@ dependencies {
compile project(':libraries:sharedCode')
compile 'com.google.android.gms:play-services:5.0.89'
compile 'com.crashlytics.android:crashlytics:1.+'
}

View File

@@ -55,7 +55,7 @@
android:configChanges="fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
android:launchMode="singleTop"
android:windowSoftInputMode="stateUnspecified|adjustResize"
android:theme="@style/AppTheme.Light.Editor">
android:theme="@style/AppThemeEditorDark">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -85,32 +85,12 @@
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
<activity
android:name="sharedcode.turboeditor.activity.PreferenceAbout"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/info"
android:parentActivityName=".HomeActivity"
android:theme="@style/AppTheme.Dark">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".HomeActivity" />
</activity>
<activity
android:name="sharedcode.turboeditor.activity.LicensesActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/open_source_license"
android:parentActivityName="sharedcode.turboeditor.activity.PreferenceAbout"
android:theme="@style/AppTheme.Light">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".PreferenceAbout" />
</activity>
<activity
android:name="sharedcode.turboeditor.activity.SelectFileActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/open_a_file"
android:parentActivityName=".HomeActivity"
android:theme="@style/AppTheme.Light">
android:theme="@style/AppThemeBaseLight">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".HomeActivity" />

View File

@@ -22,8 +22,10 @@ package com.maskyn.fileeditor;
import android.os.Bundle;
import com.crashlytics.android.Crashlytics;
import sharedcode.turboeditor.activity.BaseHomeActivity;
import sharedcode.turboeditor.preferences.PreferenceHelper;
import sharedcode.turboeditor.util.ProCheckUtils;
public class HomeActivity extends BaseHomeActivity {
@@ -36,11 +38,13 @@ public class HomeActivity extends BaseHomeActivity {
if(PreferenceHelper.getSendErrorReports(this))
Crashlytics.start(this);
// setup the ads
adsHelper = new AdsHelper(this);
if(!ProCheckUtils.isPro(this))
adsHelper = new AdsHelper(this);
}
@Override
public void displayInterstitial() {
adsHelper.displayInterstitial();
if(adsHelper != null && !ProCheckUtils.isPro(this))
adsHelper.displayInterstitial();
}
}