diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index beeda4ff1..105164deb 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -132,19 +132,19 @@ dependencies { implementation 'com.apollographql.apollo3:apollo-runtime:3.7.2' - implementation 'androidx.compose.material3:material3:1.1.0-alpha03' - implementation 'androidx.compose.material3:material3-window-size-class:1.1.0-alpha03' + implementation 'androidx.compose.material3:material3:1.1.2' + 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.accompanist:accompanist-systemuicontroller: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.posthog.android:posthog:1.+' + implementation 'com.posthog.android:posthog:2.0.3' implementation 'io.intercom.android:intercom-sdk:15.1.0' // Room Deps diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/models/ServerSyncStatus.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/models/ServerSyncStatus.kt index e55ffe1ef..fdf568d2f 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/models/ServerSyncStatus.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/models/ServerSyncStatus.kt @@ -1,7 +1,7 @@ package app.omnivore.omnivore.models -public enum class ServerSyncStatus( - public val rawValue: Int, +enum class ServerSyncStatus( + val rawValue: Int, ) { IS_SYNCED(0), IS_SYNCING(1), diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/CreateUserProfile.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/CreateUserProfile.kt index fa3697a51..b09cd5c29 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/CreateUserProfile.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/CreateUserProfile.kt @@ -73,7 +73,6 @@ fun CreateUserProfileView(viewModel: LoginViewModel) { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun UserProfileFields( name: String, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt index 173b00368..5af3750e3 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailLogin.kt @@ -86,7 +86,6 @@ fun EmailLoginView(viewModel: LoginViewModel) { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun LoginFields( email: String, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailSignUpView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailSignUpView.kt index b2b87d507..2f9afe44f 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailSignUpView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/EmailSignUpView.kt @@ -140,7 +140,6 @@ fun EmailSignUpForm(viewModel: LoginViewModel) { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun EmailSignUpFields( email: String, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/SelfHostedView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/SelfHostedView.kt index bc1842fb3..241645f3a 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/SelfHostedView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/SelfHostedView.kt @@ -110,7 +110,6 @@ fun SelfHostedView(viewModel: LoginViewModel) { } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun SelfHostedFields( apiServer: String, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelCreationDialog.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelCreationDialog.kt index 0facbd226..fcadcdaea 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelCreationDialog.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/components/LabelCreationDialog.kt @@ -27,7 +27,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import app.omnivore.omnivore.R -@OptIn(ExperimentalMaterial3Api::class) @Composable fun LabelCreationDialog(onDismiss: () -> Unit, onSave: (String, String) -> Unit) { var labelName by rememberSaveable { mutableStateOf("") } diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryFilterBar.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryFilterBar.kt index c6e587893..443f34f84 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryFilterBar.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryFilterBar.kt @@ -25,7 +25,6 @@ import app.omnivore.omnivore.R import app.omnivore.omnivore.persistence.entities.SavedItemLabel import app.omnivore.omnivore.ui.components.LabelChipColors -@OptIn(ExperimentalMaterial3Api::class) @Composable fun LibraryFilterBar(viewModel: LibraryViewModel) { var isSavedItemFilterMenuExpanded by remember { mutableStateOf(false) } diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/notebook/NotebookView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/notebook/NotebookView.kt index 61a46e0db..9065415c5 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/notebook/NotebookView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/notebook/NotebookView.kt @@ -246,7 +246,6 @@ fun ArticleNotes(viewModel: NotebookViewModel, item: SavedItemWithLabelsAndHighl } } -@OptIn(ExperimentalMaterial3Api::class) @Composable fun HighlightsList(item: SavedItemWithLabelsAndHighlights, onEditNote: (note: Highlight?) -> Unit) { val highlights = item.highlights?.filter { it.type == "HIGHLIGHT" } ?: listOf() diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/AnnotationEditView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/AnnotationEditView.kt index 97abd9781..5bd9976b1 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/AnnotationEditView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/AnnotationEditView.kt @@ -39,7 +39,6 @@ class AnnotationEditFragment : DialogFragment() { this.onCancel = onCancel } - @OptIn(ExperimentalMaterial3Api::class) override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/ReaderPreferencesView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/ReaderPreferencesView.kt index 782dc2c8f..fef35f2e2 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/ReaderPreferencesView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/reader/ReaderPreferencesView.kt @@ -28,7 +28,6 @@ import androidx.compose.ui.unit.sp import app.omnivore.omnivore.R import app.omnivore.omnivore.ui.theme.OmnivoreTheme -@OptIn(ExperimentalMaterial3Api::class) @Composable fun ReaderPreferencesView(webReaderViewModel: WebReaderViewModel) { val isDark = isSystemInDarkTheme()