From cfa645abd84a7dc356e2e158145b039303cd919e Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 12 Sep 2017 00:08:34 -0400
Subject: Fix most recents in main activity (#269)

---
 .../com/pitchedapps/frost/fragments/WebFragment.kt | 28 ++++++++++++----------
 app/src/main/res/xml/frost_changelog.xml           |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'app')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
index fd2b6cc1..f0bf2efa 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
@@ -30,18 +30,22 @@ class WebFragment : Fragment() {
         const val REQUEST_TEXT_ZOOM = 17
         const val REQUEST_REFRESH = 99
 
-        operator fun invoke(data: FbItem, position: Int) = WebFragment().withArguments(
-                ARG_URL to data.url,
-                ARG_POSITION to position,
-                ARG_URL_ENUM to when (data) {
-                //If is feed, check if sorting method is specified
-                    FbItem.FEED -> when (FeedSort(Prefs.feedSort)) {
-                        FeedSort.DEFAULT -> data
-                        FeedSort.MOST_RECENT -> FbItem.FEED_MOST_RECENT
-                        FeedSort.TOP -> FbItem.FEED_TOP_STORIES
-                    }
-                    else -> data
-                })
+        operator fun invoke(data: FbItem, position: Int) = WebFragment().apply {
+            val d = when (data) {
+            //If is feed, check if sorting method is specified
+                FbItem.FEED -> when (FeedSort(Prefs.feedSort)) {
+                    FeedSort.DEFAULT -> data
+                    FeedSort.MOST_RECENT -> FbItem.FEED_MOST_RECENT
+                    FeedSort.TOP -> FbItem.FEED_TOP_STORIES
+                }
+                else -> data
+            }
+            withArguments(
+                    ARG_URL to d.url,
+                    ARG_POSITION to position,
+                    ARG_URL_ENUM to d
+            )
+        }
     }
 
     //    val refresh: SwipeRefreshLayout by lazy { frostWebView.refresh }
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 422fae19..716c2bbf 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -12,7 +12,7 @@
 	
 	<version title="Beta Updates"/>
 	<item text="Prevent image loading from trimming too many characters" />
-	<item text="" />
+	<item text="Fix most recent mode for news feed" />
 	<item text="" />
 	<item text="" />
 	<item text="" />
-- 
cgit v1.2.3