From ab7ec131b62ac1567e983c846c921bd3ada11dd4 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 7 Aug 2017 14:56:48 -0700
Subject: Fix/2FA (#115)

* Create basis for downloading videos

* Resolve some download errors and allow video to be opened in external apps

* Remove url checks for loging

* Update readme with build links

* Allow for all apks to build

* Fix travis apk uploads

* Fix null mapping

* Fix some notation

* Add commit message to test builds

* Remove faulty commit from test release

* Add intent overriding to login web client

* Add resource logging

* Add intent verification without url check

* Simplify login activity

* Check start activity for result

* Add check before resolving intent

* Fix wrong index

* Temporary fix for 2FA login with U2F (#116)

* Clean up and add comments
---
 app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt   | 9 +++------
 .../main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt    | 2 ++
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/views')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index dc5ac6ac..4b6c9e4e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -6,9 +6,7 @@ import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import ca.allanwang.kau.iitems.KauIItem
-import ca.allanwang.kau.utils.bindView
-import ca.allanwang.kau.utils.fadeIn
-import ca.allanwang.kau.utils.toDrawable
+import ca.allanwang.kau.utils.*
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
@@ -30,7 +28,7 @@ class AccountItem(val cookie: CookieModel?) : KauIItem<AccountItem, AccountItem.
     override fun bindView(viewHolder: ViewHolder, payloads: List<Any>?) {
         super.bindView(viewHolder, payloads)
         with(viewHolder) {
-            text.visibility = View.INVISIBLE
+            text.invisible()
             text.setTextColor(Prefs.textColor)
             if (cookie != null) {
                 text.text = cookie.name
@@ -46,10 +44,9 @@ class AccountItem(val cookie: CookieModel?) : KauIItem<AccountItem, AccountItem.
                     }
                 }).into(image)
             } else {
-                text.visibility = View.VISIBLE
+                text.visible()
                 image.setImageDrawable(GoogleMaterial.Icon.gmd_add_circle_outline.toDrawable(itemView.context, 100, Prefs.textColor))
                 text.text = itemView.context.getString(R.string.kau_add_account)
-                //todo add plus image
             }
         }
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
index 367495b5..d692c7aa 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostViewPager.kt
@@ -1,5 +1,6 @@
 package com.pitchedapps.frost.views
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.support.v4.view.ViewPager
 import android.util.AttributeSet
@@ -16,5 +17,6 @@ class FrostViewPager @JvmOverloads constructor(context: Context, attrs: Attribut
 
     override fun onInterceptTouchEvent(ev: MotionEvent?) = Prefs.viewpagerSwipe && enableSwipe && super.onInterceptTouchEvent(ev)
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(ev: MotionEvent?): Boolean = Prefs.viewpagerSwipe && enableSwipe && super.onTouchEvent(ev)
 }
\ No newline at end of file
-- 
cgit v1.2.3