aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-01-05 00:12:45 -0500
committerAllan Wang <me@allanwang.ca>2019-01-05 00:12:45 -0500
commit635bdddebbc52ec67cfb157830c3fc8b32f9a6e7 (patch)
tree08245d02eb04045ec2c5d475ce6db4efe481a412
parentc00aab03622a5045cf01b4b3883c7f7b835c841e (diff)
downloadfrost-635bdddebbc52ec67cfb157830c3fc8b32f9a6e7.tar.gz
frost-635bdddebbc52ec67cfb157830c3fc8b32f9a6e7.tar.bz2
frost-635bdddebbc52ec67cfb157830c3fc8b32f9a6e7.zip
Remove all rx libraries
-rw-r--r--app/build.gradle6
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt3
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt2
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt1
-rw-r--r--gradle.properties8
5 files changed, 1 insertions, 19 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 23d26fd8..5fc249bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -251,12 +251,6 @@ dependencies {
implementation "com.sothree.slidinguppanel:library:${SLIDING_PANEL}"
- //Reactive Libs
- implementation "io.reactivex.rxjava2:rxjava:${RX_JAVA}"
-// implementation "io.reactivex.rxjava2:rxkotlin:${RX_KOTLIN}"
-// implementation "io.reactivex.rxjava2:rxandroid:${RX_ANDROID}"
- implementation "com.github.pwittchen:reactivenetwork-rx2:${RX_NETWORK}"
-
}
// Validates code and generates apk
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index 283477d7..8d849bff 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -66,9 +66,7 @@ class AboutActivity : AboutActivityBase(null, {
val include = arrayOf(
"AboutLibraries",
"AndroidIconics",
- "androidin_appbillingv3",
"androidslidinguppanel",
- "Crashlytics",
"dbflow",
"fastadapter",
"glide",
@@ -77,7 +75,6 @@ class AboutActivity : AboutActivityBase(null, {
"kotterknife",
"materialdialogs",
"materialdrawer",
- "rxjava",
"subsamplingscaleimageview"
)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
index 10746b75..67953144 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
@@ -89,4 +89,4 @@ fun removeCookie(id: Long) {
L.d { "Fb cookie deleted" }
L._d { id }
}
-} \ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
index cceabcae..870e2ccd 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
@@ -27,7 +27,6 @@ import com.bumptech.glide.load.resource.bitmap.CircleCrop
import com.bumptech.glide.module.AppGlideModule
import com.bumptech.glide.request.RequestOptions
import com.pitchedapps.frost.facebook.FbCookie
-import com.pitchedapps.frost.utils.L
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import okhttp3.Response
diff --git a/gradle.properties b/gradle.properties
index 691544bc..aabfd255 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -57,14 +57,6 @@ MATERIAL_DRAWER_KT=2.0.1
OKHTTP=3.12.1
# http://robolectric.org/getting-started/
ROBOELECTRIC=4.1
-# https://github.com/ReactiveX/RxAndroid/releases
-RX_ANDROID=2.1.0
-# https://github.com/ReactiveX/RxJava/releases
-RX_JAVA=2.2.4
-# https://github.com/ReactiveX/RxKotlin/releases
-RX_KOTLIN=2.3.0
-# https://github.com/pwittchen/ReactiveNetwork/releases
-RX_NETWORK=2.1.0
# https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
SCALE_IMAGE_VIEW=3.10.0
# https://github.com/umano/AndroidSlidingUpPanel#importing-the-library