Skip to content
This repository was archived by the owner on Feb 17, 2020. It is now read-only.

Commit c919898

Browse files
committed
Rename Event.favorited -> Event.favorite
1 parent eed394e commit c919898

9 files changed

Lines changed: 9 additions & 9 deletions

File tree

app/src/debug/java/net/squanchy/support/debug/DebugActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class DebugActivity : AppCompatActivity() {
7575
experienceLevel = Option(ExperienceLevel.ADVANCED),
7676
speakers = createTalkSpeakers(),
7777
type = Event.Type.TALK,
78-
favorited = true,
78+
favorite = true,
7979
description = Option.empty(),
8080
track = Option(createTrack()),
8181
timeZone = DateTimeZone.forID("Europe/Rome")

app/src/main/java/net/squanchy/eventdetails/EventDetailsService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ internal class EventDetailsService(
3333
}
3434

3535
private fun toggleFavoriteOn(event: Event): Completable {
36-
return if (event.favorited) {
36+
return if (event.favorite) {
3737
removeFavorite(event.id)
3838
} else {
3939
favorite(event.id)

app/src/main/java/net/squanchy/eventdetails/widget/EventDetailsCoordinatorLayout.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EventDetailsCoordinatorLayout @JvmOverloads constructor(
2222

2323
if (canBeFavorited(event)) {
2424
favoriteFab.setImageResource(
25-
if (event.favorited)
25+
if (event.favorite)
2626
R.drawable.ic_favorite_filled
2727
else R.drawable.ic_favorite_empty
2828
)

app/src/main/java/net/squanchy/favorites/FavoritesService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ internal class FirestoreFavoritesService(
3333

3434
private fun SchedulePage.asFavouritesDayViewModel(): List<FavoritesItem> {
3535
val eventsAsFavoriteItems = this.events
36-
.filter { it.favorited }
36+
.filter { it.favorite }
3737
.map { it.toFavoriteItem() }
3838

3939
if (eventsAsFavoriteItems.isNotEmpty()) {

app/src/main/java/net/squanchy/notification/NotificationService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal class NotificationService(private val authService: AuthService, private
1111
fun sortedFavourites(): Observable<List<Event>> {
1212
return authService.ifUserSignedInThenObservableFrom { userId ->
1313
eventRepository.events(userId)
14-
.map { it.filter { it.favorited } }
14+
.map { it.filter { it.favorite } }
1515
.map { it.sortedBy { it.startTime } }
1616
.take(1)
1717
.subscribeOn(Schedulers.io())

app/src/main/java/net/squanchy/schedule/domain/view/Event.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data class Event(
1818
val speakers: List<Speaker>,
1919
val experienceLevel: Option<ExperienceLevel>,
2020
val type: Type,
21-
val favorited: Boolean,
21+
val favorite: Boolean,
2222
val description: Option<String>,
2323
val timeZone: DateTimeZone
2424
) {

app/src/main/java/net/squanchy/schedule/view/TalkEventItemView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class TalkEventItemView @JvmOverloads constructor(
4040
speaker_container.visibility = if (event.speakers.isEmpty()) View.GONE else View.VISIBLE
4141
speaker_container.updateWith(event.speakers, null)
4242

43-
favoriteIcon.isVisible = event.favorited
43+
favoriteIcon.isVisible = event.favorite
4444
}
4545

4646
private fun Place?.toPlaceLabel(): CharSequence? = if (this != null) "${this.name}" else null

app/src/main/java/net/squanchy/service/firebase/FirestoreMappers.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fun FirestoreEvent.toEvent(checksum: Checksum, timeZone: DateTimeZone, isFavorit
5959
experienceLevel = experienceLevel.toExperienceLevel(),
6060
speakers = speakers.map { it.toSpeaker(checksum) },
6161
type = type.toEventType(),
62-
favorited = isFavorite,
62+
favorite = isFavorite,
6363
description = description.option(),
6464
track = track?.toTrack(checksum).option(),
6565
timeZone = timeZone

app/src/test/java/net/squanchy/schedule/domain/view/ScheduleFixtures.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fun anEvent(
6363
description = description,
6464
track = track,
6565
timeZone = timeZone,
66-
favorited = favorited
66+
favorite = favorited
6767
)
6868

6969
fun aPlace(

0 commit comments

Comments
 (0)