Skip to content

Commit 8ec07e4

Browse files
chore: Release v1.3.0 (#1728)
chore: Release v1.3.0 Co-authored-by: Mario Behling <[email protected]> Co-authored-by: Areeb Jamal <[email protected]>
2 parents 8b68d7a + 06a2889 commit 8ec07e4

File tree

76 files changed

+1565
-656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1565
-656
lines changed

.travis.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ jdk:
55
android:
66
components:
77
- tools
8-
- android-27
9-
- build-tools-27.0.3
8+
- android-28
9+
- build-tools-28.0.3
1010
- platform-tools
1111
before_cache:
1212
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -16,8 +16,6 @@ cache:
1616
- "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/"
1717
- "$HOME/.gradle/caches/"
1818
- "$HOME/.gradle/wrapper/"
19-
install:
20-
- echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-28"
2119
script:
2220
- ./gradlew build
2321
- ./gradlew testPlayStoreDebugUnitTestCoverage

README.md

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Open Event Organizer](https://storage.googleapis.com/eventyay.com/assets/branding/organizer_app_branding.png)
1+
![Open Event Organizer](docs/images/organizer_app_branding.png)
22

33

44
## Open Event Organizer App
@@ -8,10 +8,11 @@
88
[![Codecov Coverage](https://img.shields.io/codecov/c/github/fossasia/open-event-orga-app/development.svg)](https://codecov.io/gh/fossasia/open-event-orga-app)
99
[![Appetize Preview](https://img.shields.io/badge/Preview-appetize.io-673AB7.svg)](https://appetize.io/app/w8v8z7pc9aewargb2uuyf108f0)
1010
[![Gitter](https://img.shields.io/badge/chat-on%20gitter-ff006f.svg)](https://gitter.im/fossasia/open-event-orga-app)
11+
[![Twitter Follow](https://img.shields.io/twitter/follow/eventyay.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/eventyay)
1112

1213
Event management app for organizers using Open Event Platform
1314

14-
<img height="256px" src="https://user-images.githubusercontent.com/3874064/29111547-5814a318-7d08-11e7-8c86-0a10a640825e.png" />
15+
<img height="256px" src="docs/images/organizer_app_logo.png" />
1516

1617
The core features of this Android Application are
1718
- Scan a QR code
@@ -43,19 +44,19 @@ Our chat channel is on gitter here: https://gitter.im/fossasia/open-event-orga-a
4344

4445
<table>
4546
<tr>
46-
<td><img src="docs/_static/login.png"></td>
47-
<td><img src="docs/_static/dashboard_one.png"></td>
48-
<td><img src="docs/_static/dashboard_two.png"></td>
47+
<td><img src="docs/images/login.png"></td>
48+
<td><img src="docs/images/dashboard_one.png"></td>
49+
<td><img src="docs/images/dashboard_two.png"></td>
4950
</tr>
5051
<tr>
51-
<td><img src="docs/_static/attendees.png"></td>
52-
<td><img src="docs/_static/checkin.png"></td>
53-
<td><img src="docs/_static/order_checkin.png"></td>
52+
<td><img src="docs/images/attendees.png"></td>
53+
<td><img src="docs/images/checkin.png"></td>
54+
<td><img src="docs/images/order_checkin.png"></td>
5455
</tr>
5556
<tr>
56-
<td><img src="docs/_static/create_ticket.png"></td>
57-
<td><img src="docs/_static/navigation.png"></td>
58-
<td><img src="docs/_static/organizer.png"></td>
57+
<td><img src="docs/images/create_ticket.png"></td>
58+
<td><img src="docs/images/navigation.png"></td>
59+
<td><img src="docs/images/organizer.png"></td>
5960
</tr>
6061
</table>
6162

@@ -64,11 +65,6 @@ Our chat channel is on gitter here: https://gitter.im/fossasia/open-event-orga-a
6465
- The [Open Event Organizer Server](https://github.com/fossasia/open-event-orga-server) acts as the backend for this application. The API docs for the same can be accessed at https://open-event-api-dev.herokuapp.com/ .
6566
- The following account can be used for testing and development purposes.
6667

67-
68-
69-
Password: fossasia
70-
71-
7268
## Publishing
7369

7470
Each push to master branch automatically publishes the application to Play Store as an Alpha Release. Thus, on each merge into master, the `versionCode` and `versionName` **MUST** be changed accordingly in `app/build.gradle`

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
applicationId "com.eventyay.organizer"
2525
minSdkVersion versions.minSdk
2626
targetSdkVersion versions.targetSdk
27-
versionCode 12
28-
versionName "1.2.1"
27+
versionCode 13
28+
versionName "1.3.0"
2929
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
vectorDrawables.useSupportLibrary = true
3131
manifestPlaceholders = [

app/src/main/java/com/eventyay/organizer/common/di/module/ApiModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.eventyay.organizer.data.feedback.FeedbackApi;
1010
import com.eventyay.organizer.data.notification.NotificationApi;
1111
import com.eventyay.organizer.data.order.OrderApi;
12-
import com.eventyay.organizer.data.roles.RoleApi;
12+
import com.eventyay.organizer.data.role.RoleApi;
1313
import com.eventyay.organizer.data.session.SessionApi;
1414
import com.eventyay.organizer.data.speaker.SpeakerApi;
1515
import com.eventyay.organizer.data.speakerscall.SpeakersCallApi;

app/src/main/java/com/eventyay/organizer/common/di/module/ChangeListenerModule.java

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.eventyay.organizer.data.db.DbFlowDatabaseChangeListener;
77
import com.eventyay.organizer.data.event.Event;
88
import com.eventyay.organizer.data.faq.Faq;
9+
import com.eventyay.organizer.data.role.RoleInvite;
910
import com.eventyay.organizer.data.notification.Notification;
1011
import com.eventyay.organizer.data.session.Session;
1112
import com.eventyay.organizer.data.speaker.Speaker;
@@ -70,6 +71,11 @@ DatabaseChangeListener<Event> providesEventChangeListener() {
7071
return new DbFlowDatabaseChangeListener<>(Event.class);
7172
}
7273

74+
@Provides
75+
DatabaseChangeListener<RoleInvite> providesRoleListChangeListener() {
76+
return new DbFlowDatabaseChangeListener<>(RoleInvite.class);
77+
}
78+
7379
@Provides
7480
DatabaseChangeListener<Notification> providesNotificationsChangeListener() {
7581
return new DbFlowDatabaseChangeListener<>(Notification.class);

app/src/main/java/com/eventyay/organizer/common/di/module/NetworkModule.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import com.eventyay.organizer.data.notification.Notification;
1414
import com.eventyay.organizer.data.order.Order;
1515
import com.eventyay.organizer.data.order.OrderStatistics;
16-
import com.eventyay.organizer.data.roles.Role;
17-
import com.eventyay.organizer.data.roles.RoleInvite;
16+
import com.eventyay.organizer.data.role.Role;
17+
import com.eventyay.organizer.data.role.RoleInvite;
1818
import com.eventyay.organizer.data.session.Session;
1919
import com.eventyay.organizer.data.speaker.Speaker;
2020
import com.eventyay.organizer.data.speakerscall.SpeakersCall;

app/src/main/java/com/eventyay/organizer/common/di/module/RepoModule.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import com.eventyay.organizer.data.notification.NotificationRepositoryImpl;
1717
import com.eventyay.organizer.data.order.OrderRepository;
1818
import com.eventyay.organizer.data.order.OrderRepositoryImpl;
19-
import com.eventyay.organizer.data.roles.RoleRepository;
20-
import com.eventyay.organizer.data.roles.RoleRepositoryImpl;
19+
import com.eventyay.organizer.data.role.RoleRepository;
20+
import com.eventyay.organizer.data.role.RoleRepositoryImpl;
2121
import com.eventyay.organizer.data.session.SessionRepository;
2222
import com.eventyay.organizer.data.session.SessionRepositoryImpl;
2323
import com.eventyay.organizer.data.speaker.SpeakerRepository;

app/src/main/java/com/eventyay/organizer/common/di/module/ViewModelModule.java

+25-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
import com.eventyay.organizer.common.di.OrgaViewModelFactory;
77
import com.eventyay.organizer.core.attendee.checkin.AttendeeCheckInViewModel;
88
import com.eventyay.organizer.core.attendee.history.CheckInHistoryViewModel;
9+
import com.eventyay.organizer.core.attendee.qrscan.ScanQRViewModel;
910
import com.eventyay.organizer.core.auth.login.LoginViewModel;
1011
import com.eventyay.organizer.core.auth.reset.ResetPasswordViewModel;
1112
import com.eventyay.organizer.core.auth.signup.SignUpViewModel;
1213
import com.eventyay.organizer.core.auth.start.StartViewModel;
14+
import com.eventyay.organizer.core.event.about.AboutEventViewModel;
15+
import com.eventyay.organizer.core.event.chart.ChartViewModel;
1316
import com.eventyay.organizer.core.event.copyright.CreateCopyrightViewModel;
1417
import com.eventyay.organizer.core.event.copyright.update.UpdateCopyrightViewModel;
1518
import com.eventyay.organizer.core.event.create.CreateEventViewModel;
@@ -27,7 +30,8 @@
2730
import com.eventyay.organizer.core.organizer.detail.OrganizerDetailViewModel;
2831
import com.eventyay.organizer.core.organizer.password.ChangePasswordViewModel;
2932
import com.eventyay.organizer.core.organizer.update.UpdateOrganizerInfoViewModel;
30-
import com.eventyay.organizer.core.roleinvite.RoleInviteViewModel;
33+
import com.eventyay.organizer.core.role.list.RoleListViewModel;
34+
import com.eventyay.organizer.core.role.invite.RoleInviteViewModel;
3135
import com.eventyay.organizer.core.settings.autocheckin.AutoCheckInViewModel;
3236
import com.eventyay.organizer.core.settings.restriction.TicketSettingsViewModel;
3337
import com.eventyay.organizer.core.share.ShareEventViewModel;
@@ -61,6 +65,16 @@ public abstract class ViewModelModule {
6165
@ViewModelKey(ResetPasswordViewModel.class)
6266
public abstract ViewModel bindResetPasswordViewModel(ResetPasswordViewModel resetPasswordViewModel);
6367

68+
@Binds
69+
@IntoMap
70+
@ViewModelKey(AboutEventViewModel.class)
71+
public abstract ViewModel bindAboutEventViewModel(AboutEventViewModel aboutEventViewModel);
72+
73+
@Binds
74+
@IntoMap
75+
@ViewModelKey(ChartViewModel.class)
76+
public abstract ViewModel bindChartViewModel(ChartViewModel chartViewModel);
77+
6478
@Binds
6579
@IntoMap
6680
@ViewModelKey(SpeakerDetailsViewModel.class)
@@ -211,11 +225,21 @@ public abstract class ViewModelModule {
211225
@ViewModelKey(RoleInviteViewModel.class)
212226
public abstract ViewModel bindRoleInvitesViewModel(RoleInviteViewModel roleInviteViewModel);
213227

228+
@Binds
229+
@IntoMap
230+
@ViewModelKey(RoleListViewModel.class)
231+
public abstract ViewModel bindRoleListViewModel(RoleListViewModel roleListViewModel);
232+
214233
@Binds
215234
@IntoMap
216235
@ViewModelKey(NotificationsViewModel.class)
217236
public abstract ViewModel bindNotificationsViewModel(NotificationsViewModel notificationsViewModel);
218237

238+
@Binds
239+
@IntoMap
240+
@ViewModelKey(ScanQRViewModel.class)
241+
public abstract ViewModel bindScanQRViewModel(ScanQRViewModel scanQRViewModel);
242+
219243
@Binds
220244
public abstract ViewModelProvider.Factory bindViewModelFactory(OrgaViewModelFactory factory);
221245

app/src/main/java/com/eventyay/organizer/common/di/module/android/MainFragmentBuildersModule.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
import com.eventyay.organizer.core.notification.list.NotificationsFragment;
1414
import com.eventyay.organizer.core.orders.detail.OrderDetailFragment;
1515
import com.eventyay.organizer.core.orders.list.OrdersFragment;
16-
import com.eventyay.organizer.core.roleinvite.RoleInviteFragment;
16+
import com.eventyay.organizer.core.role.list.RoleListFragment;
17+
import com.eventyay.organizer.core.role.invite.RoleInviteFragment;
1718
import com.eventyay.organizer.core.settings.SettingsFragment;
1819
import com.eventyay.organizer.core.settings.restriction.CheckInRestrictions;
1920
import com.eventyay.organizer.core.share.ShareEventFragment;
@@ -92,10 +93,13 @@ public abstract class MainFragmentBuildersModule {
9293
@ContributesAndroidInjector
9394
abstract FeedbackListFragment contributeFeedbackListFragment();
9495

95-
// RoleInvite
96+
// Role
9697

9798
@ContributesAndroidInjector
98-
abstract RoleInviteFragment contributeRoleInvitesFragment();
99+
abstract RoleInviteFragment contributeRoleInviteFragment();
100+
101+
@ContributesAndroidInjector
102+
abstract RoleListFragment contributeRoleListFragment();
99103

100104
// Sponsor
101105

0 commit comments

Comments
 (0)