Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue/13268 introduce date range picker screen in Activity Log #13324

Merged
merged 14 commits into from
Nov 18, 2020
Merged

Issue/13268 introduce date range picker screen in Activity Log #13324

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4c0def5
Initialize fullscreen date range picker
malinajirka Nov 2, 2020
d9b23a0
Override date range picker styles
malinajirka Nov 2, 2020
dc88044
Merge branch 'issue/13268-introduce-feature-flag' into issue/13268-in…
malinajirka Nov 2, 2020
2f5d46a
Merge branch 'develop' into issue/13268-introduce-date-range-picker-s…
malinajirka Nov 9, 2020
6053e60
Fix names of date picker styles
malinajirka Nov 9, 2020
a580deb
Merge branch 'issue/13268-introduce-feature-flag' into issue/13268-in…
malinajirka Nov 9, 2020
c4cd182
Extract date range picker creation into a private method
malinajirka Nov 9, 2020
3a48d1b
Persist selected date range
malinajirka Nov 9, 2020
c42c415
Remove duplicated styles from night/styles.xml
malinajirka Nov 9, 2020
20d94ba
Minor refactoring in ActivityLogListFragment.kt
malinajirka Nov 10, 2020
6f5e34d
Fix order of MaterialCalendar styles in styles.xml
malinajirka Nov 11, 2020
29b9c17
Fix MaterialDatePicker confirm button after config change
malinajirka Nov 17, 2020
b7c44fe
Use child fragment manager for date range picker fragment
malinajirka Nov 17, 2020
406d82e
Merge branch 'develop' into issue/13268-introduce-date-range-picker-s…
malinajirka Nov 17, 2020
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
19 changes: 19 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.datepicker.MaterialDatePicker
import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.activity_log_list_fragment.*
import kotlinx.android.synthetic.main.activity_log_list_loading_item.*
Expand All @@ -25,9 +26,12 @@ import org.wordpress.android.util.helpers.SwipeToRefreshHelper
import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel
import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ActivityLogListStatus.FETCHING
import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ActivityLogListStatus.LOADING_MORE
import org.wordpress.android.viewmodel.activitylog.DateRange
import org.wordpress.android.widgets.WPSnackbar
import javax.inject.Inject

private const val DATE_PICKER_TAG = "activity_log_date_picker_tag"

class ActivityLogListFragment : Fragment() {
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@Inject lateinit var uiHelpers: UiHelpers
Expand Down Expand Up @@ -73,6 +77,8 @@ class ActivityLogListFragment : Fragment() {
}
})

date_range_picker.setOnClickListener { viewModel.dateRangePickerClicked() }

setupObservers()

viewModel.start(site)
Expand Down Expand Up @@ -100,6 +106,10 @@ class ActivityLogListFragment : Fragment() {
uiHelpers.updateVisibility(date_range_picker, visibility)
})

viewModel.showDateRangePicker.observe(viewLifecycleOwner, Observer { event ->
showDateRangePicker(event.initialSelection)
})
ParaskP7 marked this conversation as resolved.
Show resolved Hide resolved

viewModel.showItemDetail.observe(viewLifecycleOwner, Observer {
if (it is ActivityLogListItem.Event) {
ActivityLauncher.viewActivityLogDetailForResult(activity, viewModel.site, it.activityId)
Expand Down Expand Up @@ -136,6 +146,15 @@ class ActivityLogListFragment : Fragment() {
}
}

private fun showDateRangePicker(initialDateRange: DateRange?) {
ParaskP7 marked this conversation as resolved.
Show resolved Hide resolved
val picker = MaterialDatePicker.Builder
.dateRangePicker()
.setSelection(initialDateRange)
.build()
picker.addOnPositiveButtonClickListener { viewModel.onDateRangeSelected(it) }
picker.show(parentFragmentManager, DATE_PICKER_TAG)
}

private fun refreshProgressBars(eventListStatus: ActivityLogViewModel.ActivityLogListStatus?) {
if (!isAdded || view == null) {
return
Expand Down
19 changes: 19 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.wordpress.android.viewmodel.activitylog

import androidx.core.util.Pair
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer
Expand Down Expand Up @@ -30,6 +31,8 @@ import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.Activity
import javax.inject.Inject
import javax.inject.Named

typealias DateRange = Pair<Long, Long>
ParaskP7 marked this conversation as resolved.
Show resolved Hide resolved

class ActivityLogViewModel @Inject constructor(
private val activityLogStore: ActivityLogStore,
private val rewindStatusService: RewindStatusService,
Expand Down Expand Up @@ -63,6 +66,10 @@ class ActivityLogViewModel @Inject constructor(
val showRewindDialog: LiveData<ActivityLogListItem>
get() = _showRewindDialog

private val _showDateRangePicker = SingleLiveEvent<ShowDateRangePicker>()
val showDateRangePicker: LiveData<ShowDateRangePicker>
get() = _showDateRangePicker

private val _moveToTop = SingleLiveEvent<Unit>()
val moveToTop: SingleLiveEvent<Unit>
get() = _moveToTop
Expand All @@ -89,6 +96,7 @@ class ActivityLogViewModel @Inject constructor(

private var lastRewindActivityId: String? = null
private var lastRewindStatus: Status? = null
private var currentDateRangeFilter: DateRange? = null
private val rewindProgressObserver = Observer<RewindProgress> {
if (it?.activityLogItem?.activityID != lastRewindActivityId || it?.status != lastRewindStatus) {
lastRewindActivityId = it?.activityLogItem?.activityID
Expand Down Expand Up @@ -151,6 +159,15 @@ class ActivityLogViewModel @Inject constructor(
}
}

fun dateRangePickerClicked() {
_showDateRangePicker.value = ShowDateRangePicker(initialSelection = currentDateRangeFilter)
ParaskP7 marked this conversation as resolved.
Show resolved Hide resolved
}

fun onDateRangeSelected(dateRange: DateRange?) {
currentDateRangeFilter = dateRange
// TODO malinjir: refetch/load data
}

fun onRewindConfirmed(rewindId: String) {
rewindStatusService.rewind(rewindId, site)
showRewindStartedMessage()
Expand Down Expand Up @@ -293,4 +310,6 @@ class ActivityLogViewModel @Inject constructor(
_eventListStatus.value = DONE
}
}

data class ShowDateRangePicker(val initialSelection: DateRange?)
}
6 changes: 6 additions & 0 deletions WordPress/src/main/res/color/on_surface_button_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="@dimen/material_emphasis_disabled" android:color="?attr/colorOnSurface" android:state_enabled="false" />
<item android:color="?attr/colorOnSurface" android:state_selected="true" />
<item android:color="?attr/colorOnSurface" />
</selector>
5 changes: 5 additions & 0 deletions WordPress/src/main/res/values-night/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@
<item name="categoriesButtonBackgroundSelected">@color/mlp_categories_button_background_selected_dark</item>
<item name="mlpDividerColor">@color/mlp_divider_dark</item>
<item name="categoriesBackground">@color/mlp_categories_background_dark</item>

<!-- Material Date Range Picker -->
<item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>
<item name="materialCalendarFullscreenTheme">@style/WordPress.MaterialCalendarFullscreenTheme</item>
<item name="materialCalendarTheme">@style/WordPress.MaterialCalendarTheme</item>
</style>

<style name="WordPress.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
Expand Down
45 changes: 45 additions & 0 deletions WordPress/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,51 @@
<item name="categoriesButtonBackgroundSelected">@color/grey_900</item>
<item name="mlpDividerColor">@color/grey_300</item>
<item name="categoriesBackground">@color/white</item>

<!-- Material Date Range Picker -->
<item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>
<item name="materialCalendarFullscreenTheme">@style/WordPress.MaterialCalendarFullscreenTheme</item>
<item name="materialCalendarTheme">@style/WordPress.MaterialCalendarTheme</item>
</style>

<style name="WordPress.MaterialCalendarStyle" parent="Widget.MaterialComponents.MaterialCalendar">
</style>

<style name="WordPress.MaterialCalendarFullscreenTheme" parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
<item name="materialCalendarHeaderTitle">@style/WordPress.MaterialCalendarHeaderTitle</item>
<item name="materialCalendarHeaderLayout">@style/WordPress.MaterialCalendarHeaderLayout</item>
<item name="materialCalendarHeaderSelection">@style/WordPress.MaterialCalendarHeaderSelection</item>
<item name="materialCalendarHeaderToggleButton">@style/WordPress.MaterialCalendarHeaderToggleButton</item>
<item name="materialCalendarHeaderConfirmButton">@style/WordPress.MaterialCalendarHeaderConfirmButton</item>
<item name="materialCalendarHeaderDivider">@style/WordPress.MaterialCalendarHeaderDivider</item>
<!-- Used to color the cancel button which doesn't use any overridable styles -->
<item name="colorOnPrimary">?attr/colorOnSurface</item>
</style>

ParaskP7 marked this conversation as resolved.
Show resolved Hide resolved
<style name="WordPress.MaterialCalendarTheme" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
</style>

<style name="WordPress.MaterialCalendarHeaderTitle" parent="Widget.MaterialComponents.MaterialCalendar.HeaderTitle">
<item name="android:textColor">?attr/colorOnSurface</item>
</style>

<style name="WordPress.MaterialCalendarHeaderSelection" parent="Widget.MaterialComponents.MaterialCalendar.HeaderSelection.Fullscreen">
<item name="android:textColor">?attr/colorOnSurface</item>
</style>
<style name="WordPress.MaterialCalendarHeaderToggleButton" parent="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton">
<item name="android:tint">?attr/colorOnSurface</item>
</style>
<style name="WordPress.MaterialCalendarHeaderDivider" parent="Widget.MaterialComponents.MaterialCalendar.HeaderDivider">
<item name="android:visibility">visible</item>
<item name="android:background">?attr/colorOnSurface</item>

</style>
<style name="WordPress.MaterialCalendarHeaderLayout" parent="Widget.MaterialComponents.MaterialCalendar.HeaderLayout">
<item name="android:background">?attr/colorSurface</item>
</style>
<style name="WordPress.MaterialCalendarHeaderConfirmButton" parent="Widget.MaterialComponents.MaterialCalendar.HeaderConfirmButton">
<item name="android:textColor">@color/on_surface_button_selector</item>
<item name="rippleColor">@color/on_surface_button_selector</item>
</style>

<style name="WordPress.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
Expand Down