chore: Release v1.1.1 (#1625)

chore: Release v1.1.1
fossasia · May 8, 2019 · 1768a31 · 1768a31
2 parents 9a741d9 + 88e13a0
commit 1768a31
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Build Status](https://img.shields.io/travis/fossasia/open-event-orga-app/development.svg)](https://travis-ci.org/fossasia/open-event-orga-app)
 [![Codacy Grade](https://img.shields.io/codacy/grade/d6ae120356c94c0d94d6449ec540f520.svg)](https://www.codacy.com/app/mb/open-event-orga-app)
 [![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)
-[![Appetize Preview](https://img.shields.io/badge/Preview-appetize.io-673AB7.svg)](https://appetize.io/app/t8hace1jdrybzvwwrfw5p1ayuw)
+[![Appetize Preview](https://img.shields.io/badge/Preview-appetize.io-673AB7.svg)](https://appetize.io/app/w8v8z7pc9aewargb2uuyf108f0)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-ff006f.svg)](https://gitter.im/fossasia/open-event-orga-app)
 > Event management app for organizers using Open Event Platform
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "com.eventyay.organizer"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 8
-        versionName "1.1.0"
+        versionCode 9
+        versionName "1.1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
@@ -122,7 +122,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:1.1.0-alpha04"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0-alpha04"
-    implementation "com.google.android.material:material:1.1.0-alpha05"
+    implementation "com.google.android.material:material:1.1.0-alpha06"
     implementation "androidx.browser:browser:1.0.0"
     implementation "androidx.palette:palette:1.0.0"
     implementation "com.takisoft.fix:preference-v7:${versions.support_lib}.0"
@@ -168,7 +168,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}"
     implementation "com.squareup.retrofit2:converter-jackson:${versions.retrofit}"
     implementation "com.squareup.retrofit2:adapter-rxjava2:${versions.retrofit}"
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
     implementation 'com.github.jasminb:jsonapi-converter:0.9'
 
     // RxJava
@@ -235,16 +235,16 @@ dependencies {
     playStoreImplementation "com.google.android.gms:play-services-oss-licenses:${versions.play_services}"
 
     //Testing
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0-alpha03', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0-beta01', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testImplementation("androidx.arch.core:core-testing:2.1.0-alpha01", {
+    testImplementation("androidx.arch.core:core-testing:2.1.0-alpha02", {
         exclude group: 'com.android.support', module: 'support-compat'
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-core-utils'
     })
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-inline:2.26.0'
+    testImplementation 'org.mockito:mockito-inline:2.27.0'
     testImplementation 'org.json:json:20180130'
     testImplementation "org.robolectric:robolectric:${versions.roboelectric}"
     testImplementation "org.robolectric:shadows-multidex:${versions.roboelectric}"

diff --git a/app/jacoco.gradle b/app/jacoco.gradle
@@ -69,7 +69,7 @@ project.afterEvaluate {
                 reports {
                     xml.enabled = true
                     html.enabled = true
-                    xml.destination "${buildDir}/reports/jacoco/report.xml"
+                    xml.destination file("${buildDir}/reports/jacoco/report.xml")
                 }
             }
         }

diff --git a/app/src/main/java/com/eventyay/organizer/data/event/EventStatistics.java b/app/src/main/java/com/eventyay/organizer/data/event/EventStatistics.java
@@ -22,7 +22,7 @@ public class EventStatistics {
     public String id;
 
     public Long sessions;
-    public Long speakers;
+    public SpeakerStatistics speakers;
     public Long sessionsPending;
     public Long sponsors;
     public Long sessionsSubmitted;

diff --git a/app/src/main/java/com/eventyay/organizer/data/event/SpeakerStatistics.java b/app/src/main/java/com/eventyay/organizer/data/event/SpeakerStatistics.java
@@ -0,0 +1,32 @@
+package com.eventyay.organizer.data.event;
+
+
+import com.github.jasminb.jsonapi.LongIdHandler;
+import com.github.jasminb.jsonapi.annotations.Id;
+import com.github.jasminb.jsonapi.annotations.Type;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+import com.eventyay.organizer.data.db.configuration.OrgaDatabase;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@Type("speakerStatistics")
+@NoArgsConstructor
+@ToString()
+@Table(database = OrgaDatabase.class, allFields = true)
+public class SpeakerStatistics {
+
+    @Id(LongIdHandler.class)
+    @PrimaryKey
+    public Long id;
+
+    public Long accepted;
+    public Long confirmed;
+    public Long pending;
+    public Long rejected;
+    public Long total;
+}
diff --git a/app/src/main/res/layout/bottomsheet_attendee_check_in.xml b/app/src/main/res/layout/bottomsheet_attendee_check_in.xml
@@ -77,6 +77,25 @@
                         android:layerType="software"
                         android:src="@drawable/dotted" />
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:padding="4dp"
+                        android:text="@string/attendee_id"
+                        android:textAllCaps="true"
+                        tools:text="Attendee ID" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/spacing_extra_small"
+                        android:gravity="center_vertical"
+                        android:padding="@dimen/spacing_extra_small"
+                        android:text="@{ checkinAttendee.id }"
+                        android:textColor="@android:color/black"
+                        tools:text="Attendee ID" />
+
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/event_statistics.xml b/app/src/main/res/layout/event_statistics.xml
@@ -180,7 +180,7 @@
                         android:layout_marginBottom="@dimen/spacing_normal"
                         android:layout_marginLeft="@dimen/spacing_large"
                         android:layout_marginStart="@dimen/spacing_large"
-                        android:text="@{ BindingAdapters.longToStr(eventStatistics.speakers) }"
+                        android:text="@{ BindingAdapters.longToStr(eventStatistics.speakers.accepted) }"
                         android:textSize="@dimen/text_size_normal" />
 
                     <TextView

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -382,6 +382,7 @@
     <string name="action_insert_link">Action insert link</string>
     <string name="play_store_link">https://play.google.com/store/apps/details?id=com.eventyay.organizer</string>
     <string name="resend_verification_mail">Resend verification mail</string>
+    <string name="attendee_id">Attendee ID</string>
 
     <string-array name="timezones">
         <item>Africa/Abidjan</item>

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         classpath 'io.sentry:sentry-android-gradle-plugin:1.7.22'
         classpath 'com.noveogroup.android:check:1.2.5'
         classpath "com.google.gms:oss-licenses:0.9.2"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
diff --git a/versions.gradle b/versions.gradle
@@ -17,7 +17,7 @@ versions.rxandroid = '2.1.1'
 versions.rxjava = '2.1.10'
 versions.stetho = '1.5.1'
 versions.stetho_no_op = '1.1'
-versions.roboelectric = '3.8'
+versions.roboelectric = '4.2'
 versions.threetenbp = '1.2.0'
 versions.mp_android_chart = 'v3.0.3'
 versions.lombok = '1.16.18'