Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
applicationId "com.eventyay.attendee"
minSdkVersion 21
targetSdkVersion 28
versionCode 12
versionName "0.6.0"
versionCode 13
versionName "0.6.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class EventDetailsFragment : Fragment() {
.nonNull()
.observe(viewLifecycleOwner, Observer {
rootView.feedbackProgress.isVisible = it
rootView.feedbackBtn.isEnabled = !it
rootView.feedbackBtn.isVisible = !it
})

eventViewModel.eventFeedback.observe(viewLifecycleOwner, Observer {
Expand All @@ -286,7 +286,10 @@ class EventDetailsFragment : Fragment() {
eventViewModel.submittedFeedback
.nonNull()
.observe(viewLifecycleOwner, Observer {
feedbackAdapter.add(it)
if (feedbackAdapter.itemCount < LIMITED_FEEDBACK_NUMBER)
feedbackAdapter.add(it)
else
rootView.seeFeedbackTextView.isVisible = true
rootView.feedbackRv.isVisible = true
rootView.noFeedBackTv.isVisible = false
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class SearchTypeFragment : Fragment() {
private val searchTypeViewModel by viewModel<SearchTypeViewModel>()
private val safeArgs: SearchTypeFragmentArgs by navArgs()
private lateinit var rootView: View
private val eventTypesList: MutableList<String> = arrayListOf(getString(R.string.anything))
private val eventTypesList = ArrayList<String>()

override fun onCreateView(
inflater: LayoutInflater,
Expand All @@ -41,6 +41,7 @@ class SearchTypeFragment : Fragment() {
rootView.eventTypesRecyclerView.layoutManager = LinearLayoutManager(activity)
rootView.eventTypesRecyclerView.adapter = typesAdapter
searchTypeViewModel.loadEventTypes()
eventTypesList.add(getString(R.string.anything))

searchTypeViewModel.connection
.nonNull()
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/content_event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -557,12 +557,13 @@

<Button
android:id="@+id/feedbackBtn"
style="@style/ThreeDS2TextButtonStyle"
android:textAllCaps="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_margin_small"
android:layout_marginStart="@dimen/layout_margin_large"
android:layout_marginEnd="@dimen/layout_margin_large"
android:layout_marginTop="@dimen/layout_margin_medium"
android:layout_marginBottom="@dimen/layout_margin_large"
android:textColor="@color/colorAccent"
android:text="@string/write_feedback" />
</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
layout="@layout/content_event"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/event_details_divider_margin"
android:layout_marginBottom="@dimen/layout_margin_extreme_large"
bind:event="@{event}" />

<View
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,11 @@
<string name="and_i_m_up_for">And I\'m up for</string>
<string name="what_type">What Sounds good?</string>
<string name="feedback">Feedback</string>
<string name="write_feedback">Write Feedback</string>
<string name="write_feedback">Write a feedback</string>
<string name="submit">Submit</string>
<string name="submit_feedback">Submit Feedback</string>
<string name="feedback_submitted">Feedback submitted Successfully</string>
<string name="be_the_first_to_write_a_review">Be the first to write a review</string>
<string name="be_the_first_to_write_a_review">Be the first to write a feedback</string>
<string name="frequently_asked_questions">Frequently Asked Questions</string>
<string name="no_faq_message">There are no frequenly asked questions for this event.</string>

Expand Down
21 changes: 21 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/13.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
**v0.6.1:**
HOTFIX: Fix search filter crashing

**v0.6.0:**
🚀 Features and Enhancements

- Update tickets section and display ticket status
- Add donation tickets
- Verify email and reset password with the app
- Edit profile image
- Improve filtering and sorting
- Add pagination in different sections
- Several UI enhancement

🐛 Bug Fixes

- Multiple crashes
- Fixes for API < 24
- Error handling
- Billing information for paid tickets
- Event's time and timezone
3 changes: 2 additions & 1 deletion scripts/update-apk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,6 @@ if [ "$TRAVIS_BRANCH" != "$PUBLISH_BRANCH" ]; then
exit 0
fi

cd ..
gem install fastlane
fastlane supply --aab eventyay-attendee-master-app.aab --skip_upload_apk true --track alpha --json_key ../scripts/fastlane.json --package_name $PACKAGE_NAME
fastlane supply --aab ./apk/eventyay-attendee-master-app.aab --skip_upload_apk true --track alpha --json_key ./scripts/fastlane.json --package_name $PACKAGE_NAME