diff --git a/.gitignore b/.gitignore index 39b6783..c298eda 100755 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ captures/ # IntelliJ *.iml +.idea/ .idea/workspace.xml .idea/tasks.xml .idea/gradle.xml diff --git a/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt b/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt index 5247b37..f42f6ad 100755 --- a/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt +++ b/app/src/main/java/com/mdgd/j_commons/dto/Quake.kt @@ -44,6 +44,4 @@ class Quake { result = 31 * result + (title?.hashCode() ?: 0) return result } - - } diff --git a/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt b/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt index 55226a8..6adab85 100755 --- a/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt +++ b/app/src/main/java/com/mdgd/j_commons/dto/SearchParams.kt @@ -15,10 +15,8 @@ class SearchParams(val query: String = "", val stDate: Long = DEF_TIME, get() = (TextUtils.isEmpty(query) && stDate == DEF_TIME && TextUtils.isEmpty(stMag) && endDate == -DEF_TIME && TextUtils.isEmpty(endMag)) - fun isRegular(): Boolean { - return (TextUtils.isEmpty(query) && stDate != DEF_TIME + fun isRegular(): Boolean = (TextUtils.isEmpty(query) && stDate != DEF_TIME && TextUtils.isEmpty(stMag) && endDate == DEF_TIME && TextUtils.isEmpty(endMag)) - } companion object { const val DEF_TIME = -1L diff --git a/build.gradle b/build.gradle index 11568b0..a145449 100755 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext.kotlin_version = '1.3.50' ext.support_ver = '1.1.0' - ext.gcm_ver = '16.1.0' + ext.gcm_ver = '17.0.0' ext.retrofit_ver = '2.4.0' ext.androidx = '1.1.0' ext.androidx_recycler = '1.1.0-beta05' diff --git a/result/build.gradle b/result/build.gradle index a0b24e3..d4e861c 100755 --- a/result/build.gradle +++ b/result/build.gradle @@ -21,7 +21,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - } dependencies {} diff --git a/retrofit_support/build.gradle b/retrofit_support/build.gradle index 303a30e..91b91f4 100755 --- a/retrofit_support/build.gradle +++ b/retrofit_support/build.gradle @@ -19,7 +19,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - } dependencies {