-
Notifications
You must be signed in to change notification settings - Fork 923
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Settings: Update ITR settings item (#5398)
Task/Issue URL: https://app.asana.com/0/1207908166761516/1208966262488273/f ### Description - Refactored subscription status management by introducing a generic `ProductSubscriptionManager` to handle status checks for multiple products - Updated ITR settings UI to show different states (active, expired, activating) with appropriate icons and click behaviors - Added legacy support for ITR settings view to maintain backward compatibility ### Steps to test this PR Prerequisite: Enable `newSettings` feature toggle Prerequisite: Apply the patch in the [Asana task](https://app.asana.com/0/1207908166761516/1208966262488273/f) Note: All PPro items should be seen in this PR, that is VPN, PIR, and ITR. _ITR Subscribed_ - [ ] In `RealSubscriptions` change ln 77 to `return flowOf(listOf(NetP, PIR, ITR))` - [ ] Open New Settings - [ ] Verify ITR item is visible with colored icon and status is on - [ ] Click ITR item - [ ] ITR screen should open though the webpage will not load properly as a result of the hacked setup for subscriptions. I have confirmed it works with a real subscription _Unsubscribed_ - [ ] In `SubscriptionManager` change ln 442 to `return SubscriptionStatus.UNKNOWN` - [ ] Open New Settings - [ ] Verify ITR item is not visible _ITR Expired_ - [ ] In `SubscriptionManager` change ln 442 to `return SubscriptionStatus.EXPIRED` - [ ] Open New Settings - [ ] Verify ITR item is visible with grey icon and is not clickable, and status is off - [ ] Click ITR item - [ ] Nothing should happen _PPro Activating_ - [ ] In `SubscriptionManager` change ln 442 to `return SubscriptionStatus.WAITING` - [ ] Open New Settings - [ ] Verify ITR item is visible with grey icon and status is off - [ ] Click ITR item - [ ] Nothing should happen _No Entitlement_ - [ ] In `SubscriptionManager` change ln 442 to `return SubscriptionStatus.AUTO_RENEWABLE` - [ ] In `RealSubscriptions` change ln 77 to `return flowOf(listOf())` - [ ] Open New Settings - [ ] Verify ITR item is not visible _Legacy Support_ - [ ] Turn off `newSettings` - [ ] Verify old ITR settings works by repeating steps above ### UI changes | Before | After | | --- | --- | |  |  | |  |  | |  |  | |  |  | |  |  |
- Loading branch information
1 parent
4b15b55
commit 8095023
Showing
13 changed files
with
607 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
...pl/src/main/java/com/duckduckgo/subscriptions/impl/settings/views/LegacyItrSettingView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright (c) 2023 DuckDuckGo | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.duckduckgo.subscriptions.impl.settings.views | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.content.Context | ||
| import android.util.AttributeSet | ||
| import android.widget.FrameLayout | ||
| import androidx.lifecycle.ViewModelProvider | ||
| import androidx.lifecycle.findViewTreeLifecycleOwner | ||
| import androidx.lifecycle.findViewTreeViewModelStoreOwner | ||
| import com.duckduckgo.anvil.annotations.InjectWith | ||
| import com.duckduckgo.common.ui.view.gone | ||
| import com.duckduckgo.common.ui.view.show | ||
| import com.duckduckgo.common.ui.viewbinding.viewBinding | ||
| import com.duckduckgo.common.utils.ConflatedJob | ||
| import com.duckduckgo.common.utils.ViewViewModelFactory | ||
| import com.duckduckgo.di.scopes.ViewScope | ||
| import com.duckduckgo.navigation.api.GlobalActivityStarter | ||
| import com.duckduckgo.subscriptions.impl.SubscriptionsConstants | ||
| import com.duckduckgo.subscriptions.impl.databinding.LegacyViewItrSettingsBinding | ||
| import com.duckduckgo.subscriptions.impl.settings.views.LegacyItrSettingViewModel.Command | ||
| import com.duckduckgo.subscriptions.impl.settings.views.LegacyItrSettingViewModel.Command.OpenItr | ||
| import com.duckduckgo.subscriptions.impl.settings.views.LegacyItrSettingViewModel.ViewState | ||
| import com.duckduckgo.subscriptions.impl.ui.SubscriptionsWebViewActivityWithParams | ||
| import dagger.android.support.AndroidSupportInjection | ||
| import javax.inject.Inject | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.SupervisorJob | ||
| import kotlinx.coroutines.cancel | ||
| import kotlinx.coroutines.flow.launchIn | ||
| import kotlinx.coroutines.flow.onEach | ||
|
|
||
| @InjectWith(ViewScope::class) | ||
| class LegacyItrSettingView @JvmOverloads constructor( | ||
| context: Context, | ||
| attrs: AttributeSet? = null, | ||
| defStyle: Int = 0, | ||
| ) : FrameLayout(context, attrs, defStyle) { | ||
|
|
||
| @Inject | ||
| lateinit var viewModelFactory: ViewViewModelFactory | ||
|
|
||
| @Inject | ||
| lateinit var globalActivityStarter: GlobalActivityStarter | ||
|
|
||
| private var coroutineScope: CoroutineScope? = null | ||
|
|
||
| private val binding: LegacyViewItrSettingsBinding by viewBinding() | ||
|
|
||
| private val viewModel: LegacyItrSettingViewModel by lazy { | ||
| ViewModelProvider(findViewTreeViewModelStoreOwner()!!, viewModelFactory)[LegacyItrSettingViewModel::class.java] | ||
| } | ||
|
|
||
| private var job: ConflatedJob = ConflatedJob() | ||
|
|
||
| override fun onAttachedToWindow() { | ||
| AndroidSupportInjection.inject(this) | ||
| super.onAttachedToWindow() | ||
|
|
||
| findViewTreeLifecycleOwner()?.lifecycle?.addObserver(viewModel) | ||
|
|
||
| binding.itrSettings.setClickListener { | ||
| viewModel.onItr() | ||
| } | ||
|
|
||
| @SuppressLint("NoHardcodedCoroutineDispatcher") | ||
| coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main) | ||
|
|
||
| job += viewModel.commands() | ||
| .onEach { processCommands(it) } | ||
| .launchIn(coroutineScope!!) | ||
|
|
||
| viewModel.viewState | ||
| .onEach { renderView(it) } | ||
| .launchIn(coroutineScope!!) | ||
| } | ||
|
|
||
| override fun onDetachedFromWindow() { | ||
| super.onDetachedFromWindow() | ||
| findViewTreeLifecycleOwner()?.lifecycle?.removeObserver(viewModel) | ||
| coroutineScope?.cancel() | ||
| job.cancel() | ||
| coroutineScope = null | ||
| } | ||
|
|
||
| private fun renderView(viewState: ViewState) { | ||
| if (viewState.hasSubscription) { | ||
| binding.itrSettings.show() | ||
| } else { | ||
| binding.itrSettings.gone() | ||
| } | ||
| } | ||
|
|
||
| private fun processCommands(command: Command) { | ||
| when (command) { | ||
| is OpenItr -> { | ||
| globalActivityStarter.start( | ||
| context, | ||
| SubscriptionsWebViewActivityWithParams( | ||
| url = SubscriptionsConstants.ITR_URL, | ||
| ), | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.