[Layout] - Refactor: use same layout for all of the content listing f…

…ragments
art-institute-of-chicago · Oct 25, 2018 · e68b240 · e68b240
1 parent 70ab313
commit e68b240
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 126 deletions.
diff --git a/content_listing/src/main/kotlin/edu/artic/events/AllEventsFragment.kt b/content_listing/src/main/kotlin/edu/artic/events/AllEventsFragment.kt
@@ -18,7 +18,7 @@ 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>() {
@@ -29,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
 

diff --git a/content_listing/src/main/kotlin/edu/artic/exhibitions/AllExhibitionsFragment.kt b/content_listing/src/main/kotlin/edu/artic/exhibitions/AllExhibitionsFragment.kt
@@ -19,7 +19,7 @@ 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>() {
@@ -30,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
 

diff --git a/content_listing/src/main/kotlin/edu/artic/tours/AllToursFragment.kt b/content_listing/src/main/kotlin/edu/artic/tours/AllToursFragment.kt
@@ -20,7 +20,7 @@ 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>() {
@@ -31,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
 

diff --git a/content_listing/src/main/res/layout/fragment_all_events.xml b/content_listing/src/main/res/layout/fragment_all_events.xml
diff --git a/content_listing/src/main/res/layout/fragment_all_exhibitions.xml b/content_listing/src/main/res/layout/fragment_all_exhibitions.xml
diff --git a/content_listing/src/main/res/layout/fragment_all_tours.xml b/content_listing/src/main/res/layout/fragment_all_tours.xml