Private & Pending Pages

WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt

@@ -17,7 +17,7 @@ sealed class PageItem(open val type: Type) {
     abstract class Page(
         open val id: Long,
         open val title: String,
-        open val labelRes: Int?,
+        open val labels: List<Int>,
         open var indent: Int,
         open val actions: Set<Action>,
         open var actionsEnabled: Boolean
@@ -26,29 +26,29 @@ sealed class PageItem(open val type: Type) {
     data class PublishedPage(
         override val id: Long,
         override val title: String,
-        override val labelRes: Int? = null,
+        override val labels: List<Int> = emptyList(),
         override var indent: Int = 0,
         override var actionsEnabled: Boolean = true
-    ) : Page(id, title, labelRes, indent, setOf(VIEW_PAGE, SET_PARENT, MOVE_TO_DRAFT, MOVE_TO_TRASH), actionsEnabled)
+    ) : Page(id, title, labels, indent, setOf(VIEW_PAGE, SET_PARENT, MOVE_TO_DRAFT, MOVE_TO_TRASH), actionsEnabled)
 
     data class DraftPage(
         override val id: Long,
         override val title: String,
-        override val labelRes: Int? = null,
+        override val labels: List<Int> = emptyList(),
         override var actionsEnabled: Boolean = true
-    ) : Page(id, title, labelRes, 0, setOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH), actionsEnabled)
+    ) : Page(id, title, labels, 0, setOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH), actionsEnabled)
 
     data class ScheduledPage(
         override val id: Long,
         override val title: String,
         override var actionsEnabled: Boolean = true
-    ) : Page(id, title, null, 0, setOf(VIEW_PAGE, SET_PARENT, MOVE_TO_DRAFT, MOVE_TO_TRASH), actionsEnabled)
+    ) : Page(id, title, emptyList(), 0, setOf(VIEW_PAGE, SET_PARENT, MOVE_TO_DRAFT, MOVE_TO_TRASH), actionsEnabled)
 
     data class TrashedPage(
         override val id: Long,
         override val title: String,
         override var actionsEnabled: Boolean = true
-    ) : Page(id, title, null, 0, setOf(VIEW_PAGE, MOVE_TO_DRAFT, DELETE_PERMANENTLY), actionsEnabled)
+    ) : Page(id, title, emptyList(), 0, setOf(VIEW_PAGE, MOVE_TO_DRAFT, DELETE_PERMANENTLY), actionsEnabled)
 
     data class ParentPage(
         val id: Long,

WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt

@@ -31,7 +31,8 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
     ) : PageItemViewHolder(parentView, layout.page_list_item) {
         private val pageTitle = itemView.findViewById<TextView>(id.page_title)
         private val pageMore = itemView.findViewById<ImageButton>(id.page_more)
-        private val pageLabel = itemView.findViewById<TextView>(id.page_label)
+        private val firstLabel = itemView.findViewById<TextView>(id.first_label)
+        private val secondLabel = itemView.findViewById<TextView>(id.second_label)
         private val pageItemContainer = itemView.findViewById<ViewGroup>(id.page_item)
         private val largeStretcher = itemView.findViewById<View>(id.large_stretcher)
         private val smallStretcher = itemView.findViewById<View>(id.small_stretcher)
@@ -48,17 +49,24 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
                 else
                     pageItem.title
 
-                if (pageItem.labelRes == null) {
-                    pageLabel.visibility = View.GONE
+                if (pageItem.labels.isEmpty()) {
+                    firstLabel.visibility = View.GONE
                     smallStretcher.visibility = View.VISIBLE
                     largeStretcher.visibility = View.GONE
                 } else {
-                    pageLabel.text = parent.context.getString(pageItem.labelRes!!)
-                    pageLabel.visibility = View.VISIBLE
+                    firstLabel.text = parent.context.getString(pageItem.labels.first())
+                    firstLabel.visibility = View.VISIBLE
                     smallStretcher.visibility = View.GONE
                     largeStretcher.visibility = View.VISIBLE
                 }
 
+                if (pageItem.labels.size <= 1) {
+                    secondLabel.visibility = View.GONE
+                } else {
+                    secondLabel.text = parent.context.getString(pageItem.labels[1])
+                    secondLabel.visibility = View.VISIBLE
+                }
+
                 itemView.setOnClickListener { onItemTapped(pageItem) }
 
                 pageMore.setOnClickListener { moreClick(pageItem, it) }

WordPress/src/main/java/org/wordpress/android/ui/pages/PageListFragment.kt

@@ -14,9 +14,9 @@ import android.view.ViewGroup
 import kotlinx.android.synthetic.main.pages_list_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
-import org.wordpress.android.fluxc.model.page.PageStatus
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.viewmodel.pages.PageListViewModel
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType
 import org.wordpress.android.viewmodel.pages.PagesViewModel
 import org.wordpress.android.widgets.RecyclerItemDecoration
 import javax.inject.Inject
@@ -29,12 +29,12 @@ class PageListFragment : Fragment() {
     private val listStateKey = "list_state"
 
     companion object {
-        private const val statusKey = "status_key"
+        private const val typeKey = "type_key"
 
-        fun newInstance(pageStatus: PageStatus): PageListFragment {
+        fun newInstance(listType: PageListType): PageListFragment {
             val fragment = PageListFragment()
             val bundle = Bundle()
-            bundle.putSerializable(statusKey, pageStatus)
+            bundle.putSerializable(typeKey, listType)
             fragment.arguments = bundle
             return fragment
         }
@@ -64,11 +64,11 @@ class PageListFragment : Fragment() {
     private fun initializeViewModels(activity: FragmentActivity) {
         val pagesViewModel = ViewModelProviders.of(activity, viewModelFactory).get(PagesViewModel::class.java)
 
-        val pageStatus = checkNotNull(arguments?.getSerializable(statusKey) as PageStatus?)
+        val listType = arguments?.getSerializable(typeKey) as PageListType
         viewModel = ViewModelProviders.of(this, viewModelFactory)
-                .get(pageStatus.name, PageListViewModel::class.java)
+                .get(listType.name, PageListViewModel::class.java)
 
-        viewModel.start(pageStatus, pagesViewModel)
+        viewModel.start(listType, pagesViewModel)
 
         setupObservers()
     }
@@ -96,7 +96,7 @@ class PageListFragment : Fragment() {
             adapter = PagesAdapter(
                     onMenuAction = { action, page -> viewModel.onMenuAction(action, page) },
                     onItemTapped = { page -> viewModel.onItemTapped(page) },
-                    onEmptyActionButtonTapped = { (viewModel as PageListViewModel).onEmptyListNewPageButtonTapped() })
+                    onEmptyActionButtonTapped = { viewModel.onEmptyListNewPageButtonTapped() })
             recyclerView.adapter = adapter
         } else {
             adapter = recyclerView.adapter as PagesAdapter

WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt

@@ -27,10 +27,6 @@ import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.WordPress
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.page.PageStatus.DRAFT
-import org.wordpress.android.fluxc.model.page.PageStatus.PUBLISHED
-import org.wordpress.android.fluxc.model.page.PageStatus.SCHEDULED
-import org.wordpress.android.fluxc.model.page.PageStatus.TRASHED
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.pages.PageItem.Page
@@ -41,8 +37,11 @@ import org.wordpress.android.util.WPSwipeToRefreshHelper
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListState
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListState.FETCHING
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.DRAFTS
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.PUBLISHED
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.SCHEDULED
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.TRASHED
 import org.wordpress.android.viewmodel.pages.PagesViewModel
-import org.wordpress.android.viewmodel.pages.getTitle
 import javax.inject.Inject
 
 class PagesFragment : Fragment() {
@@ -291,7 +290,7 @@ class PagesFragment : Fragment() {
 
 class PagesPagerAdapter(val context: Context, fm: FragmentManager) : FragmentPagerAdapter(fm) {
     companion object {
-        val pageTypes = listOf(PUBLISHED, DRAFT, SCHEDULED, TRASHED)
+        val pageTypes = listOf(PUBLISHED, DRAFTS, SCHEDULED, TRASHED)
     }
 
     override fun getCount(): Int = pageTypes.size
@@ -301,6 +300,6 @@ class PagesPagerAdapter(val context: Context, fm: FragmentManager) : FragmentPag
     }
 
     override fun getPageTitle(position: Int): CharSequence? {
-        return context.getString(pageTypes[position].getTitle())
+        return context.getString(pageTypes[position].title)
     }
 }

WordPress/src/main/java/org/wordpress/android/util/coroutines/CoroutineHelpers.kt

@@ -0,0 +1,13 @@
+package org.wordpress.android.util.coroutines
+
+import kotlinx.coroutines.experimental.suspendCancellableCoroutine
+import kotlinx.coroutines.experimental.withTimeoutOrNull
+import java.util.concurrent.TimeUnit.MILLISECONDS
+import kotlin.coroutines.experimental.Continuation
+
+suspend inline fun <T> suspendCoroutineWithTimeout(
+    timeout: Long,
+    crossinline block: (Continuation<T>) -> Unit
+) = withTimeoutOrNull(timeout, MILLISECONDS) {
+    suspendCancellableCoroutine(block = block)
+}

WordPress/src/main/java/org/wordpress/android/viewmodel/pages/ActionPerformer.kt

@@ -5,15 +5,13 @@ import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.store.PostStore.OnPostUploaded
 import javax.inject.Inject
-import kotlinx.coroutines.experimental.suspendCancellableCoroutine
-import kotlinx.coroutines.experimental.withTimeoutOrNull
 import org.wordpress.android.fluxc.action.PostAction
 import org.wordpress.android.fluxc.action.PostAction.DELETE_POST
 import org.wordpress.android.fluxc.action.PostAction.UPDATE_POST
 import org.wordpress.android.fluxc.store.PostStore.OnPostChanged
+import org.wordpress.android.util.coroutines.suspendCoroutineWithTimeout
 import org.wordpress.android.viewmodel.pages.ActionPerformer.PageAction.EventType
 import org.wordpress.android.viewmodel.pages.ActionPerformer.PageAction.EventType.UPLOAD
-import java.util.concurrent.TimeUnit.SECONDS
 import kotlin.coroutines.experimental.Continuation
 
 class ActionPerformer
@@ -22,7 +20,7 @@ class ActionPerformer
     private lateinit var eventType: EventType
 
     companion object {
-        private const val ACTION_TIMEOUT = 30L
+        private const val ACTION_TIMEOUT = 30L * 1000
     }
 
     init {
@@ -62,13 +60,6 @@ class ActionPerformer
         }
     }
 
-    private suspend inline fun <T> suspendCoroutineWithTimeout(
-        timeout: Long,
-        crossinline block: (Continuation<T>) -> Unit
-    ) = withTimeoutOrNull(timeout, SECONDS) {
-        suspendCancellableCoroutine(block = block)
-    }
-
     data class PageAction(val event: EventType, val perform: () -> Unit) {
         var onSuccess: () -> Unit = { }
         var onError: () -> Unit = { }