Fix media not found when opened from widget

Author: rev0lgenX

app/src/main/kotlin/com/revolgenx/anilib/common/ui/viewmodel/ViewModelModule.kt

@@ -158,8 +158,8 @@ val viewModelModules = module {
         SeasonFilterViewModel(
             get<Context>().seasonFilterDataStore,
             get<Context>().mediaTagCollectionDataStore,
-        get<Context>().genreCollectionDataStore,
-        get()
+            get<Context>().genreCollectionDataStore,
+            get()
         )
     }
 
@@ -288,12 +288,14 @@ val viewModelModules = module {
     viewModel { parameters -> ActivityInfoViewModel(parameters.get(), get()) }
 
     //browse
-    viewModel { BrowseViewModel(
-        get<Context>().mediaTagCollectionDataStore,
-        get<Context>().genreCollectionDataStore,
-        get(),
-        get()
-    ) }
+    viewModel {
+        BrowseViewModel(
+            get<Context>().mediaTagCollectionDataStore,
+            get<Context>().genreCollectionDataStore,
+            get(),
+            get()
+        )
+    }
     viewModel {
         BrowseFilterViewModel(
             get<Context>().mediaTagCollectionDataStore,
@@ -316,22 +318,16 @@ val viewModelModules = module {
     viewModel { RecommendationFilterViewModel() }
 
     //settings
-    viewModel {
-        SettingsViewModel(
-            get(),
-            get<Context>().airingScheduleFilterDataStore,
-            get<Context>().exploreAiringScheduleFilterDataStore
-        )
-    }
+    viewModel { SettingsViewModel(get()) }
     viewModel { GeneralSettingsViewModel(get()) }
     viewModel { AppearanceSettingsViewModel(get(), get(), get(), get()) }
     viewModel { MediaSettingsViewModel(get(), get(), get()) }
     viewModel { NotificationSettingsViewModel(get(), get(), get()) }
     viewModel { MediaListSettingsViewModel(get(), get()) }
     viewModel { FilterSettingsViewModel(get(), get()) }
     viewModel { TagFilterSettingsViewModel(get<Context>().mediaTagCollectionDataStore, get()) }
-    viewModel { GenreFilterSettingsViewModel( get<Context>().genreCollectionDataStore, get()) }
-    viewModel { WidgetSettingsViewModel(get(), get(), get())}
+    viewModel { GenreFilterSettingsViewModel(get<Context>().genreCollectionDataStore, get()) }
+    viewModel { WidgetSettingsViewModel(get(), get(), get()) }
     //explore
     viewModel {
         ExploreMediaViewModel.ExploreTrendingViewModel(
@@ -380,6 +376,6 @@ val viewModelModules = module {
 
 
     viewModel { AdsViewModel(get(), get()) }
-    viewModel{ ScrollViewModel() }
+    viewModel { ScrollViewModel() }
     viewModel { BillingViewModel(get()) }
 }

app/src/main/kotlin/com/revolgenx/anilib/setting/ui/screen/SupportSettingsScreen.kt

@@ -10,7 +10,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
@@ -36,6 +35,7 @@ import com.revolgenx.anilib.common.data.constant.InterstitialAdsInterval
 import com.revolgenx.anilib.common.data.constant.RewardedInterstitialAdsInterval
 import com.revolgenx.anilib.common.ext.activityViewModel
 import com.revolgenx.anilib.common.ext.componentActivity
+import com.revolgenx.anilib.common.ext.get
 import com.revolgenx.anilib.common.ext.horizontalBottomWindowInsets
 import com.revolgenx.anilib.common.ext.localContext
 import com.revolgenx.anilib.common.ui.ads.AdsViewModel
@@ -68,10 +68,10 @@ fun SupportSettingsScreenContent() {
 
     val context = localContext()
     val scope = rememberCoroutineScope()
-    val appIsSupported = billingViewModel.appIsSupported.collectAsState(false)
+    val appIsSupported = billingViewModel.isAppDevSupported.collectAsState(false)
 
     LaunchedEffect(billingViewModel) {
-        if (billingViewModel.billingConnectionState.intValue == ConnectionState.DISCONNECTED) {
+        if (billingViewModel.billingConnectionState.intValue == ConnectionState.DISCONNECTED && !billingViewModel.isAppDevSupported.get()) {
             billingViewModel.restartBillingConnection()
         }
     }

app/src/main/kotlin/com/revolgenx/anilib/setting/ui/viewmodel/BillingViewModel.kt

@@ -37,7 +37,7 @@ class BillingViewModel(
     val billingConnectionState = mutableIntStateOf(ConnectionState.DISCONNECTED)
     private var launchingBillingFlow = false
 
-    val appIsSupported = billingDataStore.isAppDevSupported
+    val isAppDevSupported = billingDataStore.isAppDevSupported
 
     val hasPendingPurchase = mutableStateOf(false)
 
@@ -102,6 +102,7 @@ class BillingViewModel(
 
     fun queryPurchases() {
         hasPendingPurchase.value = false
+        failedToPurchase.value = false
         val params = QueryPurchasesParams
             .newBuilder()
             .setProductType(BillingClient.ProductType.INAPP)

app/src/main/kotlin/com/revolgenx/anilib/setting/ui/viewmodel/SettingsViewModel.kt

@@ -1,36 +1,12 @@
 package com.revolgenx.anilib.setting.ui.viewmodel
 
-import android.content.Context
-import android.content.Intent
 import androidx.lifecycle.ViewModel
-import com.revolgenx.anilib.app.ui.activity.MainActivity
-import com.revolgenx.anilib.common.data.store.AiringScheduleFilterDataStore
 import com.revolgenx.anilib.common.data.store.AppPreferencesDataStore
-import com.revolgenx.anilib.common.ext.launch
-import com.revolgenx.anilib.common.ext.restart
-import com.revolgenx.anilib.setting.data.store.BillingDataStore
 
 class SettingsViewModel(
     val appPreferencesDataStore: AppPreferencesDataStore,
-    private val airingScheduleFilterDataStore: AiringScheduleFilterDataStore,
-    private val exploreAiringScheduleFilterDataStore: AiringScheduleFilterDataStore
 ) : ViewModel() {
     val bugReport = appPreferencesDataStore.crashReport
     val displayInterstitialAdsInterval = appPreferencesDataStore.displayInterstitialAdsInterval
-    val displayRewardedInterstitialAdsInterval =
-        appPreferencesDataStore.displayRewardedInterstitialAdsInterval
-
-    fun logout(context: Context) {
-        launch {
-            appPreferencesDataStore.logout()
-            airingScheduleFilterDataStore.updateData {
-                it.copy(showOnlyPlanning = false, showOnlyWatching = false)
-            }
-
-            exploreAiringScheduleFilterDataStore.updateData {
-                it.copy(showOnlyPlanning = false, showOnlyWatching = false)
-            }
-            context.restart()
-        }
-    }
+    val displayRewardedInterstitialAdsInterval = appPreferencesDataStore.displayRewardedInterstitialAdsInterval
 }

app/src/main/kotlin/com/revolgenx/anilib/widget/data/store/AiringScheduleWidgetData.kt

@@ -71,7 +71,7 @@ fun AiringScheduleModelData.toModel(): AiringScheduleModel {
         mediaId = mediaId,
         media = media?.let {
             MediaModel(
-                id = id,
+                id = it.id,
                 title = it.title,
                 coverImage = it.coverImageModel,
                 isAdult = it.isAdult,