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

Commit 266a5d1

Browse files
committed
move location of a class
1 parent 6028e6e commit 266a5d1

6 files changed

Lines changed: 19 additions & 24 deletions

File tree

app/src/main/java/net/squanchy/search/SearchResult.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.squanchy.search
22

3-
import net.squanchy.search.domain.view.SearchListElement
3+
import net.squanchy.schedule.domain.view.Event
4+
import net.squanchy.speaker.domain.view.Speaker
45

56
sealed class SearchResult {
67

@@ -18,3 +19,11 @@ sealed class SearchResult {
1819
fun empty(): SearchResult = emptySearch
1920
}
2021
}
22+
23+
sealed class SearchListElement {
24+
object EventHeader : SearchListElement()
25+
data class EventElement(val event: Event) : SearchListElement()
26+
object SpeakerHeader : SearchListElement()
27+
data class SpeakerElement(val speaker: Speaker) : SearchListElement()
28+
object AlgoliaLogo : SearchListElement()
29+
}

app/src/main/java/net/squanchy/search/SearchService.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ import net.squanchy.search.algolia.model.AlgoliaSearchResult
88
import net.squanchy.search.algolia.model.AlgoliaSearchResult.QueryNotLongEnough
99
import net.squanchy.search.algolia.model.AlgoliaSearchResult.ErrorSearching
1010
import net.squanchy.search.algolia.model.AlgoliaSearchResult.Matches
11-
import net.squanchy.search.domain.view.SearchListElement
12-
import net.squanchy.search.domain.view.SearchListElement.SpeakerHeader
13-
import net.squanchy.search.domain.view.SearchListElement.EventHeader
14-
import net.squanchy.search.domain.view.SearchListElement.SpeakerElement
15-
import net.squanchy.search.domain.view.SearchListElement.AlgoliaLogo
16-
import net.squanchy.search.domain.view.SearchListElement.EventElement
11+
import net.squanchy.search.SearchListElement.SpeakerHeader
12+
import net.squanchy.search.SearchListElement.EventHeader
13+
import net.squanchy.search.SearchListElement.SpeakerElement
14+
import net.squanchy.search.SearchListElement.AlgoliaLogo
15+
import net.squanchy.search.SearchListElement.EventElement
1716
import net.squanchy.service.repository.AuthService
1817
import net.squanchy.service.repository.EventRepository
1918
import net.squanchy.service.repository.SpeakerRepository

app/src/main/java/net/squanchy/search/domain/view/SearchListResult.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/src/main/java/net/squanchy/search/view/GridSpanSizeLookup.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.squanchy.search.view
22

33
import android.support.v7.widget.GridLayoutManager
4-
import net.squanchy.search.domain.view.SearchListElement
4+
import net.squanchy.search.SearchListElement
55

66
internal class GridSpanSizeLookup(private val items: List<SearchListElement>, private val columnCount: Int) : GridLayoutManager.SpanSizeLookup() {
77

app/src/main/java/net/squanchy/search/view/SearchAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import net.squanchy.imageloader.imageLoaderComponent
1313
import net.squanchy.schedule.view.EventItemView
1414
import net.squanchy.schedule.view.EventViewHolder
1515
import net.squanchy.search.SearchResult
16-
import net.squanchy.search.domain.view.SearchListElement
16+
import net.squanchy.search.SearchListElement
1717

1818
internal class SearchAdapter(activity: AppCompatActivity) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
1919

app/src/test/java/net/squanchy/search/SearchServiceTest.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import io.reactivex.Observable
66
import net.squanchy.schedule.domain.view.anEvent
77
import net.squanchy.search.algolia.AlgoliaSearchEngine
88
import net.squanchy.search.algolia.model.AlgoliaSearchResult
9-
import net.squanchy.search.domain.view.SearchListElement
10-
import net.squanchy.search.domain.view.SearchListElement.EventElement
11-
import net.squanchy.search.domain.view.SearchListElement.SpeakerElement
9+
import net.squanchy.search.SearchListElement.EventElement
10+
import net.squanchy.search.SearchListElement.SpeakerElement
1211
import net.squanchy.service.repository.AuthService
1312
import net.squanchy.service.repository.EventRepository
1413
import net.squanchy.service.repository.SpeakerRepository

0 commit comments

Comments
 (0)