Minor edits

jcerdenia · Nov 25, 2020 · f593d57 · f593d57
1 parent 67f883d
commit f593d57
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,7 +39,7 @@ dependencies {
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 

diff --git a/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/EntryListViewModel.kt b/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/EntryListViewModel.kt
@@ -143,9 +143,7 @@ class EntryListViewModel: ViewModel(), UpdateManager.UpdateReceiver {
     ): Boolean {
         var count = 0
         for (entry in entries) {
-            if (entry.isStarred) {
-                count += 1
-            } else break
+            if (entry.isStarred) count += 1 else break
         }
         return count == entries.size
     }
@@ -155,9 +153,7 @@ class EntryListViewModel: ViewModel(), UpdateManager.UpdateReceiver {
     ): Boolean {
         var count = 0
         for (entry in entries) {
-            if (entry.isRead) {
-                count += 1
-            } else break
+            if (entry.isRead) count += 1 else break
         }
         return count == entries.size
     }

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.10"
+    ext.kotlin_version = "1.4.20"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.28-alpha'
 

diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+# Warning: experimental
+# android.jetifier.blacklist = pass
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jun 20 15:52:47 PST 2020
+#Mon Nov 23 21:08:43 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip