Android: Update few dependencies + minor clean up
Signed-off-by: Remy Chantenay <remy.chantenay@gmail.com>
This commit is contained in:
@ -132,19 +132,19 @@ dependencies {
|
|||||||
|
|
||||||
implementation 'com.apollographql.apollo3:apollo-runtime:3.7.2'
|
implementation 'com.apollographql.apollo3:apollo-runtime:3.7.2'
|
||||||
|
|
||||||
implementation 'androidx.compose.material3:material3:1.1.0-alpha03'
|
implementation 'androidx.compose.material3:material3:1.1.2'
|
||||||
implementation 'androidx.compose.material3:material3-window-size-class:1.1.0-alpha03'
|
implementation 'androidx.compose.material3:material3-window-size-class:1.1.2'
|
||||||
|
|
||||||
implementation 'com.google.android.gms:play-services-auth:20.4.0'
|
implementation 'com.google.android.gms:play-services-auth:20.4.0'
|
||||||
implementation "com.google.accompanist:accompanist-systemuicontroller:0.25.1"
|
implementation "com.google.accompanist:accompanist-systemuicontroller:0.25.1"
|
||||||
implementation "com.google.accompanist:accompanist-flowlayout:0.25.1"
|
implementation "com.google.accompanist:accompanist-flowlayout:0.25.1"
|
||||||
|
|
||||||
implementation 'io.coil-kt:coil-compose:2.2.0'
|
implementation 'io.coil-kt:coil-compose:2.3.0'
|
||||||
|
|
||||||
implementation 'com.google.code.gson:gson:2.8.9'
|
implementation 'com.google.code.gson:gson:2.9.0'
|
||||||
implementation 'com.pspdfkit:pspdfkit:8.4.1'
|
implementation 'com.pspdfkit:pspdfkit:8.4.1'
|
||||||
|
|
||||||
implementation 'com.posthog.android:posthog:1.+'
|
implementation 'com.posthog.android:posthog:2.0.3'
|
||||||
implementation 'io.intercom.android:intercom-sdk:15.1.0'
|
implementation 'io.intercom.android:intercom-sdk:15.1.0'
|
||||||
|
|
||||||
// Room Deps
|
// Room Deps
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
package app.omnivore.omnivore.models
|
package app.omnivore.omnivore.models
|
||||||
|
|
||||||
public enum class ServerSyncStatus(
|
enum class ServerSyncStatus(
|
||||||
public val rawValue: Int,
|
val rawValue: Int,
|
||||||
) {
|
) {
|
||||||
IS_SYNCED(0),
|
IS_SYNCED(0),
|
||||||
IS_SYNCING(1),
|
IS_SYNCING(1),
|
||||||
|
|||||||
@ -73,7 +73,6 @@ fun CreateUserProfileView(viewModel: LoginViewModel) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun UserProfileFields(
|
fun UserProfileFields(
|
||||||
name: String,
|
name: String,
|
||||||
|
|||||||
@ -86,7 +86,6 @@ fun EmailLoginView(viewModel: LoginViewModel) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LoginFields(
|
fun LoginFields(
|
||||||
email: String,
|
email: String,
|
||||||
|
|||||||
@ -140,7 +140,6 @@ fun EmailSignUpForm(viewModel: LoginViewModel) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun EmailSignUpFields(
|
fun EmailSignUpFields(
|
||||||
email: String,
|
email: String,
|
||||||
|
|||||||
@ -110,7 +110,6 @@ fun SelfHostedView(viewModel: LoginViewModel) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun SelfHostedFields(
|
fun SelfHostedFields(
|
||||||
apiServer: String,
|
apiServer: String,
|
||||||
|
|||||||
@ -27,7 +27,6 @@ import androidx.compose.ui.unit.dp
|
|||||||
import androidx.compose.ui.window.Dialog
|
import androidx.compose.ui.window.Dialog
|
||||||
import app.omnivore.omnivore.R
|
import app.omnivore.omnivore.R
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LabelCreationDialog(onDismiss: () -> Unit, onSave: (String, String) -> Unit) {
|
fun LabelCreationDialog(onDismiss: () -> Unit, onSave: (String, String) -> Unit) {
|
||||||
var labelName by rememberSaveable { mutableStateOf("") }
|
var labelName by rememberSaveable { mutableStateOf("") }
|
||||||
|
|||||||
@ -25,7 +25,6 @@ import app.omnivore.omnivore.R
|
|||||||
import app.omnivore.omnivore.persistence.entities.SavedItemLabel
|
import app.omnivore.omnivore.persistence.entities.SavedItemLabel
|
||||||
import app.omnivore.omnivore.ui.components.LabelChipColors
|
import app.omnivore.omnivore.ui.components.LabelChipColors
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LibraryFilterBar(viewModel: LibraryViewModel) {
|
fun LibraryFilterBar(viewModel: LibraryViewModel) {
|
||||||
var isSavedItemFilterMenuExpanded by remember { mutableStateOf(false) }
|
var isSavedItemFilterMenuExpanded by remember { mutableStateOf(false) }
|
||||||
|
|||||||
@ -246,7 +246,6 @@ fun ArticleNotes(viewModel: NotebookViewModel, item: SavedItemWithLabelsAndHighl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun HighlightsList(item: SavedItemWithLabelsAndHighlights, onEditNote: (note: Highlight?) -> Unit) {
|
fun HighlightsList(item: SavedItemWithLabelsAndHighlights, onEditNote: (note: Highlight?) -> Unit) {
|
||||||
val highlights = item.highlights?.filter { it.type == "HIGHLIGHT" } ?: listOf()
|
val highlights = item.highlights?.filter { it.type == "HIGHLIGHT" } ?: listOf()
|
||||||
|
|||||||
@ -39,7 +39,6 @@ class AnnotationEditFragment : DialogFragment() {
|
|||||||
this.onCancel = onCancel
|
this.onCancel = onCancel
|
||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
inflater: LayoutInflater,
|
inflater: LayoutInflater,
|
||||||
container: ViewGroup?,
|
container: ViewGroup?,
|
||||||
|
|||||||
@ -28,7 +28,6 @@ import androidx.compose.ui.unit.sp
|
|||||||
import app.omnivore.omnivore.R
|
import app.omnivore.omnivore.R
|
||||||
import app.omnivore.omnivore.ui.theme.OmnivoreTheme
|
import app.omnivore.omnivore.ui.theme.OmnivoreTheme
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ReaderPreferencesView(webReaderViewModel: WebReaderViewModel) {
|
fun ReaderPreferencesView(webReaderViewModel: WebReaderViewModel) {
|
||||||
val isDark = isSystemInDarkTheme()
|
val isDark = isSystemInDarkTheme()
|
||||||
|
|||||||
Reference in New Issue
Block a user