Update

ShiftHackZ · ShiftHackZ · commit 05834661f534 · 2023-08-17T00:23:36.000+03:00
diff --git a/data/src/main/java/com/shifthackz/joyreactor/data/datasource/remote/CommentsRemoteDataSource.kt b/data/src/main/java/com/shifthackz/joyreactor/data/datasource/remote/CommentsRemoteDataSource.kt
@@ -4,7 +4,7 @@ import com.shifthackz.joyreactor.domain.datasource.CommentsDataSource
 import com.shifthackz.joyreactor.entity.Comment
 import com.shifthackz.joyreactor.network.parser.CommentsParser
 
-class CommentsRemoteDataSource(
+internal class CommentsRemoteDataSource(
     private val commentsParser: CommentsParser,
 ) : CommentsDataSource.Remote {
 
diff --git a/data/src/main/java/com/shifthackz/joyreactor/data/datasource/remote/SectionsRemoteDataSource.kt b/data/src/main/java/com/shifthackz/joyreactor/data/datasource/remote/SectionsRemoteDataSource.kt
@@ -0,0 +1,15 @@
+package com.shifthackz.joyreactor.data.datasource.remote
+
+import com.shifthackz.joyreactor.domain.datasource.SectionsDataSource
+import com.shifthackz.joyreactor.entity.JoyReactorLink
+import com.shifthackz.joyreactor.entity.Section
+import com.shifthackz.joyreactor.network.parser.SectionsParser
+
+internal class SectionsRemoteDataSource(
+    private val sectionsParser: SectionsParser,
+) : SectionsDataSource.Remote {
+
+    override suspend fun fetchSections(): Result<List<Section>> {
+        return sectionsParser.fetchSections(JoyReactorLink.HOME_GOOD.url)
+    }
+}
diff --git a/data/src/main/java/com/shifthackz/joyreactor/data/di/Modules.kt b/data/src/main/java/com/shifthackz/joyreactor/data/di/Modules.kt
@@ -3,19 +3,24 @@ package com.shifthackz.joyreactor.data.di
 import com.shifthackz.joyreactor.data.datasource.local.PostsLocalDataSource
 import com.shifthackz.joyreactor.data.datasource.remote.CommentsRemoteDataSource
 import com.shifthackz.joyreactor.data.datasource.remote.PostsRemoteDataSource
+import com.shifthackz.joyreactor.data.datasource.remote.SectionsRemoteDataSource
 import com.shifthackz.joyreactor.data.repository.CommentsRepositoryImpl
 import com.shifthackz.joyreactor.data.repository.PostsRepositoryImpl
+import com.shifthackz.joyreactor.data.repository.SectionsRepositoryImpl
 import com.shifthackz.joyreactor.domain.datasource.CommentsDataSource
 import com.shifthackz.joyreactor.domain.datasource.PostsDataSource
+import com.shifthackz.joyreactor.domain.datasource.SectionsDataSource
 import com.shifthackz.joyreactor.domain.repository.CommentsRepository
 import com.shifthackz.joyreactor.domain.repository.PostsRepository
+import com.shifthackz.joyreactor.domain.repository.SectionsRepository
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
 internal val remoteDataSourceModule = module {
     factoryOf(::PostsRemoteDataSource) bind PostsDataSource.Remote::class
     factoryOf(::CommentsRemoteDataSource) bind CommentsDataSource.Remote::class
+    factoryOf(::SectionsRemoteDataSource) bind SectionsDataSource.Remote::class
 }
 
 internal val localDataSourceModule = module {
@@ -25,6 +30,7 @@ internal val localDataSourceModule = module {
 internal val repositoryModule = module {
     factoryOf(::PostsRepositoryImpl) bind PostsRepository::class
     factoryOf(::CommentsRepositoryImpl) bind CommentsRepository::class
+    factoryOf(::SectionsRepositoryImpl) bind SectionsRepository::class
 }
 
 val dataModule = (remoteDataSourceModule + localDataSourceModule + repositoryModule).toTypedArray()
diff --git a/data/src/main/java/com/shifthackz/joyreactor/data/repository/SectionsRepositoryImpl.kt b/data/src/main/java/com/shifthackz/joyreactor/data/repository/SectionsRepositoryImpl.kt
@@ -0,0 +1,14 @@
+package com.shifthackz.joyreactor.data.repository
+
+import com.shifthackz.joyreactor.domain.datasource.SectionsDataSource
+import com.shifthackz.joyreactor.domain.repository.SectionsRepository
+import com.shifthackz.joyreactor.entity.Section
+
+internal class SectionsRepositoryImpl(
+    private val sectionsRds: SectionsDataSource.Remote,
+) : SectionsRepository {
+
+    override suspend fun fetchSections(): Result<List<Section>> {
+        return sectionsRds.fetchSections()
+    }
+}
diff --git a/domain/src/main/java/com/shifthackz/joyreactor/domain/datasource/SectionsDataSource.kt b/domain/src/main/java/com/shifthackz/joyreactor/domain/datasource/SectionsDataSource.kt
@@ -0,0 +1,10 @@
+package com.shifthackz.joyreactor.domain.datasource
+
+import com.shifthackz.joyreactor.entity.Section
+
+sealed interface SectionsDataSource {
+
+    interface Remote : SectionsDataSource {
+        suspend fun fetchSections(): Result<List<Section>>
+    }
+}
diff --git a/domain/src/main/java/com/shifthackz/joyreactor/domain/di/Modules.kt b/domain/src/main/java/com/shifthackz/joyreactor/domain/di/Modules.kt
@@ -6,6 +6,8 @@ import com.shifthackz.joyreactor.domain.usecase.post.FetchPostsPageUseCase
 import com.shifthackz.joyreactor.domain.usecase.post.FetchPostsPageUseCaseImpl
 import com.shifthackz.joyreactor.domain.usecase.post.GetFullPostUseCase
 import com.shifthackz.joyreactor.domain.usecase.post.GetFullPostUseCaseImpl
+import com.shifthackz.joyreactor.domain.usecase.sections.FetchSectionsUseCase
+import com.shifthackz.joyreactor.domain.usecase.sections.FetchSectionsUseCaseImpl
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
@@ -14,4 +16,5 @@ val domainModule = module {
     factoryOf(::FetchPostsPageUseCaseImpl) bind FetchPostsPageUseCase::class
     factoryOf(::GetFullPostUseCaseImpl) bind GetFullPostUseCase::class
     factoryOf(::FetchPostCommentsUseCaseImpl) bind FetchPostCommentsUseCase::class
+    factoryOf(::FetchSectionsUseCaseImpl) bind FetchSectionsUseCase::class
 }
diff --git a/domain/src/main/java/com/shifthackz/joyreactor/domain/repository/SectionsRepository.kt b/domain/src/main/java/com/shifthackz/joyreactor/domain/repository/SectionsRepository.kt
@@ -0,0 +1,7 @@
+package com.shifthackz.joyreactor.domain.repository
+
+import com.shifthackz.joyreactor.entity.Section
+
+interface SectionsRepository {
+    suspend fun fetchSections(): Result<List<Section>>
+}
diff --git a/domain/src/main/java/com/shifthackz/joyreactor/domain/usecase/sections/FetchSectionsUseCase.kt b/domain/src/main/java/com/shifthackz/joyreactor/domain/usecase/sections/FetchSectionsUseCase.kt
@@ -0,0 +1,7 @@
+package com.shifthackz.joyreactor.domain.usecase.sections
+
+import com.shifthackz.joyreactor.entity.Section
+
+interface FetchSectionsUseCase {
+    suspend operator fun invoke(): Result<List<Section>>
+}
diff --git a/domain/src/main/java/com/shifthackz/joyreactor/domain/usecase/sections/FetchSectionsUseCaseImpl.kt b/domain/src/main/java/com/shifthackz/joyreactor/domain/usecase/sections/FetchSectionsUseCaseImpl.kt
@@ -0,0 +1,13 @@
+package com.shifthackz.joyreactor.domain.usecase.sections
+
+import com.shifthackz.joyreactor.domain.repository.SectionsRepository
+import com.shifthackz.joyreactor.entity.Section
+
+internal class FetchSectionsUseCaseImpl(
+    private val sectionsRepository: SectionsRepository,
+) : FetchSectionsUseCase {
+
+    override suspend fun invoke(): Result<List<Section>> {
+        return sectionsRepository.fetchSections()
+    }
+}
diff --git a/entity/src/main/java/com/shifthackz/joyreactor/entity/Section.kt b/entity/src/main/java/com/shifthackz/joyreactor/entity/Section.kt
@@ -0,0 +1,7 @@
+package com.shifthackz.joyreactor.entity
+
+data class Section(
+    val name: String,
+    val url: String,
+    val imageUrl: String,
+)
diff --git a/network/src/main/java/com/shifthackz/joyreactor/network/di/Modules.kt b/network/src/main/java/com/shifthackz/joyreactor/network/di/Modules.kt
@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder
 import com.shifthackz.joyreactor.network.interceptor.LoggingInterceptor
 import com.shifthackz.joyreactor.network.parser.CommentsParser
 import com.shifthackz.joyreactor.network.parser.PostsParser
+import com.shifthackz.joyreactor.network.parser.SectionsParser
 import com.shifthackz.joyreactor.network.qualifier.HttpInterceptors
 import com.shifthackz.joyreactor.network.qualifier.NetworkInterceptor
 import com.shifthackz.joyreactor.network.qualifier.NetworkInterceptors
@@ -22,6 +23,7 @@ private const val HTTP_TIMEOUT = 1L
 val networkModule = module {
     singleOf(::PostsParser)
     singleOf(::CommentsParser)
+    singleOf(::SectionsParser)
 
     single<Gson> { GsonBuilder().setLenient().create() }
 
diff --git a/network/src/main/java/com/shifthackz/joyreactor/network/extensions/ParserExtensions.kt b/network/src/main/java/com/shifthackz/joyreactor/network/extensions/ParserExtensions.kt
@@ -1,5 +1,17 @@
 package com.shifthackz.joyreactor.network.extensions
 
+import java.net.URL
+
 fun String.formatImageUrl(): String {
     return if (startsWith("//")) "https:$this" else this
-}
+}
+
+fun String.formatSectionUrl(): String {
+    if (startsWith("javascript")) return ""
+    return if (startsWith("http")) this else "https://joyreactor.cc$this"
+}
+
+fun String.baseUrl(): String {
+    val locationUrl = URL(this)
+    return locationUrl.protocol + "://" + locationUrl.host
+}
diff --git a/network/src/main/java/com/shifthackz/joyreactor/network/parser/PostsParser.kt b/network/src/main/java/com/shifthackz/joyreactor/network/parser/PostsParser.kt
@@ -8,11 +8,11 @@ import com.shifthackz.joyreactor.entity.JoyReactorLink
 import com.shifthackz.joyreactor.entity.PagePayload
 import com.shifthackz.joyreactor.entity.Post
 import com.shifthackz.joyreactor.entity.Tag
+import com.shifthackz.joyreactor.network.extensions.baseUrl
 import com.shifthackz.joyreactor.network.extensions.formatImageUrl
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jsoup.Jsoup
-import java.net.URL
 import java.util.Date
 
 
@@ -37,8 +37,7 @@ class PostsParser {
                 .get()
 
             val location = doc.location()
-            val locationUrl = URL(location)
-            val baseUrl = locationUrl.protocol + "://" + locationUrl.host
+            val baseUrl = location.baseUrl()
 
             val postContainers = doc.select(".postContainer")
             for (i in 0 until postContainers.size) {
diff --git a/network/src/main/java/com/shifthackz/joyreactor/network/parser/SectionsParser.kt b/network/src/main/java/com/shifthackz/joyreactor/network/parser/SectionsParser.kt
@@ -0,0 +1,58 @@
+package com.shifthackz.joyreactor.network.parser
+
+import android.util.Log
+import com.shifthackz.joyreactor.entity.Section
+import com.shifthackz.joyreactor.network.extensions.baseUrl
+import com.shifthackz.joyreactor.network.extensions.formatSectionUrl
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.jsoup.Jsoup
+
+class SectionsParser {
+
+    suspend fun fetchSections(url: String): Result<List<Section>> = withContext(Dispatchers.IO) {
+        try {
+            val sections = mutableListOf<Section>()
+            val doc = Jsoup.connect(url).get()
+            val cssUrl = doc.head().select("link[href~=.*\\.(css)]").attr("href").let { "https:$it" }
+            val css = Jsoup.connect(cssUrl).get().html()
+//            Log.d("DBGCSS", "$cc")
+            val sidebars = doc.select("div.sidebar_block")
+            for (i in 0 until sidebars.size) {
+                val title = sidebars[i].select("h2.sideheader").text()
+                val lis = sidebars[i].select("li")
+                for (j in 0 until lis.size) {
+                    if (lis[j].attr("id").isNotBlank()) continue
+                    val name = lis[j].attr("class")
+                    val link = lis[j].select("a")[0].attr("href").formatSectionUrl()
+//                    lis[j].select("a")[0].
+                    val img = lis[j].select("a")[0].cssSelector()
+                    val imgCssSel = img.split(" > ").takeLast(2).joinToString(" ")//.split(" ")[0]
+//                    Log.d("DBGCSS", "$img")
+//                    Log.d("DBGCSS", "$imgCssSel")
+//                    Log.d("DBGCSS", "${css.html().contains(imgCssSel)}")
+                    var idx = css.lastIndexOf(imgCssSel)
+                    var symbol = css[idx]
+                    var str = ""
+                    while (symbol != ')') {
+                        idx++
+                        symbol = css[idx]
+                        str += symbol
+                    }
+                    val one = cssUrl.baseUrl() + str.split("'")[1].replace("..", "")
+                    Log.d("DBGCSS", "$one")
+                    if (link.isNotBlank() && !link.startsWith("javascript")) {
+                        sections.add(
+                            Section(
+                                name, link, one
+                            )
+                        )
+                    }
+                }
+            }
+            Result.success(sections)
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+}
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/di/Modules.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/di/Modules.kt
@@ -2,7 +2,9 @@ package com.shifthackz.joyreactor.presentation.di
 
 import com.shifthackz.joyreactor.presentation.ui.screen.comments.CommentsViewModel
 import com.shifthackz.joyreactor.presentation.ui.screen.posts.PostsViewModel
+import com.shifthackz.joyreactor.presentation.ui.screen.section.SectionViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.dsl.module
 
 val viewModelModule = module {
@@ -13,4 +15,6 @@ val viewModelModule = module {
     viewModel {
         CommentsViewModel(it.get(), get())
     }
+
+    viewModelOf(::SectionViewModel)
 }
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/navigation/Route.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/navigation/Route.kt
@@ -12,6 +12,7 @@ enum class Route(val value: String) {
     HOME_DISCUSSED_ALL("home_discussed_all"),
     HOME_DISCUSSED_GOOD("home_discussed_good"),
     HOME_DISCUSSED_FLAME("home_discussed_flame"),
+    HOME_SECTION("home_section"),
     SLIDER("slider/{${Argument.POST_ID}}"),
     COMMENTS("comments/{${Argument.POST_ID}}");
 
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/home/HomeNavGraph.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/home/HomeNavGraph.kt
@@ -2,6 +2,7 @@ package com.shifthackz.joyreactor.presentation.ui.screen.home
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Dashboard
+import androidx.compose.material.icons.filled.Segment
 import androidx.compose.material.icons.filled.Topic
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavGraphBuilder
@@ -18,6 +19,8 @@ import com.shifthackz.joyreactor.presentation.ui.screen.feed.feedBestTab
 import com.shifthackz.joyreactor.presentation.ui.screen.feed.feedGoodTab
 import com.shifthackz.joyreactor.presentation.ui.screen.feed.feedNewTab
 import com.shifthackz.joyreactor.presentation.ui.screen.posts.PostsActionsListener
+import com.shifthackz.joyreactor.presentation.ui.screen.section.SectionScreen
+import org.koin.androidx.compose.koinViewModel
 
 fun NavGraphBuilder.homeNavGraph(
     route: Route = Route.HOME,
@@ -29,6 +32,7 @@ fun NavGraphBuilder.homeNavGraph(
                 navItems = listOf(
                     feedTab(postsActionsListener),
                     discussedTab(postsActionsListener),
+                    sectionTab(postsActionsListener),
                 ),
             )
         }.apply { this.route = route.value }
@@ -67,3 +71,16 @@ private fun discussedTab(postsActionsListener: PostsActionsListener) = HomeNavIt
         )
     }
 )
+
+@Composable
+private fun sectionTab(postsActionsListener: PostsActionsListener) = HomeNavItem(
+    route = Route.HOME_SECTION,
+    name = R.string.home_tab_sections.asTextUi(),
+    icon = Icons.Default.Segment,
+    content = {
+        SectionScreen(
+            viewModel = koinViewModel(),
+            listener = postsActionsListener,
+        ).Build()
+    }
+)
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/posts/PostsScreen.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/posts/PostsScreen.kt
@@ -2,12 +2,9 @@
 
 package com.shifthackz.joyreactor.presentation.ui.screen.posts
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -17,7 +14,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.LoadState
@@ -89,9 +85,6 @@ private fun ScreenContent(
                         postsActionsListener = postsActionsListener,
                     )
                 }
-                (post as? PostsUI.NonUnique)?.let {
-                    Box(Modifier.height(100.dp).background(Color.Cyan))
-                }
             }
             lazyPosts.run {
                 when {
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/section/SectionScreen.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/section/SectionScreen.kt
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/section/SectionState.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/section/SectionState.kt
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/section/SectionViewModel.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/screen/section/SectionViewModel.kt
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/widget/ChipComposable.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/widget/ChipComposable.kt
diff --git a/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/widget/SectionComposable.kt b/presentation/src/main/java/com/shifthackz/joyreactor/presentation/ui/widget/SectionComposable.kt
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
