mirrors/nock-nock
0
0
Fork 0
mirror of https://github.com/afollestad/nock-nock.git synced 2025-08-08 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move model to models subpackage

Browse source
This commit is contained in:
Aidan Follestad 2019-01-07 18:09:32 -08:00
commit 67aa54ac22
12 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/release/app.aab Normal file
View file

Binary file not shown.

6
app/src/main/java/com/afollestad/nocknock/ui/addsite/AddSiteViewModel.kt
View file

@ -25,7 +25,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.OnLifecycleEvent import androidx.lifecycle.OnLifecycleEvent
import com.afollestad.nocknock.R import com.afollestad.nocknock.R
import com.afollestad.nocknock.data.AppDatabase import com.afollestad.nocknock.data.AppDatabase
import com.afollestad.nocknock.data.RetryPolicy import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.model.Site import com.afollestad.nocknock.data.model.Site
import com.afollestad.nocknock.data.model.SiteSettings import com.afollestad.nocknock.data.model.SiteSettings
import com.afollestad.nocknock.data.model.Status.WAITING import com.afollestad.nocknock.data.model.Status.WAITING
@ -241,7 +241,9 @@ class AddSiteViewModel(
val retryPolicyTimes = retryPolicyTimes.value ?: 0 val retryPolicyTimes = retryPolicyTimes.value ?: 0
val retryPolicyMinutes = retryPolicyMinutes.value ?: 0 val retryPolicyMinutes = retryPolicyMinutes.value ?: 0
val newRetryPolicy: RetryPolicy? = if (retryPolicyTimes > 0 && retryPolicyMinutes > 0) { val newRetryPolicy: RetryPolicy? = if (retryPolicyTimes > 0 && retryPolicyMinutes > 0) {
RetryPolicy(count = retryPolicyTimes, minutes = retryPolicyMinutes) RetryPolicy(
count = retryPolicyTimes, minutes = retryPolicyMinutes
)
} else { } else {
null null
} }

6
app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModel.kt
View file

@ -23,7 +23,7 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import com.afollestad.nocknock.R import com.afollestad.nocknock.R
import com.afollestad.nocknock.data.AppDatabase import com.afollestad.nocknock.data.AppDatabase
import com.afollestad.nocknock.data.RetryPolicy import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.deleteSite import com.afollestad.nocknock.data.deleteSite
import com.afollestad.nocknock.data.model.Site import com.afollestad.nocknock.data.model.Site
import com.afollestad.nocknock.data.model.Status import com.afollestad.nocknock.data.model.Status
@ -321,7 +321,9 @@ class ViewSiteViewModel(
site.retryPolicy!!.copy(count = retryPolicyTimes, minutes = retryPolicyMinutes) site.retryPolicy!!.copy(count = retryPolicyTimes, minutes = retryPolicyMinutes)
} else { } else {
// Create new policy // Create new policy
RetryPolicy(count = retryPolicyTimes, minutes = retryPolicyMinutes) RetryPolicy(
count = retryPolicyTimes, minutes = retryPolicyMinutes
)
} }
} else { } else {
// No policy // No policy

2
app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelExt.kt
View file

@ -15,7 +15,7 @@
*/ */
package com.afollestad.nocknock.ui.viewsite package com.afollestad.nocknock.ui.viewsite
import com.afollestad.nocknock.data.RetryPolicy import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.model.Site import com.afollestad.nocknock.data.model.Site
import com.afollestad.nocknock.data.model.Status.WAITING import com.afollestad.nocknock.data.model.Status.WAITING
import com.afollestad.nocknock.data.model.ValidationMode.JAVASCRIPT import com.afollestad.nocknock.data.model.ValidationMode.JAVASCRIPT

2
app/src/test/java/com/afollestad/nocknock/TestData.kt
View file

@ -19,7 +19,7 @@ import android.app.PendingIntent
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import com.afollestad.nocknock.data.AppDatabase import com.afollestad.nocknock.data.AppDatabase
import com.afollestad.nocknock.data.RetryPolicy import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.RetryPolicyDao import com.afollestad.nocknock.data.RetryPolicyDao
import com.afollestad.nocknock.data.SiteDao import com.afollestad.nocknock.data.SiteDao
import com.afollestad.nocknock.data.SiteSettingsDao import com.afollestad.nocknock.data.SiteSettingsDao

1
data/src/androidTest/java/com/afollestad/nocknock/data/AppDatabaseTest.kt
View file

@ -21,6 +21,7 @@ import android.content.Context
import androidx.room.Room.inMemoryDatabaseBuilder import androidx.room.Room.inMemoryDatabaseBuilder
import androidx.test.core.app.ApplicationProvider.getApplicationContext import androidx.test.core.app.ApplicationProvider.getApplicationContext
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.model.Site import com.afollestad.nocknock.data.model.Site
import com.afollestad.nocknock.data.model.SiteSettings import com.afollestad.nocknock.data.model.SiteSettings
import com.afollestad.nocknock.data.model.Status.ERROR import com.afollestad.nocknock.data.model.Status.ERROR

1
data/src/androidTest/java/com/afollestad/nocknock/data/TestUtil.kt
View file

@ -15,6 +15,7 @@
*/ */
package com.afollestad.nocknock.data package com.afollestad.nocknock.data
import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.model.Site import com.afollestad.nocknock.data.model.Site
import com.afollestad.nocknock.data.model.SiteSettings import com.afollestad.nocknock.data.model.SiteSettings
import com.afollestad.nocknock.data.model.Status import com.afollestad.nocknock.data.model.Status

1
data/src/main/java/com/afollestad/nocknock/data/AppDatabase.kt
View file

@ -19,6 +19,7 @@ import androidx.room.Database
import androidx.room.RoomDatabase import androidx.room.RoomDatabase
import androidx.room.TypeConverters import androidx.room.TypeConverters
import com.afollestad.nocknock.data.model.Converters import com.afollestad.nocknock.data.model.Converters
import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.model.Site import com.afollestad.nocknock.data.model.Site
import com.afollestad.nocknock.data.model.SiteSettings import com.afollestad.nocknock.data.model.SiteSettings
import com.afollestad.nocknock.data.model.ValidationResult import com.afollestad.nocknock.data.model.ValidationResult

1
data/src/main/java/com/afollestad/nocknock/data/RetryPolicyDao.kt
View file

@ -21,6 +21,7 @@ import androidx.room.Insert
import androidx.room.OnConflictStrategy.FAIL import androidx.room.OnConflictStrategy.FAIL
import androidx.room.Query import androidx.room.Query
import androidx.room.Update import androidx.room.Update
import com.afollestad.nocknock.data.model.RetryPolicy
/** @author Aidan Follestad (@afollestad) */ /** @author Aidan Follestad (@afollestad) */
@Dao @Dao

2
data/src/main/java/com/afollestad/nocknock/data/RetryPolicy.kt → data/src/main/java/com/afollestad/nocknock/data/model/RetryPolicy.kt
View file

@ -15,7 +15,7 @@
*/ */
@file:Suppress("unused") @file:Suppress("unused")
package com.afollestad.nocknock.data package com.afollestad.nocknock.data.model
import androidx.room.Entity import androidx.room.Entity
import androidx.room.PrimaryKey import androidx.room.PrimaryKey

1
data/src/main/java/com/afollestad/nocknock/data/model/Site.kt
View file

@ -18,7 +18,6 @@ package com.afollestad.nocknock.data.model
import androidx.room.Entity import androidx.room.Entity
import androidx.room.Ignore import androidx.room.Ignore
import androidx.room.PrimaryKey import androidx.room.PrimaryKey
import com.afollestad.nocknock.data.RetryPolicy
import com.afollestad.nocknock.data.model.Status.WAITING import com.afollestad.nocknock.data.model.Status.WAITING
import com.afollestad.nocknock.utilities.ext.timeString import com.afollestad.nocknock.utilities.ext.timeString
import com.afollestad.nocknock.utilities.providers.CanNotifyModel import com.afollestad.nocknock.utilities.providers.CanNotifyModel

2
engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationJob.kt
View file

@ -19,7 +19,7 @@ import android.app.job.JobParameters
import android.app.job.JobService import android.app.job.JobService
import android.content.Intent import android.content.Intent
import com.afollestad.nocknock.data.AppDatabase import com.afollestad.nocknock.data.AppDatabase
import com.afollestad.nocknock.data.RetryPolicy import com.afollestad.nocknock.data.model.RetryPolicy
import com.afollestad.nocknock.data.getSite import com.afollestad.nocknock.data.getSite
import com.afollestad.nocknock.data.model.Site import com.afollestad.nocknock.data.model.Site
import com.afollestad.nocknock.data.model.Status import com.afollestad.nocknock.data.model.Status