Merge pull request #56 from hoc081098/update-deps

update deps
hoc081098 · Oct 19, 2021 · 741479b · 741479b
2 parents ef527ff + 5f1a655
commit 741479b
Show file tree

Hide file tree

Showing 36 changed files with 211 additions and 184 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,9 +21,6 @@ jobs:
     - name: Make gradlew executable
       run: chmod +x ./gradlew
 
-    - name: Spotless check
-      run: ./gradlew spotlessCheck
-
     - name: Build debug APK
       run: ./gradlew assembleDebug --warning-mode all --stacktrace
 

diff --git a/.github/workflows/remove-old-artifacts.yml b/.github/workflows/remove-old-artifacts.yml
@@ -0,0 +1,22 @@
+name: Remove old artifacts
+
+on:
+#  push:
+#    branches: [ master ]
+
+  schedule:
+    # Runs at 01:00 UTC on the 1, 8, 15, 22 and 29th of every month.
+    - cron: '0 1 */7 * *'
+
+jobs:
+  remove-old-artifacts:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - name: Remove old artifacts
+        uses: c-hive/gha-remove-artifacts@v1
+        with:
+          age: '1 month'
+          skip-tags: true
+          skip-recent: 5
diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml
@@ -0,0 +1,25 @@
+name: Spotless check
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Spotless check
+        run: ./gradlew spotlessCheck
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ This project brings to the table set of best practices, tools, and solutions:
 [Download latest debug APK here](https://nightly.link/hoc081098/ComicReaderApp_MVI_Coroutine_RxKotlin_Jetpack/workflows/build/master/app-debug.zip)
 
 # Develop
-- You must use **Android Studio Bumblebee (2021.1.1) Canary 1** (**note: Java 11 is now the minimum version required**)
+- You must use **Android Studio Arctic Fox (2020.3.1)** (**note: Java 11 is now the minimum version required**)
 - Clone: `git clone https://github.com/hoc081098/ComicReaderApp_MVI_Coroutine_RxKotlin.git`
 - _Optional: **Delete `.idea` folder** if cannot open project_
 - Open project by `Android Studio` and run as usual
@@ -69,21 +69,3 @@ Clone this repository: https://github.com/hoc081098/comic_app_server_nodejs
     MIT License
 
     Copyright (c) 2019-2021 Petrus Nguyễn Thái Học
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
diff --git a/app/release/output.json b/app/release/output.json
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
 
         <activity
             android:name=".activity.SplashActivity"
+            android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -60,14 +61,13 @@
                 android:name="com.hoc.comicapp.initializer.AnalyticsInitializer"
                 android:value="androidx.startup" />
 
+            <!-- If you are using androidx.startup to initialize other components -->
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
         </provider>
 
-        <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            android:exported="false"
-            tools:node="remove" />
-
         <receiver
             android:name=".worker.ComicAppBroadcastReceiver"
             android:exported="false" />

diff --git a/app/src/main/java/com/hoc/comicapp/activity/main/MainActivity.kt b/app/src/main/java/com/hoc/comicapp/activity/main/MainActivity.kt
@@ -174,7 +174,7 @@ class MainActivity : ScopeActivity(R.layout.activity_main) {
                     .height(size)
                     .endConfig()
                     .buildRect(
-                      firstLetter.toUpperCase().toString(),
+                      firstLetter.uppercase(),
                       ColorGenerator.MATERIAL.getColor(user.email)
                     )
                 }

diff --git a/app/src/main/java/com/hoc/comicapp/activity/main/MainVM.kt b/app/src/main/java/com/hoc/comicapp/activity/main/MainVM.kt
@@ -13,6 +13,7 @@ import com.jakewharton.rxrelay3.PublishRelay
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Observable.mergeArray
 import io.reactivex.rxjava3.core.ObservableTransformer
+import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.kotlin.addTo
 import io.reactivex.rxjava3.kotlin.ofType
 import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -23,7 +24,7 @@ class MainVM(
 ) : BaseViewModel<ViewIntent, ViewState, SingleEvent>(ViewState.initial()) {
   private val intentS = PublishRelay.create<ViewIntent>()
 
-  override fun processIntents(intents: Observable<ViewIntent>) = intents.subscribe(intentS)!!
+  override fun processIntents(intents: Observable<ViewIntent>): Disposable = intents.subscribe(intentS)
 
   private val initialProcessor =
     ObservableTransformer<ViewIntent.Initial, PartialChange> { intent ->

diff --git a/app/src/main/java/com/hoc/comicapp/data/analytics/AnalyticsServiceImpl.kt b/app/src/main/java/com/hoc/comicapp/data/analytics/AnalyticsServiceImpl.kt
@@ -27,7 +27,7 @@ class AnalyticsServiceImpl : AnalyticsService {
 
 class SnakeCaseFirebaseAnalyticsEventMapper {
   fun nameFor(event: String): String =
-    CAMEL_REGEX.replace(event) { "_" + it.value }.toLowerCase()
+    CAMEL_REGEX.replace(event) { "_" + it.value }.lowercase()
 
   fun paramsFor(params: Map<String, Any>?): Bundle? {
     return bundleOf(

diff --git a/.../main/java/com/hoc/comicapp/data/firebase/favorite_comics/FavoriteComicsDataSourceImpl.kt b/.../main/java/com/hoc/comicapp/data/firebase/favorite_comics/FavoriteComicsDataSourceImpl.kt
@@ -14,6 +14,7 @@ import com.hoc.comicapp.domain.models.AuthError
 import com.hoc.comicapp.domain.thread.CoroutinesDispatchersProvider
 import com.hoc.comicapp.domain.thread.RxSchedulerProvider
 import com.hoc.comicapp.utils.snapshots
+import com.hoc.comicapp.utils.unit
 import io.reactivex.rxjava3.core.Observable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ObsoleteCoroutinesApi
@@ -138,9 +139,7 @@ class FavoriteComicsDataSourceImpl(
     }
   }
 
-  override fun update(comics: List<_FavoriteComic>) {
-    actor.offer(comics)
-  }
+  override fun update(comics: List<_FavoriteComic>) = actor.trySend(comics).unit
 
   private val favoriteCollectionForCurrentUserOrNull: CollectionReference?
     get() = firebaseAuth.currentUser?.uid?.let {

diff --git a/app/src/main/java/com/hoc/comicapp/data/repository/ComicRepositoryImpl.kt b/app/src/main/java/com/hoc/comicapp/data/repository/ComicRepositoryImpl.kt
@@ -29,9 +29,9 @@ import kotlinx.coroutines.channels.actor
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import kotlin.time.Duration.Companion.seconds
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTime
-import kotlin.time.seconds
 
 @OptIn(
   ExperimentalTime::class,
@@ -259,7 +259,7 @@ class ComicRepositoryImpl(
     favoriteComicsDataSource.update(listOf(entity))
 
     // update downloaded
-    actor.offer(Mappers.responseToLocalEntity(comicDetail))
+    actor.trySend(Mappers.responseToLocalEntity(comicDetail))
   }
 
   private companion object {

diff --git a/app/src/main/java/com/hoc/comicapp/data/repository/DownloadComicsRepositoryImpl.kt b/app/src/main/java/com/hoc/comicapp/data/repository/DownloadComicsRepositoryImpl.kt
@@ -54,6 +54,7 @@ import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.File
 import java.util.Date
+import kotlin.time.DurationUnit
 import kotlin.time.ExperimentalTime
 import kotlin.time.TimeSource
 
@@ -279,7 +280,7 @@ class DownloadComicsRepositoryImpl(
           chapterName = chapterDetail.chapterName,
           comicLink = chapterDetail.comicLink,
           comicName = chapterDetail.comicName,
-          elapsedInMilliseconds = elapsed.inMilliseconds,
+          elapsedInMilliseconds = elapsed.toDouble(DurationUnit.MILLISECONDS),
           elapsedInString = elapsed.toString()
         )
       )

diff --git a/app/src/main/java/com/hoc/comicapp/ui/category/CategoryViewModel.kt b/app/src/main/java/com/hoc/comicapp/ui/category/CategoryViewModel.kt
@@ -9,6 +9,7 @@ import com.hoc.comicapp.utils.notOfType
 import com.jakewharton.rxrelay3.PublishRelay
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.ObservableTransformer
+import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.kotlin.addTo
 import io.reactivex.rxjava3.kotlin.cast
 import io.reactivex.rxjava3.kotlin.ofType
@@ -87,6 +88,7 @@ class CategoryViewModel(
             when (it) {
               is CategoryPartialChange.RefreshPartialChange.Error -> sendMessageEvent(message = "Refresh error occurred: ${it.error.getMessage()}")
               is CategoryPartialChange.RefreshPartialChange.Data -> sendMessageEvent(message = "Refresh success")
+              CategoryPartialChange.RefreshPartialChange.Loading -> return@doOnNext
             }
           }
           .cast<CategoryPartialChange>()
@@ -109,8 +111,8 @@ class CategoryViewModel(
       }
     }
 
-  override fun processIntents(intents: Observable<CategoryViewIntent>) =
-    intents.subscribe(intentS)!!
+  override fun processIntents(intents: Observable<CategoryViewIntent>): Disposable =
+    intents.subscribe(intentS)
 
   init {
     intentS

diff --git a/app/src/main/java/com/hoc/comicapp/ui/category_detail/CategoryDetailAdapter.kt b/app/src/main/java/com/hoc/comicapp/ui/category_detail/CategoryDetailAdapter.kt
@@ -7,10 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.core.view.isVisible
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.OnLifecycleEvent
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
@@ -33,6 +31,7 @@ import com.hoc.comicapp.ui.category_detail.CategoryDetailContract.ViewState.Head
 import com.hoc.comicapp.ui.category_detail.CategoryDetailContract.ViewState.Item
 import com.hoc.comicapp.utils.asObservable
 import com.hoc.comicapp.utils.inflater
+import com.hoc.comicapp.utils.unit
 import com.jakewharton.rxbinding4.recyclerview.scrollStateChanges
 import com.jakewharton.rxbinding4.view.clicks
 import com.jakewharton.rxbinding4.view.detaches
@@ -186,11 +185,10 @@ class CategoryDetailAdapter(
       lifecycleOwner
         .lifecycle
         .addObserver(
-          object : LifecycleObserver {
+          object : DefaultLifecycleObserver {
             var disposable: Disposable? = null
 
-            @OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
-            private fun onCreate() {
+            override fun onCreate(owner: LifecycleOwner) {
               disposable = startStopAutoScrollS
                 .mergeWith(
                   binding.popularRecyclerHorizontal
@@ -229,14 +227,11 @@ class CategoryDetailAdapter(
                 )
             }
 
-            @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-            private fun onResume() = startStopAutoScrollS.accept(true)
+            override fun onResume(owner: LifecycleOwner) = startStopAutoScrollS.accept(true)
 
-            @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-            private fun onPause() = startStopAutoScrollS.accept(false)
+            override fun onPause(owner: LifecycleOwner) = startStopAutoScrollS.accept(false)
 
-            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-            private fun onDestroy() = disposable?.dispose()
+            override fun onDestroy(owner: LifecycleOwner) = disposable?.dispose().unit
           }
         )
     }

diff --git a/app/src/main/java/com/hoc/comicapp/ui/category_detail/CategoryDetailVM.kt b/app/src/main/java/com/hoc/comicapp/ui/category_detail/CategoryDetailVM.kt
@@ -15,6 +15,7 @@ import com.jakewharton.rxrelay3.PublishRelay
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Observable.mergeArray
 import io.reactivex.rxjava3.core.ObservableTransformer
+import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.kotlin.addTo
 import io.reactivex.rxjava3.kotlin.ofType
 import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -27,7 +28,7 @@ class CategoryDetailVM(
   private val intentS = PublishRelay.create<ViewIntent>()
   private val stateS = BehaviorRelay.createDefault(initialState)
 
-  override fun processIntents(intents: Observable<ViewIntent>) = intents.subscribe(intentS)!!
+  override fun processIntents(intents: Observable<ViewIntent>): Disposable = intents.subscribe(intentS)
 
   private val initialProcessor =
     ObservableTransformer<ViewIntent.Initial, PartialChange> { intent ->

diff --git a/app/src/main/java/com/hoc/comicapp/ui/chapter_detail/ChapterDetailViewModel.kt b/app/src/main/java/com/hoc/comicapp/ui/chapter_detail/ChapterDetailViewModel.kt
@@ -15,6 +15,7 @@ import com.hoc.comicapp.utils.notOfType
 import com.jakewharton.rxrelay3.PublishRelay
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.ObservableTransformer
+import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.kotlin.addTo
 import io.reactivex.rxjava3.kotlin.ofType
 import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -120,8 +121,8 @@ class ChapterDetailViewModel(
       )
     }
 
-  override fun processIntents(intents: Observable<ViewIntent>) =
-    intents.subscribe(intentS)!!
+  override fun processIntents(intents: Observable<ViewIntent>): Disposable =
+    intents.subscribe(intentS)
 
   init {
     intentS

diff --git a/app/src/main/java/com/hoc/comicapp/ui/detail/ComicDetailViewModel.kt b/app/src/main/java/com/hoc/comicapp/ui/detail/ComicDetailViewModel.kt
@@ -26,6 +26,7 @@ import com.jakewharton.rxrelay3.BehaviorRelay
 import com.jakewharton.rxrelay3.PublishRelay
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.ObservableTransformer
+import io.reactivex.rxjava3.disposables.Disposable
 import io.reactivex.rxjava3.kotlin.addTo
 import io.reactivex.rxjava3.kotlin.ofType
 import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -52,8 +53,8 @@ class ComicDetailViewModel(
   private val intentS = PublishRelay.create<ComicDetailIntent>()
   private val stateS = BehaviorRelay.createDefault(initialState)
 
-  override fun processIntents(intents: Observable<ComicDetailIntent>) =
-    intents.subscribe(intentS)!!
+  override fun processIntents(intents: Observable<ComicDetailIntent>): Disposable =
+    intents.subscribe(intentS)
 
   private val initialProcessor =
     ObservableTransformer<ComicDetailIntent.Initial, ComicDetailPartialChange> { intent ->
@@ -225,6 +226,9 @@ class ComicDetailViewModel(
             Timber.d("$operation error $it")
             sendMessageEvent("$operation error: ${event.chapter.chapterName}")
           }
+          is ComicDetailSingleEvent.EnqueuedDownloadFailure -> return@subscribeBy
+          is ComicDetailSingleEvent.EnqueuedDownloadSuccess -> return@subscribeBy
+          is ComicDetailSingleEvent.MessageEvent -> return@subscribeBy
         }
       }
       .addTo(compositeDisposable)