Merge pull request #526 from squanchy-dev/show_event_room_in_schedule

Show event room in schedule

Author: quiro91

app/src/debug/java/net/squanchy/support/debug/DebugActivity.kt

@@ -83,7 +83,7 @@ class DebugActivity : AppCompatActivity() {
     }
 
     private fun createPlace(): Option<Place> = Option(
-        Place("1", "That room over there", Option.empty())
+        Place("1", "That room over there", Option.empty(), -1)
     )
 
     private fun createTalkSpeakers(): List<Speaker> {

app/src/main/java/net/squanchy/favorites/FavoritesPageView.kt

@@ -33,7 +33,7 @@ class FavoritesPageView @JvmOverloads constructor(
     private val disposable = CompositeDisposable()
 
     init {
-        with(favoritesComponent(unwrapToActivityContext(context))) {
+        with(favoritesComponent(context.unwrapToActivityContext())) {
             favoritesService = favoritesService()
             navigator = navigator()
             analytics = analytics()
@@ -126,7 +126,7 @@ class FavoritesPageView @JvmOverloads constructor(
         // ⚠️ HACK this is DIRTY and HORRIBLE but it's the only way we can ship this
         // without rewriting the whole data layer. Sorry. I swear, we know it sucks
         // and we want to fix this ASAP.
-        val activity: HomeActivity = unwrapToActivityContext(context) as HomeActivity
+        val activity: HomeActivity = context.unwrapToActivityContext() as HomeActivity
         activity.requestSignIn()
     }
 

app/src/main/java/net/squanchy/favorites/view/FavoritesViewHolders.kt

@@ -5,6 +5,7 @@ import android.view.View
 import android.widget.TextView
 import net.squanchy.schedule.domain.view.Event
 import net.squanchy.schedule.view.EventItemView
+import net.squanchy.schedule.view.OnEventClickListener
 import org.joda.time.LocalDate
 
 fun favoriteItemViewHolderFor(itemView: View) = when (itemView) {
@@ -17,9 +18,9 @@ sealed class FavoritesViewHolder<T : View>(itemView: T) : RecyclerView.ViewHolde
 
 class EventViewHolder(itemView: EventItemView) : FavoritesViewHolder<EventItemView>(itemView) {
 
-    fun updateWith(event: Event, listener: (Event) -> Unit) {
-        (itemView as EventItemView).updateWith(event)
-        itemView.setOnClickListener { listener(event) }
+    fun updateWith(event: Event, listener: OnEventClickListener?) {
+        (itemView as EventItemView).updateWith(event, false) // TODO import the feature flag here as well
+        itemView.setOnClickListener { listener?.invoke(event) }
     }
 }
 

app/src/main/java/net/squanchy/imageloader/ImageLoaderComponent.kt

@@ -4,7 +4,7 @@ import android.support.v7.app.AppCompatActivity
 import dagger.Component
 import net.squanchy.injection.ActivityContextModule
 
-fun imageLoaderComponent(activity: AppCompatActivity) =
+fun imageLoaderComponent(activity: AppCompatActivity): ImageLoaderComponent =
     DaggerImageLoaderComponent.builder()
         .activityContextModule(ActivityContextModule(activity))
         .imageLoaderModule(ImageLoaderModule())

app/src/main/java/net/squanchy/injection/ApplicationComponent.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import dagger.Component
 import net.squanchy.analytics.Analytics
 import net.squanchy.analytics.AnalyticsModule
+import net.squanchy.remoteconfig.FeatureFlags
 import net.squanchy.remoteconfig.RemoteConfig
 import net.squanchy.remoteconfig.RemoteConfigModule
 import net.squanchy.schedule.tracksfilter.TracksFilter
@@ -65,6 +66,8 @@ interface ApplicationComponent {
 
     fun remoteConfig(): RemoteConfig
 
+    fun featureFlags(): FeatureFlags
+
     fun application(): Application
 
     fun algoliaSearchEngine(): AlgoliaSearchEngine

app/src/main/java/net/squanchy/remoteconfig/FeatureFlags.kt

@@ -0,0 +1,18 @@
+package net.squanchy.remoteconfig
+
+class FeatureFlags(private val remoteConfig: RemoteConfig) {
+
+    val showEventRoomInSchedule
+        get() = isFeatureEnabled(Feature.ShowEventRoomInSchedule)
+
+    private fun isFeatureEnabled(feature: Feature) = remoteConfig.getBoolean(feature.remoteConfigFlagName)
+
+    private sealed class Feature {
+        abstract val remoteConfigFlagName: String
+
+        object ShowEventRoomInSchedule : Feature() {
+
+            override val remoteConfigFlagName = "show_event_room_in_schedule"
+        }
+    }
+}

app/src/main/java/net/squanchy/remoteconfig/RemoteConfig.kt

@@ -14,6 +14,9 @@ class RemoteConfig(
     private val cacheExpiryInSeconds: Long
         get() = if (debugMode) EXPIRY_IMMEDIATELY else EXPIRY_ONE_HOUR
 
+    fun getBoolean(key: String): Single<Boolean> =
+        getConfigValue { firebaseRemoteConfig.getBoolean(key) }
+
     private fun <T> getConfigValue(action: () -> T): Single<T> {
         return fetchAndActivate(cacheExpiryInSeconds)
             .andThen(Single.fromCallable { action() })

app/src/main/java/net/squanchy/remoteconfig/RemoteConfigModule.kt

@@ -1,24 +1,25 @@
 package net.squanchy.remoteconfig
 
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-
-import net.squanchy.BuildConfig
-import net.squanchy.R
-
 import dagger.Module
 import dagger.Provides
+import net.squanchy.BuildConfig
+import net.squanchy.R
 
 @Module
 class RemoteConfigModule {
 
     @Provides
-    internal fun firebaseRemoteConfig() = FirebaseRemoteConfig.getInstance()
+    fun firebaseRemoteConfig() = FirebaseRemoteConfig.getInstance()
 
     @Provides
-    internal fun remoteConfig(firebaseRemoteConfig: FirebaseRemoteConfig): RemoteConfig {
+    fun remoteConfig(firebaseRemoteConfig: FirebaseRemoteConfig): RemoteConfig {
         return RemoteConfigBuilder(firebaseRemoteConfig)
             .withDebugMode(BuildConfig.DEBUG)
             .withDefaults(R.xml.remote_config_defaults)
             .build()
     }
+
+    @Provides
+    fun featureFlags(remoteConfig: RemoteConfig) = FeatureFlags(remoteConfig)
 }

app/src/main/java/net/squanchy/schedule/ScheduleComponent.kt

@@ -9,6 +9,7 @@ import net.squanchy.injection.ApplicationComponent
 import net.squanchy.injection.applicationComponent
 import net.squanchy.navigation.NavigationModule
 import net.squanchy.navigation.Navigator
+import net.squanchy.remoteconfig.FeatureFlags
 import net.squanchy.schedule.tracksfilter.TracksFilter
 import net.squanchy.service.repository.TracksRepository
 import net.squanchy.support.injection.CurrentTimeModule
@@ -23,7 +24,10 @@ internal fun scheduleComponent(activity: AppCompatActivity): ScheduleComponent =
     .build()
 
 @ActivityLifecycle
-@Component(modules = [ScheduleModule::class, NavigationModule::class, CurrentTimeModule::class], dependencies = [ApplicationComponent::class])
+@Component(
+    modules = [ScheduleModule::class, NavigationModule::class, CurrentTimeModule::class],
+    dependencies = [ApplicationComponent::class]
+)
 internal interface ScheduleComponent {
 
     fun scheduleService(): ScheduleService
@@ -37,4 +41,6 @@ internal interface ScheduleComponent {
     fun tracksRepository(): TracksRepository
 
     fun tracksFilter(): TracksFilter
+
+    fun featureFlags(): FeatureFlags
 }

app/src/main/java/net/squanchy/schedule/SchedulePageView.kt

@@ -5,15 +5,18 @@ import android.support.design.widget.CoordinatorLayout
 import android.support.design.widget.TabLayout
 import android.text.Spanned
 import android.util.AttributeSet
-import android.view.View
+import androidx.view.isVisible
+import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.functions.BiFunction
 import kotlinx.android.synthetic.main.view_page_schedule.view.*
 import net.squanchy.R
 import net.squanchy.analytics.Analytics
 import net.squanchy.analytics.ContentType
 import net.squanchy.home.Loadable
 import net.squanchy.navigation.Navigator
+import net.squanchy.remoteconfig.FeatureFlags
 import net.squanchy.schedule.domain.view.Event
 import net.squanchy.schedule.domain.view.Schedule
 import net.squanchy.schedule.view.ScheduleViewPagerAdapter
@@ -35,16 +38,18 @@ class SchedulePageView @JvmOverloads constructor(
     private val navigate: Navigator
     private val analytics: Analytics
     private val currentTime: CurrentTime
+    private val featureFlags: FeatureFlags
     private var subscriptions = CompositeDisposable()
 
     init {
-        val activity = unwrapToActivityContext(getContext())
+        val activity = context.unwrapToActivityContext()
         val component = scheduleComponent(activity)
         service = component.scheduleService()
         navigate = component.navigator()
         analytics = component.analytics()
         viewPagerAdapter = ScheduleViewPagerAdapter(activity)
         currentTime = component.currentTime()
+        featureFlags = component.featureFlags()
     }
 
     override fun onFinishInflate() {
@@ -80,15 +85,17 @@ class SchedulePageView @JvmOverloads constructor(
 
     override fun startLoading() {
         subscriptions.add(
-            service.schedule()
+            Observable.combineLatest(service.schedule(), featureFlags.showEventRoomInSchedule.toObservable(), combineInPair())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
-                    { updateWith(it, ::onEventClicked) },
-                    { Timber.e(it) }
+                    { updateWith(it.first, it.second, ::onEventClicked) },
+                    Timber::e
                 )
         )
     }
 
+    private fun combineInPair(): BiFunction<Schedule, Boolean, Pair<Schedule, Boolean>> = BiFunction(::Pair)
+
     private fun onEventClicked(event: Event) {
         analytics.trackItemSelected(ContentType.SCHEDULE_ITEM, event.id)
         navigate.toEventDetails(event.id)
@@ -115,27 +122,27 @@ class SchedulePageView @JvmOverloads constructor(
         }
     }
 
-    private fun hasTypefaceSpan(text: CharSequence?) = if (text !is Spanned) false else text.hasTypefaceSpan()
+    private fun hasTypefaceSpan(text: CharSequence?) = (text as? Spanned)?.hasTypefaceSpan() ?: false
 
-    fun updateWith(schedule: Schedule, onEventClicked: (Event) -> Unit) {
-        progressbar.visibility = View.GONE
+    fun updateWith(schedule: Schedule, showRoom: Boolean, onEventClicked: (Event) -> Unit) {
+        progressbar.isVisible = false
 
         if (schedule.isEmpty) {
-            viewpager.visibility = GONE
-            tabstrip.visibility = GONE
-            emptyView.visibility = VISIBLE
+            viewpager.isVisible = false
+            tabstrip.isVisible = false
+            emptyView.isVisible = true
             return
         }
 
-        viewpager.visibility = VISIBLE
-        tabstrip.visibility = VISIBLE
-        emptyView.visibility = GONE
+        viewpager.isVisible = true
+        tabstrip.isVisible = true
+        emptyView.isVisible = false
 
-        viewPagerAdapter.updateWith(schedule.pages, onEventClicked)
+        viewPagerAdapter.updateWith(schedule.pages, showRoom, onEventClicked)
         if (viewpager.adapter == null) {
             viewpager.adapter = viewPagerAdapter
         }
 
-        progressbar.visibility = View.GONE
+        progressbar.isVisible = false
     }
 }