Skip to content

Commit 5d7ce65

Browse files
committed
r
-move pull to load view to seperate lib
1 parent 7389a2a commit 5d7ce65

File tree

26 files changed

+164
-103
lines changed

26 files changed

+164
-103
lines changed

.idea/assetWizardSettings.xml

Lines changed: 0 additions & 47 deletions
This file was deleted.
46 Bytes
Binary file not shown.

.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ apply plugin: 'kotlin-android-extensions'
77
android {
88
compileSdkVersion 27
99
defaultConfig {
10+
multiDexEnabled true
1011
applicationId "com.wardabbass.redit"
11-
minSdkVersion 16
12+
minSdkVersion 21
1213
targetSdkVersion 27
1314
versionCode 1
1415
versionName "1.0"
@@ -24,25 +25,21 @@ android {
2425
}
2526

2627
dependencies {
27-
implementation fileTree(dir: 'libs', include: ['*.jar'])
28+
implementation fileTree(include: ['*.jar'], dir: 'libs')
2829
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2930
implementation "com.android.support:appcompat-v7:$supportlib_version"
3031
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
31-
3232
implementation "android.arch.lifecycle:extensions:$lifeCycleVersion"
3333
implementation "com.android.support:design:$supportlib_version"
3434
implementation "com.android.support:recyclerview-v7:$supportlib_version"
35-
3635
implementation "org.jetbrains.anko:anko:$anko_version"
3736
implementation 'io.reactivex.rxjava2:rxkotlin:2.2.0'
3837
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
3938
implementation 'com.amitshekhar.android:android-networking:1.0.1'
4039
implementation 'com.google.code.gson:gson:2.8.4'
4140
implementation 'com.amitshekhar.android:rx2-android-networking:1.0.1'
4241
implementation 'com.asksira.android:webviewsuite:1.0.2'
43-
4442
implementation 'com.github.bumptech.glide:glide:4.7.1'
45-
4643
implementation 'com.android.support:support-v4:27.1.1'
4744
testImplementation 'junit:junit:4.12'
4845
androidTestImplementation 'com.android.support.test:rules:1.0.2'
@@ -51,15 +48,14 @@ dependencies {
5148
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
5249
implementation 'com.android.support:cardview-v7:27.1.1'
5350
androidTestImplementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.2'
54-
5551
testImplementation 'org.mockito:mockito-core:2.6.3'
56-
testImplementation "org.robolectric:robolectric:3.8"
57-
testImplementation "org.fluttercode.datafactory:datafactory:0.8"
58-
52+
testImplementation 'org.robolectric:robolectric:3.8'
53+
testImplementation 'org.fluttercode.datafactory:datafactory:0.8'
5954
androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:2.2.2', {
6055
exclude group: 'com.android.support', module: 'support-annotations'
6156
exclude group: 'com.android.support', module: 'support-v4'
6257
exclude group: 'com.android.support', module: 'design'
6358
exclude group: 'com.android.support', module: 'recyclerview-v7'
6459
}
60+
implementation project(':wrecycler')
6561
}

app/src/main/java/com/wardabbass/redit/datalayer/ApiSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.wardabbass.redit.datalayer
33
import android.util.Log
44
import com.androidnetworking.AndroidNetworking
55
import com.rx2androidnetworking.Rx2AndroidNetworking
6-
import com.wardabbass.redit.common.ui.PullToLoadView.Companion.DEFAULT_PAGE_SIZE
6+
import com.ward.wrecycler.PullToLoadView.Companion.DEFAULT_PAGE_SIZE
77
import com.wardabbass.redit.models.RedditResponse
88
import io.reactivex.Single
99
import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/com/wardabbass/redit/ui/fragments/BookmarkedFragment.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@ package com.wardabbass.redit.ui.fragments
33

44
import android.arch.lifecycle.ViewModelProviders
55
import android.os.Bundle
6-
import android.support.v4.app.Fragment
76
import android.util.Log
87
import android.view.LayoutInflater
98
import android.view.View
109
import android.view.ViewGroup
10+
import com.ward.wrecycler.PullToLoadView
1111

1212
import com.wardabbass.redit.R
13-
import com.wardabbass.redit.common.ui.PullToLoadView
1413
import com.wardabbass.redit.models.ReditPost
1514
import com.wardabbass.redit.ui.adapter.RedditPostsAdapter
1615
import com.wardabbass.redit.ui.adapter.ReditPostClickListener
1716
import com.wardabbass.redit.viewmodels.BookmarkedViewModel
1817
import io.reactivex.Observable
19-
import io.reactivex.Scheduler
2018
import io.reactivex.android.schedulers.AndroidSchedulers
2119
import io.reactivex.disposables.CompositeDisposable
2220
import io.reactivex.schedulers.Schedulers

0 commit comments

Comments
 (0)