rebase v14

This commit is contained in:
naman14
2016-10-31 18:37:41 +05:30
4 changed files with 12 additions and 10 deletions

View File

@@ -8,8 +8,8 @@ android {
applicationId "naman14.timber"
minSdkVersion 16
targetSdkVersion 24
versionCode 13
versionName "0.21b"
versionCode 14
versionName "0.2b"
//renderscript support mode is not supported for 21+ with gradle version 2.0
renderscriptTargetApi 20
renderscriptSupportModeEnabled true

View File

@@ -16,10 +16,12 @@
<application
android:name=".TimberApp"
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme.FullScreen.Light">
android:theme="@style/AppTheme.FullScreen.Light"
tools:replace="android:allowBackup">
<activity
android:name=".activities.MainActivity"
android:label="@string/app_name"

View File

@@ -198,9 +198,6 @@ public class MainActivity extends BaseActivity implements ATEActivityThemeCustom
}, 350);
}
if(!BillingProcessor.isIabServiceAvailable(this)) {
navigationView.getMenu().removeItem(R.id.nav_donate);
}
}
private void loadEverything() {
@@ -302,6 +299,10 @@ public class MainActivity extends BaseActivity implements ATEActivityThemeCustom
navigationView.getMenu().findItem(R.id.nav_donate).setIcon(R.drawable.payment_white);
}
if(!BillingProcessor.isIabServiceAvailable(this)) {
navigationView.getMenu().removeItem(R.id.nav_donate);
}
}
private void updatePosition(final MenuItem menuItem) {

View File

@@ -5,9 +5,8 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
// NOTE: Do not place your application dependencies here; they belong
classpath 'com.android.tools.build:gradle:2.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}