From b10a745c7f0f46f4f014e1ba7fa71172d7442b83 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 8 Jul 2017 03:03:55 -0400
Subject: Dev-1.1.7 (#39) - feature overload + context menu

* Address some crashlytics issues

* Add text scaling

* Kau fixes and cleanup

* WIP formatter

* Create in house url formatter

* Update context menu

* Update themes

* Test proguard without R

* Implement sharing and clean up context menu

* Disable viewpager swipe on long press

* Test keeping lib strings

* Update changelog and proguard
---
 app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 9fee3571..6f3459d7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -23,8 +23,8 @@ import com.crashlytics.android.answers.Answers
 import com.crashlytics.android.answers.CustomEvent
 import com.pitchedapps.frost.*
 import com.pitchedapps.frost.dbflow.CookieModel
-import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.facebook.FbTab
+import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.services.NotificationService
 
 /**
@@ -51,17 +51,6 @@ fun Activity.cookies(): ArrayList<CookieModel> {
     return intent?.extras?.getParcelableArrayList<CookieModel>(EXTRA_COOKIES) ?: arrayListOf()
 }
 
-val String.formattedFbUrl: String
-    get() {
-        var url = this
-        if (url.startsWith("#!/")) url = url.substring(2)
-        if (url.startsWith('/')) url = FB_URL_BASE + url.substring(1)
-        url = url.replace("/#!/", "/")
-        val ref = url.indexOf("?ref")
-        if (ref != -1) url = url.substring(0, ref)
-        return url
-    }
-
 fun Context.launchWebOverlay(url: String) {
     val argUrl = url.formattedFbUrl
     L.v("Launch received $url")
@@ -172,4 +161,5 @@ fun View.frostSnackbar(@StringRes text: Int, builder: Snackbar.() -> Unit = {})
 
 fun Activity.frostNavigationBar() {
     navigationBarColor = if (Prefs.tintNavBar) Prefs.headerColor else Color.BLACK
-}
\ No newline at end of file
+}
+
-- 
cgit v1.2.3