diff --git a/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt b/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt
index 49206069a..2183cff3b 100644
--- a/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/data/Resource.kt
@@ -12,7 +12,7 @@ class Resource {
fun getString(@StringRes resId: Int) = context?.getString(resId)
- fun getString(@StringRes resId: Int, vararg args: Any?) = context?.getString(resId, args)
+ fun getString(@StringRes resId: Int, vararg args: Any?) = context?.getString(resId, args[0])
fun getColor(@ColorRes resId: Int) = context?.resources?.getColor(resId)
}
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
index 36cffe681..384052984 100644
--- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt
@@ -400,7 +400,7 @@ class EventDetailsFragment : Fragment() {
.nonNull()
.observe(viewLifecycleOwner, Observer { similarEvents ->
similarEventsAdapter.submitList(similarEvents)
- })
+ })
}
private fun loadEvent(event: Event) {
@@ -462,10 +462,10 @@ class EventDetailsFragment : Fragment() {
rootView.eventLocationLinearLayout.setOnClickListener(mapClickListener)
Picasso.get()
- .load(eventViewModel.loadMap(event))
- .placeholder(R.drawable.ic_map_black)
- .error(R.drawable.ic_map_black)
- .into(rootView.imageMap)
+ .load(eventViewModel.loadMap(event))
+ .placeholder(R.drawable.ic_map_black)
+ .error(R.drawable.ic_map_black)
+ .into(rootView.imageMap)
} else {
rootView.imageMap.isVisible = false
}
@@ -529,7 +529,9 @@ class EventDetailsFragment : Fragment() {
val currentSocialLinks = eventViewModel.socialLinks.value
if (currentSocialLinks == null) {
- currentEvent?.let { eventViewModel.fetchSocialLink(it.id) }
+ currentEvent?.let {
+ eventViewModel.fetchSocialLink(it.id)
+ }
} else {
socialLinkAdapter.addAll(currentSocialLinks)
rootView.socialLinkContainer.isVisible = currentSocialLinks.isNotEmpty()
@@ -602,7 +604,10 @@ class EventDetailsFragment : Fragment() {
currentEvent = it
} else {
EventUtils.showLoginToLikeDialog(requireContext(), layoutInflater, object : RedirectToLogin {
- override fun goBackToLogin() { redirectToLogin() } }, it.originalImageUrl, it.name)
+ override fun goBackToLogin() {
+ redirectToLogin()
+ }
+ }, it.originalImageUrl, it.name)
}
}
true
@@ -620,8 +625,8 @@ class EventDetailsFragment : Fragment() {
}
R.id.code_of_conduct -> {
currentEvent?.let { event ->
- findNavController(rootView)
- .navigate(EventDetailsFragmentDirections.actionEventDetailsToConductCode(event.id))
+ findNavController(rootView)
+ .navigate(EventDetailsFragmentDirections.actionEventDetailsToConductCode(event.id))
}
return true
}
@@ -758,21 +763,23 @@ class EventDetailsFragment : Fragment() {
.show()
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
layout.feedback.addTextChangedListener(object : TextWatcher {
- override fun afterTextChanged(p0: Editable?) {
+ override fun afterTextChanged(p0: Editable?) {
- if (layout.feedback.text.toString().isNotEmpty()) {
- layout.feedbackTextInputLayout.error = null
- alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
- layout.feedbackTextInputLayout.isErrorEnabled = false
- } else {
- layout.feedbackTextInputLayout.error = getString(R.string.cant_be_empty)
- }
+ if (layout.feedback.text.toString().isNotEmpty()) {
+ layout.feedbackTextInputLayout.error = null
+ alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
+ layout.feedbackTextInputLayout.isErrorEnabled = false
+ } else {
+ layout.feedbackTextInputLayout.error = getString(R.string.cant_be_empty)
}
+ }
- override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ }
+ override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/
+ }
- override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ }
- })
+ override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/
+ }
+ })
}
private fun moveToSponsorSection() {
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt
index b39ce31df..4f29f7e51 100644
--- a/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/event/EventDetailsViewModel.kt
@@ -122,6 +122,7 @@ class EventDetailsViewModel(
mutablePopMessage.value = resource.getString(R.string.error_submitting_feedback)
})
}
+
fun fetchEventSpeakers(id: Long) {
if (id == -1L) return
diff --git a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt
index b5c55abf5..b92eddb18 100644
--- a/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt
+++ b/app/src/main/java/org/fossasia/openevent/general/event/EventsFragment.kt
@@ -122,8 +122,7 @@ class EventsFragment : Fragment(), BottomIconDoubleClick {
showEmptyMessage(eventsListAdapter.currentList?.isEmpty() ?: true)
})
- eventsViewModel.progress
- .nonNull()
+ eventsViewModel.progress.nonNull()
.observe(viewLifecycleOwner, Observer {
if (it) {
rootView.shimmerEvents.startShimmer()
@@ -132,6 +131,7 @@ class EventsFragment : Fragment(), BottomIconDoubleClick {
} else {
rootView.shimmerEvents.stopShimmer()
rootView.swiperefresh.isRefreshing = false
+ showEmptyMessage(eventsListAdapter.currentList?.isEmpty() ?: true)
}
rootView.shimmerEvents.isVisible = it
})
@@ -237,7 +237,7 @@ class EventsFragment : Fragment(), BottomIconDoubleClick {
val eventClickListener: EventClickListener = object : EventClickListener {
override fun onClick(eventID: Long, imageView: ImageView) {
findNavController(rootView).navigate(EventsFragmentDirections.actionEventsToEventsDetail(eventID),
- FragmentNavigatorExtras(imageView to "eventDetailImage"))
+ FragmentNavigatorExtras(imageView to "eventDetailImage"))
}
}
@@ -297,11 +297,11 @@ class EventsFragment : Fragment(), BottomIconDoubleClick {
}
private fun openSearch(hashTag: String) {
- findNavController(rootView).navigate(EventsFragmentDirections.actionEventsToSearchResults(
- query = "",
- location = Preference().getString(SAVED_LOCATION).toString(),
- date = getString(R.string.anytime),
- type = hashTag))
+ findNavController(rootView).navigate(EventsFragmentDirections.actionEventsToSearchResults(
+ query = "",
+ location = Preference().getString(SAVED_LOCATION).toString(),
+ date = getString(R.string.anytime),
+ type = hashTag))
}
private fun showNoInternetScreen(show: Boolean) {
@@ -363,9 +363,11 @@ class EventsFragment : Fragment(), BottomIconDoubleClick {
}
}
- override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ }
+ override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/
+ }
- override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ }
+ override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/
+ }
})
layout.confirmNewPassword.addTextChangedListener(object : TextWatcher {
@@ -392,9 +394,11 @@ class EventsFragment : Fragment(), BottomIconDoubleClick {
}
}
- override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ }
+ override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/
+ }
- override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/ }
+ override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { /*Implement here*/
+ }
})
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1e7f8d626..b0d0b3bc3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -343,7 +343,7 @@
Please provide first name and last name!
Error updating user!
User updated successfully!
- "Error fetching %1$s for the event
+ Error fetching %1$s for the event
Fail on submitting the feedback
Error getting feedback for this event
There are no feedback for this event.