move LinkedItem into models package

This commit is contained in:
Satindar Dhillon 2022-09-19 10:22:08 -07:00
parent ab9a7dae88
commit 40d56ac6c8
5 changed files with 39 additions and 32 deletions

View file

@ -0,0 +1,35 @@
package app.omnivore.omnivore.models
import androidx.core.net.toUri
public data class LinkedItem(
public val id: String,
public val title: String,
public val createdAt: Any,
// public val savedAt: Any,
public val readAt: Any?,
// public val updatedAt: Any,
public val readingProgress: Double,
public val readingProgressAnchor: Int,
public val imageURLString: String?,
// public val onDeviceImageURLString: String?,
// public val documentDirectoryPath: String?,
public val pageURLString: String,
public val descriptionText: String?,
public val publisherURLString: String?,
// public val siteName: String?,
public val author: String?,
public val publishDate: Any?,
public val slug: String,
// public val isArchived: Boolean,
// public val contentReader: String?,
// public val originalHtml: String?,
) {
fun publisherDisplayName(): String? {
return publisherURLString?.toUri()?.host
}
fun labelsJSONString(): String {
return ""
}
}

View file

@ -14,6 +14,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.navigation.NavHostController
import app.omnivore.omnivore.Routes
import app.omnivore.omnivore.models.LinkedItem
import kotlinx.coroutines.flow.distinctUntilChanged

View file

@ -8,6 +8,7 @@ import app.omnivore.omnivore.Constants
import app.omnivore.omnivore.DatastoreKeys
import app.omnivore.omnivore.DatastoreRepository
import app.omnivore.omnivore.graphql.generated.SearchQuery
import app.omnivore.omnivore.models.LinkedItem
import com.apollographql.apollo3.ApolloClient
import com.apollographql.apollo3.api.Optional
import dagger.hilt.android.lifecycle.HiltViewModel
@ -123,34 +124,3 @@ class HomeViewModel @Inject constructor(
}
}
public data class LinkedItem(
public val id: String,
public val title: String,
public val createdAt: Any,
// public val savedAt: Any,
public val readAt: Any?,
// public val updatedAt: Any,
public val readingProgress: Double,
public val readingProgressAnchor: Int,
public val imageURLString: String?,
// public val onDeviceImageURLString: String?,
// public val documentDirectoryPath: String?,
public val pageURLString: String,
public val descriptionText: String?,
public val publisherURLString: String?,
// public val siteName: String?,
public val author: String?,
public val publishDate: Any?,
public val slug: String,
// public val isArchived: Boolean,
// public val contentReader: String?,
// public val originalHtml: String?,
) {
fun publisherDisplayName(): String? {
return publisherURLString?.toUri()?.host
}
fun labelsJSONString(): String {
return ""
}
}

View file

@ -15,6 +15,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import app.omnivore.omnivore.models.LinkedItem
import coil.compose.rememberAsyncImagePainter
@Composable

View file

@ -1,6 +1,6 @@
package app.omnivore.omnivore.ui.reader
import app.omnivore.omnivore.ui.home.LinkedItem
import app.omnivore.omnivore.models.LinkedItem
enum class WebFont(val displayText: String, val rawValue: String) {
INTER("Inter", "Inter"),