Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kotlin #54

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 17 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 28
buildToolsVersion "28.0.2"
buildToolsVersion "28.0.3"

defaultConfig {
applicationId "com.rxjava2.android.samples"
Expand All @@ -26,16 +28,23 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test:rules:1.1.0-alpha4'
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
implementation 'androidx.recyclerview:recyclerview:1.0.0-rc02'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-beta01'
androidTestImplementation 'androidx.test:runner:1.2.0-beta01'
androidTestImplementation 'androidx.test:rules:1.2.0-beta01'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha05'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha05'

// RxJava2 Dependencies
implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'

// FastAndroidNetworking Dependency
implementation 'com.amitshekhar.android:rx2-android-networking:1.0.2'

// kotlin
implementation "androidx.core:core-ktx:1.0.2"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
mavenCentral()
}
89 changes: 1 addition & 88 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".MyApplication"
android:allowBackup="true"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
Expand All @@ -24,15 +23,6 @@
<activity
android:name=".ui.networking.NetworkingActivity"
android:label="@string/networking" />
<activity
android:name=".ui.cache.CacheExampleActivity"
android:label="@string/cache" />
<activity
android:name=".ui.rxbus.RxBusActivity"
android:label="@string/rx_bus" />
<activity
android:name=".ui.pagination.PaginationActivity"
android:label="@string/pagination" />
<activity
android:name=".ui.search.SearchActivity"
android:label="@string/search" />
Expand All @@ -45,99 +35,22 @@
<activity
android:name=".ui.operators.ZipExampleActivity"
android:label="@string/zip" />
<activity
android:name=".ui.operators.DisposableExampleActivity"
android:label="@string/disposable" />
<activity
android:name=".ui.operators.TakeExampleActivity"
android:label="@string/take" />
<activity
android:name=".ui.operators.TimerExampleActivity"
android:label="@string/timer" />
<activity
android:name=".ui.operators.IntervalExampleActivity"
android:label="@string/interval" />
<activity
android:name=".ui.operators.SingleObserverExampleActivity"
android:label="@string/SingleObserver" />
<activity
android:name=".ui.operators.CompletableObserverExampleActivity"
android:label="@string/CompletableObserver" />
<activity
android:name=".ui.operators.FlowableExampleActivity"
android:label="@string/Flowable" />
<activity
android:name=".ui.operators.ReduceExampleActivity"
android:label="@string/reduce" />
<activity
android:name=".ui.operators.BufferExampleActivity"
android:label="@string/buffer" />
<activity
android:name=".ui.operators.FilterExampleActivity"
android:label="@string/filter" />
<activity
android:name=".ui.operators.SkipExampleActivity"
android:label="@string/skip" />
<activity
android:name=".ui.operators.ScanExampleActivity"
android:label="@string/scan" />
<activity
android:name=".ui.operators.ReplayExampleActivity"
android:label="@string/replay" />
<activity
android:name=".ui.operators.ConcatExampleActivity"
android:label="@string/concat" />
<activity
android:name=".ui.operators.MergeExampleActivity"
android:label="@string/merge" />
<activity
android:name=".ui.operators.DeferExampleActivity"
android:label="@string/defer" />
<activity
android:name=".ui.operators.DistinctExampleActivity"
android:label="@string/distinct" />
<activity
android:name=".ui.operators.LastOperatorExampleActivity"
android:label="@string/last" />
<activity
android:name=".ui.operators.ReplaySubjectExampleActivity"
android:label="@string/replay_subject" />
<activity
android:name=".ui.operators.PublishSubjectExampleActivity"
android:label="@string/publish_subject" />
<activity
android:name=".ui.operators.BehaviorSubjectExampleActivity"
android:label="@string/behavior_subject" />
<activity
android:name=".ui.operators.AsyncSubjectExampleActivity"
android:label="@string/async_subject" />
<activity
android:name=".ui.operators.ThrottleLastExampleActivity"
android:label="@string/throttle_last" />
<activity
android:name=".ui.operators.DebounceExampleActivity"
android:label="@string/debounce" />
<activity
android:name=".ui.operators.WindowExampleActivity"
android:label="@string/window" />
<activity
android:name=".ui.operators.ThrottleFirstExampleActivity"
android:label="@string/throttle_first" />
<activity
android:name=".ui.operators.DelayExampleActivity"
android:label="@string/delay" />
<activity
android:name=".ui.compose.ComposeOperatorExampleActivity"
android:label="@string/compose" />
<activity
android:name=".ui.operators.SwitchMapExampleActivity"
android:label="@string/switch_map" />

<activity android:name=".ui.operators.TakeWhileExampleActivity"
android:label="@string/take_while"/>

<activity android:name=".ui.operators.TakeUntilExampleActivity"
android:label="@string/take_until"/>
</application>

</manifest>
42 changes: 0 additions & 42 deletions app/src/main/java/com/rxjava2/android/samples/MyApplication.java

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/java/com/rxjava2/android/samples/model/ApiUser.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.rxjava2.android.samples.model

/**
* Created by amitshekhar on 27/08/16.
*/
data class ApiUser(var id: Long = 0L,
var firstname: String,
var lastname: String)
28 changes: 0 additions & 28 deletions app/src/main/java/com/rxjava2/android/samples/model/Car.java

This file was deleted.

21 changes: 0 additions & 21 deletions app/src/main/java/com/rxjava2/android/samples/model/Events.java

This file was deleted.

48 changes: 0 additions & 48 deletions app/src/main/java/com/rxjava2/android/samples/model/User.java

This file was deleted.

10 changes: 10 additions & 0 deletions app/src/main/java/com/rxjava2/android/samples/model/User.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.rxjava2.android.samples.model

/**
* Created by amitshekhar on 27/08/16.
*/

data class User(var id: Long = 0L,
var firstname: String,
var lastname: String,
var isFollowing: Boolean = false)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.rxjava2.android.samples.model

/**
* Created by amitshekhar on 04/02/17.
*/

data class UserDetail(var id: Long = 0L,
var firstname: String,
var lastname: String)