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

Rename appcompose module to app

Browse Source
This commit is contained in:
Shinokuni 2024-07-03 16:21:29 +02:00
parent 84a8377e9e
commit 08de3f3a80
135 changed files with 286 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
appcompose/.gitignore → app/.gitignore vendored
View File

4
appcompose/build.gradle → app/build.gradle
View File

@ -4,11 +4,11 @@ plugins {
} }
android { android {
namespace 'com.readrops.app.compose' namespace 'com.readrops.app'
compileSdk rootProject.ext.compileSdkVersion compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "com.readrops.app.compose" applicationId "com.readrops.app"
minSdk rootProject.ext.minSdkVersion minSdk rootProject.ext.minSdkVersion
targetSdk rootProject.ext.targetSdkVersion targetSdk rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1

0
appcompose/proguard-rules.pro → app/proguard-rules.pro vendored
View File

4
appcompose/src/androidTest/java/com/readrops/app/compose/FeedColorsTest.kt → app/src/androidTest/java/com/readrops/app/FeedColorsTest.kt
View File

@ -1,10 +1,10 @@
package com.readrops.app.compose package com.readrops.app
import android.content.Context import android.content.Context
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import com.readrops.api.apiModule import com.readrops.api.apiModule
import com.readrops.api.utils.ApiUtils import com.readrops.api.utils.ApiUtils
import com.readrops.app.compose.util.FeedColors import com.readrops.app.util.FeedColors
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer import okhttp3.mockwebserver.MockWebServer

4
appcompose/src/androidTest/java/com/readrops/app/compose/GetFoldersWithFeedsTest.kt → app/src/androidTest/java/com/readrops/app/GetFoldersWithFeedsTest.kt
View File

@ -1,9 +1,9 @@
package com.readrops.app.compose package com.readrops.app
import android.content.Context import android.content.Context
import androidx.room.Room import androidx.room.Room
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import com.readrops.app.compose.repositories.GetFoldersWithFeeds import com.readrops.app.repositories.GetFoldersWithFeeds
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder

4
appcompose/src/androidTest/java/com/readrops/app/compose/LocalRSSRepositoryTest.kt → app/src/androidTest/java/com/readrops/app/LocalRSSRepositoryTest.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose package com.readrops.app
import android.content.Context import android.content.Context
import androidx.room.Room import androidx.room.Room
@ -6,7 +6,7 @@ import androidx.test.core.app.ApplicationProvider
import com.readrops.api.apiModule import com.readrops.api.apiModule
import com.readrops.api.utils.ApiUtils import com.readrops.api.utils.ApiUtils
import com.readrops.api.utils.AuthInterceptor import com.readrops.api.utils.AuthInterceptor
import com.readrops.app.compose.repositories.LocalRSSRepository import com.readrops.app.repositories.LocalRSSRepository
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account

4
appcompose/src/androidTest/java/com/readrops/app/compose/SyncResultAnalyserTest.kt → app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt
View File

@ -1,11 +1,11 @@
package com.readrops.app.compose package com.readrops.app
import android.content.Context import android.content.Context
import androidx.room.Room import androidx.room.Room
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import com.readrops.app.compose.sync.SyncAnalyzer import com.readrops.app.sync.SyncAnalyzer
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Item import com.readrops.db.entities.Item

2
appcompose/src/androidTest/java/com/readrops/app/compose/TestUtils.kt → app/src/androidTest/java/com/readrops/app/TestUtils.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose package com.readrops.app
import java.io.InputStream import java.io.InputStream

0
appcompose/src/androidTest/resources/favicon.ico → app/src/androidTest/resources/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
appcompose/src/androidTest/resources/rss_feed.xml → app/src/androidTest/resources/rss_feed.xml
View File

0
appcompose/src/debug/res/values/strings.xml → app/src/debug/res/values/strings.xml
View File

0
appcompose/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml
View File

0
appcompose/src/main/assets/fonts/Inter-Bold.woff2 → app/src/main/assets/fonts/Inter-Bold.woff2
View File

0
appcompose/src/main/assets/fonts/Inter-BoldItalic.woff2 → app/src/main/assets/fonts/Inter-BoldItalic.woff2
View File

0
appcompose/src/main/assets/fonts/Inter-Italic.woff2 → app/src/main/assets/fonts/Inter-Italic.woff2
View File

0
appcompose/src/main/assets/fonts/Inter-Regular.woff2 → app/src/main/assets/fonts/Inter-Regular.woff2
View File

28
appcompose/src/main/java/com/readrops/app/compose/ComposeAppModule.kt → app/src/main/java/com/readrops/app/ComposeAppModule.kt
View File

@ -1,21 +1,21 @@
package com.readrops.app.compose package com.readrops.app
import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.EncryptedSharedPreferences
import androidx.security.crypto.MasterKey import androidx.security.crypto.MasterKey
import com.readrops.api.services.Credentials import com.readrops.api.services.Credentials
import com.readrops.app.compose.account.AccountScreenModel import com.readrops.app.account.AccountScreenModel
import com.readrops.app.compose.account.credentials.AccountCredentialsScreenMode import com.readrops.app.account.credentials.AccountCredentialsScreenMode
import com.readrops.app.compose.account.credentials.AccountCredentialsScreenModel import com.readrops.app.account.credentials.AccountCredentialsScreenModel
import com.readrops.app.compose.account.selection.AccountSelectionScreenModel import com.readrops.app.account.selection.AccountSelectionScreenModel
import com.readrops.app.compose.feeds.FeedScreenModel import com.readrops.app.feeds.FeedScreenModel
import com.readrops.app.compose.item.ItemScreenModel import com.readrops.app.item.ItemScreenModel
import com.readrops.app.compose.notifications.NotificationsScreenModel import com.readrops.app.notifications.NotificationsScreenModel
import com.readrops.app.compose.repositories.BaseRepository import com.readrops.app.repositories.BaseRepository
import com.readrops.app.compose.repositories.FreshRSSRepository import com.readrops.app.repositories.FreshRSSRepository
import com.readrops.app.compose.repositories.GetFoldersWithFeeds import com.readrops.app.repositories.GetFoldersWithFeeds
import com.readrops.app.compose.repositories.LocalRSSRepository import com.readrops.app.repositories.LocalRSSRepository
import com.readrops.app.compose.repositories.NextcloudNewsRepository import com.readrops.app.repositories.NextcloudNewsRepository
import com.readrops.app.compose.timelime.TimelineScreenModel import com.readrops.app.timelime.TimelineScreenModel
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.db.entities.account.AccountType import com.readrops.db.entities.account.AccountType
import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidContext

10
appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt → app/src/main/java/com/readrops/app/MainActivity.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose package com.readrops.app
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
@ -13,10 +13,10 @@ import androidx.compose.ui.graphics.toArgb
import cafe.adriel.voyager.navigator.CurrentScreen import cafe.adriel.voyager.navigator.CurrentScreen
import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.Navigator
import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior import cafe.adriel.voyager.navigator.NavigatorDisposeBehavior
import com.readrops.app.compose.account.selection.AccountSelectionScreen import com.readrops.app.account.selection.AccountSelectionScreen
import com.readrops.app.compose.account.selection.AccountSelectionScreenModel import com.readrops.app.account.selection.AccountSelectionScreenModel
import com.readrops.app.compose.home.HomeScreen import com.readrops.app.home.HomeScreen
import com.readrops.app.compose.util.theme.ReadropsTheme import com.readrops.app.util.theme.ReadropsTheme
import org.koin.androidx.compose.KoinAndroidContext import org.koin.androidx.compose.KoinAndroidContext
import org.koin.core.annotation.KoinExperimentalAPI import org.koin.core.annotation.KoinExperimentalAPI
import org.koin.core.component.KoinComponent import org.koin.core.component.KoinComponent

2
appcompose/src/main/java/com/readrops/app/compose/ReadropsApp.kt → app/src/main/java/com/readrops/app/ReadropsApp.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose package com.readrops.app
import android.app.Application import android.app.Application
import android.app.NotificationChannel import android.app.NotificationChannel

8
appcompose/src/main/java/com/readrops/app/compose/account/AccountScreenModel.kt → app/src/main/java/com/readrops/app/account/AccountScreenModel.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.account package com.readrops.app.account
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
@ -6,9 +6,9 @@ import androidx.compose.runtime.Stable
import androidx.core.net.toFile import androidx.core.net.toFile
import cafe.adriel.voyager.core.model.screenModelScope import cafe.adriel.voyager.core.model.screenModelScope
import com.readrops.api.opml.OPMLParser import com.readrops.api.opml.OPMLParser
import com.readrops.app.compose.base.TabScreenModel import com.readrops.app.base.TabScreenModel
import com.readrops.app.compose.repositories.ErrorResult import com.readrops.app.repositories.ErrorResult
import com.readrops.app.compose.repositories.GetFoldersWithFeeds import com.readrops.app.repositories.GetFoldersWithFeeds
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder

30
appcompose/src/main/java/com/readrops/app/compose/account/AccountTab.kt → app/src/main/java/com/readrops/app/account/AccountTab.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.account package com.readrops.app.account
import android.content.Intent import android.content.Intent
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
@ -44,20 +44,20 @@ import cafe.adriel.voyager.navigator.currentOrThrow
import cafe.adriel.voyager.navigator.tab.Tab import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.navigator.tab.TabOptions import cafe.adriel.voyager.navigator.tab.TabOptions
import com.readrops.api.utils.ApiUtils import com.readrops.api.utils.ApiUtils
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.account.credentials.AccountCredentialsScreen import com.readrops.app.account.credentials.AccountCredentialsScreen
import com.readrops.app.compose.account.credentials.AccountCredentialsScreenMode import com.readrops.app.account.credentials.AccountCredentialsScreenMode
import com.readrops.app.compose.account.selection.AccountSelectionDialog import com.readrops.app.account.selection.AccountSelectionDialog
import com.readrops.app.compose.account.selection.AccountSelectionScreen import com.readrops.app.account.selection.AccountSelectionScreen
import com.readrops.app.compose.account.selection.adaptiveIconPainterResource import com.readrops.app.account.selection.adaptiveIconPainterResource
import com.readrops.app.compose.notifications.NotificationsScreen import com.readrops.app.notifications.NotificationsScreen
import com.readrops.app.compose.timelime.ErrorListDialog import com.readrops.app.timelime.ErrorListDialog
import com.readrops.app.compose.util.components.ErrorDialog import com.readrops.app.util.components.ErrorDialog
import com.readrops.app.compose.util.components.SelectableIconText import com.readrops.app.util.components.SelectableIconText
import com.readrops.app.compose.util.components.TwoChoicesDialog import com.readrops.app.util.components.TwoChoicesDialog
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
object AccountTab : Tab { object AccountTab : Tab {

8
appcompose/src/main/java/com/readrops/app/compose/account/OPMLChoiceDialog.kt → app/src/main/java/com/readrops/app/account/OPMLChoiceDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.account package com.readrops.app.account
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -10,9 +10,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
enum class OPML { enum class OPML {
IMPORT, IMPORT,

8
appcompose/src/main/java/com/readrops/app/compose/account/OPMLImportProgressDialog.kt → app/src/main/java/com/readrops/app/account/OPMLImportProgressDialog.kt
View File

@ -1,11 +1,11 @@
package com.readrops.app.compose.account package com.readrops.app.account
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.components.RefreshIndicator import com.readrops.app.util.components.RefreshIndicator
@Composable @Composable
fun OPMLImportProgressDialog( fun OPMLImportProgressDialog(

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

@ -1,4 +1,4 @@
package com.readrops.app.compose.account.credentials package com.readrops.app.account.credentials
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.background import androidx.compose.foundation.background
@ -35,13 +35,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cafe.adriel.voyager.koin.getScreenModel import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.home.HomeScreen import com.readrops.app.home.HomeScreen
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
import com.readrops.app.compose.util.components.AndroidScreen import com.readrops.app.util.components.AndroidScreen
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.VeryLargeSpacer import com.readrops.app.util.theme.VeryLargeSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
import org.koin.core.parameter.parametersOf import org.koin.core.parameter.parametersOf

6
appcompose/src/main/java/com/readrops/app/compose/account/credentials/AccountCredentialsScreenModel.kt → app/src/main/java/com/readrops/app/account/credentials/AccountCredentialsScreenModel.kt
View File

@ -1,11 +1,11 @@
package com.readrops.app.compose.account.credentials package com.readrops.app.account.credentials
import android.content.SharedPreferences import android.content.SharedPreferences
import android.util.Patterns import android.util.Patterns
import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.StateScreenModel
import cafe.adriel.voyager.core.model.screenModelScope import cafe.adriel.voyager.core.model.screenModelScope
import com.readrops.app.compose.repositories.BaseRepository import com.readrops.app.repositories.BaseRepository
import com.readrops.app.compose.util.components.TextFieldError import com.readrops.app.util.components.TextFieldError
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineDispatcher

10
appcompose/src/main/java/com/readrops/app/compose/account/selection/AccountSelectionDialog.kt → app/src/main/java/com/readrops/app/account/selection/AccountSelectionDialog.kt
View File

@ -1,14 +1,14 @@
package com.readrops.app.compose.account.selection package com.readrops.app.account.selection
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.components.SelectableImageText import com.readrops.app.util.components.SelectableImageText
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.account.AccountType import com.readrops.db.entities.account.AccountType
@Composable @Composable

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

@ -1,4 +1,4 @@
package com.readrops.app.compose.account.selection package com.readrops.app.account.selection
import android.graphics.drawable.AdaptiveIconDrawable import android.graphics.drawable.AdaptiveIconDrawable
import android.os.Build import android.os.Build
@ -29,15 +29,15 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cafe.adriel.voyager.koin.getScreenModel import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.account.credentials.AccountCredentialsScreen import com.readrops.app.account.credentials.AccountCredentialsScreen
import com.readrops.app.compose.account.credentials.AccountCredentialsScreenMode import com.readrops.app.account.credentials.AccountCredentialsScreenMode
import com.readrops.app.compose.home.HomeScreen import com.readrops.app.home.HomeScreen
import com.readrops.app.compose.util.components.AndroidScreen import com.readrops.app.util.components.AndroidScreen
import com.readrops.app.compose.util.components.SelectableImageText import com.readrops.app.util.components.SelectableImageText
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.db.entities.account.AccountType import com.readrops.db.entities.account.AccountType

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

@ -1,4 +1,4 @@
package com.readrops.app.compose.account.selection package com.readrops.app.account.selection
import android.content.Context import android.content.Context
import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.StateScreenModel

4
appcompose/src/main/java/com/readrops/app/compose/base/TabScreenModel.kt → app/src/main/java/com/readrops/app/base/TabScreenModel.kt
View File

@ -1,11 +1,11 @@
package com.readrops.app.compose.base package com.readrops.app.base
import android.content.SharedPreferences import android.content.SharedPreferences
import cafe.adriel.voyager.core.model.ScreenModel import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.model.screenModelScope import cafe.adriel.voyager.core.model.screenModelScope
import com.readrops.api.services.Credentials import com.readrops.api.services.Credentials
import com.readrops.api.utils.AuthInterceptor import com.readrops.api.utils.AuthInterceptor
import com.readrops.app.compose.repositories.BaseRepository import com.readrops.app.repositories.BaseRepository
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow

10
appcompose/src/main/java/com/readrops/app/compose/feeds/FeedItem.kt → app/src/main/java/com/readrops/app/feeds/FeedItem.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.feeds package com.readrops.app.feeds
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.combinedClickable
@ -15,10 +15,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.app.compose.util.toDp import com.readrops.app.util.toDp
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)

10
appcompose/src/main/java/com/readrops/app/compose/feeds/FeedScreenModel.kt → app/src/main/java/com/readrops/app/feeds/FeedScreenModel.kt
View File

@ -1,14 +1,14 @@
package com.readrops.app.compose.feeds package com.readrops.app.feeds
import android.content.Context import android.content.Context
import android.util.Patterns import android.util.Patterns
import cafe.adriel.voyager.core.model.screenModelScope import cafe.adriel.voyager.core.model.screenModelScope
import com.readrops.api.localfeed.LocalRSSDataSource import com.readrops.api.localfeed.LocalRSSDataSource
import com.readrops.api.utils.HtmlParser import com.readrops.api.utils.HtmlParser
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.base.TabScreenModel import com.readrops.app.base.TabScreenModel
import com.readrops.app.compose.repositories.GetFoldersWithFeeds import com.readrops.app.repositories.GetFoldersWithFeeds
import com.readrops.app.compose.util.components.TextFieldError import com.readrops.app.util.components.TextFieldError
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder

4
appcompose/src/main/java/com/readrops/app/compose/feeds/FeedState.kt → app/src/main/java/com/readrops/app/feeds/FeedState.kt
View File

@ -1,6 +1,6 @@
package com.readrops.app.compose.feeds package com.readrops.app.feeds
import com.readrops.app.compose.util.components.TextFieldError import com.readrops.app.util.components.TextFieldError
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account

24
appcompose/src/main/java/com/readrops/app/compose/feeds/FeedTab.kt → app/src/main/java/com/readrops/app/feeds/FeedTab.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.feeds package com.readrops.app.feeds
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -41,17 +41,17 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cafe.adriel.voyager.koin.getScreenModel import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.tab.Tab import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.navigator.tab.TabOptions import cafe.adriel.voyager.navigator.tab.TabOptions
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.feeds.dialogs.AddFeedDialog import com.readrops.app.feeds.dialogs.AddFeedDialog
import com.readrops.app.compose.feeds.dialogs.FeedModalBottomSheet import com.readrops.app.feeds.dialogs.FeedModalBottomSheet
import com.readrops.app.compose.feeds.dialogs.FolderDialog import com.readrops.app.feeds.dialogs.FolderDialog
import com.readrops.app.compose.feeds.dialogs.UpdateFeedDialog import com.readrops.app.feeds.dialogs.UpdateFeedDialog
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
import com.readrops.app.compose.util.components.CenteredProgressIndicator import com.readrops.app.util.components.CenteredProgressIndicator
import com.readrops.app.compose.util.components.ErrorMessage import com.readrops.app.util.components.ErrorMessage
import com.readrops.app.compose.util.components.Placeholder import com.readrops.app.util.components.Placeholder
import com.readrops.app.compose.util.components.TwoChoicesDialog import com.readrops.app.util.components.TwoChoicesDialog
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
object FeedTab : Tab { object FeedTab : Tab {

8
appcompose/src/main/java/com/readrops/app/compose/feeds/FolderExpandableItem.kt → app/src/main/java/com/readrops/app/feeds/FolderExpandableItem.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.feeds package com.readrops.app.feeds
import androidx.compose.animation.animateContentSize import androidx.compose.animation.animateContentSize
import androidx.compose.animation.core.LinearOutSlowInEasing import androidx.compose.animation.core.LinearOutSlowInEasing
@ -29,9 +29,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder

18
appcompose/src/main/java/com/readrops/app/compose/feeds/dialogs/AddFeedDialog.kt → app/src/main/java/com/readrops/app/feeds/dialogs/AddFeedDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.feeds.dialogs package com.readrops.app.feeds.dialogs
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
@ -26,14 +26,14 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.account.selection.adaptiveIconPainterResource import com.readrops.app.account.selection.adaptiveIconPainterResource
import com.readrops.app.compose.feeds.FeedScreenModel import com.readrops.app.feeds.FeedScreenModel
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable

12
appcompose/src/main/java/com/readrops/app/compose/feeds/dialogs/FeedBottomSheet.kt → app/src/main/java/com/readrops/app/feeds/dialogs/FeedBottomSheet.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.feeds.dialogs package com.readrops.app.feeds.dialogs
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -26,11 +26,11 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.VeryShortSpacer import com.readrops.app.util.theme.VeryShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)

12
appcompose/src/main/java/com/readrops/app/compose/feeds/dialogs/FolderDialog.kt → app/src/main/java/com/readrops/app/feeds/dialogs/FolderDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.feeds.dialogs package com.readrops.app.feeds.dialogs
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Clear import androidx.compose.material.icons.filled.Clear
@ -14,11 +14,11 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.feeds.FeedScreenModel import com.readrops.app.feeds.FeedScreenModel
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
@Composable @Composable
fun FolderDialog( fun FolderDialog(

14
appcompose/src/main/java/com/readrops/app/compose/feeds/dialogs/UpdateFeedDialog.kt → app/src/main/java/com/readrops/app/feeds/dialogs/UpdateFeedDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.feeds.dialogs package com.readrops.app.feeds.dialogs
import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@ -16,12 +16,12 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.feeds.FeedScreenModel import com.readrops.app.feeds.FeedScreenModel
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)

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

@ -1,4 +1,4 @@
package com.readrops.app.compose.home package com.readrops.app.home
import android.annotation.SuppressLint import android.annotation.SuppressLint
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
@ -27,12 +27,12 @@ import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import cafe.adriel.voyager.navigator.tab.CurrentTab import cafe.adriel.voyager.navigator.tab.CurrentTab
import cafe.adriel.voyager.navigator.tab.TabNavigator import cafe.adriel.voyager.navigator.tab.TabNavigator
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.account.AccountTab import com.readrops.app.account.AccountTab
import com.readrops.app.compose.feeds.FeedTab import com.readrops.app.feeds.FeedTab
import com.readrops.app.compose.more.MoreTab import com.readrops.app.more.MoreTab
import com.readrops.app.compose.timelime.TimelineTab import com.readrops.app.timelime.TimelineTab
import com.readrops.app.compose.util.components.AndroidScreen import com.readrops.app.util.components.AndroidScreen
class HomeScreen : AndroidScreen() { class HomeScreen : AndroidScreen() {

10
appcompose/src/main/java/com/readrops/app/compose/item/ItemImageDialog.kt → app/src/main/java/com/readrops/app/item/ItemImageDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.item package com.readrops.app.item
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
@ -9,10 +9,10 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.components.SelectableImageText import com.readrops.app.util.components.SelectableImageText
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
enum class ItemImageChoice { enum class ItemImageChoice {
SHARE, SHARE,

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

@ -1,4 +1,4 @@
package com.readrops.app.compose.item package com.readrops.app.item
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
@ -48,15 +48,15 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cafe.adriel.voyager.koin.getScreenModel import cafe.adriel.voyager.koin.getScreenModel
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.readrops.api.utils.DateUtils import com.readrops.api.utils.DateUtils
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.item.view.ItemNestedScrollView import com.readrops.app.item.view.ItemNestedScrollView
import com.readrops.app.compose.item.view.ItemWebView import com.readrops.app.item.view.ItemWebView
import com.readrops.app.compose.util.components.AndroidScreen import com.readrops.app.util.components.AndroidScreen
import com.readrops.app.compose.util.components.CenteredProgressIndicator import com.readrops.app.util.components.CenteredProgressIndicator
import com.readrops.app.compose.util.components.IconText import com.readrops.app.util.components.IconText
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.pojo.ItemWithFeed import com.readrops.db.pojo.ItemWithFeed
import org.koin.core.parameter.parametersOf import org.koin.core.parameter.parametersOf
import kotlin.math.roundToInt import kotlin.math.roundToInt

8
appcompose/src/main/java/com/readrops/app/compose/item/ItemScreenBottomBar.kt → app/src/main/java/com/readrops/app/item/ItemScreenBottomBar.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.item package com.readrops.app.item
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@ -15,9 +15,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.FeedColors import com.readrops.app.util.FeedColors
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
data class BottomBarState( data class BottomBarState(
val isRead: Boolean = false, val isRead: Boolean = false,

4
appcompose/src/main/java/com/readrops/app/compose/item/ItemScreenModel.kt → app/src/main/java/com/readrops/app/item/ItemScreenModel.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.item package com.readrops.app.item
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -12,7 +12,7 @@ import cafe.adriel.voyager.core.model.StateScreenModel
import cafe.adriel.voyager.core.model.screenModelScope import cafe.adriel.voyager.core.model.screenModelScope
import coil.imageLoader import coil.imageLoader
import coil.request.ImageRequest import coil.request.ImageRequest
import com.readrops.app.compose.repositories.BaseRepository import com.readrops.app.repositories.BaseRepository
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Item import com.readrops.db.entities.Item
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account

2
appcompose/src/main/java/com/readrops/app/compose/item/view/ItemNestedScrollView.kt → app/src/main/java/com/readrops/app/item/view/ItemNestedScrollView.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.item.view package com.readrops.app.item.view
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context

6
appcompose/src/main/java/com/readrops/app/compose/item/view/ItemWebView.kt → app/src/main/java/com/readrops/app/item/view/ItemWebView.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.item.view package com.readrops.app.item.view
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -7,8 +7,8 @@ import android.webkit.WebView
import android.webkit.WebViewClient import android.webkit.WebViewClient
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.graphics.toArgb
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.Utils import com.readrops.app.util.Utils
import com.readrops.db.pojo.ItemWithFeed import com.readrops.db.pojo.ItemWithFeed
import org.jsoup.Jsoup import org.jsoup.Jsoup
import org.jsoup.parser.Parser import org.jsoup.parser.Parser

18
appcompose/src/main/java/com/readrops/app/compose/more/MoreTab.kt → app/src/main/java/com/readrops/app/more/MoreTab.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.more package com.readrops.app.more
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -15,14 +15,14 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import cafe.adriel.voyager.navigator.tab.Tab import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.navigator.tab.TabOptions import cafe.adriel.voyager.navigator.tab.TabOptions
import com.readrops.app.compose.BuildConfig import com.readrops.app.BuildConfig
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.account.selection.adaptiveIconPainterResource import com.readrops.app.account.selection.adaptiveIconPainterResource
import com.readrops.app.compose.util.components.SelectableIconText import com.readrops.app.util.components.SelectableIconText
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
object MoreTab : Tab { object MoreTab : Tab {

10
appcompose/src/main/java/com/readrops/app/compose/notifications/NotificationItem.kt → app/src/main/java/com/readrops/app/notifications/NotificationItem.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.notifications package com.readrops.app.notifications
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -18,10 +18,10 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.VeryShortSpacer import com.readrops.app.util.theme.VeryShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
@Composable @Composable
fun NotificationItem( fun NotificationItem(

10
appcompose/src/main/java/com/readrops/app/compose/notifications/NotificationsScreen.kt → app/src/main/java/com/readrops/app/notifications/NotificationsScreen.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.notifications package com.readrops.app.notifications
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -35,10 +35,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cafe.adriel.voyager.koin.getScreenModel import cafe.adriel.voyager.koin.getScreenModel
import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.components.AndroidScreen import com.readrops.app.util.components.AndroidScreen
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
import org.koin.core.parameter.parametersOf import org.koin.core.parameter.parametersOf

2
appcompose/src/main/java/com/readrops/app/compose/notifications/NotificationsScreenModel.kt → app/src/main/java/com/readrops/app/notifications/NotificationsScreenModel.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.notifications package com.readrops.app.notifications
import cafe.adriel.voyager.core.model.StateScreenModel import cafe.adriel.voyager.core.model.StateScreenModel
import cafe.adriel.voyager.core.model.screenModelScope import cafe.adriel.voyager.core.model.screenModelScope

4
appcompose/src/main/java/com/readrops/app/compose/repositories/FreshRSSRepository.kt → app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.repositories package com.readrops.app.repositories
import com.readrops.api.services.Credentials import com.readrops.api.services.Credentials
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
@ -6,7 +6,7 @@ import com.readrops.api.services.SyncType
import com.readrops.api.services.freshrss.FreshRSSSyncData import com.readrops.api.services.freshrss.FreshRSSSyncData
import com.readrops.api.services.freshrss.NewFreshRSSDataSource import com.readrops.api.services.freshrss.NewFreshRSSDataSource
import com.readrops.api.utils.AuthInterceptor import com.readrops.api.utils.AuthInterceptor
import com.readrops.app.compose.util.Utils import com.readrops.app.util.Utils
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder

2
appcompose/src/main/java/com/readrops/app/compose/repositories/GetFoldersWithFeeds.kt → app/src/main/java/com/readrops/app/repositories/GetFoldersWithFeeds.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.repositories package com.readrops.app.repositories
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed

6
appcompose/src/main/java/com/readrops/app/compose/repositories/LocalRSSRepository.kt → app/src/main/java/com/readrops/app/repositories/LocalRSSRepository.kt
View File

@ -1,12 +1,12 @@
package com.readrops.app.compose.repositories package com.readrops.app.repositories
import android.util.Log import android.util.Log
import com.readrops.api.localfeed.LocalRSSDataSource import com.readrops.api.localfeed.LocalRSSDataSource
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import com.readrops.api.utils.ApiUtils import com.readrops.api.utils.ApiUtils
import com.readrops.api.utils.HtmlParser import com.readrops.api.utils.HtmlParser
import com.readrops.app.compose.util.FeedColors import com.readrops.app.util.FeedColors
import com.readrops.app.compose.util.Utils import com.readrops.app.util.Utils
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Item import com.readrops.db.entities.Item

4
appcompose/src/main/java/com/readrops/app/compose/repositories/NextcloudNewsRepository.kt → app/src/main/java/com/readrops/app/repositories/NextcloudNewsRepository.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.repositories package com.readrops.app.repositories
import com.readrops.api.services.Credentials import com.readrops.api.services.Credentials
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
@ -6,7 +6,7 @@ import com.readrops.api.services.SyncType
import com.readrops.api.services.nextcloudnews.NewNextcloudNewsDataSource import com.readrops.api.services.nextcloudnews.NewNextcloudNewsDataSource
import com.readrops.api.services.nextcloudnews.NextcloudNewsSyncData import com.readrops.api.services.nextcloudnews.NextcloudNewsSyncData
import com.readrops.api.utils.AuthInterceptor import com.readrops.api.utils.AuthInterceptor
import com.readrops.app.compose.util.Utils import com.readrops.app.util.Utils
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder

2
appcompose/src/main/java/com/readrops/app/compose/repositories/Repository.kt → app/src/main/java/com/readrops/app/repositories/Repository.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.repositories package com.readrops.app.repositories
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import com.readrops.db.Database import com.readrops.db.Database

4
appcompose/src/main/java/com/readrops/app/compose/sync/SyncAnalyzer.kt → app/src/main/java/com/readrops/app/sync/SyncAnalyzer.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.sync package com.readrops.app.sync
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap
@ -7,7 +7,7 @@ import androidx.core.graphics.drawable.toBitmap
import coil.imageLoader import coil.imageLoader
import coil.request.ImageRequest import coil.request.ImageRequest
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Item import com.readrops.db.entities.Item

10
appcompose/src/main/java/com/readrops/app/compose/sync/SyncWorker.kt → app/src/main/java/com/readrops/app/sync/SyncWorker.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.sync package com.readrops.app.sync
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -13,10 +13,10 @@ import androidx.work.WorkManager
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import androidx.work.workDataOf import androidx.work.workDataOf
import com.readrops.api.services.SyncResult import com.readrops.api.services.SyncResult
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.ReadropsApp import com.readrops.app.ReadropsApp
import com.readrops.app.compose.repositories.BaseRepository import com.readrops.app.repositories.BaseRepository
import com.readrops.app.compose.util.FeedColors import com.readrops.app.util.FeedColors
import com.readrops.db.Database import com.readrops.db.Database
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import org.koin.core.component.KoinComponent import org.koin.core.component.KoinComponent

14
appcompose/src/main/java/com/readrops/app/compose/timelime/ErrorListDialog.kt → app/src/main/java/com/readrops/app/timelime/ErrorListDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime package com.readrops.app.timelime
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.heightIn
@ -12,12 +12,12 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.repositories.ErrorResult import com.readrops.app.repositories.ErrorResult
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
import com.readrops.app.compose.util.components.BaseDialog import com.readrops.app.util.components.BaseDialog
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
@Composable @Composable
fun ErrorListDialog( fun ErrorListDialog(

10
appcompose/src/main/java/com/readrops/app/compose/timelime/FilterBottomSheet.kt → app/src/main/java/com/readrops/app/timelime/FilterBottomSheet.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime package com.readrops.app.timelime
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -14,10 +14,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.theme.LargeSpacer import com.readrops.app.util.theme.LargeSpacer
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.filters.ListSortType import com.readrops.db.filters.ListSortType
import com.readrops.db.queries.QueryFilters import com.readrops.db.queries.QueryFilters

12
appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineItem.kt → app/src/main/java/com/readrops/app/timelime/TimelineItem.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime package com.readrops.app.timelime
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -30,11 +30,11 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.readrops.api.utils.DateUtils import com.readrops.api.utils.DateUtils
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.components.IconText import com.readrops.app.util.components.IconText
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.VeryShortSpacer import com.readrops.app.util.theme.VeryShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.pojo.ItemWithFeed import com.readrops.db.pojo.ItemWithFeed
import kotlin.math.roundToInt import kotlin.math.roundToInt

10
appcompose/src/main/java/com/readrops/app/compose/timelime/TimelineScreenModel.kt → app/src/main/java/com/readrops/app/timelime/TimelineScreenModel.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime package com.readrops.app.timelime
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -8,10 +8,10 @@ import androidx.paging.PagingConfig
import androidx.paging.PagingData import androidx.paging.PagingData
import androidx.paging.cachedIn import androidx.paging.cachedIn
import cafe.adriel.voyager.core.model.screenModelScope import cafe.adriel.voyager.core.model.screenModelScope
import com.readrops.app.compose.base.TabScreenModel import com.readrops.app.base.TabScreenModel
import com.readrops.app.compose.repositories.ErrorResult import com.readrops.app.repositories.ErrorResult
import com.readrops.app.compose.repositories.GetFoldersWithFeeds import com.readrops.app.repositories.GetFoldersWithFeeds
import com.readrops.app.compose.sync.SyncWorker import com.readrops.app.sync.SyncWorker
import com.readrops.db.Database import com.readrops.db.Database
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder

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

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime package com.readrops.app.timelime
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -51,15 +51,15 @@ import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow import cafe.adriel.voyager.navigator.currentOrThrow
import cafe.adriel.voyager.navigator.tab.Tab import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.navigator.tab.TabOptions import cafe.adriel.voyager.navigator.tab.TabOptions
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.item.ItemScreen import com.readrops.app.item.ItemScreen
import com.readrops.app.compose.timelime.drawer.TimelineDrawer import com.readrops.app.timelime.drawer.TimelineDrawer
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
import com.readrops.app.compose.util.components.CenteredProgressIndicator import com.readrops.app.util.components.CenteredProgressIndicator
import com.readrops.app.compose.util.components.Placeholder import com.readrops.app.util.components.Placeholder
import com.readrops.app.compose.util.components.RefreshScreen import com.readrops.app.util.components.RefreshScreen
import com.readrops.app.compose.util.components.TwoChoicesDialog import com.readrops.app.util.components.TwoChoicesDialog
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.filters.ListSortType import com.readrops.db.filters.ListSortType
import com.readrops.db.filters.MainFilter import com.readrops.db.filters.MainFilter
import com.readrops.db.filters.SubFilter import com.readrops.db.filters.SubFilter

4
appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/DrawerFeedItem.kt → app/src/main/java/com/readrops/app/timelime/drawer/DrawerFeedItem.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime.drawer package com.readrops.app.timelime.drawer
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@ -14,7 +14,7 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.readrops.app.compose.util.theme.DrawerSpacing import com.readrops.app.util.theme.DrawerSpacing
@Composable @Composable
fun DrawerFeedItem( fun DrawerFeedItem(

6
appcompose/src/main/java/com/readrops/app/compose/timelime/drawer/DrawerFolderItem.kt → app/src/main/java/com/readrops/app/timelime/drawer/DrawerFolderItem.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime.drawer package com.readrops.app.timelime.drawer
import androidx.compose.animation.animateContentSize import androidx.compose.animation.animateContentSize
import androidx.compose.animation.core.LinearOutSlowInEasing import androidx.compose.animation.core.LinearOutSlowInEasing
@ -33,8 +33,8 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.theme.DrawerSpacing import com.readrops.app.util.theme.DrawerSpacing
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
@Composable @Composable

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

@ -1,4 +1,4 @@
package com.readrops.app.compose.timelime.drawer package com.readrops.app.timelime.drawer
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
@ -23,9 +23,9 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import coil.compose.AsyncImage import coil.compose.AsyncImage
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.timelime.TimelineState import com.readrops.app.timelime.TimelineState
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.db.entities.Feed import com.readrops.db.entities.Feed
import com.readrops.db.entities.Folder import com.readrops.db.entities.Folder
import com.readrops.db.filters.MainFilter import com.readrops.db.filters.MainFilter

4
appcompose/src/main/java/com/readrops/app/compose/util/ErrorMessage.kt → app/src/main/java/com/readrops/app/util/ErrorMessage.kt
View File

@ -1,10 +1,10 @@
package com.readrops.app.compose.util package com.readrops.app.util
import android.content.Context import android.content.Context
import com.readrops.api.utils.exceptions.HttpException import com.readrops.api.utils.exceptions.HttpException
import com.readrops.api.utils.exceptions.ParseException import com.readrops.api.utils.exceptions.ParseException
import com.readrops.api.utils.exceptions.UnknownFormatException import com.readrops.api.utils.exceptions.UnknownFormatException
import com.readrops.app.compose.R import com.readrops.app.R
import java.io.IOException import java.io.IOException
import java.net.UnknownHostException import java.net.UnknownHostException

2
appcompose/src/main/java/com/readrops/app/compose/util/Extensions.kt → app/src/main/java/com/readrops/app/util/Extensions.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util package com.readrops.app.util
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp

2
appcompose/src/main/java/com/readrops/app/compose/util/FeedColors.kt → app/src/main/java/com/readrops/app/util/FeedColors.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util package com.readrops.app.util
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import androidx.annotation.ColorInt import androidx.annotation.ColorInt

2
appcompose/src/main/java/com/readrops/app/compose/util/Utils.kt → app/src/main/java/com/readrops/app/util/Utils.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util package com.readrops.app.util
import android.graphics.Color import android.graphics.Color
import androidx.annotation.ColorInt import androidx.annotation.ColorInt

2
appcompose/src/main/java/com/readrops/app/compose/util/components/AndroidScreen.kt → app/src/main/java/com/readrops/app/util/components/AndroidScreen.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.core.screen.ScreenKey import cafe.adriel.voyager.core.screen.ScreenKey

6
appcompose/src/main/java/com/readrops/app/compose/util/components/BaseDialog.kt → app/src/main/java/com/readrops/app/util/components/BaseDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -17,8 +17,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import com.readrops.app.compose.util.theme.MediumSpacer import com.readrops.app.util.theme.MediumSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
@Composable @Composable
fun BaseDialog( fun BaseDialog(

2
appcompose/src/main/java/com/readrops/app/compose/util/components/CenteredProgressIndicator.kt → app/src/main/java/com/readrops/app/util/components/CenteredProgressIndicator.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

6
appcompose/src/main/java/com/readrops/app/compose/util/components/ErrorDialog.kt → app/src/main/java/com/readrops/app/util/components/ErrorDialog.kt
View File

@ -1,12 +1,12 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.ErrorMessage import com.readrops.app.util.ErrorMessage
@Composable @Composable
fun ErrorDialog( fun ErrorDialog(

10
appcompose/src/main/java/com/readrops/app/compose/util/components/ErrorMessage.kt → app/src/main/java/com/readrops/app/util/components/ErrorMessage.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@ -8,10 +8,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import com.readrops.app.compose.R import com.readrops.app.R
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.theme.VeryShortSpacer import com.readrops.app.util.theme.VeryShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
@Composable @Composable
fun ErrorMessage( fun ErrorMessage(

6
appcompose/src/main/java/com/readrops/app/compose/util/components/IconText.kt → app/src/main/java/com/readrops/app/util/components/IconText.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
@ -20,8 +20,8 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
import com.readrops.app.compose.util.toDp import com.readrops.app.util.toDp
@Composable @Composable
fun BaseText( fun BaseText(

6
appcompose/src/main/java/com/readrops/app/compose/util/components/Placeholder.kt → app/src/main/java/com/readrops/app/util/components/Placeholder.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -11,8 +11,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import com.readrops.app.compose.util.theme.ShortSpacer import com.readrops.app.util.theme.ShortSpacer
import com.readrops.app.compose.util.toDp import com.readrops.app.util.toDp
@Composable @Composable

6
appcompose/src/main/java/com/readrops/app/compose/util/components/RefreshScreen.kt → app/src/main/java/com/readrops/app/util/components/RefreshScreen.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -9,8 +9,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import com.readrops.app.compose.util.theme.VeryShortSpacer import com.readrops.app.util.theme.VeryShortSpacer
import com.readrops.app.compose.util.theme.spacing import com.readrops.app.util.theme.spacing
@Composable @Composable
fun RefreshScreen( fun RefreshScreen(

2
appcompose/src/main/java/com/readrops/app/compose/util/components/TextFieldUtils.kt → app/src/main/java/com/readrops/app/util/components/TextFieldUtils.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

2
appcompose/src/main/java/com/readrops/app/compose/util/components/TwoChoicesDialog.kt → app/src/main/java/com/readrops/app/util/components/TwoChoicesDialog.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.components package com.readrops.app.util.components
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Icon import androidx.compose.material3.Icon

2
appcompose/src/main/java/com/readrops/app/compose/util/theme/Color.kt → app/src/main/java/com/readrops/app/util/theme/Color.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.theme package com.readrops.app.util.theme
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color

2
appcompose/src/main/java/com/readrops/app/compose/util/theme/Spacing.kt → app/src/main/java/com/readrops/app/util/theme/Spacing.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.theme package com.readrops.app.util.theme
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size

2
appcompose/src/main/java/com/readrops/app/compose/util/theme/Theme.kt → app/src/main/java/com/readrops/app/util/theme/Theme.kt
View File

@ -1,4 +1,4 @@
package com.readrops.app.compose.util.theme package com.readrops.app.util.theme
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme

0
appcompose/src/main/res/drawable/ic_add_account.xml → app/src/main/res/drawable/ic_add_account.xml
View File

0
appcompose/src/main/res/drawable/ic_backup.xml → app/src/main/res/drawable/ic_backup.xml
View File

0
appcompose/src/main/res/drawable/ic_broken_image.xml → app/src/main/res/drawable/ic_broken_image.xml
View File

0
appcompose/src/main/res/drawable/ic_color.xml → app/src/main/res/drawable/ic_color.xml
View File

0
appcompose/src/main/res/drawable/ic_done_all.xml → app/src/main/res/drawable/ic_done_all.xml
View File

0
appcompose/src/main/res/drawable/ic_download.xml → app/src/main/res/drawable/ic_download.xml
View File

0
appcompose/src/main/res/drawable/ic_error.xml → app/src/main/res/drawable/ic_error.xml
View File

0
appcompose/src/main/res/drawable/ic_filter_list.xml → app/src/main/res/drawable/ic_filter_list.xml
View File

0
appcompose/src/main/res/drawable/ic_folder_grey.xml → app/src/main/res/drawable/ic_folder_grey.xml
View File

0
appcompose/src/main/res/drawable/ic_hourglass_empty.xml → app/src/main/res/drawable/ic_hourglass_empty.xml
View File

0
appcompose/src/main/res/drawable/ic_image.xml → app/src/main/res/drawable/ic_image.xml
View File

0
appcompose/src/main/res/drawable/ic_import_export.xml → app/src/main/res/drawable/ic_import_export.xml
View File

0
appcompose/src/main/res/drawable/ic_new.xml → app/src/main/res/drawable/ic_new.xml
View File

0
appcompose/src/main/res/drawable/ic_new_folder.xml → app/src/main/res/drawable/ic_new_folder.xml
View File

0
appcompose/src/main/res/drawable/ic_notifications.xml → app/src/main/res/drawable/ic_notifications.xml
View File

0
appcompose/src/main/res/drawable/ic_open_in_browser.xml → app/src/main/res/drawable/ic_open_in_browser.xml
View File

0
appcompose/src/main/res/drawable/ic_person.xml → app/src/main/res/drawable/ic_person.xml
View File

0
appcompose/src/main/res/drawable/ic_read_later.xml → app/src/main/res/drawable/ic_read_later.xml
View File

0
appcompose/src/main/res/drawable/ic_remove_done.xml → app/src/main/res/drawable/ic_remove_done.xml
View File

Some files were not shown because too many files have changed in this diff Show More