Merge pull request #2024 from fossasia/development

iamareebjamal · web-flow · commit 9c6cd6f6169c · 2019-06-29T14:01:22.000+05:30
chore: Release v0.5.0
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,5 +1,5 @@
-name-template: v$NEXT_PATCH_VERSION 🌈
-tag-template: v$NEXT_PATCH_VERSION
+name-template: Release v$NEXT_MINOR_VERSION 🌈
+tag-template: v$NEXT_MINOR_VERSION
 categories:
   - title: 🚀 Features
     label: feature
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         applicationId "com.eventyay.attendee"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 10
-        versionName "0.4.0"
+        versionCode 11
+        versionName "0.5.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
@@ -589,8 +589,6 @@ class EventDetailsFragment : Fragment() {
                 menu.findItem(R.id.open_external_event_url).isVisible = false
             if (currentEvent.codeOfConduct.isNullOrBlank())
                 menu.findItem(R.id.code_of_conduct).isVisible = false
-            if (currentEvent.speakersCall == null)
-                menu.findItem(R.id.call_for_speakers).isVisible = false
             setFavoriteIconFilled(currentEvent.favorite)
         }
         super.onPrepareOptionsMenu(menu)
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
@@ -60,10 +60,6 @@ class EventService(
             .toList()
     }
 
-    fun getEventTopics(): Flowable<List<EventTopic>> {
-        return eventTopicsDao.getAllEventTopics()
-    }
-
     fun getEventTypes(): Single<List<EventType>> {
         return eventTypesApi.getEventTypes()
     }
@@ -85,6 +81,9 @@ class EventService(
         val query = "[{\"name\":\"location-name\",\"op\":\"ilike\",\"val\":\"%$locationName%\"}," +
             "{\"name\":\"ends-at\",\"op\":\"ge\",\"val\":\"%${EventUtils.getTimeInISO8601(Date())}%\"}]"
         return eventApi.searchEvents("name", query).flatMapPublisher { apiList ->
+            apiList.forEach {
+                it.speakersCall?.let { sc -> speakersCallDao.insertSpeakerCall(sc) }
+            }
             updateFavorites(apiList)
         }
     }
diff --git a/app/src/main/java/org/fossasia/openevent/general/search/SearchResultsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/search/SearchResultsFragment.kt
@@ -27,6 +27,7 @@ import kotlinx.android.synthetic.main.fragment_search_results.view.eventsRecycle
 import kotlinx.android.synthetic.main.fragment_search_results.view.noSearchResults
 import kotlinx.android.synthetic.main.fragment_search_results.view.shimmerSearch
 import kotlinx.android.synthetic.main.fragment_search_results.view.toolbar
+import kotlinx.android.synthetic.main.fragment_search_results.view.toolbarLayout
 import kotlinx.android.synthetic.main.fragment_search_results.view.searchText
 import kotlinx.android.synthetic.main.fragment_search_results.view.filter
 import kotlinx.android.synthetic.main.fragment_search_results.view.clearSearchText
@@ -51,6 +52,7 @@ import org.fossasia.openevent.general.utils.Utils.hideSoftKeyboard
 import org.fossasia.openevent.general.utils.Utils.showSoftKeyboard
 import org.fossasia.openevent.general.utils.extensions.setPostponeSharedElementTransition
 import org.fossasia.openevent.general.utils.extensions.setStartPostponedEnterTransition
+import kotlin.math.abs
 
 class SearchResultsFragment : Fragment(), CompoundButton.OnCheckedChangeListener {
 
@@ -263,11 +265,13 @@ class SearchResultsFragment : Fragment(), CompoundButton.OnCheckedChangeListener
         })
 
         rootView.appBar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, offset ->
-            if (Math.abs(offset) == appBarLayout.totalScrollRange) {
+            if (abs(offset) == appBarLayout.totalScrollRange) {
                 rootView.toolbarTitle.text = if (rootView.searchText.text.isNullOrBlank())
                     getString(R.string.search_hint) else rootView.searchText.text.toString()
+                rootView.toolbarLayout.elevation = resources.getDimension(R.dimen.custom_toolbar_elevation)
             } else {
                 rootView.toolbarTitle.text = ""
+                rootView.toolbarLayout.elevation = 0F
             }
         })
 
diff --git a/app/src/main/java/org/fossasia/openevent/general/speakercall/SpeakersCallFragment.kt b/app/src/main/java/org/fossasia/openevent/general/speakercall/SpeakersCallFragment.kt
@@ -38,21 +38,6 @@ class SpeakersCallFragment : Fragment() {
     private val speakersCallViewModel by viewModel<SpeakersCallViewModel>()
     private val safeArgs: SpeakersCallFragmentArgs by navArgs()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (speakersCallViewModel.isLoggedIn()) {
-            val currentUser = speakersCallViewModel.user.value
-            if (currentUser == null) {
-                speakersCallViewModel.loadMyUserAndSpeaker(safeArgs.eventId, safeArgs.eventIdentifier)
-            } else {
-                val currentSpeaker = speakersCallViewModel.speaker.value
-                if (currentSpeaker == null) {
-                    speakersCallViewModel.loadMySpeaker(currentUser, safeArgs.eventId, safeArgs.eventIdentifier)
-                }
-            }
-        }
-    }
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         rootView = inflater.inflate(R.layout.fragment_speakers_call, container, false)
 
@@ -85,6 +70,18 @@ class SpeakersCallFragment : Fragment() {
                 showEmptyView(false)
             })
 
+        if (speakersCallViewModel.isLoggedIn()) {
+            val currentUser = speakersCallViewModel.user.value
+            if (currentUser == null) {
+                speakersCallViewModel.loadMyUserAndSpeaker(safeArgs.eventId, safeArgs.eventIdentifier)
+            } else {
+                val currentSpeaker = speakersCallViewModel.speaker.value
+                if (currentSpeaker == null) {
+                    speakersCallViewModel.loadMySpeaker(currentUser, safeArgs.eventId, safeArgs.eventIdentifier)
+                }
+            }
+        }
+
         speakersCallViewModel.loadSpeakersCall(safeArgs.eventId)
         return rootView
     }
@@ -150,9 +147,9 @@ class SpeakersCallFragment : Fragment() {
     }
 
     private fun showEmptyView(show: Boolean) {
-        rootView.speakersCallContainer.visibility = if (show) View.GONE else View.VISIBLE
-        rootView.speakersCallEmptyView.visibility = if (show) View.VISIBLE else View.GONE
-        if (show) rootView.submitProposalButton.visibility = View.GONE
+        rootView.speakersCallContainer.isVisible = !show
+        rootView.speakersCallEmptyView.isVisible = show
+        if (show) rootView.submitProposalButton.isVisible = false
     }
 
     private fun loadSpeakersCallSection(speakersCall: SpeakersCall) {
diff --git a/app/src/main/java/org/fossasia/openevent/general/speakercall/SpeakersCallViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/speakercall/SpeakersCallViewModel.kt
@@ -31,13 +31,13 @@ class SpeakersCallViewModel(
     val speakersCall: LiveData<SpeakersCall> = mutableSpeakersCall
     private val mutableMessage = SingleLiveEvent<String>()
     val message: LiveData<String> = mutableMessage
-    private val mutableProgress = MutableLiveData<Boolean>(true)
+    private val mutableProgress = MutableLiveData(true)
     val progress: LiveData<Boolean> = mutableProgress
     private val mutableSpeaker = MutableLiveData<Speaker>()
     val speaker: LiveData<Speaker> = mutableSpeaker
     private val mutableUser = MutableLiveData<User>()
     val user: LiveData<User> = mutableUser
-    private val mutableEmptySpeakersCall = MutableLiveData<Boolean>(true)
+    private val mutableEmptySpeakersCall = MutableLiveData<Boolean>()
     val emptySpeakersCall: LiveData<Boolean> = mutableEmptySpeakersCall
 
     fun isLoggedIn(): Boolean = authHolder.isLoggedIn()
diff --git a/app/src/main/res/layout/fragment_search_results.xml b/app/src/main/res/layout/fragment_search_results.xml
@@ -7,15 +7,20 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <androidx.cardview.widget.CardView
+        android:id="@+id/toolbarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="0dp"
+        app:layout_constraintTop_toTopOf="parent">
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:background="@color/colorPrimary"
         app:titleTextColor="@color/black"
         android:layout_width="match_parent"
         app:navigationIcon="@drawable/ic_arrow_back_black"
         android:layout_height="wrap_content"
-        android:backgroundTint="@color/white"
-        app:layout_constraintTop_toTopOf="parent">
+        android:backgroundTint="@color/white">
         <TextView
             android:id="@+id/toolbarTitle"
             style = "@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
@@ -31,6 +36,7 @@
             android:tint="@color/black"
             android:src="@drawable/ic_filter"/>
     </androidx.appcompat.widget.Toolbar>
+    </androidx.cardview.widget.CardView>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"

Original file line number	Diff line number	Diff line change
`@@ -589,8 +589,6 @@ class EventDetailsFragment : Fragment() {`
`589`	`589`	`menu.findItem(R.id.open_external_event_url).isVisible = false`
`590`	`590`	`if (currentEvent.codeOfConduct.isNullOrBlank())`
`591`	`591`	`menu.findItem(R.id.code_of_conduct).isVisible = false`
`592`		`- if (currentEvent.speakersCall == null)`
`593`		`- menu.findItem(R.id.call_for_speakers).isVisible = false`
`594`	`592`	`setFavoriteIconFilled(currentEvent.favorite)`
`595`	`593`	`}`
`596`	`594`	`super.onPrepareOptionsMenu(menu)`
Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,6 @@ class EventService(`
`60`	`60`	`.toList()`
`61`	`61`	`}`
`62`	`62`
`63`		`- fun getEventTopics(): Flowable<List<EventTopic>> {`
`64`		`- return eventTopicsDao.getAllEventTopics()`
`65`		`- }`
`66`		`-`
`67`	`63`	`fun getEventTypes(): Single<List<EventType>> {`
`68`	`64`	`return eventTypesApi.getEventTypes()`
`69`	`65`	`}`
`@@ -85,6 +81,9 @@ class EventService(`
`85`	`81`	`val query = "[{\"name\":\"location-name\",\"op\":\"ilike\",\"val\":\"%$locationName%\"}," +`
`86`	`82`	`"{\"name\":\"ends-at\",\"op\":\"ge\",\"val\":\"%${EventUtils.getTimeInISO8601(Date())}%\"}]"`
`87`	`83`	`return eventApi.searchEvents("name", query).flatMapPublisher { apiList ->`
	`84`	`+ apiList.forEach {`
	`85`	`+ it.speakersCall?.let { sc -> speakersCallDao.insertSpeakerCall(sc) }`
	`86`	`+ }`
`88`	`87`	`updateFavorites(apiList)`
`89`	`88`	`}`
`90`	`89`	`}`