[1.105.*] Pre-release merge (#404)

msasikanth · Mar 25, 2024 · 5b8a015 · 5b8a015
2 parents 01d465d + c535a84
commit 5b8a015
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 761 deletions.
diff --git a/core/model/src/commonMain/kotlin/dev/sasikanth/rss/reader/core/model/local/Tag.kt b/core/model/src/commonMain/kotlin/dev/sasikanth/rss/reader/core/model/local/Tag.kt
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/App.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/App.kt
@@ -45,7 +45,6 @@ import dev.sasikanth.rss.reader.search.ui.SearchScreen
 import dev.sasikanth.rss.reader.settings.ui.SettingsScreen
 import dev.sasikanth.rss.reader.share.LocalShareHandler
 import dev.sasikanth.rss.reader.share.ShareHandler
-import dev.sasikanth.rss.reader.tags.ui.TagsScreen
 import dev.sasikanth.rss.reader.utils.LocalWindowSizeClass
 import me.tatarka.inject.annotations.Inject
 
@@ -105,9 +104,6 @@ fun App(
               is Screen.Reader -> {
                 ReaderScreen(presenter = screen.presenter, modifier = fillMaxSizeModifier)
               }
-              is Screen.Tags -> {
-                TagsScreen(tagsPresenter = screen.presenter, modifier = fillMaxSizeModifier)
-              }
             }
           }
 

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/AppPresenter.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/AppPresenter.kt
@@ -43,7 +43,6 @@ import dev.sasikanth.rss.reader.repository.RssRepository
 import dev.sasikanth.rss.reader.repository.SettingsRepository
 import dev.sasikanth.rss.reader.search.SearchPresentFactory
 import dev.sasikanth.rss.reader.settings.SettingsPresenterFactory
-import dev.sasikanth.rss.reader.tags.TagsPresenterFactory
 import dev.sasikanth.rss.reader.util.DispatchersProvider
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
@@ -66,7 +65,6 @@ class AppPresenter(
   private val aboutPresenter: AboutPresenterFactory,
   private val readerPresenter: ReaderPresenterFactory,
   private val feedPresenter: FeedPresenterFactory,
-  private val tagsPresenter: TagsPresenterFactory,
   private val lastUpdatedAt: LastUpdatedAt,
   private val rssRepository: RssRepository,
   private val settingsRepository: SettingsRepository,
@@ -165,16 +163,6 @@ class AppPresenter(
           presenter = readerPresenter(config.postLink, componentContext) { navigation.pop() }
         )
       }
-      is Config.Tags -> {
-        Screen.Tags(
-          presenter =
-            tagsPresenter(
-              componentContext,
-            ) {
-              navigation.pop()
-            }
-        )
-      }
     }
 
   private fun openPost(postLink: String) {
@@ -228,8 +216,6 @@ class AppPresenter(
     @Serializable data object About : Config
 
     @Serializable data class Reader(val postLink: String) : Config
-
-    @Serializable data object Tags : Config
   }
 
   @Serializable

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/Screens.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/Screens.kt
@@ -21,7 +21,6 @@ import dev.sasikanth.rss.reader.home.HomePresenter
 import dev.sasikanth.rss.reader.reader.ReaderPresenter
 import dev.sasikanth.rss.reader.search.SearchPresenter
 import dev.sasikanth.rss.reader.settings.SettingsPresenter
-import dev.sasikanth.rss.reader.tags.TagsPresenter
 
 internal sealed interface Screen {
   class Home(val presenter: HomePresenter) : Screen
@@ -35,6 +34,4 @@ internal sealed interface Screen {
   class About(val presenter: AboutPresenter) : Screen
 
   class Reader(val presenter: ReaderPresenter) : Screen
-
-  class Tags(val presenter: TagsPresenter) : Screen
 }
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/di/DataComponent.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/di/DataComponent.kt
@@ -21,8 +21,6 @@ import dev.sasikanth.rss.reader.database.DateAdapter
 import dev.sasikanth.rss.reader.database.Feed
 import dev.sasikanth.rss.reader.database.Post
 import dev.sasikanth.rss.reader.database.ReaderDatabase
-import dev.sasikanth.rss.reader.database.Tag
-import dev.sasikanth.rss.reader.database.UuidAdapter
 import dev.sasikanth.rss.reader.di.scopes.AppScope
 import me.tatarka.inject.annotations.Provides
 
@@ -45,12 +43,6 @@ internal interface DataComponent : SqlDriverPlatformComponent, DataStorePlatform
           lastCleanUpAtAdapter = DateAdapter
         ),
       bookmarkAdapter = Bookmark.Adapter(dateAdapter = DateAdapter),
-      tagAdapter =
-        Tag.Adapter(
-          idAdapter = UuidAdapter,
-          createdAtAdapter = DateAdapter,
-          updatedAtAdapter = DateAdapter
-        )
     )
   }
 
@@ -65,6 +57,4 @@ internal interface DataComponent : SqlDriverPlatformComponent, DataStorePlatform
 
   @Provides
   fun providesFeedSearchFTSQueries(database: ReaderDatabase) = database.feedSearchFTSQueries
-
-  @Provides fun providesTagQueries(database: ReaderDatabase) = database.tagQueries
 }
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/repository/TagRepository.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/repository/TagRepository.kt
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/tags/TagsEvent.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/tags/TagsEvent.kt
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/tags/TagsPresenter.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/tags/TagsPresenter.kt
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/tags/TagsState.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/tags/TagsState.kt