Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
44c3307
Stats Revamp Feature Announcement
ravishanker Jun 3, 2022
9c9377e
Update image
ravishanker Jun 7, 2022
add7824
Adds PreferenceFragmentLifeCycleOwner class to support lifecycleowner…
SowmiaS Jun 13, 2022
cf5193f
Merge pull request #16370 from SowmiaS/issue/12372_implement_lifecycl…
AjeshRPai Jun 14, 2022
3d786c5
Merge branch 'trunk' into merge/release-20.1-into-trunk
spencertransier Jun 14, 2022
771b76b
Build: Remove unused analytics specific gradle properties example file
ParaskP7 Jun 14, 2022
c3ade3c
Build: Remove unnecessary git ignore file from analytics module
ParaskP7 Jun 14, 2022
4ebe98e
Build: Remove sub-root related gradle files from analytics module
ParaskP7 Jun 14, 2022
6e421a8
Docs: Update readme for analytics module
ParaskP7 Jun 14, 2022
206995f
Build: Remove unnecessary wordpress analytics module level
ParaskP7 Jun 14, 2022
9b20599
Merge pull request #16741 from wordpress-mobile/merge/release-20.1-in…
spencertransier Jun 14, 2022
427319b
Migrate StatsNewFeaturesIntroDialogFragment to Hilt
irfano Jun 14, 2022
65600eb
Merge branch 'trunk' into Stats-Revamp-v2-New-Features-Announcement
ravishanker Jun 15, 2022
b652d82
Merge pull request #16703 from wordpress-mobile/Stats-Revamp-v2-New-F…
ravishanker Jun 15, 2022
af667ac
Docs: Update library with module on analytics module readme description
ParaskP7 Jun 15, 2022
039001f
Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…
ParaskP7 Jun 15, 2022
7b878c7
Merge pull request #16750 from wordpress-mobile/release/20.1
AliSoftware Jun 15, 2022
1db2504
Build: Remove unused networking specific gradle properties example file
ParaskP7 Jun 15, 2022
916931c
Build: Remove unnecessary git ignore file from networking module
ParaskP7 Jun 15, 2022
dadf4f0
Build: Remove sub-root related gradle files from networking module
ParaskP7 Jun 15, 2022
3e790e3
Docs: Add readme for networking module
ParaskP7 Jun 15, 2022
743d067
Build: Remove unnecessary wordpress networking module level
ParaskP7 Jun 15, 2022
975f451
Fix date problem on stats line chart
irfano Jun 15, 2022
a3aaa79
Merge pull request #16754 from wordpress-mobile/fix/stats-revamp-v2-l…
ravishanker Jun 16, 2022
3af2fc7
Merge pull request #16744 from wordpress-mobile/build/restructure-ana…
ParaskP7 Jun 16, 2022
6f2c174
Merge branch 'trunk' into build/restructure-networking-module
ParaskP7 Jun 16, 2022
7cb0558
Merge pull request #16752 from wordpress-mobile/build/restructure-net…
ParaskP7 Jun 16, 2022
8b8ec5b
Merge pull request #16761 from wordpress-mobile/release/20.1
AliSoftware Jun 16, 2022
aa402fa
Release script: Update build.gradle gutenbergMobileVersion to ref
SiobhyB Jun 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Migrate StatsNewFeaturesIntroDialogFragment to Hilt
  • Loading branch information
irfano committed Jun 14, 2022
commit 427319b61ddfbee6b9b96e46ab01f400734720e4
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@
import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
import org.wordpress.android.ui.stats.StatsConnectJetpackActivity;
import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroDialogFragment;
import org.wordpress.android.ui.stats.refresh.lists.StatsListFragment;
import org.wordpress.android.ui.stats.refresh.lists.widget.alltime.AllTimeWidgetBlockListProviderFactory;
import org.wordpress.android.ui.stats.refresh.lists.widget.alltime.AllTimeWidgetListProvider;
Expand Down Expand Up @@ -674,6 +673,4 @@ public interface AppComponent {
void inject(BloggingPromptsOnboardingDialogFragment object);

void inject(DismissNotificationReceiver object);

void inject(StatsNewFeaturesIntroDialogFragment object);
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
import org.wordpress.android.ui.reader.viewmodels.ReaderPostListViewModel;
import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel;
import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel;
import org.wordpress.android.ui.stats.intro.StatsNewFeatureIntroViewModel;
import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
import org.wordpress.android.ui.stats.refresh.lists.InsightsDetailListViewModel;
import org.wordpress.android.ui.stats.refresh.lists.InsightsListViewModel;
Expand Down Expand Up @@ -618,9 +617,4 @@ abstract class ViewModelModule {
@IntoMap
@ViewModelKey(AccountSettingsViewModel.class)
abstract ViewModel accountSettingsViewModel(AccountSettingsViewModel viewModel);

@Binds
@IntoMap
@ViewModelKey(StatsNewFeatureIntroViewModel.class)
abstract ViewModel statsNewFeatureIntroViewModel(StatsNewFeatureIntroViewModel viewModel);
}
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,12 @@
import static org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE;
import static org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS;

import dagger.hilt.android.AndroidEntryPoint;

/**
* Main activity which hosts sites, reader, me and notifications pages
*/
@AndroidEntryPoint
public class WPMainActivity extends LocaleAwareActivity implements
OnPageListener,
BottomNavController,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package org.wordpress.android.ui.stats.intro

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.CoroutineDispatcher
import org.wordpress.android.analytics.AnalyticsTracker.Stat
import org.wordpress.android.modules.UI_THREAD
Expand All @@ -13,6 +14,7 @@ import org.wordpress.android.viewmodel.ScopedViewModel
import javax.inject.Inject
import javax.inject.Named

@HiltViewModel
class StatsNewFeatureIntroViewModel @Inject constructor(
@Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
private val statsSiteProvider: StatsSiteProvider,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
package org.wordpress.android.ui.stats.intro

import android.content.Context
import android.os.Bundle
import android.view.View
import androidx.lifecycle.ViewModelProvider
import androidx.fragment.app.viewModels
import dagger.hilt.android.AndroidEntryPoint
import org.wordpress.android.R
import org.wordpress.android.WordPress
import org.wordpress.android.databinding.StatsRevampV2FeaturesIntroContentViewBinding
import org.wordpress.android.ui.ActivityLauncher
import org.wordpress.android.ui.featureintroduction.FeatureIntroductionDialogFragment
import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroAction.DismissDialog
import org.wordpress.android.ui.stats.intro.StatsNewFeaturesIntroAction.OpenStats
import org.wordpress.android.util.extensions.exhaustive

@AndroidEntryPoint
class StatsNewFeaturesIntroDialogFragment : FeatureIntroductionDialogFragment() {
private lateinit var viewModel: StatsNewFeatureIntroViewModel
private val viewModel: StatsNewFeatureIntroViewModel by viewModels()

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
viewModel = ViewModelProvider(this, viewModelFactory).get(StatsNewFeatureIntroViewModel::class.java)
initializeViews()
setupObservers()
}

override fun onAttach(context: Context) {
super.onAttach(context)
(requireActivity().applicationContext as WordPress).component().inject(this)
}

private fun initializeViews() {
setHeaderIcon(R.drawable.ic_outline_lightbulb_orange_gradient_40dp)
setHeaderTitle(R.string.stats_revamp_v2_intro_header_title)
Expand Down