aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-06-13 14:05:10 -0700
committerAllan Wang <me@allanwang.ca>2019-06-13 14:05:10 -0700
commita8521935200a858d77fb8abfcc6d60e6a626eece (patch)
treee8025b92998fa2913ddaa5d5f55c378b7e3999dc /app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
parent1af2414105b33e92b7a9902b016aa7f4a9b3c869 (diff)
downloadfrost-a8521935200a858d77fb8abfcc6d60e6a626eece.tar.gz
frost-a8521935200a858d77fb8abfcc6d60e6a626eece.tar.bz2
frost-a8521935200a858d77fb8abfcc6d60e6a626eece.zip
Update kau and fix 29 incompatibilities
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index ff31b56b..5b2d01d4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -47,8 +47,8 @@ import ca.allanwang.kau.utils.toast
import ca.allanwang.kau.utils.withAlpha
import ca.allanwang.kau.utils.withMainContext
import com.google.android.material.snackbar.BaseTransientBottomBar
-import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
-import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
+import com.mikepenz.community_material_typeface_library.CommunityMaterial
+import com.mikepenz.google_material_typeface_library.GoogleMaterial
import com.pitchedapps.frost.R
import com.pitchedapps.frost.contracts.ActivityContract
import com.pitchedapps.frost.contracts.FileChooserContract
@@ -163,13 +163,16 @@ open class WebOverlayActivityBase(private val forceDesktopAgent: Boolean) : Base
val content: FrostContentWeb by bindView(R.id.frost_content_web)
val web: FrostWebView
get() = content.coreView
- val coordinator: CoordinatorLayout by bindView(R.id.overlay_main_content)
+ private val coordinator: CoordinatorLayout by bindView(R.id.overlay_main_content)
private inline val urlTest: String?
get() = intent.getStringExtra(ARG_URL) ?: intent.dataString
+ /**
+ * Nonnull variant; verify by checking [urlTest]
+ */
override val baseUrl: String
- get() = (intent.getStringExtra(ARG_URL) ?: intent.dataString).formattedFbUrl
+ get() = urlTest!!.formattedFbUrl
override val baseEnum: FbItem? = null