Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/datetime/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
16 changes: 16 additions & 0 deletions core/datetime/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
plugins {
id "moop.android.library"
}

android {
namespace "soup.movie.datetime"
}

dependencies {
implementation projects.core.kotlin
implementation projects.data.model

implementation libs.kotlin.stdlib

testImplementation projects.testing
}
2 changes: 2 additions & 0 deletions core/datetime/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest />
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package soup.movie.domain.movie
package soup.movie.datetime

import java.time.DayOfWeek
import java.time.LocalDate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package soup.movie.domain.movie
package soup.movie.datetime

import org.junit.Assert.assertEquals
import org.junit.Test
Expand Down
1 change: 1 addition & 0 deletions domain/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ android {

dependencies {
implementation projects.core.kotlin
implementation projects.core.datetime
implementation projects.data.model

implementation libs.kotlin.stdlib
Expand Down
6 changes: 3 additions & 3 deletions domain/src/main/java/soup/movie/domain/movie/MovieExt.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package soup.movie.domain.movie

import soup.movie.model.MovieDetailModel
import soup.movie.datetime.today
import soup.movie.model.MovieModel
import java.time.LocalDate
import java.time.temporal.ChronoUnit
Expand All @@ -36,8 +36,8 @@ private fun MovieModel.hasOpenDate(): Boolean = openDate.toLocalDate() != null

fun MovieModel.isDDay(): Boolean = isPlan and hasOpenDate()

fun MovieDetailModel.screenDays(): Int {
val openDate = movie.openDate.toLocalDate()
fun MovieModel.screenDays(): Int {
val openDate = openDate.toLocalDate()
if (openDate != null) {
return ChronoUnit.DAYS.between(openDate, today()).toInt()
}
Expand Down
1 change: 1 addition & 0 deletions feature/detail/impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies {
implementation projects.core.imageloading.api
implementation projects.core.logger
implementation projects.core.resources
implementation projects.core.datetime
implementation projects.data.repository.api
implementation projects.data.model
implementation projects.domain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import soup.movie.common.DefaultDispatcher
import soup.movie.data.repository.MovieRepository
import soup.movie.domain.movie.MM_DD
import soup.movie.datetime.MM_DD
import soup.movie.datetime.yesterday
import soup.movie.domain.movie.screenDays
import soup.movie.domain.movie.yesterday
import soup.movie.log.Logger
import soup.movie.model.MovieDetailModel
import soup.movie.model.OpenDateAlarmModel
Expand Down Expand Up @@ -96,7 +96,7 @@ class DetailViewModel @Inject constructor(
rank = rank,
rankDate = yesterday().MM_DD(),
audience = audiAcc,
screenDays = screenDays(),
screenDays = movie.screenDays(),
),
)
}
Expand Down
1 change: 1 addition & 0 deletions feature/tasks/impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies {
implementation projects.core.kotlin
implementation projects.core.logger
implementation projects.core.resources
implementation projects.core.datetime
implementation projects.data.repository.api
implementation projects.data.model
implementation projects.domain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import androidx.work.BackoffPolicy
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import soup.movie.domain.movie.currentTime
import soup.movie.datetime.currentTime
import soup.movie.feature.tasks.AnnounceOpenDateTasks
import java.time.temporal.ChronoUnit
import java.util.concurrent.TimeUnit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
package soup.movie.feature.tasks.impl

import soup.movie.data.repository.MovieRepository
import soup.movie.domain.movie.YYYY_MM_DD
import soup.movie.domain.movie.plusDaysTo
import soup.movie.domain.movie.today
import soup.movie.datetime.YYYY_MM_DD
import soup.movie.datetime.plusDaysTo
import soup.movie.datetime.today
import soup.movie.feature.notification.NotificationBuilder
import soup.movie.model.OpenDateAlarmModel
import java.time.DayOfWeek
Expand Down