Skip to content

Commit 679f50d

Browse files
iamareebjamaliamareebjamal
authored
Merge pull request #2295 from fossasia/development
chore: Release v0.7.0
2 parents 8e87ac0 + de7156f commit 679f50d

File tree

120 files changed

+4097
-568
lines changed

Some content is hidden

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

120 files changed

+4097
-568
lines changed

‎README.md‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,18 @@ Our chat channel is on gitter [here](https://gitter.im/fossasia/open-event-atten
2727
## Screenshots
2828
<table>
2929
<tr>
30-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_1.png"></td>
31-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_2.png"></td>
32-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_3.png"></td>
30+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_1.jpg"></td>
31+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_2.jpg"></td>
32+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_3.jpg"></td>
3333
</tr>
3434
<tr>
35-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_4.png"></td>
36-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_5.png"></td>
37-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_6.png"></td>
35+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_5.jpg"></td>
36+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_6.jpg"></td>
37+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_7.jpg"></td>
3838
</tr>
3939
<tr>
40-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_7.png"></td>
41-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_8.png"></td>
42-
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_9.png"></td>
40+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_8.jpg"></td>
41+
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_9.jpg"></td>
4342
</tr>
4443
</table>
4544

‎app/build.gradle‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.diffplug.gradle.spotless" version "3.23.1"
2+
id "com.diffplug.gradle.spotless" version "3.24.2"
33
}
44

55
apply plugin: 'com.android.application'
@@ -22,8 +22,8 @@ android {
2222
applicationId "com.eventyay.attendee"
2323
minSdkVersion 21
2424
targetSdkVersion 28
25-
versionCode 13
26-
versionName "0.6.1"
25+
versionCode 14
26+
versionName "0.7.0"
2727
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2828
vectorDrawables.useSupportLibrary = true
2929
multiDexEnabled true
@@ -121,7 +121,7 @@ repositories {
121121
}
122122

123123
dependencies {
124-
def lifecycle_version = "2.2.0-alpha02"
124+
def lifecycle_version = "2.2.0-alpha03"
125125
def koin_version = "2.0.1"
126126
def roomVersion = "2.1.0"
127127
def ktx_version = "1.0.0"
@@ -135,8 +135,8 @@ dependencies {
135135
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
136136
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
137137
implementation 'androidx.cardview:cardview:1.0.0'
138-
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01'
139-
implementation 'com.google.android.material:material:1.1.0-alpha08'
138+
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
139+
implementation 'com.google.android.material:material:1.1.0-alpha09'
140140
implementation "androidx.browser:browser:1.0.0"
141141
implementation 'androidx.exifinterface:exifinterface:1.0.0'
142142
implementation "androidx.lifecycle:lifecycle-extensions:${lifecycle_version}"
@@ -172,24 +172,24 @@ dependencies {
172172

173173
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.6"
174174
implementation 'com.github.jasminb:jsonapi-converter:0.9'
175-
implementation 'com.squareup.okhttp3:logging-interceptor:4.0.1'
176-
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
177-
implementation 'com.squareup.retrofit2:converter-jackson:2.6.0'
175+
implementation 'com.squareup.okhttp3:logging-interceptor:4.1.0'
176+
implementation 'com.squareup.retrofit2:retrofit:2.6.1'
177+
implementation 'com.squareup.retrofit2:converter-jackson:2.6.1'
178178

179179
// Cards Shimmer Animation
180180
implementation 'com.facebook.shimmer:shimmer:0.5.0'
181181

182182
// RxJava
183183
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
184-
implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
185-
implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
186-
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.0'
184+
implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
185+
implementation 'io.reactivex.rxjava2:rxjava:2.2.11'
186+
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.1'
187187

188188
// Picasso
189189
implementation 'com.squareup.picasso:picasso:2.71828'
190190

191191
// Stripe
192-
implementation 'com.stripe:stripe-android:10.0.3'
192+
implementation 'com.stripe:stripe-android:10.3.0'
193193

194194
// QR Code
195195
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
@@ -215,7 +215,7 @@ dependencies {
215215
testImplementation 'com.github.iamareebjamal:stetho-noop:1.2.1'
216216

217217
//LeakCanary
218-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-3'
218+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-2'
219219

220220
// Paging
221221
implementation "androidx.paging:paging-runtime:$paging_version"
@@ -224,6 +224,13 @@ dependencies {
224224
// Searchable Spinner
225225
implementation 'com.toptoche.searchablespinner:searchablespinnerlibrary:1.3.1'
226226

227+
//ExpandableTextView
228+
implementation 'at.blogc:expandabletextview:1.0.5'
229+
230+
//ExpandableView
231+
implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
232+
233+
227234

228235
testImplementation 'junit:junit:4.12'
229236
testImplementation 'org.threeten:threetenbp:1.4.0'

‎app/schemas/org.fossasia.openevent.general.OpenEventDatabase/8.json‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 8,
5-
"identityHash": "c65ffea75fee1faf6cd199cbbc5c25ee",
5+
"identityHash": "35acee6b8147d48c581bb8f884508c79",
66
"entities": [
77
{
88
"tableName": "Event",
@@ -1223,7 +1223,7 @@
12231223
},
12241224
{
12251225
"tableName": "Speaker",
1226-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT, `email` TEXT, `photoUrl` TEXT, `shortBiography` TEXT, `longBiography` TEXT, `speakingExperience` TEXT, `position` TEXT, `mobile` TEXT, `location` TEXT, `country` TEXT, `city` TEXT, `organisation` TEXT, `gender` TEXT, `website` TEXT, `twitter` TEXT, `facebook` TEXT, `linkedin` TEXT, `github` TEXT, `isFeatured` INTEGER NOT NULL, `event` INTEGER, `user` INTEGER, PRIMARY KEY(`id`))",
1226+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT, `email` TEXT, `photoUrl` TEXT, `shortBiography` TEXT, `longBiography` TEXT, `speakingExperience` TEXT, `position` TEXT, `mobile` TEXT, `location` TEXT, `country` TEXT, `city` TEXT, `organisation` TEXT, `gender` TEXT, `website` TEXT, `twitter` TEXT, `facebook` TEXT, `linkedin` TEXT, `github` TEXT, `heardFrom` TEXT, `isFeatured` INTEGER NOT NULL, `event` INTEGER, `user` INTEGER, PRIMARY KEY(`id`))",
12271227
"fields": [
12281228
{
12291229
"fieldPath": "id",
@@ -1339,6 +1339,12 @@
13391339
"affinity": "TEXT",
13401340
"notNull": false
13411341
},
1342+
{
1343+
"fieldPath": "heardFrom",
1344+
"columnName": "heardFrom",
1345+
"affinity": "TEXT",
1346+
"notNull": false
1347+
},
13421348
{
13431349
"fieldPath": "isFeatured",
13441350
"columnName": "isFeatured",
@@ -1985,7 +1991,7 @@
19851991
},
19861992
{
19871993
"tableName": "Proposal",
1988-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER, `title` TEXT, `language` TEXT, `shortAbstract` TEXT, `comments` TEXT, `startsAt` TEXT, `endsAt` TEXT, `track` TEXT, `event` INTEGER, `speakers` TEXT NOT NULL, PRIMARY KEY(`id`))",
1994+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER, `title` TEXT, `language` TEXT, `shortAbstract` TEXT, `comments` TEXT, `startsAt` TEXT, `endsAt` TEXT, `subTitle` TEXT, `longAbstract` TEXT, `track` TEXT, `event` INTEGER, `speakers` TEXT NOT NULL, PRIMARY KEY(`id`))",
19891995
"fields": [
19901996
{
19911997
"fieldPath": "id",
@@ -2029,6 +2035,18 @@
20292035
"affinity": "TEXT",
20302036
"notNull": false
20312037
},
2038+
{
2039+
"fieldPath": "subTitle",
2040+
"columnName": "subTitle",
2041+
"affinity": "TEXT",
2042+
"notNull": false
2043+
},
2044+
{
2045+
"fieldPath": "longAbstract",
2046+
"columnName": "longAbstract",
2047+
"affinity": "TEXT",
2048+
"notNull": false
2049+
},
20322050
{
20332051
"fieldPath": "track",
20342052
"columnName": "track",
@@ -2086,7 +2104,7 @@
20862104
"views": [],
20872105
"setupQueries": [
20882106
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
2089-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c65ffea75fee1faf6cd199cbbc5c25ee')"
2107+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '35acee6b8147d48c581bb8f884508c79')"
20902108
]
20912109
}
20922110
}

0 commit comments

Comments
 (0)