File tree Expand file tree Collapse file tree 8 files changed +39
-12
lines changed
java/org/fossasia/openevent/general
fastlane/metadata/android/en-US/changelogs Expand file tree Collapse file tree 8 files changed +39
-12
lines changed Original file line number Diff line number Diff line change @@ -22,8 +22,8 @@ android {
22
22
applicationId " com.eventyay.attendee"
23
23
minSdkVersion 21
24
24
targetSdkVersion 28
25
- versionCode 12
26
- versionName " 0.6.0 "
25
+ versionCode 13
26
+ versionName " 0.6.1 "
27
27
testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
28
28
vectorDrawables. useSupportLibrary = true
29
29
multiDexEnabled true
Original file line number Diff line number Diff line change @@ -267,7 +267,7 @@ class EventDetailsFragment : Fragment() {
267
267
.nonNull()
268
268
.observe(viewLifecycleOwner, Observer {
269
269
rootView.feedbackProgress.isVisible = it
270
- rootView.feedbackBtn.isEnabled = ! it
270
+ rootView.feedbackBtn.isVisible = ! it
271
271
})
272
272
273
273
eventViewModel.eventFeedback.observe(viewLifecycleOwner, Observer {
@@ -286,7 +286,10 @@ class EventDetailsFragment : Fragment() {
286
286
eventViewModel.submittedFeedback
287
287
.nonNull()
288
288
.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
290
293
rootView.feedbackRv.isVisible = true
291
294
rootView.noFeedBackTv.isVisible = false
292
295
})
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ class SearchTypeFragment : Fragment() {
28
28
private val searchTypeViewModel by viewModel<SearchTypeViewModel >()
29
29
private val safeArgs: SearchTypeFragmentArgs by navArgs()
30
30
private lateinit var rootView: View
31
- private val eventTypesList: MutableList <String > = arrayListOf (getString( R .string.anything) )
31
+ private val eventTypesList = ArrayList <String >( )
32
32
33
33
override fun onCreateView (
34
34
inflater : LayoutInflater ,
@@ -41,6 +41,7 @@ class SearchTypeFragment : Fragment() {
41
41
rootView.eventTypesRecyclerView.layoutManager = LinearLayoutManager (activity)
42
42
rootView.eventTypesRecyclerView.adapter = typesAdapter
43
43
searchTypeViewModel.loadEventTypes()
44
+ eventTypesList.add(getString(R .string.anything))
44
45
45
46
searchTypeViewModel.connection
46
47
.nonNull()
Original file line number Diff line number Diff line change 557
557
558
558
<Button
559
559
android : id =" @+id/feedbackBtn"
560
+ style =" @style/ThreeDS2TextButtonStyle"
561
+ android : textAllCaps =" true"
560
562
android : layout_width =" match_parent"
561
563
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"
565
565
android : layout_marginBottom =" @dimen/layout_margin_large"
566
+ android : textColor =" @color/colorAccent"
566
567
android : text =" @string/write_feedback" />
567
568
</LinearLayout >
568
569
Original file line number Diff line number Diff line change 40
40
layout =" @layout/content_event"
41
41
android : layout_width =" match_parent"
42
42
android : layout_height =" match_parent"
43
- android : layout_marginBottom =" @dimen/event_details_divider_margin "
43
+ android : layout_marginBottom =" @dimen/layout_margin_extreme_large "
44
44
bind : event =" @{event}" />
45
45
46
46
<View
Original file line number Diff line number Diff line change 356
356
<string name =" and_i_m_up_for" >And I\'m up for</string >
357
357
<string name =" what_type" >What Sounds good?</string >
358
358
<string name =" feedback" >Feedback</string >
359
- <string name =" write_feedback" >Write Feedback </string >
359
+ <string name =" write_feedback" >Write a feedback </string >
360
360
<string name =" submit" >Submit</string >
361
361
<string name =" submit_feedback" >Submit Feedback</string >
362
362
<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 >
364
364
<string name =" frequently_asked_questions" >Frequently Asked Questions</string >
365
365
<string name =" no_faq_message" >There are no frequenly asked questions for this event.</string >
366
366
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change @@ -66,5 +66,6 @@ if [ "$TRAVIS_BRANCH" != "$PUBLISH_BRANCH" ]; then
66
66
exit 0
67
67
fi
68
68
69
+ cd ..
69
70
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
You can’t perform that action at this time.
0 commit comments