From 70a81235b478469ee337e96c2ea54ae3c2540f75 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Thu, 10 Oct 2024 15:35:43 +0200 Subject: [PATCH] Fix warnings --- api/src/main/java/com/readrops/api/utils/ApiUtils.kt | 4 ++-- .../test/java/com/readrops/api/localfeed/XmlAdapterTest.kt | 7 +------ .../com/readrops/api/localfeed/rss1/RSS1AdapterTest.kt | 4 ++-- app/src/main/java/com/readrops/app/account/AccountTab.kt | 4 ++-- .../app/account/credentials/AccountCredentialsScreen.kt | 4 ++-- .../app/account/selection/AccountSelectionScreen.kt | 4 ++-- app/src/main/java/com/readrops/app/feeds/FeedTab.kt | 4 ++-- .../java/com/readrops/app/feeds/dialogs/AddFeedDialog.kt | 3 ++- .../com/readrops/app/feeds/dialogs/UpdateFeedDialog.kt | 3 ++- app/src/main/java/com/readrops/app/item/ItemScreen.kt | 4 ++-- .../com/readrops/app/more/preferences/PreferencesScreen.kt | 4 ++-- .../com/readrops/app/notifications/NotificationsScreen.kt | 4 ++-- app/src/main/java/com/readrops/app/timelime/TimelineTab.kt | 4 ++-- .../com/readrops/app/timelime/drawer/TimelineDrawer.kt | 4 ++-- 14 files changed, 27 insertions(+), 30 deletions(-) diff --git a/api/src/main/java/com/readrops/api/utils/ApiUtils.kt b/api/src/main/java/com/readrops/api/utils/ApiUtils.kt index 0b48aac4..2325f804 100644 --- a/api/src/main/java/com/readrops/api/utils/ApiUtils.kt +++ b/api/src/main/java/com/readrops/api/utils/ApiUtils.kt @@ -21,7 +21,7 @@ object ApiUtils { fun isMimeImage(type: String): Boolean = type == "image" || type == "image/jpeg" || type == "image/jpg" || type == "image/png" - fun parseContentType(header: String?): String? { + fun parseContentType(header: String): String? { val matcher = Pattern.compile(RSS_CONTENT_TYPE_REGEX) .matcher(header) return if (matcher.find()) { @@ -37,7 +37,7 @@ object ApiUtils { * @param text string to clean * @return cleaned text */ - fun cleanText(text: String?): String { + fun cleanText(text: String): String { return Jsoup.parse(text).text().trim() } diff --git a/api/src/test/java/com/readrops/api/localfeed/XmlAdapterTest.kt b/api/src/test/java/com/readrops/api/localfeed/XmlAdapterTest.kt index 06b0d3e1..74800a01 100644 --- a/api/src/test/java/com/readrops/api/localfeed/XmlAdapterTest.kt +++ b/api/src/test/java/com/readrops/api/localfeed/XmlAdapterTest.kt @@ -3,17 +3,12 @@ package com.readrops.api.localfeed import com.readrops.api.localfeed.atom.ATOMFeedAdapter import com.readrops.api.localfeed.rss1.RSS1FeedAdapter import com.readrops.api.localfeed.rss2.RSS2FeedAdapter -import junit.framework.Assert.assertTrue import org.junit.Assert.assertThrows -import org.junit.Rule +import org.junit.Assert.assertTrue import org.junit.Test -import org.junit.rules.ExpectedException class XmlAdapterTest { - @get:Rule - val expectedException: ExpectedException = ExpectedException.none() - @Test fun xmlFeedAdapterFactoryTest() { assertTrue(XmlAdapter.xmlFeedAdapterFactory(LocalRSSHelper.RSSType.RSS_1) is RSS1FeedAdapter) diff --git a/api/src/test/java/com/readrops/api/localfeed/rss1/RSS1AdapterTest.kt b/api/src/test/java/com/readrops/api/localfeed/rss1/RSS1AdapterTest.kt index cd1d0f72..386fbff6 100644 --- a/api/src/test/java/com/readrops/api/localfeed/rss1/RSS1AdapterTest.kt +++ b/api/src/test/java/com/readrops/api/localfeed/rss1/RSS1AdapterTest.kt @@ -4,9 +4,9 @@ import com.gitlab.mvysny.konsumexml.konsumeXml import com.readrops.api.TestUtils import com.readrops.api.utils.exceptions.ParseException import com.readrops.db.util.DateUtils -import junit.framework.Assert.assertEquals -import junit.framework.Assert.assertNotNull import junit.framework.TestCase +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull import org.junit.Assert.assertThrows import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/main/java/com/readrops/app/account/AccountTab.kt b/app/src/main/java/com/readrops/app/account/AccountTab.kt index 1b084669..0660d29e 100644 --- a/app/src/main/java/com/readrops/app/account/AccountTab.kt +++ b/app/src/main/java/com/readrops/app/account/AccountTab.kt @@ -39,7 +39,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.Tab @@ -81,7 +81,7 @@ object AccountTab : Tab { override fun Content() { val navigator = LocalNavigator.currentOrThrow val context = LocalContext.current - val screenModel = getScreenModel() + val screenModel = koinScreenModel() val closeHome by screenModel.closeHome.collectAsStateWithLifecycle() val state by screenModel.accountState.collectAsStateWithLifecycle() diff --git a/app/src/main/java/com/readrops/app/account/credentials/AccountCredentialsScreen.kt b/app/src/main/java/com/readrops/app/account/credentials/AccountCredentialsScreen.kt index e8ce98a8..3b77226e 100644 --- a/app/src/main/java/com/readrops/app/account/credentials/AccountCredentialsScreen.kt +++ b/app/src/main/java/com/readrops/app/account/credentials/AccountCredentialsScreen.kt @@ -37,7 +37,7 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import com.readrops.app.R @@ -67,7 +67,7 @@ class AccountCredentialsScreen( override fun Content() { val navigator = LocalNavigator.currentOrThrow val screenModel = - getScreenModel(parameters = { parametersOf(account, mode) }) + koinScreenModel(parameters = { parametersOf(account, mode) }) val state by screenModel.state.collectAsStateWithLifecycle() diff --git a/app/src/main/java/com/readrops/app/account/selection/AccountSelectionScreen.kt b/app/src/main/java/com/readrops/app/account/selection/AccountSelectionScreen.kt index 8c6f8727..43214bee 100644 --- a/app/src/main/java/com/readrops/app/account/selection/AccountSelectionScreen.kt +++ b/app/src/main/java/com/readrops/app/account/selection/AccountSelectionScreen.kt @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp import androidx.core.content.res.ResourcesCompat import androidx.core.graphics.drawable.toBitmap import androidx.lifecycle.compose.collectAsStateWithLifecycle -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import com.readrops.api.utils.ApiUtils @@ -60,7 +60,7 @@ class AccountSelectionScreen : AndroidScreen() { val navigator = LocalNavigator.currentOrThrow val context = LocalContext.current - val screenModel = getScreenModel() + val screenModel = koinScreenModel() val state by screenModel.state.collectAsStateWithLifecycle() val opmlImportLauncher = diff --git a/app/src/main/java/com/readrops/app/feeds/FeedTab.kt b/app/src/main/java/com/readrops/app/feeds/FeedTab.kt index 55b93f9a..b28266dc 100644 --- a/app/src/main/java/com/readrops/app/feeds/FeedTab.kt +++ b/app/src/main/java/com/readrops/app/feeds/FeedTab.kt @@ -39,7 +39,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.tab.Tab import cafe.adriel.voyager.navigator.tab.TabOptions import com.readrops.app.R @@ -75,7 +75,7 @@ object FeedTab : Tab { val uriHandler = LocalUriHandler.current val context = LocalContext.current - val screenModel = getScreenModel() + val screenModel = koinScreenModel() val state by screenModel.feedsState.collectAsStateWithLifecycle() val snackbarHostState = remember { SnackbarHostState() } diff --git a/app/src/main/java/com/readrops/app/feeds/dialogs/AddFeedDialog.kt b/app/src/main/java/com/readrops/app/feeds/dialogs/AddFeedDialog.kt index 34ad7591..bd40e4b3 100644 --- a/app/src/main/java/com/readrops/app/feeds/dialogs/AddFeedDialog.kt +++ b/app/src/main/java/com/readrops/app/feeds/dialogs/AddFeedDialog.kt @@ -11,6 +11,7 @@ import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -112,7 +113,7 @@ fun AddFeedDialog( modifier = Modifier.size(24.dp) ) }, - modifier = Modifier.menuAnchor() + modifier = Modifier.menuAnchor(type = MenuAnchorType.PrimaryNotEditable) ) } diff --git a/app/src/main/java/com/readrops/app/feeds/dialogs/UpdateFeedDialog.kt b/app/src/main/java/com/readrops/app/feeds/dialogs/UpdateFeedDialog.kt index e2dc7d3e..13779f3a 100644 --- a/app/src/main/java/com/readrops/app/feeds/dialogs/UpdateFeedDialog.kt +++ b/app/src/main/java/com/readrops/app/feeds/dialogs/UpdateFeedDialog.kt @@ -6,6 +6,7 @@ import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -118,7 +119,7 @@ fun UpdateFeedDialog( ) } }, - modifier = Modifier.menuAnchor() + modifier = Modifier.menuAnchor(type = MenuAnchorType.PrimaryNotEditable) ) } diff --git a/app/src/main/java/com/readrops/app/item/ItemScreen.kt b/app/src/main/java/com/readrops/app/item/ItemScreen.kt index 3b2fdf57..3cb9e886 100644 --- a/app/src/main/java/com/readrops/app/item/ItemScreen.kt +++ b/app/src/main/java/com/readrops/app/item/ItemScreen.kt @@ -55,7 +55,7 @@ import androidx.compose.ui.viewinterop.AndroidView import androidx.core.net.toUri import androidx.core.view.children import androidx.lifecycle.compose.collectAsStateWithLifecycle -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import coil.compose.AsyncImage @@ -85,7 +85,7 @@ class ItemScreen( val navigator = LocalNavigator.currentOrThrow val screenModel = - getScreenModel(parameters = { parametersOf(itemId) }) + koinScreenModel(parameters = { parametersOf(itemId) }) val state by screenModel.state.collectAsStateWithLifecycle() val primaryColor = MaterialTheme.colorScheme.primary diff --git a/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt b/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt index 519d7413..12491e2f 100644 --- a/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt +++ b/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreen.kt @@ -30,7 +30,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import com.readrops.app.R @@ -51,7 +51,7 @@ class PreferencesScreen : AndroidScreen() { override fun Content() { val navigator = LocalNavigator.currentOrThrow val context = LocalContext.current - val screenModel = getScreenModel() + val screenModel = koinScreenModel() val scrollState = rememberScrollState() val coroutineScope = rememberCoroutineScope() diff --git a/app/src/main/java/com/readrops/app/notifications/NotificationsScreen.kt b/app/src/main/java/com/readrops/app/notifications/NotificationsScreen.kt index de74cbf7..9d12d785 100644 --- a/app/src/main/java/com/readrops/app/notifications/NotificationsScreen.kt +++ b/app/src/main/java/com/readrops/app/notifications/NotificationsScreen.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.lifecycle.compose.collectAsStateWithLifecycle -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import com.google.accompanist.permissions.ExperimentalPermissionsApi @@ -60,7 +60,7 @@ class NotificationsScreen(val account: Account) : AndroidScreen() { override fun Content() { val navigator = LocalNavigator.currentOrThrow val context = LocalContext.current - val screenModel = getScreenModel { parametersOf(account) } + val screenModel = koinScreenModel { parametersOf(account) } val state by screenModel.state.collectAsStateWithLifecycle() diff --git a/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt b/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt index 6ef29ffb..fedaeb33 100644 --- a/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt +++ b/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt @@ -51,7 +51,7 @@ import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.itemKey -import cafe.adriel.voyager.koin.getScreenModel +import cafe.adriel.voyager.koin.koinScreenModel import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.tab.Tab @@ -89,7 +89,7 @@ object TimelineTab : Tab { val navigator = LocalNavigator.currentOrThrow val context = LocalContext.current - val screenModel = getScreenModel() + val screenModel = koinScreenModel() val state by screenModel.timelineState.collectAsStateWithLifecycle() val preferences = state.preferences val items = state.itemState.collectAsLazyPagingItems() diff --git a/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt b/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt index a08d8191..53d62d94 100644 --- a/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt +++ b/app/src/main/java/com/readrops/app/timelime/drawer/TimelineDrawer.kt @@ -9,7 +9,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Star -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalDrawerSheet @@ -172,7 +172,7 @@ fun DrawerDefaultItems( @Composable fun DrawerDivider() { - Divider( + HorizontalDivider( thickness = 2.dp, modifier = Modifier.padding( vertical = MaterialTheme.spacing.drawerSpacing,