From 282e3dd9f86cc90ff4eb8f0e4f0fa3cdae91aca7 Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Fri, 18 Aug 2023 18:17:14 +0200
Subject: [PATCH] Add TimelineTab topBar icons
---
.../app/compose/timelime/TimelineTab.kt | 42 ++++++++++++++++++-
.../src/main/res/drawable/ic_done_all.xml | 5 +++
.../src/main/res/drawable/ic_filter_list.xml | 5 +++
appcompose/src/main/res/drawable/ic_sync.xml | 5 +++
4 files changed, 55 insertions(+), 2 deletions(-)
create mode 100644 appcompose/src/main/res/drawable/ic_done_all.xml
create mode 100644 appcompose/src/main/res/drawable/ic_filter_list.xml
create mode 100644 appcompose/src/main/res/drawable/ic_sync.xml
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 ee989059..2e8a1690 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
@@ -9,8 +9,13 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
@@ -20,12 +25,14 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.navigator.tab.TabOptions
import com.google.accompanist.swiperefresh.SwipeRefresh
import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import com.readrops.app.compose.R
import com.readrops.app.compose.item.ItemScreen
import com.readrops.app.compose.util.theme.spacing
import org.koin.androidx.compose.getViewModel
@@ -57,9 +64,40 @@ object TimelineTab : Tab {
Scaffold(
topBar = {
TopAppBar(
- title = { Text(text = "Timeline") }
+ title = { Text(text = "Timeline") },
+ navigationIcon = {
+ IconButton(onClick = { }) {
+ Icon(
+ imageVector = Icons.Default.Menu,
+ contentDescription = null
+ )
+ }
+ },
+ actions = {
+ IconButton(onClick = { }) {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_filter_list),
+ contentDescription = null
+ )
+ }
+
+ IconButton(onClick = { }) {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_sync),
+ contentDescription = null
+ )
+ }
+ }
)
- }
+ },
+ floatingActionButton = {
+ FloatingActionButton(onClick = { }) {
+ Icon(
+ painter = painterResource(id = R.drawable.ic_done_all),
+ contentDescription = null
+ )
+ }
+ },
) { paddingValues ->
SwipeRefresh(
state = swipeToRefreshState,
diff --git a/appcompose/src/main/res/drawable/ic_done_all.xml b/appcompose/src/main/res/drawable/ic_done_all.xml
new file mode 100644
index 00000000..9635085d
--- /dev/null
+++ b/appcompose/src/main/res/drawable/ic_done_all.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+</vector>
diff --git a/appcompose/src/main/res/drawable/ic_filter_list.xml b/appcompose/src/main/res/drawable/ic_filter_list.xml
new file mode 100644
index 00000000..b8090430
--- /dev/null
+++ b/appcompose/src/main/res/drawable/ic_filter_list.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>
diff --git a/appcompose/src/main/res/drawable/ic_sync.xml b/appcompose/src/main/res/drawable/ic_sync.xml
new file mode 100644
index 00000000..6c2e2b73
--- /dev/null
+++ b/appcompose/src/main/res/drawable/ic_sync.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
+</vector>