Skip to content

Commit

Permalink
chore: Release v0.6.0 (#2193)
Browse files Browse the repository at this point in the history
chore: Release v0.6.0
  • Loading branch information
iamareebjamal authored Jul 27, 2019
2 parents 9c6cd6f + 87ba549 commit 5883908
Show file tree
Hide file tree
Showing 199 changed files with 7,694 additions and 2,076 deletions.
4 changes: 4 additions & 0 deletions .github/issue_label_bot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
label-alias:
bug: 'bug'
feature_request: 'feature'
question: 'question'
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
language: android
dist: trusty
sudo: false
jdk:
- oraclejdk8
android:
components:
- tools
- android-27
- build-tools-27.0.3
- android-28
- build-tools-28.0.3
- platform-tools
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand All @@ -16,11 +17,10 @@ cache:
- "${TRAVIS_BUILD_DIR}/gradle/wrapper/dists/"
- "$HOME/.gradle/caches/"
- "$HOME/.gradle/wrapper/"
install:
- echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-28"
before_script:
- bash scripts/prep-key.sh
script:
- ./gradlew spotlessCheck
- ./gradlew build
after_success:
- bash scripts/prep-key.sh
- bash scripts/update-apk.sh
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Open Event Android App
[![Build Status](https://travis-ci.org/fossasia/open-event-android.svg?branch=development)](https://travis-ci.org/fossasia/open-event-android?branch=development)
[![Build Status](https://travis-ci.org/fossasia/open-event-android.svg?branch=master)](https://travis-ci.org/fossasia/open-event-android?branch=master)
# Open Event Attendee App
[![Build Status](https://travis-ci.org/fossasia/open-event-attendee-android.svg?branch=development)](https://travis-ci.org/fossasia/open-event-attendee-android?branch=development)
[![Build Status](https://travis-ci.org/fossasia/open-event-attendee-android.svg?branch=master)](https://travis-ci.org/fossasia/open-event-attendee-android?branch=master)
[![Join the chat at https://gitter.im/fossasia/open-event-android](https://badges.gitter.im/fossasia/open-event-android.svg)](https://gitter.im/fossasia/open-event-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Mailing List](https://img.shields.io/badge/Mailing%20List-FOSSASIA-blue.svg)](https://groups.google.com/forum/#!forum/open-event)
[![Twitter Follow](https://img.shields.io/twitter/follow/eventyay.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/eventyay)
Expand All @@ -22,24 +22,24 @@ Planned features & enhancements are:

Please join our mailing list to discuss questions regarding the project: https://groups.google.com/forum/#!forum/open-event

Our chat channel is on gitter [here](https://gitter.im/fossasia/open-event-android)
Our chat channel is on gitter [here](https://gitter.im/fossasia/open-event-attendee-android)

## Screenshots
<table>
<tr>
<td><img src = "docs/images/screenshot_1.png" height = "480" width="270"></td>
<td><img src = "docs/images/screenshot_2.png" height = "480" width="270"></td>
<td><img src = "docs/images/screenshot_3.png" height = "480" width="270"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_1.png"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_2.png"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_3.png"></td>
</tr>
<tr>
<td><img src = "docs/images/screenshot_4.png" height = "480" width="270"></td>
<td><img src = "docs/images/screenshot_5.png" height = "480" width="270"></td>
<td><img src = "docs/images/screenshot_6.png" height = "480" width="270"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_4.png"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_5.png"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_6.png"></td>
</tr>
<tr>
<td><img src = "docs/images/screenshot_7.png" height = "480" width="270"></td>
<td><img src = "docs/images/screenshot_8.png" height = "480" width="270"></td>
<td><img src = "docs/images/screenshot_9.png" height = "480" width="270"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_7.png"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_8.png"></td>
<td><img src = "fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot_9.png"></td>
</tr>
</table>

Expand Down Expand Up @@ -92,7 +92,7 @@ We have the following branches
- _versionCode_ : **Integer** : To be monotonically incremented with each merge. Failure to do so will lead to publishing error, and thus is a crucial step before any merge
- _versionName_ : **String** : User visible version of the app. To be changed following [semantic versioning](http://semver.org/)
* **apk** This branch contains two apk's, that are automatically generated on the merged pull request a) debug apk and b) release apk.
- Please download and test the app that is using the code from the development and master branches [here](https://github.com/fossasia/open-event-android/tree/apk).
- Please download and test the app that is using the code from the development and master branches [here](https://github.com/fossasia/open-event-attendee-android/tree/apk).
### Code practices

Please help us follow the best practices to make it easy for the reviewer as well as the contributor. We want to focus on the code quality more than on managing pull request ethics.
Expand All @@ -112,7 +112,7 @@ Please help us follow the best practices to make it easy for the reviewer as wel
If you are a tester and want to test the app, you have two ways to do that:
1. **Installing APK on your device:** You can get debug APK as well as Release APK in apk branch of the repository. After each PR merge, both the APKs are automatically updated. So, just download the APK you want and install it on your device. The APKs will always be the latest one.

## Open Event Android Suggestions
## Open Event Attendee Android Suggestions

- Suggestion form link: [Form](https://docs.google.com/forms/d/e/1FAIpQLSd7Y1T1xoXeYaAG_b6Tu1YYK-jZssoC5ltmQbkUX0kmDZaKYw/viewform)
- Suggestion responses link: [Sheet](https://docs.google.com/spreadsheets/d/1SzR75MBEVrTY1sDM3KAMm9wltiulDAp0QT5hv9eJkKM/edit#gid=1676755229)
Expand Down
63 changes: 47 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'androidx.navigation.safeargs.kotlin'
apply plugin: "com.github.b3er.local.properties"

def STRIPE_API_TOKEN = System.getenv('STRIPE_API_TOKEN') ?: "YOUR_API_KEY"
def MAPBOX_KEY = System.getenv('MAPBOX_KEY') ?: "pk.eyJ1IjoiYW5nbWFzMSIsImEiOiJjanNqZDd0N2YxN2Q5NDNuNTBiaGt6eHZqIn0.BCrxjW6rP_OuOuGtbhVEQg"
def LOCAL_KEY_PRESENT = project.hasProperty('SIGNING_KEY_FILE') && rootProject.file(SIGNING_KEY_FILE).exists()

android {
dataBinding {
Expand All @@ -20,8 +22,8 @@ android {
applicationId "com.eventyay.attendee"
minSdkVersion 21
targetSdkVersion 28
versionCode 11
versionName "0.5.0"
versionCode 12
versionName "0.6.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
multiDexEnabled true
Expand All @@ -31,23 +33,40 @@ android {
}
}
}
signingConfigs {
if (TRAVIS_BUILD) {
release {
storeFile KEYSTORE_FILE
storePassword System.getenv("STORE_PASS")
keyAlias System.getenv("ALIAS")
keyPassword System.getenv("KEY_PASS")
}
} else if (LOCAL_KEY_PRESENT) {
release {
storeFile rootProject.file(SIGNING_KEY_FILE)
storePassword STORE_PASS
keyAlias ALIAS
keyPassword KEY_PASS
}
}
}
buildTypes {
release {
shrinkResources true
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField "String", "DEFAULT_BASE_URL", '"https://api.eventyay.com/v1/"'
buildConfigField "String", "FRONTEND_URL", '"https://eventyay.com/"'
buildConfigField "String", "MAPBOX_KEY", '"'+MAPBOX_KEY+'"'
buildConfigField "String", "STRIPE_API_KEY", '"'+STRIPE_API_TOKEN+'"'
resValue "string", "FRONTEND_HOST", "eventyay.com"
if (LOCAL_KEY_PRESENT || TRAVIS_BUILD)
signingConfig signingConfigs.release
}
debug {
buildConfigField "String", "DEFAULT_BASE_URL", '"https://open-event-api-dev.herokuapp.com/v1/"'
buildConfigField "String", "FRONTEND_URL", '"https://fossasia.github.io/open-event-frontend/"'
buildConfigField "String", "MAPBOX_KEY", '"'+MAPBOX_KEY+'"'
buildConfigField "String", "STRIPE_API_KEY", '"'+STRIPE_API_TOKEN+'"'
resValue "string", "FRONTEND_HOST", "fossasia.github.io/open-event-frontend"
resValue "string", "FRONTEND_HOST", "open-event-fe.netlify.com"
}
}

Expand Down Expand Up @@ -75,13 +94,17 @@ android {
}
lintOptions {
disable 'MissingTranslation'
warning 'InvalidPackage'
}
androidExtensions {
experimental = true
}
aaptOptions {
cruncherEnabled = false
}
kotlinOptions {
jvmTarget = "1.8"
}
}

spotless {
Expand All @@ -98,21 +121,22 @@ repositories {
}

dependencies {
def lifecycle_version = "2.2.0-alpha01"
def lifecycle_version = "2.2.0-alpha02"
def koin_version = "2.0.1"
def roomVersion = "2.1.0"
def ktx_version = "1.0.0"
def ktx2_version = "2.0.0"
def nav_version = "2.1.0-alpha05"
def nav_version = "2.1.0-beta02"
def anko_version = "0.10.8"
def paging_version = "2.1.0"

implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
implementation 'com.google.android.material:material:1.1.0-alpha07'
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01'
implementation 'com.google.android.material:material:1.1.0-alpha08'
implementation "androidx.browser:browser:1.0.0"
implementation 'androidx.exifinterface:exifinterface:1.0.0'
implementation "androidx.lifecycle:lifecycle-extensions:${lifecycle_version}"
Expand All @@ -122,7 +146,7 @@ dependencies {
implementation "androidx.room:room-rxjava2:${roomVersion}"
kapt "androidx.room:room-compiler:${roomVersion}"
testImplementation "androidx.room:room-testing:${roomVersion}"
implementation 'androidx.preference:preference:1.1.0-beta01'
implementation 'androidx.preference:preference:1.1.0-rc01'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// KTX
Expand All @@ -148,12 +172,12 @@ dependencies {

implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.6"
implementation 'com.github.jasminb:jsonapi-converter:0.9'
implementation 'com.squareup.okhttp3:logging-interceptor:4.0.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.0.1'
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
implementation 'com.squareup.retrofit2:converter-jackson:2.6.0'

// Cards Shimmer Animation
implementation 'com.facebook.shimmer:shimmer:0.4.0'
implementation 'com.facebook.shimmer:shimmer:0.5.0'

// RxJava
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
Expand All @@ -165,7 +189,7 @@ dependencies {
implementation 'com.squareup.picasso:picasso:2.71828'

// Stripe
implementation 'com.stripe:stripe-android:9.3.5'
implementation 'com.stripe:stripe-android:10.0.3'

// QR Code
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
Expand All @@ -191,10 +215,17 @@ dependencies {
testImplementation 'com.github.iamareebjamal:stetho-noop:1.2.1'

//LeakCanary
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-2'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-3'

// Paging
implementation "androidx.paging:paging-runtime:$paging_version"
implementation "androidx.paging:paging-rxjava2:$paging_version"

// Searchable Spinner
implementation 'com.toptoche.searchablespinner:searchablespinnerlibrary:1.3.1'


testImplementation 'junit:junit:4.12'
testImplementation "io.mockk:mockk:1.9.3"
testImplementation 'org.threeten:threetenbp:1.4.0'
testImplementation "org.koin:koin-test:$koin_version"
testImplementation 'androidx.arch.core:core-testing:2.0.1'
Expand Down
22 changes: 11 additions & 11 deletions app/schemas/org.fossasia.openevent.general.OpenEventDatabase/7.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"formatVersion": 1,
"database": {
"version": 7,
"identityHash": "9eb49166f82304a9b5132dfa28d8e6ca",
"identityHash": "a641e7fa047321119d684609308e713a",
"entities": [
{
"tableName": "Event",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `identifier` TEXT NOT NULL, `startsAt` TEXT NOT NULL, `endsAt` TEXT NOT NULL, `timezone` TEXT NOT NULL, `privacy` TEXT NOT NULL, `paymentCountry` TEXT, `paypalEmail` TEXT, `thumbnailImageUrl` TEXT, `schedulePublishedOn` TEXT, `paymentCurrency` TEXT, `organizerDescription` TEXT, `originalImageUrl` TEXT, `onsiteDetails` TEXT, `organizerName` TEXT, `largeImageUrl` TEXT, `deletedAt` TEXT, `ticketUrl` TEXT, `locationName` TEXT, `codeOfConduct` TEXT, `state` TEXT, `searchableLocationName` TEXT, `description` TEXT, `pentabarfUrl` TEXT, `xcalUrl` TEXT, `logoUrl` TEXT, `externalEventUrl` TEXT, `iconImageUrl` TEXT, `icalUrl` TEXT, `createdAt` TEXT, `bankDetails` TEXT, `chequeDetails` TEXT, `isComplete` INTEGER NOT NULL, `latitude` REAL, `longitude` REAL, `refundPolicy` TEXT, `orderExpiryTime` INTEGER NOT NULL, `canPayByStripe` INTEGER NOT NULL, `canPayByCheque` INTEGER NOT NULL, `canPayByBank` INTEGER NOT NULL, `canPayByPaypal` INTEGER NOT NULL, `canPayOnsite` INTEGER NOT NULL, `isSponsorsEnabled` INTEGER NOT NULL, `hasOrganizerInfo` INTEGER NOT NULL, `isSessionsSpeakersEnabled` INTEGER NOT NULL, `isTicketingEnabled` INTEGER NOT NULL, `isTaxEnabled` INTEGER NOT NULL, `isMapShown` INTEGER NOT NULL, `favorite` INTEGER NOT NULL, `eventTopic` TEXT, `eventType` TEXT, `eventSubTopic` TEXT, `speakersCall` TEXT, PRIMARY KEY(`id`))",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `identifier` TEXT NOT NULL, `startsAt` TEXT NOT NULL, `endsAt` TEXT NOT NULL, `timezone` TEXT NOT NULL, `privacy` TEXT NOT NULL, `paymentCountry` TEXT, `paypalEmail` TEXT, `thumbnailImageUrl` TEXT, `schedulePublishedOn` TEXT, `paymentCurrency` TEXT, `ownerDescription` TEXT, `originalImageUrl` TEXT, `onsiteDetails` TEXT, `ownerName` TEXT, `largeImageUrl` TEXT, `deletedAt` TEXT, `ticketUrl` TEXT, `locationName` TEXT, `codeOfConduct` TEXT, `state` TEXT, `searchableLocationName` TEXT, `description` TEXT, `pentabarfUrl` TEXT, `xcalUrl` TEXT, `logoUrl` TEXT, `externalEventUrl` TEXT, `iconImageUrl` TEXT, `icalUrl` TEXT, `createdAt` TEXT, `bankDetails` TEXT, `chequeDetails` TEXT, `isComplete` INTEGER NOT NULL, `latitude` REAL, `longitude` REAL, `refundPolicy` TEXT, `orderExpiryTime` INTEGER NOT NULL, `canPayByStripe` INTEGER NOT NULL, `canPayByCheque` INTEGER NOT NULL, `canPayByBank` INTEGER NOT NULL, `canPayByPaypal` INTEGER NOT NULL, `canPayOnsite` INTEGER NOT NULL, `isSponsorsEnabled` INTEGER NOT NULL, `hasOwnerInfo` INTEGER NOT NULL, `isSessionsSpeakersEnabled` INTEGER NOT NULL, `isTicketingEnabled` INTEGER NOT NULL, `isTaxEnabled` INTEGER NOT NULL, `isMapShown` INTEGER NOT NULL, `favorite` INTEGER NOT NULL, `eventTopic` TEXT, `eventType` TEXT, `eventSubTopic` TEXT, `speakersCall` TEXT, PRIMARY KEY(`id`))",
"fields": [
{
"fieldPath": "id",
Expand Down Expand Up @@ -81,8 +81,8 @@
"notNull": false
},
{
"fieldPath": "organizerDescription",
"columnName": "organizerDescription",
"fieldPath": "ownerDescription",
"columnName": "ownerDescription",
"affinity": "TEXT",
"notNull": false
},
Expand All @@ -99,8 +99,8 @@
"notNull": false
},
{
"fieldPath": "organizerName",
"columnName": "organizerName",
"fieldPath": "ownerName",
"columnName": "ownerName",
"affinity": "TEXT",
"notNull": false
},
Expand Down Expand Up @@ -273,8 +273,8 @@
"notNull": true
},
{
"fieldPath": "hasOrganizerInfo",
"columnName": "hasOrganizerInfo",
"fieldPath": "hasOwnerInfo",
"columnName": "hasOwnerInfo",
"affinity": "INTEGER",
"notNull": true
},
Expand Down Expand Up @@ -576,7 +576,7 @@
},
{
"tableName": "Ticket",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `description` TEXT, `type` TEXT, `name` TEXT NOT NULL, `maxOrder` INTEGER NOT NULL, `isFeeAbsorbed` INTEGER, `isDescriptionVisible` INTEGER, `price` REAL, `position` TEXT, `quantity` TEXT, `isHidden` INTEGER, `salesStartsAt` TEXT, `salesEndsAt` TEXT, `minOrder` INTEGER NOT NULL, `event` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`event`) REFERENCES `Event`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `description` TEXT, `type` TEXT, `name` TEXT NOT NULL, `maxOrder` INTEGER NOT NULL, `isFeeAbsorbed` INTEGER, `isDescriptionVisible` INTEGER, `price` REAL NOT NULL, `position` TEXT, `quantity` TEXT, `isHidden` INTEGER, `salesStartsAt` TEXT, `salesEndsAt` TEXT, `minOrder` INTEGER NOT NULL, `event` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`event`) REFERENCES `Event`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
"fields": [
{
"fieldPath": "id",
Expand Down Expand Up @@ -624,7 +624,7 @@
"fieldPath": "price",
"columnName": "price",
"affinity": "REAL",
"notNull": false
"notNull": true
},
{
"fieldPath": "position",
Expand Down Expand Up @@ -1899,7 +1899,7 @@
"views": [],
"setupQueries": [
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9eb49166f82304a9b5132dfa28d8e6ca')"
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a641e7fa047321119d684609308e713a')"
]
}
}
Loading

0 comments on commit 5883908

Please sign in to comment.