Update libraries, create CircularRepository.kt

app/build.gradle

@@ -37,19 +37,17 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'com.google.android.material:material:1.3.0-alpha02'
+    implementation 'com.google.android.material:material:1.3.0-alpha03'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
-    implementation 'androidx.navigation:navigation-fragment:2.3.0'
-    implementation 'androidx.navigation:navigation-ui:2.3.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.1'
     implementation "androidx.work:work-runtime-ktx:2.4.0"
     implementation "androidx.room:room-runtime:2.2.5"
     kapt "androidx.room:room-compiler:2.2.5"
     implementation "androidx.room:room-ktx:2.2.5"
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.3.0'

app/src/main/java/net/underdesk/circolapp/data/CircularRepository.kt

@@ -0,0 +1,51 @@
+package net.underdesk.circolapp.data
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import net.underdesk.circolapp.server.DataFetcher
+import java.io.IOException
+
+class CircularRepository(
+    val circularDao: CircularDao,
+    private val fetcher: DataFetcher = DataFetcher()
+) {
+    suspend fun updateCirculars(returnNewCirculars: Boolean = true): Pair<List<Circular>, Boolean> {
+        var onlyNewCirculars = listOf<Circular>()
+
+        try {
+            withContext(Dispatchers.IO) {
+                val oldCirculars = circularDao.getCirculars()
+                val newCirculars = fetcher.getCircularsFromServer()
+                if (newCirculars.size != oldCirculars.size) {
+                    if (newCirculars.size < oldCirculars.size) {
+                        circularDao.deleteAll()
+                    }
+
+                    if (returnNewCirculars) {
+                        val oldCircularsSize =
+                            if (newCirculars.size < oldCirculars.size) 0 else oldCirculars.size
+
+                        val circularCount = newCirculars.size - oldCircularsSize
+                        onlyNewCirculars = newCirculars.subList(0, circularCount)
+                    }
+
+                    circularDao.insertAll(newCirculars)
+                }
+            }
+        } catch (exception: IOException) {
+            return Pair(onlyNewCirculars, false)
+        }
+
+        return Pair(onlyNewCirculars, true)
+    }
+
+    companion object {
+        @Volatile
+        private var instance: CircularRepository? = null
+
+        fun getInstance(circularDao: CircularDao) =
+            instance ?: synchronized(this) {
+                instance ?: CircularRepository(circularDao).also { instance = it }
+            }
+    }
+}

app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt

@@ -32,14 +32,23 @@ import kotlinx.android.synthetic.main.fragment_circular_letters.view.*
 import net.underdesk.circolapp.MainActivity
 import net.underdesk.circolapp.R
 import net.underdesk.circolapp.adapters.CircularLetterAdapter
+import net.underdesk.circolapp.data.AppDatabase
+import net.underdesk.circolapp.data.CircularRepository
 import net.underdesk.circolapp.viewmodels.CircularLetterViewModel
+import net.underdesk.circolapp.viewmodels.CircularLetterViewModelFactory
 
 class CircularLetterFragment :
     Fragment(),
     MainActivity.SearchCallback,
     MainActivity.RefreshCallback {
 
-    private val circularLetterViewModel by viewModels<CircularLetterViewModel>()
+    private val circularLetterViewModel: CircularLetterViewModel by viewModels {
+        CircularLetterViewModelFactory(
+            CircularRepository.getInstance(
+                AppDatabase.getInstance(requireContext()).circularDao()
+            )
+        )
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,

app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt

@@ -29,11 +29,20 @@ import kotlinx.android.synthetic.main.fragment_circular_letters.view.*
 import net.underdesk.circolapp.MainActivity
 import net.underdesk.circolapp.R
 import net.underdesk.circolapp.adapters.CircularLetterAdapter
+import net.underdesk.circolapp.data.AppDatabase
+import net.underdesk.circolapp.data.CircularRepository
 import net.underdesk.circolapp.viewmodels.FavouritesViewModel
+import net.underdesk.circolapp.viewmodels.FavouritesViewModelFactory
 
 class FavouritesFragment : Fragment(), MainActivity.SearchCallback {
 
-    private val favouritesViewModel by viewModels<FavouritesViewModel>()
+    private val favouritesViewModel: FavouritesViewModel by viewModels {
+        FavouritesViewModelFactory(
+            CircularRepository.getInstance(
+                AppDatabase.getInstance(requireContext()).circularDao()
+            )
+        )
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,

app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt

@@ -29,11 +29,20 @@ import kotlinx.android.synthetic.main.fragment_circular_letters.view.*
 import net.underdesk.circolapp.MainActivity
 import net.underdesk.circolapp.R
 import net.underdesk.circolapp.adapters.CircularLetterAdapter
+import net.underdesk.circolapp.data.AppDatabase
+import net.underdesk.circolapp.data.CircularRepository
 import net.underdesk.circolapp.viewmodels.RemindersViewModel
+import net.underdesk.circolapp.viewmodels.RemindersViewModelFactory
 
 class RemindersFragment : Fragment(), MainActivity.SearchCallback {
 
-    private val remindersViewModel by viewModels<RemindersViewModel>()
+    private val remindersViewModel: RemindersViewModel by viewModels {
+        RemindersViewModelFactory(
+            CircularRepository.getInstance(
+                AppDatabase.getInstance(requireContext()).circularDao()
+            )
+        )
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,

app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt

@@ -18,17 +18,14 @@
 
 package net.underdesk.circolapp.viewmodels
 
-import android.app.Application
 import androidx.lifecycle.*
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import net.underdesk.circolapp.data.AppDatabase
 import net.underdesk.circolapp.data.Circular
-import net.underdesk.circolapp.server.DataFetcher
+import net.underdesk.circolapp.data.CircularRepository
-import java.io.IOException
 
-class CircularLetterViewModel(application: Application) : AndroidViewModel(application) {
+class CircularLetterViewModel internal constructor(
+    private val circularRepository: CircularRepository
+) : ViewModel() {
     init {
         updateCirculars()
     }
@@ -36,9 +33,9 @@ class CircularLetterViewModel(application: Application) : AndroidViewModel(appli
     val query = MutableLiveData("")
     val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input ->
         if (input == null || input == "") {
-            AppDatabase.getInstance(getApplication()).circularDao().getLiveCirculars()
+            circularRepository.circularDao.getLiveCirculars()
         } else {
-            AppDatabase.getInstance(getApplication()).circularDao().searchCirculars("%$input%")
+            circularRepository.circularDao.searchCirculars("%$input%")
         }
     }
 
@@ -50,28 +47,14 @@ class CircularLetterViewModel(application: Application) : AndroidViewModel(appli
         if (isNotUpdating) {
             viewModelScope.launch {
                 isNotUpdating = false
-                val fetcher = DataFetcher()
 
-                try {
+                if (!circularRepository.updateCirculars(false).second) {
-                    withContext(Dispatchers.IO) {
-                        val newCirculars = fetcher.getCircularsFromServer()
-                        if (newCirculars.size != circulars.value?.size ?: true) {
-                            if (newCirculars.size < circulars.value?.size ?: 0) {
-                                AppDatabase.getInstance(getApplication()).circularDao()
-                                    .deleteAll()
-                            }
-
-                            AppDatabase.getInstance(getApplication()).circularDao()
-                                .insertAll(newCirculars)
-                        }
-                    }
-                } catch (exception: IOException) {
                     showMessage.postValue(true)
-                } finally {
+                }
+
                 isNotUpdating = true
                 circularsUpdated.postValue(true)
             }
         }
     }
 }
-}

app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModelFactory.kt

@@ -0,0 +1,15 @@
+package net.underdesk.circolapp.viewmodels
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import net.underdesk.circolapp.data.CircularRepository
+
+class CircularLetterViewModelFactory(
+    private val circularRepository: CircularRepository
+) : ViewModelProvider.Factory {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return CircularLetterViewModel(circularRepository) as T
+    }
+}

app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt

@@ -18,21 +18,22 @@
 
 package net.underdesk.circolapp.viewmodels
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
-import net.underdesk.circolapp.data.AppDatabase
+import androidx.lifecycle.ViewModel
 import net.underdesk.circolapp.data.Circular
+import net.underdesk.circolapp.data.CircularRepository
 
-class FavouritesViewModel(application: Application) : AndroidViewModel(application) {
+class FavouritesViewModel internal constructor(
+    private val circularRepository: CircularRepository
+) : ViewModel() {
     val query = MutableLiveData("")
     val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input ->
         if (input == null || input == "") {
-            AppDatabase.getInstance(getApplication()).circularDao().getFavourites()
+            circularRepository.circularDao.getFavourites()
         } else {
-            AppDatabase.getInstance(getApplication()).circularDao().searchFavourites("%$input%")
+            circularRepository.circularDao.searchFavourites("%$input%")
         }
     }
 }

app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModelFactory.kt

@@ -0,0 +1,15 @@
+package net.underdesk.circolapp.viewmodels
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import net.underdesk.circolapp.data.CircularRepository
+
+class FavouritesViewModelFactory(
+    private val circularRepository: CircularRepository
+) : ViewModelProvider.Factory {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return FavouritesViewModel(circularRepository) as T
+    }
+}

app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt

@@ -18,21 +18,22 @@
 
 package net.underdesk.circolapp.viewmodels
 
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
-import net.underdesk.circolapp.data.AppDatabase
+import androidx.lifecycle.ViewModel
 import net.underdesk.circolapp.data.Circular
+import net.underdesk.circolapp.data.CircularRepository
 
-class RemindersViewModel(application: Application) : AndroidViewModel(application) {
+class RemindersViewModel internal constructor(
+    private val circularRepository: CircularRepository
+) : ViewModel() {
     val query = MutableLiveData("")
     val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input ->
         if (input == null || input == "") {
-            AppDatabase.getInstance(getApplication()).circularDao().getReminders()
+            circularRepository.circularDao.getReminders()
         } else {
-            AppDatabase.getInstance(getApplication()).circularDao().searchReminders("%$input%")
+            circularRepository.circularDao.searchReminders("%$input%")
         }
     }
 }

app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModelFactory.kt

@@ -0,0 +1,15 @@
+package net.underdesk.circolapp.viewmodels
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import net.underdesk.circolapp.data.CircularRepository
+
+class RemindersViewModelFactory(
+    private val circularRepository: CircularRepository
+) : ViewModelProvider.Factory {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return RemindersViewModel(circularRepository) as T
+    }
+}

app/src/main/java/net/underdesk/circolapp/works/PollWork.kt

@@ -30,15 +30,12 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.preference.PreferenceManager
 import androidx.work.*
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.withContext
 import net.underdesk.circolapp.MainActivity
 import net.underdesk.circolapp.R
 import net.underdesk.circolapp.data.AppDatabase
 import net.underdesk.circolapp.data.Circular
-import net.underdesk.circolapp.server.DataFetcher
+import net.underdesk.circolapp.data.CircularRepository
-import java.io.IOException
 import java.util.concurrent.TimeUnit
 
 class PollWork(appContext: Context, workerParams: WorkerParameters) :
@@ -87,33 +84,26 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) :
     }
 
     override suspend fun doWork(): Result = coroutineScope {
-        val fetcher = DataFetcher()
+        val circularRepository = CircularRepository.getInstance(
+            AppDatabase.getInstance(applicationContext).circularDao()
+        )
 
-        withContext(Dispatchers.IO) {
+        val result = circularRepository.updateCirculars()
-            val oldCirculars =
+        if (!result.second)
-                AppDatabase.getInstance(applicationContext).circularDao().getCirculars()
+            return@coroutineScope Result.retry()
-            val newCirculars = try {
-                fetcher.getCircularsFromServer()
-            } catch (exception: IOException) {
-                return@withContext Result.retry()
-            }
 
-            if (newCirculars.size != oldCirculars.size) {
+        val newCirculars = result.first
-                val oldCircularsSize =
-                    if (newCirculars.size < oldCirculars.size) 0 else oldCirculars.size
 
-                withContext(Dispatchers.Main) {
+        if (newCirculars.isNotEmpty()) {
             createNotificationChannel()
 
             val summaryStyle = NotificationCompat.InboxStyle()
                 .setBigContentTitle(applicationContext.getString(R.string.notification_summary_title))
                 .setSummaryText(applicationContext.getString(R.string.notification_summary))
 
-                    val circularCount = newCirculars.size - oldCircularsSize
+            for (circular in newCirculars) {
-
+                createNotification(circular)
-                    for (i in 0 until circularCount) {
+                summaryStyle.addLine(circular.name)
-                        createNotification(newCirculars[i])
-                        summaryStyle.addLine(newCirculars[i].name)
             }
 
             val summaryNotification =
@@ -122,8 +112,8 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) :
                     .setContentText(
                         applicationContext.resources.getQuantityString(
                             R.plurals.notification_summary_text,
-                                    circularCount,
+                            newCirculars.size,
-                                    circularCount
+                            newCirculars.size
                         )
                     )
                     .setSmallIcon(R.drawable.ic_notification)
@@ -137,17 +127,8 @@ class PollWork(appContext: Context, workerParams: WorkerParameters) :
             }
         }
 
-                if (newCirculars.size < oldCirculars.size) {
-                    AppDatabase.getInstance(applicationContext).circularDao()
-                        .deleteAll()
-                }
-
-                AppDatabase.getInstance(applicationContext).circularDao()
-                    .insertAll(newCirculars)
-            }
         Result.success()
     }
-    }
 
     private fun createNotification(circular: Circular) {
         val mainIntent = Intent(applicationContext, MainActivity::class.java)

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version"
         classpath "org.jlleitschuh.gradle:ktlint-gradle:9.4.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Sep 01 12:16:30 CEST 2020
+#Wed Oct 21 19:00:49 CEST 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