Clean up

Author: machiav3lli

app/src/main/java/com/saulhdev/feeder/MainActivity.kt

@@ -28,11 +28,11 @@ import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import com.saulhdev.feeder.data.content.FeedPreferences
-import com.saulhdev.feeder.utils.extensions.isDarkTheme
 import com.saulhdev.feeder.manager.sync.FeedSyncer
 import com.saulhdev.feeder.ui.navigation.NAV_BASE
 import com.saulhdev.feeder.ui.navigation.NavigationManager
 import com.saulhdev.feeder.ui.theme.AppTheme
+import com.saulhdev.feeder.utils.extensions.isDarkTheme
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.koin.java.KoinJavaComponent.inject
 import java.util.concurrent.TimeUnit

app/src/main/java/com/saulhdev/feeder/manager/service/OverlayView.kt

@@ -23,8 +23,6 @@ import com.saulhdev.feeder.NeoApp
 import com.saulhdev.feeder.R
 import com.saulhdev.feeder.data.content.FeedPreferences
 import com.saulhdev.feeder.data.entity.MenuItem
-import com.saulhdev.feeder.utils.extensions.isDark
-import com.saulhdev.feeder.utils.extensions.setCustomTheme
 import com.saulhdev.feeder.manager.sync.SyncRestClient
 import com.saulhdev.feeder.ui.feed.FeedAdapter
 import com.saulhdev.feeder.ui.navigation.Routes
@@ -35,6 +33,8 @@ import com.saulhdev.feeder.ui.views.DialogMenu
 import com.saulhdev.feeder.ui.views.FilterBottomSheet
 import com.saulhdev.feeder.utils.Android
 import com.saulhdev.feeder.utils.LinearLayoutManagerWrapper
+import com.saulhdev.feeder.utils.extensions.isDark
+import com.saulhdev.feeder.utils.extensions.setCustomTheme
 import com.saulhdev.feeder.viewmodels.ArticleListViewModel
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
@@ -211,12 +211,12 @@ class OverlayView(val context: Context) :
 
             a14 && darkTheme -> ContextCompat.getColor(
                 context,
-                android.R.color.system_primary_dark
+                android.R.color.system_on_primary_container_dark
             )
 
             a14              -> ContextCompat.getColor(
                 context,
-                android.R.color.system_primary_light
+                android.R.color.system_primary_container_light
             )
 
             a12              -> ContextCompat.getColor(

app/src/main/java/com/saulhdev/feeder/ui/components/BookmarkItem.kt

@@ -65,7 +65,7 @@ fun BookmarkItem(
     val backgroundColor by animateColorAsState(
         targetValue = if (isPinned) MaterialTheme.colorScheme.surfaceContainerHighest
         else MaterialTheme.colorScheme.surfaceContainer,
-        label = ""
+        label = "backgroundColor"
     )
 
     Card(

app/src/main/java/com/saulhdev/feeder/ui/components/OverflowMenu.kt

@@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
@@ -46,7 +45,6 @@ fun OverflowMenu(
             Icon(
                 imageVector = Phosphor.DotsThreeVertical,
                 contentDescription = stringResource(id = R.string.title_settings),
-                tint = MaterialTheme.colorScheme.primary
             )
         }
         DropdownMenu(

app/src/main/java/com/saulhdev/feeder/ui/pages/MainPage.kt

@@ -10,10 +10,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import com.saulhdev.feeder.ui.navigation.NavItem
-import com.saulhdev.feeder.ui.navigation.NavigationSuiteScaffold
 import com.saulhdev.feeder.ui.components.SlidePager
 import com.saulhdev.feeder.ui.components.dialog.DrawPermissionRequestDialog
+import com.saulhdev.feeder.ui.navigation.NavItem
+import com.saulhdev.feeder.ui.navigation.NavigationSuiteScaffold
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.launch
 

app/src/main/java/com/saulhdev/feeder/viewmodels/ArticleListViewModel.kt

@@ -49,7 +49,7 @@ class ArticleListViewModel(
         prefs.sortingFilter.get(),
         prefs.sortingAsc.get(),
         prefs.sourcesFilter.get(),
-        prefs.tagsFilter.get()
+        prefs.tagsFilter.get(),
     ) { sort, sortAsc, sources, tags ->
         SortFilterModel(sort, sortAsc, sources, tags)
     }
@@ -125,26 +125,26 @@ class ArticleListViewModel(
                 else list.filterNot { it.feedTag in sfm.tagsFilter }
             }
             .let { list ->
-                when {
-                    sfm.sort == SORT_CHRONOLOGICAL && !sfm.sortAsc ->
+                when (sfm.sort) {
+                    SORT_CHRONOLOGICAL if !sfm.sortAsc ->
                         list.sortedByDescending(FeedItem::timeMillis)
 
-                    sfm.sort == SORT_CHRONOLOGICAL && sfm.sortAsc  ->
+                    SORT_CHRONOLOGICAL if sfm.sortAsc  ->
                         list.sortedBy(FeedItem::timeMillis)
 
-                    sfm.sort == SORT_TITLE && sfm.sortAsc          ->
+                    SORT_TITLE if sfm.sortAsc          ->
                         list.sortedBy(FeedItem::contentTitle)
 
-                    sfm.sort == SORT_TITLE && !sfm.sortAsc         ->
+                    SORT_TITLE if !sfm.sortAsc         ->
                         list.sortedByDescending(FeedItem::contentTitle)
 
-                    sfm.sort == SORT_SOURCE && sfm.sortAsc         ->
+                    SORT_SOURCE if sfm.sortAsc         ->
                         list.sortedBy(FeedItem::displayTitle)
 
-                    sfm.sort == SORT_SOURCE && !sfm.sortAsc        ->
+                    SORT_SOURCE if !sfm.sortAsc        ->
                         list.sortedByDescending(FeedItem::displayTitle)
 
-                    else                                           -> list.sortedByDescending(
+                    else                               -> list.sortedByDescending(
                         FeedItem::timeMillis
                     )
                 }