From 90b8c54e18718fe5fda43995376ed18d11fcbcc9 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Thu, 15 Feb 2024 12:03:39 +0100
Subject: [PATCH 1/2] Use string resources in TimelineTab when possible

---
 .../java/com/readrops/app/compose/timelime/TimelineTab.kt  | 3 ++-
 .../readrops/app/compose/timelime/drawer/TimelineDrawer.kt | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt
index 5b643202..f1307067 100644
--- a/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt
+++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineTab.kt
@@ -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() }
diff --git a/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt b/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt
index 5b3627c2..a534dcb6 100644
--- a/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt
+++ b/appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/TimelineDrawer.kt
@@ -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),

From 6c875d9d93bd37e2d850478fb79ed3a32053cd5e Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Thu, 15 Feb 2024 12:15:57 +0100
Subject: [PATCH 2/2] Update build workflow to use JDK 1.17

---
 .github/workflows/android.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ed02aca4..7a5fb3d3 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -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
\ No newline at end of file