Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed6e716c authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

App lounge: (issue_4427) implement FdroidFetchViewModel in app lists and fragments.

parent bde1eec7
Loading
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.google.android.material.button.MaterialButton
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.textview.MaterialTextView
import dagger.hilt.android.AndroidEntryPoint
import foundation.e.apps.FdroidFetchViewModel
import foundation.e.apps.MainActivityViewModel
import foundation.e.apps.PrivacyInfoViewModel
import foundation.e.apps.R
@@ -75,6 +76,7 @@ class ApplicationFragment : Fragment(R.layout.fragment_application) {

    private val applicationViewModel: ApplicationViewModel by viewModels()
    private val privacyInfoViewModel: PrivacyInfoViewModel by viewModels()
    private val fdroidFetchViewModel: FdroidFetchViewModel by viewModels()
    private val mainActivityViewModel: MainActivityViewModel by activityViewModels()

    private var applicationIcon: ImageView? = null
@@ -144,6 +146,7 @@ class ApplicationFragment : Fragment(R.layout.fragment_application) {
                applicationIcon = appIcon
                appName.text = it.name
                appAuthor.text = it.author
                fdroidFetchViewModel.setAuthorNameIfNeeded(appAuthor, it)
                categoryTitle.text = it.category
                if (args.origin == Origin.CLEANAPK) {
                    appIcon.load(CleanAPKInterface.ASSET_URL + it.icon_image_path)
+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import dagger.hilt.android.AndroidEntryPoint
import foundation.e.apps.AppProgressViewModel
import foundation.e.apps.MainActivityViewModel
import foundation.e.apps.PrivacyInfoViewModel
import foundation.e.apps.FdroidFetchViewModel
import foundation.e.apps.R
import foundation.e.apps.api.fused.FusedAPIInterface
import foundation.e.apps.api.fused.data.FusedApp
@@ -57,6 +58,7 @@ class ApplicationListFragment : Fragment(R.layout.fragment_application_list), Fu

    private val viewModel: ApplicationListViewModel by viewModels()
    private val privacyInfoViewModel: PrivacyInfoViewModel by viewModels()
    private val fdroidFetchViewModel: FdroidFetchViewModel by viewModels()
    private val mainActivityViewModel: MainActivityViewModel by activityViewModels()
    private val appProgressViewModel: AppProgressViewModel by viewModels()

@@ -110,6 +112,7 @@ class ApplicationListFragment : Fragment(R.layout.fragment_application_list), Fu
                ApplicationListRVAdapter(
                    this,
                    privacyInfoViewModel,
                    fdroidFetchViewModel,
                    it,
                    pkgManagerModule,
                    User.valueOf(mainActivityViewModel.userType.value ?: User.UNAVAILABLE.name),
+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.facebook.shimmer.Shimmer
import com.facebook.shimmer.Shimmer.Direction.LEFT_TO_RIGHT
import com.facebook.shimmer.ShimmerDrawable
import com.google.android.material.snackbar.Snackbar
import foundation.e.apps.FdroidFetchViewModel
import foundation.e.apps.PrivacyInfoViewModel
import foundation.e.apps.R
import foundation.e.apps.api.cleanapk.CleanAPKInterface
@@ -53,6 +54,7 @@ import javax.inject.Singleton
class ApplicationListRVAdapter(
    private val fusedAPIInterface: FusedAPIInterface,
    private val privacyInfoViewModel: PrivacyInfoViewModel,
    private val fdroidFetchViewModel: FdroidFetchViewModel,
    private val currentDestinationId: Int,
    private val pkgManagerModule: PkgManagerModule,
    private val user: User,
@@ -121,6 +123,7 @@ class ApplicationListRVAdapter(
            }
            appTitle.text = searchApp.name
            appAuthor.text = searchApp.author
            fdroidFetchViewModel.setAuthorNameIfNeeded(appAuthor, searchApp)
            if (searchApp.ratings.usageQualityScore != -1.0) {
                appRating.text = searchApp.ratings.usageQualityScore.toString()
                appRatingBar.rating = searchApp.ratings.usageQualityScore.toFloat()
+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import dagger.hilt.android.AndroidEntryPoint
import foundation.e.apps.AppProgressViewModel
import foundation.e.apps.MainActivityViewModel
import foundation.e.apps.PrivacyInfoViewModel
import foundation.e.apps.FdroidFetchViewModel
import foundation.e.apps.R
import foundation.e.apps.api.fused.FusedAPIInterface
import foundation.e.apps.api.fused.data.FusedApp
@@ -69,6 +70,7 @@ class SearchFragment :

    private val searchViewModel: SearchViewModel by viewModels()
    private val privacyInfoViewModel: PrivacyInfoViewModel by viewModels()
    private val fdroidFetchViewModel: FdroidFetchViewModel by viewModels()
    private val mainActivityViewModel: MainActivityViewModel by activityViewModels()
    private val appProgressViewModel: AppProgressViewModel by viewModels()

@@ -114,6 +116,7 @@ class SearchFragment :
            ApplicationListRVAdapter(
                this,
                privacyInfoViewModel,
                fdroidFetchViewModel,
                it,
                pkgManagerModule,
                User.valueOf(mainActivityViewModel.userType.value ?: User.UNAVAILABLE.name),
+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import dagger.hilt.android.AndroidEntryPoint
import foundation.e.apps.AppProgressViewModel
import foundation.e.apps.MainActivityViewModel
import foundation.e.apps.PrivacyInfoViewModel
import foundation.e.apps.FdroidFetchViewModel
import foundation.e.apps.R
import foundation.e.apps.api.fused.FusedAPIInterface
import foundation.e.apps.api.fused.data.FusedApp
@@ -56,6 +57,7 @@ class UpdatesFragment : Fragment(R.layout.fragment_updates), FusedAPIInterface {

    private val updatesViewModel: UpdatesViewModel by viewModels()
    private val privacyInfoViewModel: PrivacyInfoViewModel by viewModels()
    private val fdroidFetchViewModel: FdroidFetchViewModel by viewModels()
    private val mainActivityViewModel: MainActivityViewModel by activityViewModels()
    private val appProgressViewModel: AppProgressViewModel by viewModels()

@@ -83,6 +85,7 @@ class UpdatesFragment : Fragment(R.layout.fragment_updates), FusedAPIInterface {
            ApplicationListRVAdapter(
                this,
                privacyInfoViewModel,
                fdroidFetchViewModel,
                it,
                pkgManagerModule,
                User.valueOf(mainActivityViewModel.userType.value ?: User.UNAVAILABLE.name),