FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Voyager

This commit is contained in:
Shinokuni 2024-03-01 19:40:44 +01:00
parent 2ee2144fd3
commit 97dc2446ce
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appcompose/build.gradle
View File

@ -78,11 +78,9 @@ dependencies {
implementation "com.google.accompanist:accompanist-swiperefresh:0.30.1"
def voyager = "1.0.0-rc03"
def voyager = "1.0.0"
implementation "cafe.adriel.voyager:voyager-navigator:$voyager"
implementation "cafe.adriel.voyager:voyager-bottom-sheet-navigator:$voyager"
implementation "cafe.adriel.voyager:voyager-tab-navigator:$voyager"
implementation "cafe.adriel.voyager:voyager-androidx:$voyager"
implementation "cafe.adriel.voyager:voyager-koin:$voyager"
implementation "cafe.adriel.voyager:voyager-transitions:$voyager"

2
appcompose/src/main/java/com/readrops/app/compose/account/credentials/AccountCredentialsScreen.kt
View File

@ -8,10 +8,10 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import cafe.adriel.voyager.androidx.AndroidScreen
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import com.readrops.app.compose.home.HomeScreen
import com.readrops.app.compose.util.components.AndroidScreen
import com.readrops.db.entities.account.Account
import com.readrops.db.entities.account.AccountType

2
appcompose/src/main/java/com/readrops/app/compose/account/selection/AccountSelectionScreen.kt
View File

@ -16,12 +16,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cafe.adriel.voyager.androidx.AndroidScreen
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import com.readrops.app.compose.R
import com.readrops.app.compose.account.credentials.AccountCredentialsScreen
import com.readrops.app.compose.home.HomeScreen
import com.readrops.app.compose.util.components.AndroidScreen
import com.readrops.db.entities.account.AccountType
import org.koin.androidx.compose.getViewModel

2
appcompose/src/main/java/com/readrops/app/compose/home/HomeScreen.kt
View File

@ -16,7 +16,6 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import cafe.adriel.voyager.androidx.AndroidScreen
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import cafe.adriel.voyager.navigator.tab.CurrentTab
@ -26,6 +25,7 @@ import com.readrops.app.compose.account.AccountTab
import com.readrops.app.compose.feeds.FeedTab
import com.readrops.app.compose.more.MoreTab
import com.readrops.app.compose.timelime.TimelineTab
import com.readrops.app.compose.util.components.AndroidScreen
class HomeScreen : AndroidScreen() {

2
appcompose/src/main/java/com/readrops/app/compose/item/ItemScreen.kt
View File

@ -2,7 +2,7 @@ package com.readrops.app.compose.item
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import cafe.adriel.voyager.androidx.AndroidScreen
import com.readrops.app.compose.util.components.AndroidScreen
class ItemScreen : AndroidScreen() {

10
appcompose/src/main/java/com/readrops/app/compose/util/components/AndroidScreen.kt Normal file
View File

@ -0,0 +1,10 @@
package com.readrops.app.compose.util.components
import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.core.screen.ScreenKey
import cafe.adriel.voyager.core.screen.uniqueScreenKey
abstract class AndroidScreen : Screen {
override val key: ScreenKey = uniqueScreenKey
}