Consolidate welcome module dependencies

app/build.gradle

@@ -73,13 +73,11 @@ dependencies {
     implementation project(':base')
     implementation project(':splash')
     implementation project(':welcome')
-    implementation project(':tours')
+    implementation project(':content_listing')
     implementation project(':tour_manager')
     implementation project(':info')
     implementation project(':audio')
     implementation project(':map')
-    implementation project(':exhibitions')
-    implementation project(':events')
     implementation project(':analytics')
     implementation project(':media')
     implementation project(':media_ui')

content_listing/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="edu.artic.content.listing" />

events/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt → content_listing/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt

@@ -6,6 +6,7 @@ import com.fuzz.rx.disposedBy
 import com.jakewharton.rxbinding2.widget.text
 import edu.artic.adapter.AutoHolderRecyclerViewAdapter
 import edu.artic.adapter.BaseViewHolder
+import edu.artic.content.listing.R
 import edu.artic.image.GlideApp
 import kotlinx.android.synthetic.main.cell_all_events_layout.view.*
 

events/src/main/kotlin/edu/artic/events/AllEventsFragment.kt → content_listing/src/main/kotlin/edu/artic/events/AllEventsFragment.kt

@@ -12,12 +12,13 @@ import edu.artic.adapter.itemChanges
 import edu.artic.adapter.itemClicksWithPosition
 import edu.artic.analytics.ScreenName
 import edu.artic.base.utils.asDeepLinkIntent
+import edu.artic.content.listing.R
 import edu.artic.events.recyclerview.AllEventsItemDecoration
 import edu.artic.navigation.NavigationConstants
 import edu.artic.viewmodel.BaseViewModelFragment
 import edu.artic.viewmodel.Navigate
 import io.reactivex.rxkotlin.subscribeBy
-import kotlinx.android.synthetic.main.fragment_all_events.*
+import kotlinx.android.synthetic.main.fragment_view_all.*
 import kotlin.reflect.KClass
 
 class AllEventsFragment : BaseViewModelFragment<AllEventsViewModel>() {
@@ -28,7 +29,7 @@ class AllEventsFragment : BaseViewModelFragment<AllEventsViewModel>() {
     override val viewModelClass: KClass<AllEventsViewModel>
         get() = AllEventsViewModel::class
     override val layoutResId: Int
-        get() = R.layout.fragment_all_events
+        get() = R.layout.fragment_view_all
 
     override val title = R.string.events
 

events/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt → content_listing/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt

@@ -4,10 +4,10 @@ import android.content.Context
 import android.graphics.Rect
 import android.support.v7.widget.RecyclerView
 import android.view.View
+import edu.artic.content.listing.R
 import edu.artic.events.AllEventsAdapter
 import edu.artic.events.AllEventsCellHeaderViewModel
 import edu.artic.events.AllEventsCellViewModel
-import edu.artic.events.R
 
 class AllEventsItemDecoration(
         context: Context,

exhibitions/src/main/kotlin/edu/artic/exhibitions/AllExhibitionsAdapter.kt → content_listing/src/main/kotlin/edu/artic/exhibitions/AllExhibitionsAdapter.kt

@@ -6,6 +6,7 @@ import com.fuzz.rx.disposedBy
 import com.jakewharton.rxbinding2.widget.text
 import edu.artic.adapter.AutoHolderRecyclerViewAdapter
 import edu.artic.adapter.BaseViewHolder
+import edu.artic.content.listing.R
 import edu.artic.image.GlideApp
 import kotlinx.android.synthetic.main.cell_all_exhibitions_layout.view.*
 

exhibitions/src/main/kotlin/edu/artic/exhibitions/AllExhibitionsFragment.kt → content_listing/src/main/kotlin/edu/artic/exhibitions/AllExhibitionsFragment.kt

@@ -12,13 +12,14 @@ import edu.artic.adapter.itemChanges
 import edu.artic.adapter.itemClicksWithPosition
 import edu.artic.analytics.ScreenName
 import edu.artic.base.utils.asDeepLinkIntent
+import edu.artic.content.listing.R
 import edu.artic.exhibitions.recyclerview.AllExhibitionsItemDecoration
 import edu.artic.navigation.NavigationConstants
 import edu.artic.viewmodel.BaseViewModelFragment
 import edu.artic.viewmodel.Navigate
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.subscribeBy
-import kotlinx.android.synthetic.main.fragment_all_exhibitions.*
+import kotlinx.android.synthetic.main.fragment_view_all.*
 import kotlin.reflect.KClass
 
 class AllExhibitionsFragment : BaseViewModelFragment<AllExhibitionsViewModel>() {
@@ -29,7 +30,7 @@ class AllExhibitionsFragment : BaseViewModelFragment<AllExhibitionsViewModel>()
     override val viewModelClass: KClass<AllExhibitionsViewModel>
         get() = AllExhibitionsViewModel::class
     override val layoutResId: Int
-        get() = R.layout.fragment_all_exhibitions
+        get() = R.layout.fragment_view_all
 
     override val title = R.string.onView
 

exhibitions/src/main/kotlin/edu/artic/exhibitions/recyclerview/AllToursItemDecoration.kt → content_listing/src/main/kotlin/edu/artic/exhibitions/recyclerview/AllToursItemDecoration.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.graphics.Rect
 import android.support.v7.widget.RecyclerView
 import android.view.View
-import edu.artic.exhibitions.R
+import edu.artic.content.listing.R
 
 class AllExhibitionsItemDecoration(
         context: Context,

tours/src/main/kotlin/edu/artic/tours/AllToursAdapter.kt → content_listing/src/main/kotlin/edu/artic/tours/AllToursAdapter.kt

@@ -8,6 +8,7 @@ import com.fuzz.rx.disposedBy
 import com.jakewharton.rxbinding2.widget.text
 import edu.artic.adapter.AutoHolderRecyclerViewAdapter
 import edu.artic.adapter.BaseViewHolder
+import edu.artic.content.listing.R
 import io.reactivex.subjects.Subject
 import edu.artic.image.GlideApp
 import kotlinx.android.synthetic.main.cell_all_tours_intro.view.*

tours/src/main/kotlin/edu/artic/tours/AllToursFragment.kt → content_listing/src/main/kotlin/edu/artic/tours/AllToursFragment.kt

@@ -13,13 +13,14 @@ import edu.artic.adapter.itemChanges
 import edu.artic.adapter.itemClicksWithPosition
 import edu.artic.analytics.ScreenName
 import edu.artic.base.utils.asDeepLinkIntent
+import edu.artic.content.listing.R
 import edu.artic.navigation.NavigationConstants
 import edu.artic.tours.recyclerview.AllToursItemDecoration
 import edu.artic.viewmodel.BaseViewModelFragment
 import edu.artic.viewmodel.Navigate
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.subscribeBy
-import kotlinx.android.synthetic.main.fragment_all_tours.*
+import kotlinx.android.synthetic.main.fragment_view_all.*
 import kotlin.reflect.KClass
 
 class AllToursFragment : BaseViewModelFragment<AllToursViewModel>() {
@@ -30,7 +31,7 @@ class AllToursFragment : BaseViewModelFragment<AllToursViewModel>() {
     override val viewModelClass: KClass<AllToursViewModel>
         get() = AllToursViewModel::class
     override val layoutResId: Int
-        get() = R.layout.fragment_all_tours
+        get() = R.layout.fragment_view_all
 
     override val title = R.string.tours
 

tours/src/main/kotlin/edu/artic/tours/recyclerview/AllToursItemDecoration.kt → content_listing/src/main/kotlin/edu/artic/tours/recyclerview/AllToursItemDecoration.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.graphics.Rect
 import android.support.v7.widget.RecyclerView
 import android.view.View
-import edu.artic.tours.R
+import edu.artic.content.listing.R
 
 class AllToursItemDecoration(
         context: Context,

tours/src/main/res/layout/fragment_all_tours.xml → content_listing/src/main/res/layout/fragment_view_all.xml

@@ -5,7 +5,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:animateLayoutChanges="true">
+    android:animateLayoutChanges="true"
+    tools:theme="@style/AppTheme"
+    >
 
     <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
@@ -16,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintHeight_max="?attr/actionBarSize"
-        tools:title="Tours"
+        tools:title="@tools:sample/lorem"
         tools:layout_height="52dp" >
 
         <ImageView
@@ -30,11 +32,10 @@
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
-        tools:listitem="@layout/cell_all_tours_intro"
+        app:layout_constraintBottom_toBottomOf="parent"
         />
 
 </android.support.constraint.ConstraintLayout>

events/src/main/res/values/dimens.xml → content_listing/src/main/res/values/dimens.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+
     <dimen name="all_tour_cell_spacing_vertical">23dp</dimen>
     <dimen name="all_tour_cell_spacing_vertical_header" tools:ignore="MissingDefaultResource">@dimen/marginDouble</dimen>
     <dimen name="all_tour_cell_spacing_horizontal">16dp</dimen>
+
+    <dimen name="all_exhibitions_cell_spacing_vertical">18dp</dimen>
+    <dimen name="all_exhibitions_cell_spacing_horizontal">16dp</dimen>
+
 </resources>

settings.gradle

@@ -1,14 +1,12 @@
 include ':adapter',
-        ':membership',
         ':access_card',
         ':analytics',
         ':app',
         ':audio',
         ':base',
+        ':content_listing',
         ':db',
         ':details',
-        ':events',
-        ':exhibitions',
         ':image',
         ':info',
         ':localization',
@@ -18,10 +16,10 @@ include ':adapter',
         ':map',
         ':media',
         ':media_ui',
+        ':membership',
         ':navigation',
         ':search',
         ':splash',
-        ':tours',
         ':tour_manager',
         ':ui',
         ':viewmodel',