diff options
| author | Allan Wang <me@allanwang.ca> | 2017-07-08 19:21:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-08 19:21:13 -0400 |
| commit | 085295d5dbda84ff02221cc65bd472fff69e636e (patch) | |
| tree | 12768bed871581a054941b030f1e1224278fc794 /app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt | |
| parent | b10a745c7f0f46f4f014e1ba7fa71172d7442b83 (diff) | |
| download | frost-085295d5dbda84ff02221cc65bd472fff69e636e.tar.gz frost-085295d5dbda84ff02221cc65bd472fff69e636e.tar.bz2 frost-085295d5dbda84ff02221cc65bd472fff69e636e.zip | |
Dev 1.2.1 (#43) - Revamp notificationsv1.2.1
* Test proguard
* Test proguard without enums
* Allow notifications from only current account
* Prettify notifications
* Clean up layouts
* Test proguard log
* Update rxkotlin
* Update remaining dependencies
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt index 9b79b996..a27a1ee2 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt @@ -13,19 +13,14 @@ import ca.allanwang.kau.utils.fadeOut import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException -import com.bumptech.glide.load.resource.bitmap.CircleCrop import com.bumptech.glide.request.RequestListener -import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.Target import com.crashlytics.android.answers.LoginEvent import com.pitchedapps.frost.dbflow.CookieModel import com.pitchedapps.frost.dbflow.fetchUsername import com.pitchedapps.frost.dbflow.loadFbCookiesAsync import com.pitchedapps.frost.facebook.PROFILE_PICTURE_URL -import com.pitchedapps.frost.utils.L -import com.pitchedapps.frost.utils.frostAnswers -import com.pitchedapps.frost.utils.launchNewTask -import com.pitchedapps.frost.utils.setFrostColors +import com.pitchedapps.frost.utils.* import com.pitchedapps.frost.web.LoginWebView import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -110,8 +105,7 @@ class LoginActivity : BaseActivity() { fun loadProfile(id: Long) { - val options = RequestOptions().transform(CircleCrop()) - Glide.with(this@LoginActivity).load(PROFILE_PICTURE_URL(id)).apply(options).listener(object : RequestListener<Drawable> { + Glide.with(this@LoginActivity).load(PROFILE_PICTURE_URL(id)).withRoundIcon().listener(object : RequestListener<Drawable> { override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean { profileObservable.onSuccess(true) return false |