Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

Commit

Permalink
reverted back from Android studio 3.0 and released 2.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Kosh committed May 28, 2017
1 parent e1cff31 commit 81dd458
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 60 deletions.
112 changes: 56 additions & 56 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ android {
applicationId "com.fastaccess.github"
minSdkVersion 21
targetSdkVersion 26
versionCode 252
versionName "2.5.2"
versionCode 253
versionName "2.5.3"
signingConfig signingConfigs.signing
buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string
buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string
Expand Down Expand Up @@ -100,66 +100,66 @@ repositories {
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "com.android.support:appcompat-v7:${supportVersion}"
implementation "com.android.support:design:${supportVersion}"
implementation "com.android.support:cardview-v7:${supportVersion}"
implementation "com.android.support:recyclerview-v7:${supportVersion}"
implementation "com.android.support:preference-v14:${supportVersion}"
implementation "com.android.support:customtabs:${supportVersion}"
implementation "com.android.support:palette-v7:${supportVersion}"
// implementation "com.android.support:support-emoji-appcompat:${supportVersion}"
implementation "net.grandcentrix.thirtyinch:thirtyinch:${thirtyinchVersion}"
implementation "net.grandcentrix.thirtyinch:thirtyinch-rx2:${thirtyinchVersion}"
implementation "com.squareup.retrofit2:retrofit:${retrofit}"
implementation "com.squareup.retrofit2:converter-gson:${retrofit}"
implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit}"
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'cn.gavinliu.android.lib:ShapedImageView:0.8.3'
implementation "frankiesardo:icepick:${icepickVersion}"
implementation "com.jakewharton:butterknife:${butterKnifeVersion}"
implementation 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.1-rc1'
implementation 'io.reactivex.rxjava2:rxjava:2.0.7'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'
implementation 'com.annimon:stream:1.1.7'
implementation 'com.github.GrenderG:Toasty:1.1.3'
implementation 'com.github.JediBurrell:MaterialTapTargetPrompt:-SNAPSHOT'
implementation 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2'
implementation 'com.github.daniel-stoneuk:material-about-library:1.8.1'
implementation "io.requery:requery:${requery}"
implementation "io.requery:requery-android:${requery}"
implementation('com.mikepenz:aboutlibraries:5.9.5@aar') { transitive = true }
implementation 'com.github.nightwhistler:HtmlSpanner:0.4'
implementation 'net.sourceforge.htmlcleaner:htmlcleaner:2.2'
implementation 'com.github.matthiasrobbers:shortbread:1.0.1'
implementation 'com.atlassian.commonmark:commonmark:0.9.0'
implementation 'com.firebase:firebase-jobdispatcher:0.6.0'
implementation "com.google.firebase:firebase-ads:${gms}"
implementation "com.google.firebase:firebase-messaging:${gms}"
releaseImplementation "com.google.firebase:firebase-crash:${gms}"
implementation "com.google.android.gms:play-services-auth:${gms}"
implementation "com.github.florent37:retrojsoup:${retroJsoup}"
implementation "com.github.florent37:rxjsoup:${retroJsoup}"
implementation "org.jsoup:jsoup:1.10.2"
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlin_version}"
compileOnly "org.projectlombok:lombok:${lombokVersion}"
compile fileTree(include: ['*.jar'], dir: 'libs')
compile "com.android.support:appcompat-v7:${supportVersion}"
compile "com.android.support:design:${supportVersion}"
compile "com.android.support:cardview-v7:${supportVersion}"
compile "com.android.support:recyclerview-v7:${supportVersion}"
compile "com.android.support:preference-v14:${supportVersion}"
compile "com.android.support:customtabs:${supportVersion}"
compile "com.android.support:palette-v7:${supportVersion}"
// compile "com.android.support:support-emoji-appcompat:${supportVersion}"
compile "net.grandcentrix.thirtyinch:thirtyinch:${thirtyinchVersion}"
compile "net.grandcentrix.thirtyinch:thirtyinch-rx2:${thirtyinchVersion}"
compile "com.squareup.retrofit2:retrofit:${retrofit}"
compile "com.squareup.retrofit2:converter-gson:${retrofit}"
compile "com.squareup.retrofit2:adapter-rxjava2:${retrofit}"
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
compile 'cn.gavinliu.android.lib:ShapedImageView:0.8.3'
compile "frankiesardo:icepick:${icepickVersion}"
compile "com.jakewharton:butterknife:${butterKnifeVersion}"
compile 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.1-rc1'
compile 'io.reactivex.rxjava2:rxjava:2.0.7'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'com.squareup.okhttp3:logging-interceptor:3.8.0'
compile 'com.annimon:stream:1.1.7'
compile 'com.github.GrenderG:Toasty:1.1.3'
compile 'com.github.JediBurrell:MaterialTapTargetPrompt:-SNAPSHOT'
compile 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2'
compile 'com.github.daniel-stoneuk:material-about-library:1.8.1'
compile "io.requery:requery:${requery}"
compile "io.requery:requery-android:${requery}"
compile('com.mikepenz:aboutlibraries:5.9.5@aar') { transitive = true }
compile 'com.github.nightwhistler:HtmlSpanner:0.4'
compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2'
compile 'com.github.matthiasrobbers:shortbread:1.0.1'
compile 'com.atlassian.commonmark:commonmark:0.9.0'
compile 'com.firebase:firebase-jobdispatcher:0.6.0'
compile "com.google.firebase:firebase-ads:${gms}"
compile "com.google.firebase:firebase-messaging:${gms}"
releaseCompile "com.google.firebase:firebase-crash:${gms}"
compile "com.google.android.gms:play-services-auth:${gms}"
compile "com.github.florent37:retrojsoup:${retroJsoup}"
compile "com.github.florent37:rxjsoup:${retroJsoup}"
compile "org.jsoup:jsoup:1.10.2"
// compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlin_version}"
provided "org.projectlombok:lombok:${lombokVersion}"
annotationProcessor "com.github.florent37:retrojsoup-compiler:${retroJsoup}"
annotationProcessor "io.requery:requery-processor:${requery}"
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
annotationProcessor "frankiesardo:icepick-processor:${icepickVersion}"
annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
annotationProcessor 'com.github.matthiasrobbers:shortbread-compiler:1.0.1'
// testImplementation "net.grandcentrix.thirtyinch:thirtyinch-test:$thirtyinchVersion"
testImplementation "junit:junit:${junitVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.assertj:assertj-core:${assertjVersion}"
androidTestImplementation "com.android.support:support-annotations:${supportVersion}"
androidTestImplementation "org.mockito:mockito-core:${mockitoVersion}"
androidTestImplementation 'com.android.support.test:runner:0.5'
androidTestImplementation 'com.android.support.test:rules:0.5'
androidTestImplementation "com.android.support.test.espresso:espresso-intents:${espresseVersion}"
androidTestImplementation "com.android.support.test.espresso:espresso-core:${espresseVersion}"
// testCompile "net.grandcentrix.thirtyinch:thirtyinch-test:$thirtyinchVersion"
testCompile "junit:junit:${junitVersion}"
testCompile "org.mockito:mockito-core:${mockitoVersion}"
testCompile "org.assertj:assertj-core:${assertjVersion}"
androidTestCompile "com.android.support:support-annotations:${supportVersion}"
androidTestCompile "org.mockito:mockito-core:${mockitoVersion}"
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile "com.android.support.test.espresso:espresso-intents:${espresseVersion}"
androidTestCompile "com.android.support.test.espresso:espresso-core:${espresseVersion}"
}

apply plugin: 'com.google.gms.google-services'
8 changes: 5 additions & 3 deletions app/src/main/java/com/fastaccess/helper/PrefGetter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,11 @@ public static boolean isRVAnimationEnabled() {
}

public static int getNotificationTaskDuration() {
String prefValue = PrefHelper.getString("notificationTime");
if (prefValue != null) {
return notificationDurationMillis(prefValue);
if (PrefHelper.isExist("notificationEnabled") && PrefHelper.getBoolean("notificationEnabled")) {
String prefValue = PrefHelper.getString("notificationTime");
if (prefValue != null) {
return notificationDurationMillis(prefValue);
}
}
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ buildscript {
maven { url "https://maven.google.com" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-alpha2'
classpath 'com.android.tools.build:gradle:2.4.0-alpha7'
classpath 'com.google.gms:google-services:3.0.0'
classpath('com.google.firebase:firebase-plugins:1.0.5') {
exclude group: 'com.google.guava', module: 'guava-jdk5'
Expand Down

0 comments on commit 81dd458

Please sign in to comment.