Skip to content

Commit

Permalink
Fixed deprecation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
spacecowboy committed Apr 18, 2024
1 parent f83571c commit 99225a1
Show file tree
Hide file tree
Showing 8 changed files with 330 additions and 331 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material3.Divider
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -216,7 +216,7 @@ fun EditFeedScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
Icons.Default.ArrowBack,
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.go_back),
)
}
Expand Down Expand Up @@ -310,9 +310,7 @@ fun EditFeedView(
rightFocusRequester = rightFocusRequester,
)

Divider(
modifier = Modifier.fillMaxWidth(),
)
HorizontalDivider(modifier = Modifier.fillMaxWidth())

RightContent(
viewState = viewState,
Expand Down Expand Up @@ -516,9 +514,7 @@ fun ColumnScope.RightContent(
description = stringResource(id = R.string.only_enable_for_bad_id_feeds),
icon = null,
) { viewState.alternateId = it }
Divider(
modifier = Modifier.fillMaxWidth(),
)
HorizontalDivider(modifier = Modifier.fillMaxWidth())
GroupTitle(
startingSpace = false,
height = 48.dp,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ import androidx.compose.material.icons.filled.Menu
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.Divider
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -683,7 +683,7 @@ fun FeedScreen(
Text(stringResource(id = R.string.mark_all_as_read))
},
)
Divider()
HorizontalDivider()
DropdownMenuItem(
onClick = {
onRefreshAll()
Expand All @@ -699,7 +699,7 @@ fun FeedScreen(
Text(stringResource(id = R.string.synchronize_feeds))
},
)
Divider()
HorizontalDivider()
DropdownMenuItem(
onClick = {
onShowToolbarMenu(false)
Expand Down Expand Up @@ -749,7 +749,7 @@ fun FeedScreen(
Text(stringResource(id = R.string.delete_feed))
},
)
Divider()
HorizontalDivider()
DropdownMenuItem(
onClick = {
onShowToolbarMenu(false)
Expand Down Expand Up @@ -795,7 +795,7 @@ fun FeedScreen(
Text(stringResource(id = R.string.export_saved_articles))
},
)
Divider()
HorizontalDivider()
DropdownMenuItem(
onClick = {
onShowToolbarMenu(false)
Expand All @@ -811,7 +811,7 @@ fun FeedScreen(
Text(stringResource(id = R.string.action_settings))
},
)
Divider()
HorizontalDivider()
DropdownMenuItem(
onClick = {
onShowToolbarMenu(false)
Expand Down Expand Up @@ -1280,7 +1280,7 @@ fun FeedListContent(
viewState.feedItemStyle != FeedItemStyle.COMPACT_CARD
) {
if (itemIndex < pagedFeedItems.itemCount - 1) {
Divider(
HorizontalDivider(
modifier =
Modifier
.height(1.dp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.Article
import androidx.compose.material.icons.filled.Article
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material.icons.filled.OpenInBrowser
Expand Down Expand Up @@ -220,7 +221,7 @@ fun ArticleScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
Icons.Default.ArrowBack,
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.go_back),
)
}
Expand All @@ -231,7 +232,7 @@ fun ArticleScreen(
onClick = onToggleFullText,
) {
Icon(
Icons.Default.Article,
Icons.AutoMirrored.Filled.Article,
contentDescription = stringResource(R.string.fetch_full_article),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -166,7 +166,7 @@ fun OpmlImportScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
Icons.Default.ArrowBack,
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.go_back),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.SkipNext
import androidx.compose.material.icons.filled.Stop
import androidx.compose.material.icons.filled.Translate
import androidx.compose.material3.Divider
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
Expand Down Expand Up @@ -203,7 +203,7 @@ fun TTSPlayer(
},
)
}
Divider()
HorizontalDivider()
for (lang in languages.item) {
DropdownMenuItem(
onClick = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.Card
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
Expand Down Expand Up @@ -131,7 +131,7 @@ fun SearchFeedScreen(
navigationIcon = {
IconButton(onClick = onNavigateUp) {
Icon(
Icons.Default.ArrowBack,
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.go_back),
)
}
Expand Down
Loading

0 comments on commit 99225a1

Please sign in to comment.