Skip to content

Commit 27257a2

Browse files
chore: Release v0.6.1 (#2200)
chore: Release v0.6.1
2 parents 5883908 + 7cecbd5 commit 27257a2

File tree

8 files changed

+39
-12
lines changed

8 files changed

+39
-12
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId "com.eventyay.attendee"
2323
minSdkVersion 21
2424
targetSdkVersion 28
25-
versionCode 12
26-
versionName "0.6.0"
25+
versionCode 13
26+
versionName "0.6.1"
2727
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2828
vectorDrawables.useSupportLibrary = true
2929
multiDexEnabled true

app/src/main/java/org/fossasia/openevent/general/event/EventDetailsFragment.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ class EventDetailsFragment : Fragment() {
267267
.nonNull()
268268
.observe(viewLifecycleOwner, Observer {
269269
rootView.feedbackProgress.isVisible = it
270-
rootView.feedbackBtn.isEnabled = !it
270+
rootView.feedbackBtn.isVisible = !it
271271
})
272272

273273
eventViewModel.eventFeedback.observe(viewLifecycleOwner, Observer {
@@ -286,7 +286,10 @@ class EventDetailsFragment : Fragment() {
286286
eventViewModel.submittedFeedback
287287
.nonNull()
288288
.observe(viewLifecycleOwner, Observer {
289-
feedbackAdapter.add(it)
289+
if (feedbackAdapter.itemCount < LIMITED_FEEDBACK_NUMBER)
290+
feedbackAdapter.add(it)
291+
else
292+
rootView.seeFeedbackTextView.isVisible = true
290293
rootView.feedbackRv.isVisible = true
291294
rootView.noFeedBackTv.isVisible = false
292295
})

app/src/main/java/org/fossasia/openevent/general/search/type/SearchTypeFragment.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class SearchTypeFragment : Fragment() {
2828
private val searchTypeViewModel by viewModel<SearchTypeViewModel>()
2929
private val safeArgs: SearchTypeFragmentArgs by navArgs()
3030
private lateinit var rootView: View
31-
private val eventTypesList: MutableList<String> = arrayListOf(getString(R.string.anything))
31+
private val eventTypesList = ArrayList<String>()
3232

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

4546
searchTypeViewModel.connection
4647
.nonNull()

app/src/main/res/layout/content_event.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -557,12 +557,13 @@
557557

558558
<Button
559559
android:id="@+id/feedbackBtn"
560+
style="@style/ThreeDS2TextButtonStyle"
561+
android:textAllCaps="true"
560562
android:layout_width="match_parent"
561563
android:layout_height="wrap_content"
562-
android:layout_marginTop="@dimen/layout_margin_small"
563-
android:layout_marginStart="@dimen/layout_margin_large"
564-
android:layout_marginEnd="@dimen/layout_margin_large"
564+
android:layout_marginTop="@dimen/layout_margin_medium"
565565
android:layout_marginBottom="@dimen/layout_margin_large"
566+
android:textColor="@color/colorAccent"
566567
android:text="@string/write_feedback" />
567568
</LinearLayout>
568569

app/src/main/res/layout/fragment_event.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
layout="@layout/content_event"
4141
android:layout_width="match_parent"
4242
android:layout_height="match_parent"
43-
android:layout_marginBottom="@dimen/event_details_divider_margin"
43+
android:layout_marginBottom="@dimen/layout_margin_extreme_large"
4444
bind:event="@{event}" />
4545

4646
<View

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,11 @@
356356
<string name="and_i_m_up_for">And I\'m up for</string>
357357
<string name="what_type">What Sounds good?</string>
358358
<string name="feedback">Feedback</string>
359-
<string name="write_feedback">Write Feedback</string>
359+
<string name="write_feedback">Write a feedback</string>
360360
<string name="submit">Submit</string>
361361
<string name="submit_feedback">Submit Feedback</string>
362362
<string name="feedback_submitted">Feedback submitted Successfully</string>
363-
<string name="be_the_first_to_write_a_review">Be the first to write a review</string>
363+
<string name="be_the_first_to_write_a_review">Be the first to write a feedback</string>
364364
<string name="frequently_asked_questions">Frequently Asked Questions</string>
365365
<string name="no_faq_message">There are no frequenly asked questions for this event.</string>
366366

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
**v0.6.1:**
2+
HOTFIX: Fix search filter crashing
3+
4+
**v0.6.0:**
5+
🚀 Features and Enhancements
6+
7+
- Update tickets section and display ticket status
8+
- Add donation tickets
9+
- Verify email and reset password with the app
10+
- Edit profile image
11+
- Improve filtering and sorting
12+
- Add pagination in different sections
13+
- Several UI enhancement
14+
15+
🐛 Bug Fixes
16+
17+
- Multiple crashes
18+
- Fixes for API < 24
19+
- Error handling
20+
- Billing information for paid tickets
21+
- Event's time and timezone

scripts/update-apk.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,6 @@ if [ "$TRAVIS_BRANCH" != "$PUBLISH_BRANCH" ]; then
6666
exit 0
6767
fi
6868

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

0 commit comments

Comments
 (0)