Separate pref strings, add notifs control, fix searchview (#60)v1.2.2

* Separate pref strings and add notif controls

* Add overlay toggle and minor cleanups

* Fix search view

20 files changed, 134 insertions, 90 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 45bdaa16..9e492f1a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ apply plugin: 'com.github.triplet.play'
 
 play {
     jsonFile = file('../files/gplay-keys.json')
-    track = 'beta'
+    track = 'alpha'
     errorOnSizeLimit = true
     uploadImages = false
     untrackOld = true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c65a23d0..90f2d3b3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,7 +44,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/FrostTheme.Overlay" />
-
         <activity
             android:name=".FrostWebActivity"
             android:autoRemoveFromRecents="true"
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt
index 35d7153f..f9a597db 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/MainActivity.kt
@@ -49,7 +49,6 @@ import com.pitchedapps.frost.facebook.FbCookie.switchUser
 import com.pitchedapps.frost.facebook.FbTab
 import com.pitchedapps.frost.facebook.PROFILE_PICTURE_URL
 import com.pitchedapps.frost.fragments.WebFragment
-import com.pitchedapps.frost.services.NotificationContent
 import com.pitchedapps.frost.utils.*
 import com.pitchedapps.frost.utils.iab.validatePro
 import com.pitchedapps.frost.views.BadgedIcon
@@ -59,7 +58,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
-import org.jetbrains.anko.doAsync
 import org.jsoup.Jsoup
 import java.util.concurrent.TimeUnit
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
index d197918d..6c1fb5bd 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/WebOverlayActivity.kt
@@ -37,10 +37,6 @@ open class WebOverlayActivity : AppCompatActivity(),
     val frostWeb: FrostWebView by bindView(R.id.overlay_frost_webview)
     val coordinator: CoordinatorLayout by bindView(R.id.overlay_main_content)
 
-    companion object {
-        const val ARG_USER_ID = "arg_user_id"
-    }
-
     val urlTest: String?
         get() = intent.extras?.getString(ARG_URL) ?: intent.dataString
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index 2cea55b4..7b60a718 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -19,13 +19,10 @@ import com.bumptech.glide.request.transition.Transition
 import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.FrostWebActivity
 import com.pitchedapps.frost.R
-import com.pitchedapps.frost.WebOverlayActivity
 import com.pitchedapps.frost.dbflow.CookieModel
 import com.pitchedapps.frost.dbflow.fetchUsername
 import com.pitchedapps.frost.facebook.FB_URL_BASE
-import com.pitchedapps.frost.utils.GlideApp
-import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.utils.withRoundIcon
+import com.pitchedapps.frost.utils.*
 import org.jetbrains.anko.runOnUiThread
 
 /**
@@ -38,6 +35,12 @@ val Context.frostNotification: NotificationCompat.Builder
         color = color(R.color.frost_notification_accent)
     }
 
+fun Notification.frostConfig() = apply {
+    if (Prefs.notificationVibrate) defaults = defaults or Notification.DEFAULT_VIBRATE
+    if (Prefs.notificationSound) defaults = defaults or Notification.DEFAULT_SOUND
+    if (Prefs.notificationLights) defaults = defaults or Notification.DEFAULT_LIGHTS
+}
+
 val NotificationCompat.Builder.withBigText: NotificationCompat.BigTextStyle
     get() = NotificationCompat.BigTextStyle(this)
 
@@ -54,7 +57,7 @@ class FrostNotificationTarget(val context: Context,
 
     override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>) {
         builder.setLargeIcon(resource)
-        NotificationManagerCompat.from(context).notify(notifTag, notifId, builder.withBigText.build())
+        NotificationManagerCompat.from(context).notify(notifTag, notifId, builder.withBigText.build().frostConfig())
     }
 }
 
@@ -78,7 +81,7 @@ data class NotificationContent(val data: CookieModel,
         } else {
             val intent = Intent(context, FrostWebActivity::class.java)
             intent.data = Uri.parse("${FB_URL_BASE}$href")
-            intent.putExtra(WebOverlayActivity.ARG_USER_ID, data.id)
+            intent.putExtra(ARG_USER_ID, data.id)
             val group = "frost_${data.id}"
             val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
             val notifBuilder = context.frostNotification
@@ -91,7 +94,7 @@ data class NotificationContent(val data: CookieModel,
 
             if (timestamp != -1L) notifBuilder.setWhen(timestamp * 1000)
             L.v("Notif load $this")
-            NotificationManagerCompat.from(context).notify(group, notifId, notifBuilder.withBigText.build())
+            NotificationManagerCompat.from(context).notify(group, notifId, notifBuilder.withBigText.build().frostConfig())
 
             if (profileUrl.isNotBlank()) {
                 context.runOnUiThread {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
index f9d0c63c..38282bf7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
@@ -174,7 +174,7 @@ class NotificationService : JobService() {
         val notifBuilder = frostNotification
                 .setContentTitle(string(R.string.app_name))
                 .setContentText(text)
-        NotificationManagerCompat.from(this).notify(999, notifBuilder.build())
+        NotificationManagerCompat.from(this).notify(999, notifBuilder.build().frostConfig())
     }
 
     fun summaryNotification(userId: Long, count: Int) {
@@ -185,7 +185,7 @@ class NotificationService : JobService() {
                 .setGroup("frost_$userId")
                 .setGroupSummary(true)
 
-        NotificationManagerCompat.from(this).notify("frost_$userId", userId.toInt(), notifBuilder.build())
+        NotificationManagerCompat.from(this).notify("frost_$userId", userId.toInt(), notifBuilder.build().frostConfig())
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
index b912c103..7ce546b3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Behaviour.kt
@@ -1,6 +1,7 @@
 package com.pitchedapps.frost.settings
 
 import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder
+import com.pitchedapps.frost.MainActivity
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.SettingsActivity
 import com.pitchedapps.frost.utils.Prefs
@@ -14,6 +15,10 @@ fun SettingsActivity.getBehaviourPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.fancy_animations_desc
     }
 
+    checkbox(R.string.overlay_swipe, { Prefs.overlayEnabled }, { Prefs.overlayEnabled = it; setResult(MainActivity.REQUEST_REFRESH) }) {
+        descRes = R.string.overlay_swipe_desc
+    }
+
     checkbox(R.string.overlay_full_screen_swipe, { Prefs.overlayFullScreenSwipe }, { Prefs.overlayFullScreenSwipe = it }) {
         descRes = R.string.overlay_full_screen_swipe_desc
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
index 86cfcc16..b6105054 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
@@ -55,6 +55,12 @@ fun SettingsActivity.getNotificationPrefs(): KPrefAdapterBuilder.() -> Unit = {
         descRes = R.string.notification_all_accounts_desc
     }
 
+    checkbox(R.string.notification_sound, { Prefs.notificationSound }, { Prefs.notificationSound = it })
+
+    checkbox(R.string.notification_vibrate, { Prefs.notificationVibrate }, { Prefs.notificationVibrate = it })
+
+    checkbox(R.string.notification_lights, { Prefs.notificationLights }, { Prefs.notificationLights = it })
+
     plainText(R.string.notification_fetch_now) {
         descRes = R.string.notification_fetch_now_desc
         onClick = {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index 64ec08cd..d2e04898 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -89,6 +89,12 @@ object Prefs : KPref() {
 
     var notificationsInstantMessages: Boolean by kpref("notification_im", true)
 
+    var notificationVibrate: Boolean by kpref("notification_vibrate", true)
+
+    var notificationSound: Boolean by kpref("notification_sound", true)
+
+    var notificationLights: Boolean by kpref("notification_lights", true)
+
     /**
      * Cache like value to determine if user has or had pro
      * In most cases, [com.pitchedapps.frost.utils.iab.IS_FROST_PRO] should be looked at instead
@@ -105,6 +111,8 @@ object Prefs : KPref() {
 
     var searchBar: Boolean by kpref("search_bar", Showcase.experimentalDefault)
 
+    var overlayEnabled: Boolean by kpref("overlay_enabled", true)
+
     var overlayFullScreenSwipe: Boolean by kpref("overlay_full_screen_swipe", true)
 
     var viewpagerSwipe: Boolean by kpref("viewpager_swipe", true)
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 3d3025cf..9a599945 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -28,8 +28,9 @@ import com.pitchedapps.frost.facebook.formattedFbUrl
 /**
  * Created by Allan Wang on 2017-06-03.
  */
-internal const val EXTRA_COOKIES = "extra_cookies"
-internal const val ARG_URL = "arg_url"
+const val EXTRA_COOKIES = "extra_cookies"
+const val ARG_URL = "arg_url"
+const val ARG_USER_ID = "arg_user_id"
 
 @GlideModule
 class FrostGlideModule : AppGlideModule()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
index ce2daa07..5e5dc597 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt
@@ -65,7 +65,7 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : WebViewClient() {
                     refreshObservable.onNext(false)
                     webCore.jsInject(
                             JsActions.LOGIN_CHECK,
-                            JsAssets.CLICK_A.maybe(webCore.baseEnum != null),
+                            JsAssets.CLICK_A.maybe(webCore.baseEnum != null && Prefs.overlayEnabled),
                             JsAssets.CONTEXT_A,
                             JsAssets.HEADER_BADGES.maybe(webCore.baseEnum != null)
                     )
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewSearch.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewSearch.kt
index d4d08958..b3b1cfe5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewSearch.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewSearch.kt
@@ -64,7 +64,7 @@ class FrostWebViewSearch(context: Context, val contract: SearchContract) : WebVi
                         element ->
                         //split text into separate items
                         L.v("Search element ${element.attr("href")}")
-                        val texts = element.select("div").map { (it.ownText()) }.filter { it.isNotBlank() }
+                        val texts = element.select("div").map { (it.text()) }.filter { it.isNotBlank() }
                         val pair = Pair(texts, element.attr("href"))
                         L.v("Search element potential $pair")
                         pair
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4d0ed062..7bfdf410 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,7 +50,6 @@
     <string name="web_overlay_swipe_hint">Swipe right to go back to the previous window.</string>
     <string name="profile_picture">Profile Picture</string>
 
-    <string name="pro_features">Pro Features</string>
     <string name="custom_pro">Custom [Pro]</string>
     <string name="uh_oh">Uh Oh</string>
     <string name="reload">Reload</string>
diff --git a/app/src/main/res/values/strings_pref_appearance.xml b/app/src/main/res/values/strings_pref_appearance.xml
new file mode 100644
index 00000000..7f08d43c
--- /dev/null
+++ b/app/src/main/res/values/strings_pref_appearance.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="theme_customization">Theme Customization</string>
+
+    <string name="theme">Theme</string>
+    <string name="text_color">Text Color</string>
+    <string name="background_color">Background Color</string>
+    <string name="header_color">Header Color</string>
+    <string name="icon_color">Icon Color</string>
+
+    <string name="global_customization">Global Customization</string>
+
+    <string name="rounded_icons">Rounded Icons</string>
+    <string name="rounded_icons_desc">Profile photos and group conversation icons will be rounded</string>
+
+    <string name="tint_nav">Tint Nav Bar</string>
+    <string name="tint_nav_desc">Navigation bar will be the same color as the header</string>
+    <string name="web_text_scaling">Web Text Scaling</string>
+    <string name="web_text_scaling_desc">Text Scaling Example; Long press the percentage text to reset.</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_pref_behaviour.xml b/app/src/main/res/values/strings_pref_behaviour.xml
new file mode 100644
index 00000000..13924a2d
--- /dev/null
+++ b/app/src/main/res/values/strings_pref_behaviour.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="fancy_animations">Fancy Animations</string>
+    <string name="fancy_animations_desc">Reveal webviews using ripples and animate transitions</string>
+    <string name="overlay_swipe">Enable Overlays</string>
+    <string name="overlay_swipe_desc">Pressing most links will launch in a new overlay so you can easily swipe back to the original page. Note that this does result in slightly longer loads given that the whole page is reloaded.</string>
+    <string name="overlay_full_screen_swipe">Overlay Full Screen Swipe to Dismiss</string>
+    <string name="overlay_full_screen_swipe_desc">Swipe right from anywhere on the overlaying web to close the browser. If disabled, only swiping from the left edge will move it.</string>
+    <string name="viewpager_swipe">Viewpager Swipe</string>
+    <string name="viewpager_swipe_desc">Allow swiping between the pages in the main view to switch tabs. By default, the swiping automatically stops when you long press on an item, such as the like button. Disabling this will prevent page swiping altogether.</string>
+    <string name="exit_confirmation">Exit Confirmation</string>
+    <string name="exit_confirmation_desc">Show confirmation dialog before exiting the app</string>
+    <string name="analytics">Analytics</string>
+    <string name="analytics_desc">Enable anonymous analytics to help improve the app. No personal information is ever exposed.</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_pref_experimental.xml b/app/src/main/res/values/strings_pref_experimental.xml
new file mode 100644
index 00000000..2d49864b
--- /dev/null
+++ b/app/src/main/res/values/strings_pref_experimental.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="experimental_disclaimer">Disclaimer</string>
+    <string name="experimental_disclaimer_info">Experimental features may be unstable and may never make it to production. Use at your own risk, send feedback, and feel free to disable them if they don\'t work well.</string>
+    <string name="experimental_by_default">Experimental by Default</string>
+    <string name="experimental_by_default_desc">Feeling risky or just want to help with debugging? Checking this will enable future experimental functions be default.</string>
+    <string name="search_bar">Search Bar</string>
+    <string name="search_bar_desc">Enable the search bar instead of a search overlay</string>
+    <string name="verbose_logging">Verbose Logging</string>
+    <string name="verbose_logging_desc">Enable verbose logging to help with crash reports. Logging will only be sent once an error is encountered, so repeat the issue to notify the dev. This will automatically be disabled if the app restarts.</string>
+    <string name="restart_frost">Restart Frost</string>
+    <string name="restart_frost_desc">Crashlytics will only submit logs when a crash occurs or if errors are found and the app is restarted. Clicking here will restart the app and flush whatever issues are currently found.</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_pref_feed.xml b/app/src/main/res/values/strings_pref_feed.xml
new file mode 100644
index 00000000..8d872add
--- /dev/null
+++ b/app/src/main/res/values/strings_pref_feed.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="newsfeed_sort">Newsfeed Order</string>
+    <string name="newsfeed_sort_desc">Defines the order in which the posts are shown</string>
+    <string name="pro_features">Pro Features</string>
+    <string name="suggested_friends">Suggested Friends</string>
+    <string name="suggested_friends_desc">Show "People You May Know" in the feed</string>
+    <string name="facebook_ads">Facebook Ads</string>
+    <string name="facebook_ads_desc">Show native Facebook ads</string>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_pref_notifications.xml b/app/src/main/res/values/strings_pref_notifications.xml
new file mode 100644
index 00000000..1d605c2b
--- /dev/null
+++ b/app/src/main/res/values/strings_pref_notifications.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="notification_frequency">Notification Frequency</string>
+    <string name="notification_keywords">Keywords</string>
+    <string name="notification_keywords_desc">Does not notify when notification contains any of these keys.</string>
+    <string name="add_keyword">Add Keyword</string>
+    <string name="hint_keyword">Type keyword and press +</string>
+    <string name="empty_keyword">Empty Keyword</string>
+    <string name="notification_all_accounts">Notify from all accounts</string>
+    <string name="notification_all_accounts_desc">Get notifications for every account that is logged in. Disabling this will only fetch notifications form the currently selected account.</string>
+    <string name="notification_fetch_now">Fetch Notifications Now</string>
+    <string name="notification_fetch_now_desc">Trigger the notification fetcher one time.</string>
+    <string name="notification_fetch_success">Fetching Notifications…</string>
+    <string name="notification_fetch_fail">Couldn\'t fetch notifications</string>
+    <string name="notification_sound">Notification sound</string>
+    <string name="notification_vibrate">Notification vibration</string>
+    <string name="notification_lights">Notification lights</string>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_preferences b/app/src/main/res/values/strings_preferences
index f70ffe59..81545f1c 100644
--- a/app/src/main/res/values/strings_preferences
+++ b/app/src/main/res/values/strings_preferences
@@ -1,75 +1,17 @@
 <resources>
-    <!--categories-->
     <string name="appearance">Appearance</string>
     <string name="appearance_desc">Theme, Items to display, etc</string>
 
     <string name="notifications_desc">Frequency, filters, etc</string>
+
     <string name="newsfeed">News Feed</string>
     <string name="newsfeed_desc">Define what items appear in the newsfeed</string>
 
     <string name="behaviour">Behaviour</string>
     <string name="behaviour_desc">Define how the app interacts in certain settings</string>
 
-    <string name="exit_confirmation">Exit Confirmation</string>
-    <string name="exit_confirmation_desc">Show confirmation dialog before exiting the app</string>
-    <string name="analytics">Analytics</string>
-    <string name="analytics_desc">Enable anonymous analytics to help improve the app. No personal information is ever exposed.</string>
-    <string name="overlay_full_screen_swipe">Overlay Full Screen Swipe to Dismiss</string>
-    <string name="overlay_full_screen_swipe_desc">Swipe right from anywhere on the overlaying web to close the browser. If disabled, only swiping from the left edge will move it.</string>
-    <string name="viewpager_swipe">Viewpager Swipe</string>
-    <string name="viewpager_swipe_desc">Allow swiping between the pages in the main view to switch tabs. By default, the swiping automatically stops when you long press on an item, such as the like button. Disabling this will prevent page swiping altogether.</string>
-
-    <!--themes-->
-    <string name="theme">Theme</string>
-    <string name="text_color">Text Color</string>
-    <string name="background_color">Background Color</string>
-    <string name="header_color">Header Color</string>
-    <string name="icon_color">Icon Color</string>
-
-    <string name="rounded_icons">Rounded Icons</string>
-    <string name="rounded_icons_desc">Profile photos and group conversation icons will be rounded</string>
-    <string name="theme_customization">Theme Customization</string>
-    <string name="global_customization">Global Customization</string>
-    <string name="feed_customization">Feed Customization</string>
-    <string name="newsfeed_sort">Newsfeed Order</string>
-    <string name="newsfeed_sort_desc">Defines the order in which the posts are shown</string>
-    <string name="suggested_friends">Suggested Friends</string>
-    <string name="suggested_friends_desc">Show "People You May Know" in the feed</string>
-    <string name="facebook_ads">Facebook Ads</string>
-    <string name="facebook_ads_desc">Show native Facebook ads</string>
-
-    <string name="notification_frequency">Notification Frequency</string>
-    <string name="notification_keywords">Keywords</string>
-    <string name="notification_keywords_desc">Does not notify when notification contains any of these keys.</string>
-    <string name="add_keyword">Add Keyword</string>
-    <string name="hint_keyword">Type keyword and press +</string>
-    <string name="empty_keyword">Empty Keyword</string>
-    <string name="notification_all_accounts">Notify from all accounts</string>
-    <string name="notification_all_accounts_desc">Get notifications for every account that is logged in. Disabling this will only fetch notifications form the currently selected account.</string>
-    <string name="notification_fetch_now">Fetch Notifications Now</string>
-    <string name="notification_fetch_now_desc">Trigger the notification fetcher one time.</string>
-    <string name="notification_fetch_success">Fetching Notifications…</string>
-    <string name="notification_fetch_fail">Couldn\'t fetch notifications</string>
-
-    <string name="fancy_animations">Fancy Animations</string>
-    <string name="fancy_animations_desc">Reveal webviews using ripples and animate transitions</string>
-    <string name="tint_nav">Tint Nav Bar</string>
-    <string name="tint_nav_desc">Navigation bar will be the same color as the header</string>
-    <string name="web_text_scaling">Web Text Scaling</string>
-    <string name="web_text_scaling_desc">Text Scaling Example; Long press the percentage text to reset.</string>
-
     <string name="experimental">Experimental</string>
     <string name="experimental_desc">Enable early access to potentially unstable features</string>
-    <string name="experimental_disclaimer">Disclaimer</string>
-    <string name="experimental_disclaimer_info">Experimental features may be unstable and may never make it to production. Use at your own risk, send feedback, and feel free to disable them if they don\'t work well.</string>
-    <string name="experimental_by_default">Experimental by Default</string>
-    <string name="experimental_by_default_desc">Feeling risky or just want to help with debugging? Checking this will enable future experimental functions be default.</string>
-    <string name="search_bar">Search Bar</string>
-    <string name="search_bar_desc">Enable the search bar instead of a search overlay</string>
-    <string name="verbose_logging">Verbose Logging</string>
-    <string name="verbose_logging_desc">Enable verbose logging to help with crash reports. Logging will only be sent once an error is encountered, so repeat the issue to notify the dev. This will automatically be disabled if the app restarts.</string>
-    <string name="restart_frost">Restart Frost</string>
-    <string name="restart_frost_desc">Crashlytics will only submit logs when a crash occurs or if errors are found and the app is restarted. Clicking here will restart the app and flush whatever issues are currently found.</string>
 
     <string name="restore_purchases">Restore Purchases</string>
     <string name="restore_purchases_desc">Restore any previous purchases from the Play Store</string>
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 8b229dea..59baeef5 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -8,17 +8,17 @@
     <item text="" />
     -->
 
-    <version title="Beta Updates"/>
+    <version title="Beta Updates" />
     <item text="Reduce Menu loading logic" />
     <item text="Load js injectors after showing webview" />
-    <item text="Add notifications for messages" />
-    <item text="" />
-    <item text="" />
-    <item text="" />
+    <item text="Add toggles for sound, vibration, and lights" />
+    <item text="Avoid restricting facebook features (such as user tagging)" />
+    <item text="Add option to disable loading in overlays" />
+    <item text="Fixed experimental search result text" />
     <item text="" />
     <item text="" />
 
-    <version title="v1.3"/>
+    <version title="v1.3" />
     <item text="Create toggle for notifications only from primary account" />
     <item text="Micro string optimizations" />
     <item text="Add profile icons to notifications" />
@@ -26,7 +26,7 @@
     <item text="Add notification trigger in settings" />
     <item text="Fix bug where only single latest notification is showing" />
 
-    <version title="v1.2"/>
+    <version title="v1.2" />
     <item text="Scale browser on keyboard pop up" />
     <item text="Clean up web overlay" />
     <item text="Allow customization of overlay swipe" />
@@ -37,7 +37,7 @@
     <item text="Intelligently stop horizontal page scrolling on long press" />
     <item text="More theming" />
 
-    <version title="v1.1"/>
+    <version title="v1.1" />
     <item text="Add universal experimental toggle" />
     <item text="Fixed up billing properties and add auto checker" />
     <item text="Open status updates in new window" />
@@ -48,7 +48,7 @@
     <item text="Initial Reddit beta release" />
 
 
-    <version title="v1.0"/>
+    <version title="v1.0" />
     <item text="Add more global preferences" />
     <item text="Add fully customizable theme engine" />
     <item text="Add support for in app billing" />