Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-12 14:03:00 +01:00
Code Issues Releases Activity

Clean up selector activity

Browse Source
This commit is contained in:
Allan Wang 2017-06-21 16:07:54 -07:00
parent 8769be8551
commit 01083ccb6c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/com/pitchedapps/frost/LoginActivity.kt
View File

@ -14,7 +14,9 @@ import ca.allanwang.kau.utils.setTextWithFade
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
@ -71,7 +73,6 @@ class LoginActivity : BaseActivity() {
cookie ->
web.fadeOut(onFinish = {
profile.fadeIn()
textview.fadeIn()
loadInfo(cookie)
})
}
@ -87,7 +88,8 @@ class LoginActivity : BaseActivity() {
(foundImage, name) ->
refresh = false
if (!foundImage) L.e("Could not get profile photo; Invalid userId?\n\t$cookie")
textview.setTextWithFade(String.format(getString(R.string.welcome), name), duration = 500)
textview.text = String.format(getString(R.string.welcome), name)
textview.fadeIn()
frostAnswers {
logLogin(LoginEvent().putMethod("frost_browser").putSuccess(true))
}
@ -108,7 +110,8 @@ class LoginActivity : BaseActivity() {
fun loadProfile(id: Long) {
Glide.with(this@LoginActivity).load(PROFILE_PICTURE_URL(id)).listener(object : RequestListener<Drawable> {
val options = RequestOptions().transform(CircleCrop())
Glide.with(this@LoginActivity).load(PROFILE_PICTURE_URL(id)).apply(options).listener(object : RequestListener<Drawable> {
override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
profileObservable.onSuccess(true)
return false

1
app/src/main/res/layout/login_webview.xml
View File

@ -24,7 +24,6 @@
android:layout_height="wrap_content"
android:layout_below="@id/profile"
android:layout_centerHorizontal="true"
android:text="@string/loading_account"
android:visibility="invisible" />
<com.pitchedapps.frost.web.LoginWebView