From 4ad1fd3fb5408fceb3e131473e0a3d3990b539d7 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Patel Date: Thu, 27 May 2021 00:04:13 +0530 Subject: [PATCH] Revert "Add promotional apps section on ForYou page" This reverts commit 00e24e5125f0e71e70b75cd358fcbeaf4199a2fa. --- .../controller/GenericCarouselController.kt | 2 +- .../epoxy/views/details/MiniScreenshotView.kt | 12 ++-- .../epoxy/views/details/ScreenshotView.kt | 12 ++-- .../view/ui/details/AppDetailsActivity.kt | 56 +++++++------------ .../homestream/BaseClusterViewModel.kt | 21 ------- 5 files changed, 29 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt b/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt index 221816d99..a3965edae 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/controller/GenericCarouselController.kt @@ -44,7 +44,7 @@ open class GenericCarouselController(private val callbacks: Callbacks) : open fun applyFilter(streamBundle: StreamCluster): Boolean { return streamBundle.clusterTitle.isNotBlank() //Filter noisy cluster && streamBundle.clusterAppList.isNotEmpty() //Filter empty clusters - && streamBundle.clusterAppList.count() >= 1 //Filter clusters with single apps (mostly promotions) + && streamBundle.clusterAppList.count() > 1 //Filter clusters with single apps (mostly promotions) } override fun buildModels(streamBundle: StreamBundle?) { diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt index 3a391385c..8fedbfd37 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt @@ -26,12 +26,12 @@ import com.airbnb.epoxy.CallbackProp import com.airbnb.epoxy.ModelProp import com.airbnb.epoxy.ModelView import com.airbnb.epoxy.OnViewRecycled -import com.aurora.extensions.clear -import com.aurora.extensions.load -import com.aurora.extensions.px import com.aurora.gplayapi.data.models.Artwork import com.aurora.store.R import com.aurora.store.databinding.ViewScreenshotMiniBinding +import com.aurora.extensions.clear +import com.aurora.extensions.load +import com.aurora.extensions.px import com.aurora.store.view.epoxy.views.BaseView import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions @@ -79,11 +79,7 @@ class MiniScreenshotView : RelativeLayout { @ModelProp fun artwork(artwork: Artwork) { normalizeSize(artwork) - val imgUrl = if (artwork.url.endsWith(".webp")) - artwork.url - else - "${artwork.url}=rw-w480-v1-e15" - B.img.load(imgUrl, DrawableTransitionOptions.withCrossFade()) { + B.img.load("${artwork.url}=rw-w480-v1-e15", DrawableTransitionOptions.withCrossFade()) { placeholder(R.drawable.bg_rounded) transform(RoundedCorners(8.px.toInt())) } diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt index 1b7465f1c..15471f09b 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt @@ -26,12 +26,12 @@ import com.airbnb.epoxy.CallbackProp import com.airbnb.epoxy.ModelProp import com.airbnb.epoxy.ModelView import com.airbnb.epoxy.OnViewRecycled -import com.aurora.extensions.clear -import com.aurora.extensions.load -import com.aurora.extensions.px import com.aurora.gplayapi.data.models.Artwork import com.aurora.store.R import com.aurora.store.databinding.ViewScreenshotBinding +import com.aurora.extensions.clear +import com.aurora.extensions.load +import com.aurora.extensions.px import com.aurora.store.view.epoxy.views.BaseView import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions @@ -79,11 +79,7 @@ class ScreenshotView : RelativeLayout { @ModelProp fun artwork(artwork: Artwork) { normalizeSize(artwork) - val imgUrl = if (artwork.url.endsWith(".webp")) - artwork.url - else - "${artwork.url}=rw-w480-v1-e15" - B.img.load(imgUrl, DrawableTransitionOptions.withCrossFade()) { + B.img.load("${artwork.url}=rw-w480-v1-e15", DrawableTransitionOptions.withCrossFade()) { placeholder(R.drawable.bg_rounded) transform(RoundedCorners(8.px.toInt())) } diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt index bbb409cbf..453531c07 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt @@ -144,7 +144,6 @@ class AppDetailsActivity : BaseDetailsActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) B = ActivityDetailsBinding.inflate(layoutInflater) - authData = AuthProvider.with(this).getAuthData() setContentView(B.root) onNewIntent(intent) @@ -175,9 +174,7 @@ class AppDetailsActivity : BaseDetailsActivity() { } else { isExternal = true app = App(packageName) - if (app.inPlayStore) { - fetchCompleteApp() - } + fetchCompleteApp() } } else { val rawApp: String? = intent.getStringExtra(Constants.STRING_EXTRA) @@ -186,11 +183,7 @@ class AppDetailsActivity : BaseDetailsActivity() { isInstalled = PackageUtil.isInstalled(this, app.packageName) inflatePartialApp() - if (app.inPlayStore) { - fetchCompleteApp() - } else { - inflateExtraDetails(app) - } + fetchCompleteApp() } else { close() } @@ -324,6 +317,7 @@ class AppDetailsActivity : BaseDetailsActivity() { private fun fetchCompleteApp() { task { + authData = AuthProvider.with(this).getAuthData() return@task AppDetailsHelper(authData) .using(HttpClient.getPreferredClient()) .getAppByPackageName(app.packageName) @@ -385,30 +379,23 @@ class AppDetailsActivity : BaseDetailsActivity() { app?.let { B.viewFlipper.displayedChild = 1 inflateAppDescription(B.layoutDetailDescription, app) - + inflateAppRatingAndReviews(B.layoutDetailsReview, app) inflateAppDevInfo(B.layoutDetailsDev, app) inflateAppPrivacy(B.layoutDetailsPrivacy, app) inflateAppPermission(B.layoutDetailsPermissions, app) - if (app.inPlayStore) { - inflateAppRatingAndReviews(B.layoutDetailsReview, app) - if (!authData.isAnonymous) { - app.testingProgram?.let { - if (it.isAvailable && it.isSubscribed) { - B.layoutDetailsApp.txtLine1.text = it.displayName - } + if (!authData.isAnonymous) { + app.testingProgram?.let { + if (it.isAvailable && it.isSubscribed) { + B.layoutDetailsApp.txtLine1.text = it.displayName } - - inflateBetaSubscription(B.layoutDetailsBeta, app) } - if (Preferences.getBoolean(this, Preferences.PREFERENCE_SIMILAR)) { - inflateAppStream(B.epoxyRecyclerStream, app) - } - } else { - B.layoutDetailsReview.root.hide() - B.layoutDetailsBeta.root.hide() - B.epoxyRecyclerStream.hide() + inflateBetaSubscription(B.layoutDetailsBeta, app) + } + + if (Preferences.getBoolean(this, Preferences.PREFERENCE_SIMILAR)) { + inflateAppStream(B.epoxyRecyclerStream, app) } } } @@ -438,16 +425,13 @@ class AppDetailsActivity : BaseDetailsActivity() { updateActionState(State.PROGRESS) task { - if (app.inPlayStore) { - PurchaseHelper(authData) - .using(HttpClient.getPreferredClient()) - .purchase(app.packageName, app.versionCode, app.offerType) - } else { - val metaFile = app.fileList[0] - val fileList: MutableList = mutableListOf() - fileList.add(metaFile) - fileList - } + val authData = AuthProvider + .with(this) + .getAuthData() + + PurchaseHelper(authData) + .using(HttpClient.getPreferredClient()) + .purchase(app.packageName, app.versionCode, app.offerType) } successUi { files -> if (files.isNotEmpty()) { var hasOBB = false diff --git a/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt index 908287bc2..8dc3c6064 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/homestream/BaseClusterViewModel.kt @@ -45,9 +45,6 @@ abstract class BaseClusterViewModel(application: Application) : BaseAndroidViewM val liveData: MutableLiveData = MutableLiveData() var streamBundle: StreamBundle = StreamBundle() - /* Should certainly do it in a better way :(*/ - var promotionsAdded: Boolean = false - lateinit var type: StreamHelper.Type lateinit var category: StreamHelper.Category @@ -75,13 +72,6 @@ abstract class BaseClusterViewModel(application: Application) : BaseAndroidViewM type ) - //Add promotional cluster - if (!promotionsAdded) { - val promotionalCluster = promotionalCluster() - newBundle.streamClusters[promotionalCluster.id] = promotionalCluster - promotionsAdded = true - } - //Update old bundle streamBundle.apply { streamClusters.putAll(newBundle.streamClusters) @@ -128,15 +118,4 @@ abstract class BaseClusterViewModel(application: Application) : BaseAndroidViewM clusterNextPageUrl = newCluster.clusterNextPageUrl } } - - private fun promotionalCluster(): StreamCluster { - val response = HttpClient.getPreferredClient().get( - "https://promotions.auroraoss.com", - hashMapOf() - ) - return if (response.isSuccessful) - gson.fromJson(String(response.responseBytes), StreamCluster::class.java) - else - StreamCluster() - } }