cenochallenge/ReadYou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the package

Browse Source
This commit is contained in:
Ash 2022-05-18 02:58:30 +08:00
parent b33e0a7ac5
commit 140cb3ed0a
62 changed files with 147 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/me/ash/reader/data/preference/DarkThemePreference.kt
View File

@ -3,6 +3,7 @@ package me.ash.reader.data.preference
import android.content.Context import android.content.Context
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.ReadOnlyComposable
import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.Preferences
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -33,6 +34,7 @@ sealed class DarkThemePreference(val value: Int) : Preference() {
} }
@Composable @Composable
@ReadOnlyComposable
fun isDarkTheme(): Boolean = when (this) { fun isDarkTheme(): Boolean = when (this) {
UseDeviceTheme -> isSystemInDarkTheme() UseDeviceTheme -> isSystemInDarkTheme()
ON -> true ON -> true

35
app/src/main/java/me/ash/reader/data/preference/Preference.kt
View File

@ -1,8 +1,43 @@
package me.ash.reader.data.preference package me.ash.reader.data.preference
import android.content.Context import android.content.Context
import androidx.datastore.preferences.core.Preferences
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
sealed class Preference { sealed class Preference {
abstract fun put(context: Context, scope: CoroutineScope) abstract fun put(context: Context, scope: CoroutineScope)
}
fun Preferences.toSettings(): Settings {
return Settings(
themeIndex = ThemeIndexPreference.fromPreferences(this),
customPrimaryColor = CustomPrimaryColorPreference.fromPreferences(this),
darkTheme = DarkThemePreference.fromPreferences(this),
amoledDarkTheme = AmoledDarkThemePreference.fromPreferences(this),
feedsFilterBarStyle = FeedsFilterBarStylePreference.fromPreferences(this),
feedsFilterBarFilled = FeedsFilterBarFilledPreference.fromPreferences(this),
feedsFilterBarPadding = FeedsFilterBarPaddingPreference.fromPreferences(this),
feedsFilterBarTonalElevation = FeedsFilterBarTonalElevationPreference.fromPreferences(this),
feedsTopBarTonalElevation = FeedsTopBarTonalElevationPreference.fromPreferences(this),
feedsGroupListExpand = FeedsGroupListExpandPreference.fromPreferences(this),
feedsGroupListTonalElevation = FeedsGroupListTonalElevationPreference.fromPreferences(this),
flowFilterBarStyle = FlowFilterBarStylePreference.fromPreferences(this),
flowFilterBarFilled = FlowFilterBarFilledPreference.fromPreferences(this),
flowFilterBarPadding = FlowFilterBarPaddingPreference.fromPreferences(this),
flowFilterBarTonalElevation = FlowFilterBarTonalElevationPreference.fromPreferences(this),
flowTopBarTonalElevation = FlowTopBarTonalElevationPreference.fromPreferences(this),
flowArticleListFeedIcon = FlowArticleListFeedIconPreference.fromPreferences(this),
flowArticleListFeedName = FlowArticleListFeedNamePreference.fromPreferences(this),
flowArticleListImage = FlowArticleListImagePreference.fromPreferences(this),
flowArticleListDesc = FlowArticleListDescPreference.fromPreferences(this),
flowArticleListTime = FlowArticleListTimePreference.fromPreferences(this),
flowArticleListDateStickyHeader = FlowArticleListDateStickyHeaderPreference.fromPreferences(
this
),
flowArticleListTonalElevation = FlowArticleListTonalElevationPreference.fromPreferences(this),
languages = LanguagesPreference.fromPreferences(this),
)
} }

35
app/src/main/java/me/ash/reader/data/preference/Settings.kt
View File

@ -6,7 +6,6 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.datastore.preferences.core.Preferences
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.dataStore
@ -41,40 +40,6 @@ data class Settings(
val languages: LanguagesPreference = LanguagesPreference.default, val languages: LanguagesPreference = LanguagesPreference.default,
) )
fun Preferences.toSettings(): Settings {
return Settings(
themeIndex = ThemeIndexPreference.fromPreferences(this),
customPrimaryColor = CustomPrimaryColorPreference.fromPreferences(this),
darkTheme = DarkThemePreference.fromPreferences(this),
amoledDarkTheme = AmoledDarkThemePreference.fromPreferences(this),
feedsFilterBarStyle = FeedsFilterBarStylePreference.fromPreferences(this),
feedsFilterBarFilled = FeedsFilterBarFilledPreference.fromPreferences(this),
feedsFilterBarPadding = FeedsFilterBarPaddingPreference.fromPreferences(this),
feedsFilterBarTonalElevation = FeedsFilterBarTonalElevationPreference.fromPreferences(this),
feedsTopBarTonalElevation = FeedsTopBarTonalElevationPreference.fromPreferences(this),
feedsGroupListExpand = FeedsGroupListExpandPreference.fromPreferences(this),
feedsGroupListTonalElevation = FeedsGroupListTonalElevationPreference.fromPreferences(this),
flowFilterBarStyle = FlowFilterBarStylePreference.fromPreferences(this),
flowFilterBarFilled = FlowFilterBarFilledPreference.fromPreferences(this),
flowFilterBarPadding = FlowFilterBarPaddingPreference.fromPreferences(this),
flowFilterBarTonalElevation = FlowFilterBarTonalElevationPreference.fromPreferences(this),
flowTopBarTonalElevation = FlowTopBarTonalElevationPreference.fromPreferences(this),
flowArticleListFeedIcon = FlowArticleListFeedIconPreference.fromPreferences(this),
flowArticleListFeedName = FlowArticleListFeedNamePreference.fromPreferences(this),
flowArticleListImage = FlowArticleListImagePreference.fromPreferences(this),
flowArticleListDesc = FlowArticleListDescPreference.fromPreferences(this),
flowArticleListTime = FlowArticleListTimePreference.fromPreferences(this),
flowArticleListDateStickyHeader = FlowArticleListDateStickyHeaderPreference.fromPreferences(
this
),
flowArticleListTonalElevation = FlowArticleListTonalElevationPreference.fromPreferences(this),
languages = LanguagesPreference.fromPreferences(this),
)
}
@Composable @Composable
fun SettingsProvider( fun SettingsProvider(
content: @Composable () -> Unit, content: @Composable () -> Unit,

2
app/src/main/java/me/ash/reader/ui/page/home/FeedIcon.kt → app/src/main/java/me/ash/reader/ui/component/FeedIcon.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home package me.ash.reader.ui.component
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row

2
app/src/main/java/me/ash/reader/ui/page/home/FilterBar.kt → app/src/main/java/me/ash/reader/ui/component/FilterBar.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home package me.ash.reader.ui.component
import android.os.Build import android.os.Build
import android.view.SoundEffectConstants import android.view.SoundEffectConstants

2
app/src/main/java/me/ash/reader/ui/component/AnimatedPopup.kt → app/src/main/java/me/ash/reader/ui/component/base/AnimatedPopup.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.animation.* import androidx.compose.animation.*
import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsets

2
app/src/main/java/me/ash/reader/ui/component/AnimatedText.kt → app/src/main/java/me/ash/reader/ui/component/base/AnimatedText.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.animation.* import androidx.compose.animation.*
import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.animation.core.FastOutSlowInEasing

2
app/src/main/java/me/ash/reader/ui/component/AsyncImage.kt → app/src/main/java/me/ash/reader/ui/component/base/AsyncImage.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme

2
app/src/main/java/me/ash/reader/ui/component/Banner.kt → app/src/main/java/me/ash/reader/ui/component/base/Banner.kt
View File

@ -6,7 +6,7 @@
* @modifier Ashinch * @modifier Ashinch
*/ */
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import android.view.SoundEffectConstants import android.view.SoundEffectConstants
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade

2
app/src/main/java/me/ash/reader/ui/component/BlockButton.kt → app/src/main/java/me/ash/reader/ui/component/base/BlockButton.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable

2
app/src/main/java/me/ash/reader/ui/component/BlockRadioButton.kt → app/src/main/java/me/ash/reader/ui/component/base/BlockRadioButton.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

2
app/src/main/java/me/ash/reader/ui/component/BottomDrawer.kt → app/src/main/java/me/ash/reader/ui/component/base/BottomDrawer.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*

2
app/src/main/java/me/ash/reader/ui/component/CanBeDisabledIconButton.kt → app/src/main/java/me/ash/reader/ui/component/base/CanBeDisabledIconButton.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon import androidx.compose.material3.Icon

2
app/src/main/java/me/ash/reader/ui/component/ClipboardTextField.kt → app/src/main/java/me/ash/reader/ui/component/base/ClipboardTextField.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.horizontalScroll
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column

2
app/src/main/java/me/ash/reader/ui/component/CurlyCornerShape.kt → app/src/main/java/me/ash/reader/ui/component/base/CurlyCornerShape.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.shape.CornerBasedShape import androidx.compose.foundation.shape.CornerBasedShape
import androidx.compose.foundation.shape.CornerSize import androidx.compose.foundation.shape.CornerSize

2
app/src/main/java/me/ash/reader/ui/component/Dialog.kt → app/src/main/java/me/ash/reader/ui/component/base/Dialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

2
app/src/main/java/me/ash/reader/ui/component/DisplayText.kt → app/src/main/java/me/ash/reader/ui/component/base/DisplayText.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.animation.* import androidx.compose.animation.*
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column

2
app/src/main/java/me/ash/reader/ui/component/DynamicSVGImage.kt → app/src/main/java/me/ash/reader/ui/component/base/DynamicSVGImage.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import android.graphics.drawable.PictureDrawable import android.graphics.drawable.PictureDrawable
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade

2
app/src/main/java/me/ash/reader/ui/component/FeedbackIconButton.kt → app/src/main/java/me/ash/reader/ui/component/base/FeedbackIconButton.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import android.view.HapticFeedbackConstants import android.view.HapticFeedbackConstants
import android.view.SoundEffectConstants import android.view.SoundEffectConstants

2
app/src/main/java/me/ash/reader/ui/component/Menu.kt → app/src/main/java/me/ash/reader/ui/component/base/Menu.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenu

2
app/src/main/java/me/ash/reader/ui/component/RadioDialog.kt → app/src/main/java/me/ash/reader/ui/component/base/RadioDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row

2
app/src/main/java/me/ash/reader/ui/component/SelectionChip.kt → app/src/main/java/me/ash/reader/ui/component/base/SelectionChip.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource

2
app/src/main/java/me/ash/reader/ui/component/SubTitle.kt → app/src/main/java/me/ash/reader/ui/component/base/SubTitle.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding

2
app/src/main/java/me/ash/reader/ui/component/SwipeRefresh.kt → app/src/main/java/me/ash/reader/ui/component/base/SwipeRefresh.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

2
app/src/main/java/me/ash/reader/ui/component/Switch.kt → app/src/main/java/me/ash/reader/ui/component/base/Switch.kt
View File

@ -6,7 +6,7 @@
* @modifier Ashinch * @modifier Ashinch
*/ */
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.animation.animateColorAsState import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.animateDpAsState

2
app/src/main/java/me/ash/reader/ui/component/TextField.kt → app/src/main/java/me/ash/reader/ui/component/base/TextField.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions

3
app/src/main/java/me/ash/reader/ui/component/TextFieldDialog.kt → app/src/main/java/me/ash/reader/ui/component/base/TextFieldDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -13,7 +13,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.DialogProperties
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
@Composable @Composable

2
app/src/main/java/me/ash/reader/ui/component/Tips.kt → app/src/main/java/me/ash/reader/ui/component/base/Tips.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons

2
app/src/main/java/me/ash/reader/ui/component/ViewPager.kt → app/src/main/java/me/ash/reader/ui/component/base/ViewPager.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import androidx.compose.animation.animateContentSize import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth

2
app/src/main/java/me/ash/reader/ui/component/WebView.kt → app/src/main/java/me/ash/reader/ui/component/base/WebView.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.component package me.ash.reader.ui.component.base
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri

2
app/src/main/java/me/ash/reader/ui/component/reader/HtmlToComposable.kt
View File

@ -51,7 +51,7 @@ import coil.size.Precision
import coil.size.Size import coil.size.Size
import coil.size.pxOrElse import coil.size.pxOrElse
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.AsyncImage import me.ash.reader.ui.component.base.AsyncImage
import org.jsoup.Jsoup import org.jsoup.Jsoup
import org.jsoup.helper.StringUtil import org.jsoup.helper.StringUtil
import org.jsoup.nodes.Element import org.jsoup.nodes.Element

6
app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedItem.kt
View File

@ -20,9 +20,9 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import me.ash.reader.data.entity.Feed import me.ash.reader.data.entity.Feed
import me.ash.reader.ui.page.home.FeedIcon import me.ash.reader.ui.component.FeedIcon
import me.ash.reader.ui.page.home.feeds.option.feed.FeedOptionViewAction import me.ash.reader.ui.page.home.feeds.drawer.feed.FeedOptionViewAction
import me.ash.reader.ui.page.home.feeds.option.feed.FeedOptionViewModel import me.ash.reader.ui.page.home.feeds.drawer.feed.FeedOptionViewModel
import kotlin.math.ln import kotlin.math.ln
@OptIn( @OptIn(

16
app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt
View File

@ -1,6 +1,5 @@
package me.ash.reader.ui.page.home.feeds package me.ash.reader.ui.page.home.feeds
import android.annotation.SuppressLint
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
@ -32,24 +31,23 @@ import me.ash.reader.data.model.getName
import me.ash.reader.data.model.toVersion import me.ash.reader.data.model.toVersion
import me.ash.reader.data.preference.* import me.ash.reader.data.preference.*
import me.ash.reader.data.repository.SyncWorker.Companion.getIsSyncing import me.ash.reader.data.repository.SyncWorker.Companion.getIsSyncing
import me.ash.reader.ui.component.Banner import me.ash.reader.ui.component.base.Banner
import me.ash.reader.ui.component.DisplayText import me.ash.reader.ui.component.base.DisplayText
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.base.FeedbackIconButton
import me.ash.reader.ui.component.Subtitle import me.ash.reader.ui.component.base.Subtitle
import me.ash.reader.ui.ext.* import me.ash.reader.ui.ext.*
import me.ash.reader.ui.page.common.RouteName import me.ash.reader.ui.page.common.RouteName
import me.ash.reader.ui.page.home.FilterBar import me.ash.reader.ui.component.FilterBar
import me.ash.reader.ui.page.home.FilterState import me.ash.reader.ui.page.home.FilterState
import me.ash.reader.ui.page.home.HomeViewAction import me.ash.reader.ui.page.home.HomeViewAction
import me.ash.reader.ui.page.home.HomeViewModel import me.ash.reader.ui.page.home.HomeViewModel
import me.ash.reader.ui.page.home.feeds.option.feed.FeedOptionDrawer import me.ash.reader.ui.page.home.feeds.drawer.feed.FeedOptionDrawer
import me.ash.reader.ui.page.home.feeds.option.group.GroupOptionDrawer import me.ash.reader.ui.page.home.feeds.drawer.group.GroupOptionDrawer
import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeDialog import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeDialog
import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeViewAction import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeViewAction
import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeViewModel import me.ash.reader.ui.page.home.feeds.subscribe.SubscribeViewModel
import me.ash.reader.ui.theme.palette.onDark import me.ash.reader.ui.theme.palette.onDark
@SuppressLint("FlowOperatorInvokedInComposition")
@OptIn( @OptIn(
ExperimentalMaterial3Api::class, com.google.accompanist.pager.ExperimentalPagerApi::class, ExperimentalMaterial3Api::class, com.google.accompanist.pager.ExperimentalPagerApi::class,
androidx.compose.foundation.ExperimentalFoundationApi::class androidx.compose.foundation.ExperimentalFoundationApi::class

4
app/src/main/java/me/ash/reader/ui/page/home/feeds/GroupItem.kt
View File

@ -28,8 +28,8 @@ import me.ash.reader.R
import me.ash.reader.data.entity.Feed import me.ash.reader.data.entity.Feed
import me.ash.reader.data.entity.Group import me.ash.reader.data.entity.Group
import me.ash.reader.ui.ext.alphaLN import me.ash.reader.ui.ext.alphaLN
import me.ash.reader.ui.page.home.feeds.option.group.GroupOptionViewAction import me.ash.reader.ui.page.home.feeds.drawer.group.GroupOptionViewAction
import me.ash.reader.ui.page.home.feeds.option.group.GroupOptionViewModel import me.ash.reader.ui.page.home.feeds.drawer.group.GroupOptionViewModel
@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class)
@Composable @Composable

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/feed/ClearFeedDialog.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/ClearFeedDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.feed package me.ash.reader.ui.page.home.feeds.drawer.feed
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.DeleteForever import androidx.compose.material.icons.outlined.DeleteForever
@ -11,9 +11,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/feed/DeleteFeedDialog.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/DeleteFeedDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.feed package me.ash.reader.ui.page.home.feeds.drawer.feed
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.DeleteForever import androidx.compose.material.icons.outlined.DeleteForever
@ -11,9 +11,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast

8
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/feed/FeedOptionDrawer.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionDrawer.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.feed package me.ash.reader.ui.page.home.feeds.drawer.feed
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
@ -19,12 +19,12 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.BottomDrawer import me.ash.reader.ui.component.base.BottomDrawer
import me.ash.reader.ui.component.TextFieldDialog import me.ash.reader.ui.component.base.TextFieldDialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.roundClick import me.ash.reader.ui.ext.roundClick
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast
import me.ash.reader.ui.page.home.FeedIcon import me.ash.reader.ui.component.FeedIcon
import me.ash.reader.ui.page.home.feeds.subscribe.ResultView import me.ash.reader.ui.page.home.feeds.subscribe.ResultView
@OptIn(ExperimentalMaterialApi::class) @OptIn(ExperimentalMaterialApi::class)

3
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/feed/FeedOptionViewModel.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/feed/FeedOptionViewModel.kt
View File

@ -1,11 +1,10 @@
package me.ash.reader.ui.page.home.feeds.option.feed package me.ash.reader.ui.page.home.feeds.drawer.feed
import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.ModalBottomSheetState import androidx.compose.material.ModalBottomSheetState
import androidx.compose.material.ModalBottomSheetValue import androidx.compose.material.ModalBottomSheetValue
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.google.accompanist.pager.ExperimentalPagerApi
import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/group/AllAllowNotificationDialog.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/AllAllowNotificationDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.group package me.ash.reader.ui.page.home.feeds.drawer.group
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Notifications import androidx.compose.material.icons.outlined.Notifications
@ -11,9 +11,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/group/AllMoveToGroupDialog.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/AllMoveToGroupDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.group package me.ash.reader.ui.page.home.feeds.drawer.group
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.DriveFileMove import androidx.compose.material.icons.outlined.DriveFileMove
@ -11,9 +11,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/group/AllParseFullContentDialog.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/AllParseFullContentDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.group package me.ash.reader.ui.page.home.feeds.drawer.group
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Article import androidx.compose.material.icons.outlined.Article
@ -11,9 +11,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/group/ClearGroupDialog.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/ClearGroupDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.group package me.ash.reader.ui.page.home.feeds.drawer.group
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.DeleteForever import androidx.compose.material.icons.outlined.DeleteForever
@ -11,9 +11,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast

5
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/group/DeleteGroupDialog.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/DeleteGroupDialog.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.group package me.ash.reader.ui.page.home.feeds.drawer.group
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.DeleteForever import androidx.compose.material.icons.outlined.DeleteForever
@ -11,9 +11,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.google.accompanist.pager.ExperimentalPagerApi
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.showToast import me.ash.reader.ui.ext.showToast

10
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/group/GroupOptionDrawer.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionDrawer.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.group package me.ash.reader.ui.page.home.feeds.drawer.group
import android.content.Context import android.content.Context
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
@ -33,10 +33,10 @@ import com.google.accompanist.flowlayout.MainAxisAlignment
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.entity.Group import me.ash.reader.data.entity.Group
import me.ash.reader.ui.component.BottomDrawer import me.ash.reader.ui.component.base.BottomDrawer
import me.ash.reader.ui.component.SelectionChip import me.ash.reader.ui.component.base.SelectionChip
import me.ash.reader.ui.component.Subtitle import me.ash.reader.ui.component.base.Subtitle
import me.ash.reader.ui.component.TextFieldDialog import me.ash.reader.ui.component.base.TextFieldDialog
import me.ash.reader.ui.ext.* import me.ash.reader.ui.ext.*
@OptIn(ExperimentalMaterialApi::class) @OptIn(ExperimentalMaterialApi::class)

2
app/src/main/java/me/ash/reader/ui/page/home/feeds/option/group/GroupOptionViewModel.kt → app/src/main/java/me/ash/reader/ui/page/home/feeds/drawer/group/GroupOptionViewModel.kt
View File

@ -1,4 +1,4 @@
package me.ash.reader.ui.page.home.feeds.option.group package me.ash.reader.ui.page.home.feeds.drawer.group
import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.ModalBottomSheetState import androidx.compose.material.ModalBottomSheetState

4
app/src/main/java/me/ash/reader/ui/page/home/feeds/subscribe/ResultView.kt
View File

@ -30,8 +30,8 @@ import com.google.accompanist.flowlayout.FlowRow
import com.google.accompanist.flowlayout.MainAxisAlignment import com.google.accompanist.flowlayout.MainAxisAlignment
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.entity.Group import me.ash.reader.data.entity.Group
import me.ash.reader.ui.component.SelectionChip import me.ash.reader.ui.component.base.SelectionChip
import me.ash.reader.ui.component.Subtitle import me.ash.reader.ui.component.base.Subtitle
import me.ash.reader.ui.ext.roundClick import me.ash.reader.ui.ext.roundClick
import me.ash.reader.ui.theme.palette.alwaysLight import me.ash.reader.ui.theme.palette.alwaysLight

6
app/src/main/java/me/ash/reader/ui/page/home/feeds/subscribe/SubscribeDialog.kt
View File

@ -25,9 +25,9 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.DialogProperties
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.ClipboardTextField import me.ash.reader.ui.component.base.ClipboardTextField
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.component.TextFieldDialog import me.ash.reader.ui.component.base.TextFieldDialog
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
@OptIn( @OptIn(

6
app/src/main/java/me/ash/reader/ui/page/home/flow/ArticleItem.kt
View File

@ -23,10 +23,10 @@ import coil.size.Scale
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.entity.ArticleWithFeed import me.ash.reader.data.entity.ArticleWithFeed
import me.ash.reader.data.preference.* import me.ash.reader.data.preference.*
import me.ash.reader.ui.component.AsyncImage import me.ash.reader.ui.component.base.AsyncImage
import me.ash.reader.ui.component.Size_1000
import me.ash.reader.ui.ext.formatAsString import me.ash.reader.ui.ext.formatAsString
import me.ash.reader.ui.page.home.FeedIcon import me.ash.reader.ui.component.FeedIcon
import me.ash.reader.ui.component.base.Size_1000
@Composable @Composable
fun ArticleItem( fun ArticleItem(

8
app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt
View File

@ -28,13 +28,13 @@ import me.ash.reader.R
import me.ash.reader.data.model.getName import me.ash.reader.data.model.getName
import me.ash.reader.data.preference.* import me.ash.reader.data.preference.*
import me.ash.reader.data.repository.SyncWorker.Companion.getIsSyncing import me.ash.reader.data.repository.SyncWorker.Companion.getIsSyncing
import me.ash.reader.ui.component.DisplayText import me.ash.reader.ui.component.FilterBar
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.base.DisplayText
import me.ash.reader.ui.component.SwipeRefresh import me.ash.reader.ui.component.base.FeedbackIconButton
import me.ash.reader.ui.component.base.SwipeRefresh
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.surfaceColorAtElevation import me.ash.reader.ui.ext.surfaceColorAtElevation
import me.ash.reader.ui.page.common.RouteName import me.ash.reader.ui.page.common.RouteName
import me.ash.reader.ui.page.home.FilterBar
import me.ash.reader.ui.page.home.FilterState import me.ash.reader.ui.page.home.FilterState
import me.ash.reader.ui.page.home.HomeViewAction import me.ash.reader.ui.page.home.HomeViewAction
import me.ash.reader.ui.page.home.HomeViewModel import me.ash.reader.ui.page.home.HomeViewModel

2
app/src/main/java/me/ash/reader/ui/page/home/flow/MarkAsReadBar.kt
View File

@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.AnimatedPopup import me.ash.reader.ui.component.base.AnimatedPopup
import me.ash.reader.ui.theme.palette.alwaysLight import me.ash.reader.ui.theme.palette.alwaysLight
@Composable @Composable

2
app/src/main/java/me/ash/reader/ui/page/home/read/ReadBar.kt
View File

@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.CanBeDisabledIconButton import me.ash.reader.ui.component.base.CanBeDisabledIconButton
@Composable @Composable
fun ReadBar( fun ReadBar(

2
app/src/main/java/me/ash/reader/ui/page/home/read/ReadPage.kt
View File

@ -23,7 +23,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.entity.ArticleWithFeed import me.ash.reader.data.entity.ArticleWithFeed
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.base.FeedbackIconButton
import me.ash.reader.ui.component.reader.reader import me.ash.reader.ui.component.reader.reader
import me.ash.reader.ui.ext.collectAsStateValue import me.ash.reader.ui.ext.collectAsStateValue
import me.ash.reader.ui.ext.drawVerticalScrollbar import me.ash.reader.ui.ext.drawVerticalScrollbar

6
app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
View File

@ -20,9 +20,9 @@ import androidx.navigation.NavHostController
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.model.toVersion import me.ash.reader.data.model.toVersion
import me.ash.reader.ui.component.Banner import me.ash.reader.ui.component.base.Banner
import me.ash.reader.ui.component.DisplayText import me.ash.reader.ui.component.base.DisplayText
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.base.FeedbackIconButton
import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.DataStoreKeys
import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.dataStore
import me.ash.reader.ui.ext.getCurrentVersion import me.ash.reader.ui.ext.getCurrentVersion

6
app/src/main/java/me/ash/reader/ui/page/settings/color/ColorAndStyle.kt
View File

@ -1,6 +1,5 @@
package me.ash.reader.ui.page.settings.color package me.ash.reader.ui.page.settings.color
import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import androidx.compose.animation.* import androidx.compose.animation.*
@ -27,7 +26,7 @@ import androidx.compose.ui.unit.dp
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.preference.* import me.ash.reader.data.preference.*
import me.ash.reader.ui.component.* import me.ash.reader.ui.component.base.*
import me.ash.reader.ui.page.common.RouteName import me.ash.reader.ui.page.common.RouteName
import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.page.settings.SettingItem
import me.ash.reader.ui.svg.PALETTE import me.ash.reader.ui.svg.PALETTE
@ -36,7 +35,6 @@ import me.ash.reader.ui.theme.palette.*
import me.ash.reader.ui.theme.palette.TonalPalettes.Companion.toTonalPalettes import me.ash.reader.ui.theme.palette.TonalPalettes.Companion.toTonalPalettes
import me.ash.reader.ui.theme.palette.dynamic.extractTonalPalettesFromUserWallpaper import me.ash.reader.ui.theme.palette.dynamic.extractTonalPalettesFromUserWallpaper
@SuppressLint("FlowOperatorInvokedInComposition")
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun ColorAndStyle( fun ColorAndStyle(
@ -157,7 +155,7 @@ fun ColorAndStyle(
} }
}, },
) { ) {
Switch( me.ash.reader.ui.component.base.Switch(
activated = darkTheme.isDarkTheme() activated = darkTheme.isDarkTheme()
) { ) {
darkThemeNot.put(context, scope) darkThemeNot.put(context, scope)

8
app/src/main/java/me/ash/reader/ui/page/settings/color/DarkTheme.kt
View File

@ -20,10 +20,10 @@ import me.ash.reader.data.preference.DarkThemePreference
import me.ash.reader.data.preference.LocalAmoledDarkTheme import me.ash.reader.data.preference.LocalAmoledDarkTheme
import me.ash.reader.data.preference.LocalDarkTheme import me.ash.reader.data.preference.LocalDarkTheme
import me.ash.reader.data.preference.not import me.ash.reader.data.preference.not
import me.ash.reader.ui.component.DisplayText import me.ash.reader.ui.component.base.DisplayText
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.base.FeedbackIconButton
import me.ash.reader.ui.component.Subtitle import me.ash.reader.ui.component.base.Subtitle
import me.ash.reader.ui.component.Switch import me.ash.reader.ui.component.base.Switch
import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.page.settings.SettingItem
import me.ash.reader.ui.theme.palette.onLight import me.ash.reader.ui.theme.palette.onLight

4
app/src/main/java/me/ash/reader/ui/page/settings/color/feeds/FeedsPageStyle.kt
View File

@ -25,9 +25,9 @@ import me.ash.reader.data.entity.Feed
import me.ash.reader.data.model.Filter import me.ash.reader.data.model.Filter
import me.ash.reader.data.entity.Group import me.ash.reader.data.entity.Group
import me.ash.reader.data.preference.* import me.ash.reader.data.preference.*
import me.ash.reader.ui.component.* import me.ash.reader.ui.component.base.*
import me.ash.reader.ui.ext.surfaceColorAtElevation import me.ash.reader.ui.ext.surfaceColorAtElevation
import me.ash.reader.ui.page.home.FilterBar import me.ash.reader.ui.component.FilterBar
import me.ash.reader.ui.page.home.feeds.GroupItem import me.ash.reader.ui.page.home.feeds.GroupItem
import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.page.settings.SettingItem
import me.ash.reader.ui.theme.palette.onDark import me.ash.reader.ui.theme.palette.onDark

18
app/src/main/java/me/ash/reader/ui/page/settings/color/flow/FlowPageStyle.kt
View File

@ -27,9 +27,9 @@ import me.ash.reader.data.entity.ArticleWithFeed
import me.ash.reader.data.entity.Feed import me.ash.reader.data.entity.Feed
import me.ash.reader.data.model.Filter import me.ash.reader.data.model.Filter
import me.ash.reader.data.preference.* import me.ash.reader.data.preference.*
import me.ash.reader.ui.component.* import me.ash.reader.ui.component.base.*
import me.ash.reader.ui.ext.surfaceColorAtElevation import me.ash.reader.ui.ext.surfaceColorAtElevation
import me.ash.reader.ui.page.home.FilterBar import me.ash.reader.ui.component.FilterBar
import me.ash.reader.ui.page.home.flow.ArticleItem import me.ash.reader.ui.page.home.flow.ArticleItem
import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.page.settings.SettingItem
import me.ash.reader.ui.theme.palette.onDark import me.ash.reader.ui.theme.palette.onDark
@ -158,7 +158,7 @@ fun FlowPageStyle(
(!articleListFeedIcon).put(context, scope) (!articleListFeedIcon).put(context, scope)
}, },
) { ) {
Switch(activated = articleListFeedIcon.value) { me.ash.reader.ui.component.base.Switch(activated = articleListFeedIcon.value) {
(!articleListFeedIcon).put(context, scope) (!articleListFeedIcon).put(context, scope)
} }
} }
@ -168,7 +168,7 @@ fun FlowPageStyle(
(!articleListFeedName).put(context, scope) (!articleListFeedName).put(context, scope)
}, },
) { ) {
Switch(activated = articleListFeedName.value) { me.ash.reader.ui.component.base.Switch(activated = articleListFeedName.value) {
(!articleListFeedName).put(context, scope) (!articleListFeedName).put(context, scope)
} }
} }
@ -178,7 +178,7 @@ fun FlowPageStyle(
(!articleListImage).put(context, scope) (!articleListImage).put(context, scope)
}, },
) { ) {
Switch(activated = articleListImage.value) { me.ash.reader.ui.component.base.Switch(activated = articleListImage.value) {
(!articleListImage).put(context, scope) (!articleListImage).put(context, scope)
} }
} }
@ -188,7 +188,7 @@ fun FlowPageStyle(
(!articleListDesc).put(context, scope) (!articleListDesc).put(context, scope)
}, },
) { ) {
Switch(activated = articleListDesc.value) { me.ash.reader.ui.component.base.Switch(activated = articleListDesc.value) {
(!articleListDesc).put(context, scope) (!articleListDesc).put(context, scope)
} }
} }
@ -198,7 +198,7 @@ fun FlowPageStyle(
(!articleListTime).put(context, scope) (!articleListTime).put(context, scope)
}, },
) { ) {
Switch(activated = articleListTime.value) { me.ash.reader.ui.component.base.Switch(activated = articleListTime.value) {
(!articleListTime).put(context, scope) (!articleListTime).put(context, scope)
} }
} }
@ -208,7 +208,7 @@ fun FlowPageStyle(
(!articleListStickyDate).put(context, scope) (!articleListStickyDate).put(context, scope)
}, },
) { ) {
Switch(activated = articleListStickyDate.value) { me.ash.reader.ui.component.base.Switch(activated = articleListStickyDate.value) {
(!articleListStickyDate).put(context, scope) (!articleListStickyDate).put(context, scope)
} }
} }
@ -242,7 +242,7 @@ fun FlowPageStyle(
(!filterBarFilled).put(context, scope) (!filterBarFilled).put(context, scope)
}, },
) { ) {
Switch(activated = filterBarFilled.value) { me.ash.reader.ui.component.base.Switch(activated = filterBarFilled.value) {
(!filterBarFilled).put(context, scope) (!filterBarFilled).put(context, scope)
} }
} }

3
app/src/main/java/me/ash/reader/ui/page/settings/interaction/Interaction.kt
View File

@ -1,6 +1,5 @@
package me.ash.reader.ui.page.settings.interaction package me.ash.reader.ui.page.settings.interaction
import android.annotation.SuppressLint
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
@ -17,13 +16,13 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.* import me.ash.reader.ui.component.*
import me.ash.reader.ui.component.base.*
import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.DataStoreKeys
import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.dataStore
import me.ash.reader.ui.ext.put import me.ash.reader.ui.ext.put
import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.page.settings.SettingItem
import me.ash.reader.ui.theme.palette.onLight import me.ash.reader.ui.theme.palette.onLight
@SuppressLint("FlowOperatorInvokedInComposition")
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun Interaction( fun Interaction(

6
app/src/main/java/me/ash/reader/ui/page/settings/languages/Languages.kt
View File

@ -23,9 +23,9 @@ import androidx.navigation.NavHostController
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.preference.LanguagesPreference import me.ash.reader.data.preference.LanguagesPreference
import me.ash.reader.data.preference.LocalLanguages import me.ash.reader.data.preference.LocalLanguages
import me.ash.reader.ui.component.Banner import me.ash.reader.ui.component.base.Banner
import me.ash.reader.ui.component.DisplayText import me.ash.reader.ui.component.base.DisplayText
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.base.FeedbackIconButton
import me.ash.reader.ui.page.settings.SettingItem import me.ash.reader.ui.page.settings.SettingItem
import me.ash.reader.ui.theme.palette.onLight import me.ash.reader.ui.theme.palette.onLight

4
app/src/main/java/me/ash/reader/ui/page/settings/tips/TipsAndSupport.kt
View File

@ -36,8 +36,8 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.CurlyCornerShape import me.ash.reader.ui.component.base.CurlyCornerShape
import me.ash.reader.ui.component.FeedbackIconButton import me.ash.reader.ui.component.base.FeedbackIconButton
import me.ash.reader.ui.ext.* import me.ash.reader.ui.ext.*
import me.ash.reader.ui.theme.palette.alwaysLight import me.ash.reader.ui.theme.palette.alwaysLight
import me.ash.reader.ui.theme.palette.onLight import me.ash.reader.ui.theme.palette.onLight

2
app/src/main/java/me/ash/reader/ui/page/settings/tips/UpdateDialog.kt
View File

@ -35,7 +35,7 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.data.source.Download import me.ash.reader.data.source.Download
import me.ash.reader.ui.component.Dialog import me.ash.reader.ui.component.base.Dialog
import me.ash.reader.ui.ext.* import me.ash.reader.ui.ext.*
@SuppressLint("FlowOperatorInvokedInComposition") @SuppressLint("FlowOperatorInvokedInComposition")

6
app/src/main/java/me/ash/reader/ui/page/startup/StartupPage.kt
View File

@ -18,9 +18,9 @@ import androidx.navigation.NavHostController
import com.ireward.htmlcompose.HtmlText import com.ireward.htmlcompose.HtmlText
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import me.ash.reader.R import me.ash.reader.R
import me.ash.reader.ui.component.DisplayText import me.ash.reader.ui.component.base.DisplayText
import me.ash.reader.ui.component.DynamicSVGImage import me.ash.reader.ui.component.base.DynamicSVGImage
import me.ash.reader.ui.component.Tips import me.ash.reader.ui.component.base.Tips
import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.DataStoreKeys
import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.dataStore
import me.ash.reader.ui.ext.put import me.ash.reader.ui.ext.put