FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Readrops/readrops into develop

Browse Source
This commit is contained in:
Shinokuni 2024-02-15 21:41:37 +01:00
commit 425d20741b
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/android.yml vendored
View File

@ -15,11 +15,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: set up JDK 1.11
- name: set up JDK 1.17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
- name: Android Emulator Runner
uses: ReactiveCircus/android-emulator-runner@v2.28.0
with:
@ -28,5 +28,5 @@ jobs:
- uses: codecov/codecov-action@v2.1.0
with:
files: ./build/reports/jacoco/jacocoFullReport.xml
fail_ci_if_error: true
fail_ci_if_error: false
verbose: true

3
appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt
View File

@ -27,6 +27,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.paging.LoadState
import androidx.paging.compose.LazyPagingItems
@ -114,7 +115,7 @@ object TimelineTab : Tab {
Scaffold(
topBar = {
TopAppBar(
title = { Text(text = "Articles") },
title = { Text(text = stringResource(R.string.articles)) },
navigationIcon = {
IconButton(
onClick = { viewModel.openDrawer() }

7
appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt
View File

@ -19,6 +19,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage
@ -117,7 +118,7 @@ fun DrawerDefaultItems(
onClick: (FilterType) -> Unit,
) {
NavigationDrawerItem(
label = { Text("Articles") },
label = { Text(text = stringResource(R.string.articles)) },
icon = {
Icon(
painter = painterResource(id = R.drawable.ic_timeline),
@ -143,7 +144,7 @@ fun DrawerDefaultItems(
)
NavigationDrawerItem(
label = { Text("Favorites") },
label = { Text(text = stringResource(R.string.favorites)) },
icon = {
Icon(
imageVector = Icons.Filled.Star,
@ -156,7 +157,7 @@ fun DrawerDefaultItems(
)
NavigationDrawerItem(
label = { Text("To read later") },
label = { Text(text = stringResource(R.string.read_later)) },
icon = {
Icon(
painter = painterResource(id = R.drawable.ic_read_later),