Merge branch 'release/v1.3.3'

Author: darriousliu

app/build.gradle.kts

@@ -19,8 +19,8 @@ android {
 
     defaultConfig {
         applicationId = "com.mrl.pixiv"
-        versionCode = 10302
-        versionName = "1.3.2"
+        versionCode = 10303
+        versionName = "1.3.3"
 
         vectorDrawables {
             useSupportLibrary = true

common/data/src/main/kotlin/com/mrl/pixiv/common/data/search/SearchResp.kt

@@ -16,7 +16,7 @@ data class SearchIllustResp(
     val searchSpanLimit: Long,
 
     @SerialName("show_ai")
-    val showAi: Boolean
+    val showAi: Boolean = true
 )
 
 @Serializable

common/datasource-remote/src/main/kotlin/com/mrl/pixiv/common/datasource/remote/PixivApi.kt

@@ -233,4 +233,13 @@ interface PixivApi {
     suspend fun addIllustBrowsingHistory(
         @Field("illust_ids[]") illustId: List<Long>,
     ): EmptyResp
+
+    @GET("v1/search/popular-preview/illust")
+    suspend fun searchPopularPreviewIllust(
+        @Query("filter") filter: String = Filter.ANDROID.value,
+        @Query("include_translated_tag_results") includeTranslatedTagResults: Boolean = true,
+        @Query("merge_plain_keyword_results") mergePlainKeywordResults: Boolean = true,
+        @Query("word") word: String,
+        @Query("search_target") searchTarget: String = SearchTarget.PARTIAL_MATCH_FOR_TAGS.value,
+    ): SearchIllustResp
 }

common/repository/src/main/kotlin/com/mrl/pixiv/common/repository/PixivRepository.kt

@@ -212,4 +212,13 @@ object PixivRepository : KoinComponent {
 
     suspend fun addIllustBrowsingHistory(illustIds: List<Long>) =
         apiApi.addIllustBrowsingHistory(illustIds)
+
+    suspend fun searchPopularPreviewIllust(query: SearchIllustQuery) =
+        apiApi.searchPopularPreviewIllust(
+            query.filter.value,
+            query.includeTranslatedTagResults,
+            query.mergePlainKeywordResults,
+            query.word,
+            query.searchTarget.value,
+        )
 }

common/repository/src/main/kotlin/com/mrl/pixiv/common/repository/paging/SearchIllustPagingSource.kt

@@ -14,6 +14,7 @@ import com.mrl.pixiv.common.repository.util.queryParams
 
 class SearchIllustPagingSource(
     private val query: SearchIllustQuery,
+    private val isPremium: Boolean,
 ) : PagingSource<SearchIllustQuery, Illust>() {
     override fun getRefreshKey(state: PagingState<SearchIllustQuery, Illust>): SearchIllustQuery? {
         return null
@@ -22,7 +23,11 @@ class SearchIllustPagingSource(
     override suspend fun load(params: LoadParams<SearchIllustQuery>): LoadResult<SearchIllustQuery, Illust> {
         return try {
             val resp = if (params.key == null) {
-                PixivRepository.searchIllust(query)
+                if (query.sort == SearchSort.POPULAR_DESC && !isPremium) {
+                    PixivRepository.searchPopularPreviewIllust(query)
+                } else {
+                    PixivRepository.searchIllust(query)
+                }
             } else {
                 PixivRepository.searchIllustNext(params.key!!.toMap())
             }
@@ -61,4 +66,4 @@ class SearchIllustPagingSource(
             LoadResult.Error(e)
         }
     }
-}
+}

feature/main/src/main/kotlin/com/mrl/pixiv/search/result/SearchResultViewModel.kt

@@ -7,10 +7,14 @@ import androidx.paging.PagingConfig
 import androidx.paging.cachedIn
 import com.mrl.pixiv.common.data.search.SearchIllustQuery
 import com.mrl.pixiv.common.repository.paging.SearchIllustPagingSource
+import com.mrl.pixiv.common.repository.requireUserInfoFlow
 import com.mrl.pixiv.common.viewmodel.BaseMviViewModel
 import com.mrl.pixiv.common.viewmodel.ViewIntent
 import com.mrl.pixiv.search.SearchState.SearchFilter
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.map
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateRange
 import kotlinx.datetime.format
@@ -46,7 +50,12 @@ class SearchResultViewModel(
 ) : BaseMviViewModel<SearchResultState, SearchResultAction>(
     initialState = SearchResultState(searchWords = searchWords),
 ), KoinComponent {
-    val searchResults = uiState.flatMapLatest { state ->
+    val searchResults = combine(
+        uiState,
+        requireUserInfoFlow.map { it.profile.isPremium }.distinctUntilChanged()
+    ) { state, isPremium ->
+        state to isPremium
+    }.flatMapLatest { (state, isPremium) ->
         val words = state.searchWords
         val filter = state.searchFilter
         val startDate = state.searchDateRange?.start
@@ -62,7 +71,8 @@ class SearchResultViewModel(
                     startDate = startDate?.format(LocalDate.Formats.ISO),
                     endDate = endDate?.format(LocalDate.Formats.ISO),
                     searchAiType = filter.searchAiType,
-                )
+                ),
+                isPremium = isPremium
             )
         }.flow
     }.cachedIn(viewModelScope)

feature/main/src/main/kotlin/com/mrl/pixiv/search/result/components/FilterBottomSheet.kt

@@ -28,13 +28,18 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.mrl.pixiv.common.compose.LocalToaster
 import com.mrl.pixiv.common.data.search.SearchAiType
 import com.mrl.pixiv.common.data.search.SearchSort
 import com.mrl.pixiv.common.data.search.SearchTarget
+import com.mrl.pixiv.common.repository.requireUserInfoFlow
 import com.mrl.pixiv.common.util.RString
 import com.mrl.pixiv.common.util.throttleClick
 import com.mrl.pixiv.search.SearchState.SearchFilter
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import kotlin.time.Duration.Companion.seconds
 
 @Composable
 internal fun FilterBottomSheet(
@@ -46,6 +51,8 @@ internal fun FilterBottomSheet(
 ) {
     var innerSearchFilter by remember { mutableStateOf(searchFilter) }
     val scope = rememberCoroutineScope()
+    val toaster = LocalToaster.current
+    val isPremium by requireUserInfoFlow.map { it.profile.isPremium }.collectAsStateWithLifecycle(false)
     ModalBottomSheet(
         onDismissRequest = onDismissRequest,
         modifier = modifier,
@@ -111,6 +118,9 @@ internal fun FilterBottomSheet(
                     selected = innerSearchFilter.sort == key,
                     onClick = {
                         innerSearchFilter = innerSearchFilter.copy(sort = key)
+                        if (!isPremium && key == SearchSort.POPULAR_DESC) {
+                            toaster.show(RString.premium_required, duration = 2.seconds)
+                        }
                     }
                 )
             }

feature/main/src/main/kotlin/com/mrl/pixiv/search/result/components/SearchResultAppBar.kt

@@ -35,14 +35,19 @@ import androidx.compose.ui.Modifier
 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 com.mrl.pixiv.common.compose.LocalToaster
+import com.mrl.pixiv.common.repository.requireUserInfoFlow
 import com.mrl.pixiv.common.util.RString
 import com.mrl.pixiv.common.util.throttleClick
+import kotlinx.coroutines.flow.map
 import kotlinx.datetime.LocalDateRange
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.atStartOfDayIn
 import kotlinx.datetime.toLocalDateTime
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.seconds
 import kotlin.time.Instant
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -59,6 +64,9 @@ internal fun SearchResultAppBar(
 ) {
     var showBookmarkMenu by remember { mutableStateOf(false) }
     var showDateRangePicker by remember { mutableStateOf(false) }
+    val toaster = LocalToaster.current
+    val isPremium by requireUserInfoFlow.map { it.profile.isPremium }
+        .collectAsStateWithLifecycle(false)
 
     TopAppBar(
         modifier = modifier,
@@ -97,7 +105,12 @@ internal fun SearchResultAppBar(
             }
             // Bookmark Range
             IconButton(
-                onClick = { showBookmarkMenu = true },
+                onClick = {
+                    showBookmarkMenu = true
+                    if (!isPremium) {
+                        toaster.show(RString.premium_required, duration = 2.seconds)
+                    }
+                },
                 shapes = IconButtonDefaults.shapes(),
             ) {
                 Icon(

feature/setting/src/main/kotlin/com/mrl/pixiv/setting/appdata/AppDataScreen.kt

@@ -38,6 +38,7 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -72,6 +73,8 @@ fun AppDataScreen(
     val state = viewModel.asState()
 
     var showMigrationConfirmDialog by remember { mutableStateOf(false) }
+    var trigger by remember { mutableIntStateOf(0) }
+    val cacheDirSize = remember(trigger) { context.cacheDir.calculateSize().adaptiveFileSize() }
 
     val permissionLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.RequestPermission()
@@ -181,7 +184,7 @@ fun AppDataScreen(
 
             ListItem(
                 headlineContent = {
-                    Text(text = stringResource(RString.clear_cache))
+                    Text(text = stringResource(RString.clear_cache, cacheDirSize))
                 },
                 modifier = Modifier.clickable {
                     scope.launch(Dispatchers.IO) {
@@ -190,6 +193,7 @@ fun AppDataScreen(
                             it.deleteRecursively()
                         }
                         ToastUtil.safeShortToast(RString.cache_cleared, dirSize)
+                        trigger++
                     }
                 },
                 leadingContent = {

lib_strings/src/main/res/values-ar/strings.xml

@@ -90,7 +90,7 @@
     <string name="user_blocked">تم حظر المستخدم</string>
     <string name="cancel_user_blocked">إلغاء حظر المستخدم</string>
     <string name="app_data">بيانات التطبيق</string>
-    <string name="clear_cache">مسح ذاكرة التخزين المؤقت</string>
+    <string name="clear_cache">مسح ذاكرة التخزين المؤقت (%1$s)</string>
     <string name="cache_cleared">تم إخلاء %1$s من المساحة</string>
     <string name="migrate_data_title">تم اكتشاف بيانات قديمة</string>
     <string name="migrate_data_desc">تم اكتشاف %1$d صورة في الدليل القديم، يوصى بنقلها إلى الدليل الجديد</string>
@@ -149,4 +149,5 @@
     <string name="new_version_available">نسخة جديدة متاحة</string>
     <string name="current_version">الإصدار الحالي: %s</string>
     <string name="download">تحميل</string>
+    <string name="premium_required">Pixiv Premium مطلوب</string>
 </resources>