Skip to content

Commit

Permalink
convert models to kolin
Browse files Browse the repository at this point in the history
  • Loading branch information
janvde committed Aug 10, 2018
1 parent 378a077 commit c2da4c7
Show file tree
Hide file tree
Showing 52 changed files with 1,178 additions and 2,365 deletions.
22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/dictionaries/jan.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

31 changes: 5 additions & 26 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions app/src/main/res/values/secrets.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="apikey">lgdBLOmA</string>
</resources>
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.60'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
11 changes: 8 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

ext {
PUBLISH_GROUP_ID = 'com.getroadmap.rome2rioandroid'
Expand Down Expand Up @@ -34,14 +35,18 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
api 'com.google.code.gson:gson:2.8.2'
api 'com.squareup.retrofit2:retrofit:2.3.0'
api 'com.squareup.retrofit2:converter-gson:2.3.0'
api 'com.squareup.retrofit2:retrofit:2.4.0'
api 'com.squareup.retrofit2:converter-gson:2.4.0'
api 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'

api 'io.reactivex.rxjava2:rxandroid:2.0.1'
api 'io.reactivex.rxjava2:rxjava:2.1.6'
api 'io.reactivex.rxjava2:rxjava:2.1.12'

testCompile 'junit:junit:4.12'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}

apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
repositories {
mavenCentral()
}
99 changes: 0 additions & 99 deletions library/src/main/java/com/getroadmap/r2rlib/models/Agency.java

This file was deleted.

50 changes: 50 additions & 0 deletions library/src/main/java/com/getroadmap/r2rlib/models/Agency.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.getroadmap.r2rlib.models

import android.os.Parcel
import android.os.Parcelable

/**
* https://www.rome2rio.com/documentation/search#Agency
* class for api v1.4
*/

/**
* name string Display name
* url string Agency URL (optional)
* phone string Agency Phone Number (optional)
* icon Icon Agency icon (optional)
*/
data class Agency(var name: String?,
var url: String?,
var phone: String?,
var icon: Icon?) : Parcelable {
constructor(parcel: Parcel) : this(
parcel.readString(),
parcel.readString(),
parcel.readString(),
parcel.readParcelable(Icon::class.java.classLoader)) {
}

override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.writeString(name)
parcel.writeString(url)
parcel.writeString(phone)
parcel.writeParcelable(icon, flags)
}

override fun describeContents(): Int {
return 0
}

companion object CREATOR : Parcelable.Creator<Agency> {
override fun createFromParcel(parcel: Parcel): Agency {
return Agency(parcel)
}

override fun newArray(size: Int): Array<Agency?> {
return arrayOfNulls(size)
}
}


}

This file was deleted.

Loading

0 comments on commit c2da4c7

Please sign in to comment.