feat: add Event Types for search

aggarwalpulkit596 · aggarwalpulkit596 · commit be4a01432e95 · 2019-04-04T21:30:58.000+05:30
diff --git a/app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt b/app/src/main/java/org/fossasia/openevent/general/OpenEventDatabase.kt
@@ -13,6 +13,8 @@ import org.fossasia.openevent.general.auth.UserDao
 import org.fossasia.openevent.general.event.Event
 import org.fossasia.openevent.general.event.EventDao
 import org.fossasia.openevent.general.event.EventIdConverter
+import org.fossasia.openevent.general.event.location.EventLocation
+import org.fossasia.openevent.general.event.location.EventLocationDao
 import org.fossasia.openevent.general.event.topic.EventTopic
 import org.fossasia.openevent.general.event.topic.EventTopicIdConverter
 import org.fossasia.openevent.general.event.topic.EventTopicsDao
@@ -25,7 +27,7 @@ import org.fossasia.openevent.general.ticket.TicketDao
 import org.fossasia.openevent.general.ticket.TicketIdConverter
 
 @Database(entities = [Event::class, User::class, SocialLink::class, Ticket::class, Attendee::class,
-    EventTopic::class, Order::class, CustomForm::class], version = 1)
+    EventTopic::class, Order::class, CustomForm::class, EventLocation::class], version = 1)
 @TypeConverters(EventIdConverter::class, EventTopicIdConverter::class, TicketIdConverter::class,
     AttendeeIdConverter::class, ListAttendeeIdConverter::class)
 abstract class OpenEventDatabase : RoomDatabase() {
@@ -42,5 +44,7 @@ abstract class OpenEventDatabase : RoomDatabase() {
 
     abstract fun eventTopicsDao(): EventTopicsDao
 
+    abstract fun eventLocationsDao(): EventLocationDao
+
     abstract fun orderDao(): OrderDao
 }
diff --git a/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt b/app/src/main/java/org/fossasia/openevent/general/di/Modules.kt
@@ -40,6 +40,8 @@ import org.fossasia.openevent.general.common.EventsDiffCallback
 import org.fossasia.openevent.general.data.Resource
 import org.fossasia.openevent.general.event.EventsListAdapter
 import org.fossasia.openevent.general.event.EventsViewModel
+import org.fossasia.openevent.general.event.location.EventLocation
+import org.fossasia.openevent.general.event.location.EventLocationApi
 import org.fossasia.openevent.general.event.topic.EventTopic
 import org.fossasia.openevent.general.event.topic.EventTopicApi
 import org.fossasia.openevent.general.event.topic.SimilarEventsViewModel
@@ -119,11 +121,15 @@ val apiModule = module {
         val retrofit: Retrofit = get()
         retrofit.create(PaypalApi::class.java)
     }
+    single {
+        val retrofit: Retrofit = get()
+        retrofit.create(EventLocationApi::class.java)
+    }
 
     factory { AuthHolder(get()) }
     factory { AuthService(get(), get(), get()) }
 
-    factory { EventService(get(), get(), get(), get()) }
+    factory { EventService(get(), get(), get(), get(), get(), get()) }
     factory { TicketService(get(), get()) }
     factory { SocialLinksService(get(), get()) }
     factory { AttendeeService(get(), get(), get()) }
@@ -139,7 +145,7 @@ val viewModelModule = module {
     viewModel { EventDetailsViewModel(get(), get()) }
     viewModel { SearchViewModel(get(), get(), get(), get()) }
     viewModel { AttendeeViewModel(get(), get(), get(), get(), get(), get(), get()) }
-    viewModel { SearchLocationViewModel(get()) }
+    viewModel { SearchLocationViewModel(get(), get()) }
     viewModel { TicketsViewModel(get(), get(), get(), get()) }
     viewModel { AboutEventViewModel(get(), get()) }
     viewModel { SocialLinksViewModel(get(), get()) }
@@ -190,7 +196,7 @@ val networkModule = module {
                 SignUp::class.java, Ticket::class.java, SocialLink::class.java, EventId::class.java,
                 EventTopic::class.java, Attendee::class.java, TicketId::class.java, Order::class.java,
                 AttendeeId::class.java, Charge::class.java, Paypal::class.java, ConfirmOrder::class.java,
-                CustomForm::class.java))
+                CustomForm::class.java, EventLocation::class.java))
             .addConverterFactory(JacksonConverterFactory.create(objectMapper))
             .baseUrl(baseUrl)
             .build()
@@ -240,6 +246,11 @@ val databaseModule = module {
         val database: OpenEventDatabase = get()
         database.orderDao()
     }
+
+    factory {
+        val database: OpenEventDatabase = get()
+        database.eventLocationsDao()
+    }
 }
 
 val fragmentsModule = module {
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventService.kt
@@ -3,6 +3,9 @@ package org.fossasia.openevent.general.event
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Single
+import org.fossasia.openevent.general.event.location.EventLocation
+import org.fossasia.openevent.general.event.location.EventLocationApi
+import org.fossasia.openevent.general.event.location.EventLocationDao
 import org.fossasia.openevent.general.event.topic.EventTopic
 import org.fossasia.openevent.general.event.topic.EventTopicApi
 import org.fossasia.openevent.general.event.topic.EventTopicsDao
@@ -12,7 +15,9 @@ class EventService(
     private val eventApi: EventApi,
     private val eventDao: EventDao,
     private val eventTopicApi: EventTopicApi,
-    private val eventTopicsDao: EventTopicsDao
+    private val eventTopicsDao: EventTopicsDao,
+    private val eventLocationApi: EventLocationApi,
+    private val eventLocationDao: EventLocationDao
 ) {
 
     fun getEvents(): Flowable<List<Event>> {
@@ -33,6 +38,23 @@ class EventService(
         }
     }
 
+    fun getEventLocations(): Flowable<List<EventLocation>> {
+        val eventsLocationFlowable = eventLocationDao.getAllEventLocation()
+        return eventsLocationFlowable.switchMap {
+            if (it.isNotEmpty())
+                eventsLocationFlowable
+            else
+                eventLocationApi.getEventLocation()
+                    .map {
+                        eventLocationDao.insertEventLocations(it)
+                    }
+                    .toFlowable()
+                    .flatMap {
+                        eventsLocationFlowable
+                    }
+        }
+    }
+
     private fun getEventTopicList(eventsList: List<Event>): List<EventTopic?> {
         return eventsList
                 .filter { it.eventTopic != null }
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/location/EventLocation.kt b/app/src/main/java/org/fossasia/openevent/general/event/location/EventLocation.kt
@@ -0,0 +1,17 @@
+package org.fossasia.openevent.general.event.location
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.github.jasminb.jsonapi.LongIdHandler
+import com.github.jasminb.jsonapi.annotations.Id
+import com.github.jasminb.jsonapi.annotations.Type
+
+@Type("event-location")
+@Entity
+data class EventLocation(
+    @Id(LongIdHandler::class)
+    @PrimaryKey
+    val id: Long?,
+    val name: String?,
+    val slug: String?
+)
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/location/EventLocationApi.kt b/app/src/main/java/org/fossasia/openevent/general/event/location/EventLocationApi.kt
@@ -0,0 +1,10 @@
+package org.fossasia.openevent.general.event.location
+
+import io.reactivex.Single
+import retrofit2.http.GET
+
+interface EventLocationApi {
+
+    @GET("event-locations?sort=name")
+    fun getEventLocation(): Single<List<EventLocation>>
+}
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/location/EventLocationDao.kt b/app/src/main/java/org/fossasia/openevent/general/event/location/EventLocationDao.kt
@@ -0,0 +1,20 @@
+package org.fossasia.openevent.general.event.location
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.reactivex.Flowable
+
+@Dao
+interface EventLocationDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertEventLocations(eventLocation: List<EventLocation?>)
+
+    @Query("SELECT * from EventLocation")
+    fun getAllEventLocation(): Flowable<List<EventLocation>>
+
+    @Query("DELETE FROM EventLocation")
+    fun deleteAll()
+}
diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationFragment.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -17,8 +18,10 @@ import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.fragment_search_location.view.currentLocationLinearLayout
 import kotlinx.android.synthetic.main.fragment_search_location.view.locationProgressBar
 import kotlinx.android.synthetic.main.fragment_search_location.view.locationSearchView
+import kotlinx.android.synthetic.main.fragment_search_location.view.eventLocationLv
 import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.utils.Utils
+import org.fossasia.openevent.general.utils.extensions.nonNull
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.fossasia.openevent.general.utils.Utils.setToolbar
 
@@ -29,11 +32,28 @@ class SearchLocationFragment : Fragment() {
     private val searchLocationViewModel by viewModel<SearchLocationViewModel>()
     private val geoLocationViewModel by viewModel<GeoLocationViewModel>()
     private val safeArgs: SearchLocationFragmentArgs by navArgs()
+    private val eventLocationList: MutableList<String> = ArrayList()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         rootView = inflater.inflate(R.layout.fragment_search_location, container, false)
         setToolbar(activity, hasUpEnabled = true, show = true)
         setHasOptionsMenu(true)
+        searchLocationViewModel.loadEventsLocation()
+        val adapter = ArrayAdapter(context, android.R.layout.simple_list_item_1, eventLocationList)
+        rootView.eventLocationLv.adapter = adapter
+
+        searchLocationViewModel.eventLocations
+            .nonNull()
+            .observe(this, Observer { list ->
+                list.forEach {
+                    eventLocationList.add(it.name ?: "")
+                }
+                adapter.notifyDataSetChanged()
+            })
+        rootView.eventLocationLv.setOnItemClickListener { parent, view, position, id ->
+            searchLocationViewModel.saveSearch(eventLocationList[position])
+            redirectToMain()
+        }
 
         geoLocationViewModel.currentLocationVisibility.observe(viewLifecycleOwner, Observer {
             rootView.currentLocationLinearLayout.visibility = View.GONE
diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchLocationViewModel.kt
@@ -1,13 +1,40 @@
 package org.fossasia.openevent.general.search
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
 import org.fossasia.openevent.general.data.Preference
+import org.fossasia.openevent.general.event.EventService
+import org.fossasia.openevent.general.event.location.EventLocation
+import timber.log.Timber
 
 const val SAVED_LOCATION = "LOCATION"
 
-class SearchLocationViewModel(private val preference: Preference) : ViewModel() {
+class SearchLocationViewModel(
+    private val eventService: EventService,
+    private val preference: Preference
+) : ViewModel() {
+
+    private val compositeDisposable = CompositeDisposable()
+    private val mutableEventLocations = MutableLiveData<List<EventLocation>>()
+    val eventLocations: LiveData<List<EventLocation>> = mutableEventLocations
 
     fun saveSearch(query: String) {
         preference.putString(SAVED_LOCATION, query)
     }
+
+    fun loadEventsLocation() {
+        compositeDisposable.add(eventService.getEventLocations()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                mutableEventLocations.value = it
+            }, {
+                Timber.e(it, "Error fetching events")
+            })
+        )
+    }
 }
diff --git a/app/src/main/res/layout/fragment_search_location.xml b/app/src/main/res/layout/fragment_search_location.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -17,12 +16,32 @@
         android:layout_marginRight="@dimen/layout_margin_medium"
         android:inputType="textCapWords"
         app:iconifiedByDefault="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:queryHint="@string/location_hint"
         app:searchIcon="@null" />
 
+    <TextView
+        android:id="@+id/titleTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_margin_large"
+        android:layout_marginLeft="@dimen/layout_margin_large"
+        android:layout_marginTop="@dimen/layout_margin_medium"
+        android:text="@string/popular_locations"
+        android:textColor="@android:color/black"
+        android:textSize="@dimen/heading_text_size" />
+
+    <ListView
+        android:id="@+id/eventLocationLv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/layout_margin_medium"
+        android:layout_marginBottom="8dp"
+        android:layout_marginStart="@dimen/layout_margin_large"
+        android:layout_marginLeft="@dimen/layout_margin_large"
+        android:layout_marginEnd="@dimen/layout_margin_large"
+        android:layout_marginRight="@dimen/layout_margin_large" />
+
+
     <LinearLayout
         android:id="@+id/currentLocationLinearLayout"
         android:layout_width="wrap_content"
@@ -34,10 +53,7 @@
         android:layout_marginBottom="@dimen/layout_margin_extra_large"
         android:background="@drawable/round_background"
         android:orientation="horizontal"
-        android:padding="@dimen/padding_medium"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        android:padding="@dimen/padding_medium">
 
         <TextView
             android:layout_width="wrap_content"
@@ -58,4 +74,4 @@
             android:layout_marginLeft="@dimen/layout_margin_large"
             android:visibility="gone" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -292,5 +292,6 @@
 
     <!--social link fragment-->
     <string name="social_link_check_internet_message">Information is not loaded! Please check your internet connection</string>
+    <string name="popular_locations">Popular Locations</string>
 
 </resources>
