aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt5
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt18
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt5
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt3
4 files changed, 13 insertions, 18 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
index 9cfe5618..52cb8c06 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -29,12 +29,9 @@ import timber.log.Timber.DebugTree
class FrostApp : Application() {
override fun onCreate() {
- val core = CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()
- Fabric.with(this, core, Answers())
if (BuildConfig.DEBUG) Timber.plant(DebugTree())
else {
-
- Fabric.with(this, Crashlytics())
+ Fabric.with(this, Crashlytics(), Answers())
Timber.plant(CrashReportingTree())
}
FlowManager.init(FlowConfig.Builder(this).build())
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
index 690f967c..63fbaffb 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
@@ -17,19 +17,13 @@ object L {
}
internal class CrashReportingTree : Timber.Tree() {
- override fun log(priority: Int, tag: String, message: String, t: Throwable?) {
+ override fun log(priority: Int, tag: String?, message: String?, t: Throwable?) {
if (priority == Log.VERBOSE || priority == Log.DEBUG)
return
- Log.println(priority, tag, message)
- Crashlytics.log(priority, tag, message)
-// FakeCrashLibrary.log(priority, tag, message)
-
-// if (t != null) {
-// if (priority == Log.ERROR) {
-// FakeCrashLibrary.logError(t)
-// } else if (priority == Log.WARN) {
-// FakeCrashLibrary.logWarning(t)
-// }
-// }
+ if (message != null) {
+ Log.println(priority, tag ?: "Frost", message)
+// Crashlytics.log(priority, tag ?: "Frost", message)
+ }
+// if (t != null) Crashlytics.logException(t)
}
} \ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
index 70129429..5c1aa5b1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
@@ -2,7 +2,10 @@ package com.pitchedapps.frost.web
import android.graphics.Bitmap
import android.view.KeyEvent
-import android.webkit.*
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
+import android.webkit.WebView
+import android.webkit.WebViewClient
import com.pitchedapps.frost.LoginActivity
import com.pitchedapps.frost.facebook.FACEBOOK_COM
import com.pitchedapps.frost.facebook.FbCookie
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index d7c16a20..7073f645 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -11,6 +11,7 @@ import com.pitchedapps.frost.facebook.FbCookie
import com.pitchedapps.frost.injectors.CssAssets
import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.views.circularReveal
+import com.pitchedapps.frost.views.fadeIn
import com.pitchedapps.frost.views.snackbar
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.SingleSubject
@@ -84,7 +85,7 @@ class LoginWebView @JvmOverloads constructor(
cookieObservable.onNext(Pair(url, CookieManager.getInstance().getCookie(url)))
CssAssets.LOGIN.inject(view, {
if (view.visibility == View.INVISIBLE)
- view.circularReveal(offset = 150L)
+ view.fadeIn(offset = 150L)
})
}
}