From 52c213da7942c1eb2ad670a15a87f60b1c33b8a4 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 30 Dec 2019 17:34:46 -0800
Subject: Update changelog and apply spotless

---
 .../main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt | 2 +-
 app/src/main/play/en-US/whatsnew                                     | 5 ++---
 app/src/main/res/xml/frost_changelog.xml                             | 3 +--
 docs/Changelog.md                                                    | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index dbe54471..0111967f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -127,10 +127,10 @@ import com.pitchedapps.frost.views.BadgedIcon
 import com.pitchedapps.frost.views.FrostVideoViewer
 import com.pitchedapps.frost.views.FrostViewPager
 import com.pitchedapps.frost.widgets.NotificationWidget
+import kotlin.math.abs
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
-import kotlin.math.abs
 
 /**
  * Created by Allan Wang on 20/12/17.
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 228b2615..6dab286d 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1,10 +1,9 @@
 v2.4.2
 
-* Fix back stack history
+* Fix townhall loading
 * Fix search suggestions
 * Redesign navigation layout
 * Update theme
 * Open formatted urls from context menu
 * Allow copying text with emojis
-* Theme webview js dialogs
-* Update changelog
\ No newline at end of file
+* Theme webview js dialogs
\ No newline at end of file
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 237fadd3..efd09204 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -7,14 +7,13 @@
     -->
 
     <version title="v2.4.2" />
-    <item text="Fix back stack history" />
+    <item text="Fix townhall loading" />
     <item text="Fix search suggestions" />
     <item text="Redesign navigation layout" />
     <item text="Update theme" />
     <item text="Open formatted urls from context menu" />
     <item text="Allow copying text with emojis" />
     <item text="Theme webview js dialogs" />
-    <item text="Update changelog" />
     <item text="" />
 
     <version title="v2.4.1" />
diff --git a/docs/Changelog.md b/docs/Changelog.md
index bc75390f..15a39878 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,14 +1,13 @@
 # Changelog
 
 ## v2.4.2
-* Fix back stack history
+* Fix townhall loading
 * Fix search suggestions
 * Redesign navigation layout
 * Update theme
 * Open formatted urls from context menu
 * Allow copying text with emojis
 * Theme webview js dialogs
-* Update changelog
 
 ## v2.4.1
 * Add better support for mobile url conversions
-- 
cgit v1.2.3