Put extensions in their own package

readrops · Dec 10, 2024 · fb49ffe · fb49ffe
1 parent 5f99afc
commit fb49ffe
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 23 deletions.
diff --git a/app/src/main/java/com/readrops/app/item/ItemScreen.kt b/app/src/main/java/com/readrops/app/item/ItemScreen.kt
@@ -60,8 +60,8 @@ import com.readrops.app.util.components.AndroidScreen
 import com.readrops.app.util.components.CenteredProgressIndicator
 import com.readrops.app.util.components.FeedIcon
 import com.readrops.app.util.components.IconText
-import com.readrops.app.util.openInCustomTab
-import com.readrops.app.util.openUrl
+import com.readrops.app.util.extensions.openInCustomTab
+import com.readrops.app.util.extensions.openUrl
 import com.readrops.app.util.theme.MediumSpacer
 import com.readrops.app.util.theme.ShortSpacer
 import com.readrops.app.util.theme.spacing

diff --git a/app/src/main/java/com/readrops/app/more/MoreTab.kt b/app/src/main/java/com/readrops/app/more/MoreTab.kt
@@ -34,7 +34,7 @@ import com.readrops.app.account.selection.adaptiveIconPainterResource
 import com.readrops.app.more.preferences.PreferencesScreen
 import com.readrops.app.util.components.IconText
 import com.readrops.app.util.components.SelectableIconText
-import com.readrops.app.util.openUrl
+import com.readrops.app.util.extensions.openUrl
 import com.readrops.app.util.theme.LargeSpacer
 import com.readrops.app.util.theme.MediumSpacer
 import com.readrops.app.util.theme.ShortSpacer

diff --git a/app/src/main/java/com/readrops/app/sync/SyncWorker.kt b/app/src/main/java/com/readrops/app/sync/SyncWorker.kt
@@ -25,7 +25,7 @@ import com.readrops.app.MainActivity
 import com.readrops.app.R
 import com.readrops.app.ReadropsApp
 import com.readrops.app.repositories.SyncResult
-import com.readrops.app.util.putSerializable
+import com.readrops.app.util.extensions.putSerializable
 import com.readrops.db.Database
 import com.readrops.db.entities.account.Account
 import kotlinx.coroutines.flow.first

diff --git a/app/src/main/java/com/readrops/app/timelime/TimelineScreenModel.kt b/app/src/main/java/com/readrops/app/timelime/TimelineScreenModel.kt
@@ -14,8 +14,8 @@ import com.readrops.app.repositories.ErrorResult
 import com.readrops.app.repositories.GetFoldersWithFeeds
 import com.readrops.app.sync.SyncWorker
 import com.readrops.app.util.Preferences
-import com.readrops.app.util.clearSerializables
-import com.readrops.app.util.getSerializable
+import com.readrops.app.util.extensions.clearSerializables
+import com.readrops.app.util.extensions.getSerializable
 import com.readrops.db.Database
 import com.readrops.db.entities.Feed
 import com.readrops.db.entities.Folder

diff --git a/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt b/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt
@@ -49,7 +49,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
@@ -67,8 +66,11 @@ import com.readrops.app.util.components.CenteredProgressIndicator
 import com.readrops.app.util.components.Placeholder
 import com.readrops.app.util.components.RefreshScreen
 import com.readrops.app.util.components.dialog.TwoChoicesDialog
-import com.readrops.app.util.openInCustomTab
-import com.readrops.app.util.openUrl
+import com.readrops.app.util.extensions.isError
+import com.readrops.app.util.extensions.isLoading
+import com.readrops.app.util.extensions.isNotEmpty
+import com.readrops.app.util.extensions.openInCustomTab
+import com.readrops.app.util.extensions.openUrl
 import com.readrops.app.util.theme.spacing
 import com.readrops.db.entities.OpenIn
 import com.readrops.db.filters.MainFilter
@@ -320,7 +322,7 @@ object TimelineTab : Tab {
                                 isRefreshing = state.isRefreshing,
                                 onRefresh = { screenModel.refreshTimeline() },
                             ) {
-                                if (items.itemCount > 0) {
+                                if (items.isNotEmpty()) {
                                     MarkItemsRead(
                                         lazyListState = lazyListState,
                                         items = items,
@@ -502,13 +504,4 @@ object TimelineTab : Tab {
                 }
         }
     }
-}
-
-
-fun <T : Any> LazyPagingItems<T>.isLoading(): Boolean {
-    return loadState.refresh is LoadState.Loading && itemCount == 0
-}
-
-fun <T : Any> LazyPagingItems<T>.isError(): Boolean {
-    return loadState.append is LoadState.Error //|| loadState.refresh is LoadState.Error
 }
diff --git a/app/src/main/java/com/readrops/app/util/components/IconText.kt b/app/src/main/java/com/readrops/app/util/components/IconText.kt
@@ -22,7 +22,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import com.readrops.app.util.theme.spacing
-import com.readrops.app.util.toDp
+import com.readrops.app.util.extensions.toDp
 
 @Composable
 fun BaseText(

diff --git a/...om/readrops/app/util/ContextExtensions.kt → .../app/util/extensions/ContextExtensions.kt b/...om/readrops/app/util/ContextExtensions.kt → .../app/util/extensions/ContextExtensions.kt
@@ -1,4 +1,4 @@
-package com.readrops.app.util
+package com.readrops.app.util.extensions
 
 import android.content.Context
 import android.content.Intent

diff --git a/.../java/com/readrops/app/util/Extensions.kt → ...eadrops/app/util/extensions/Extensions.kt b/.../java/com/readrops/app/util/Extensions.kt → ...eadrops/app/util/extensions/Extensions.kt
@@ -1,4 +1,4 @@
-package com.readrops.app.util
+package com.readrops.app.util.extensions
 
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Dp
@@ -8,7 +8,6 @@ import java.io.Serializable
 
 fun TextStyle.toDp(): Dp = fontSize.value.dp
 
-
 val Data.serializables by lazy {
     mutableMapOf<String, Serializable>()
 }

diff --git a/app/src/main/java/com/readrops/app/util/extensions/LazyPagingItemsExtensions.kt b/app/src/main/java/com/readrops/app/util/extensions/LazyPagingItemsExtensions.kt
@@ -0,0 +1,16 @@
+package com.readrops.app.util.extensions
+
+import androidx.paging.LoadState
+import androidx.paging.compose.LazyPagingItems
+
+fun <T : Any> LazyPagingItems<T>.isLoading(): Boolean {
+    return loadState.refresh is LoadState.Loading && itemCount == 0
+}
+
+fun <T : Any> LazyPagingItems<T>.isError(): Boolean {
+    return loadState.append is LoadState.Error //|| loadState.refresh is LoadState.Error
+}
+
+fun <T : Any> LazyPagingItems<T>.isNotEmpty(): Boolean {
+    return itemCount > 0
+}