Merge branch 'dev' into fix-search

42 files changed, 14 insertions, 144 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index f3eb8fe6..97abf5a2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -145,7 +145,7 @@ class LoginActivity : BaseActivity() {
     private suspend fun loadProfile(id: Long): Boolean = withMainContext {
         suspendCancellableCoroutine<Boolean> { cont ->
             profileLoader.load(profilePictureUrl(id))
-                .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
+                .transform(FrostGlide.circleCrop).listener(object : RequestListener<Drawable> {
                     override fun onResourceReady(
                         resource: Drawable?,
                         model: Any?,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
index 870e2ccd..537ad89c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/glide/GlideUtils.kt
@@ -38,8 +38,6 @@ import okhttp3.Response
  * Each caller will generate a new one upon request
  */
 object FrostGlide {
-    val roundCorner
-        get() = RoundCornerTransformation()
     val circleCrop
         get() = CircleCrop()
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt
deleted file mode 100644
index 564224ea..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2018 Allan Wang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.pitchedapps.frost.glide
-
-import android.graphics.Bitmap
-import android.graphics.BitmapShader
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.Shader
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
-import com.pitchedapps.frost.utils.Prefs
-import java.security.MessageDigest
-
-/**
- * Created by Allan Wang on 27/12/17.
- */
-class RoundCornerTransformation : BitmapTransformation() {
-
-    override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-        messageDigest.update("FrostRoundCornerTransform-${Prefs.showRoundedIcons}".toByteArray())
-    }
-
-    override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
-
-        val width = toTransform.width
-        val height = toTransform.height
-
-        val bitmap = pool.get(width, height, Bitmap.Config.ARGB_8888)
-        bitmap.setHasAlpha(true)
-
-        val radius = Math.min(width, height).toFloat() /
-            (if (Prefs.showRoundedIcons) 2f else 10f)
-
-        val canvas = Canvas(bitmap)
-        val paint = Paint()
-        paint.isAntiAlias = true
-        paint.shader = BitmapShader(toTransform, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        canvas.drawRoundRect(
-            RectF(0f, 0f, width.toFloat(), height.toFloat()),
-            radius, radius, paint
-        )
-
-        return bitmap
-    }
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
index 651a4a2a..d20e8cde 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/MenuIItem.kt
@@ -59,7 +59,7 @@ class MenuContentIItem(val data: MenuItem) :
             if (iconUrl != null)
                 GlideApp.with(itemView)
                     .load(iconUrl)
-                    .transform(FrostGlide.roundCorner)
+                    .transform(FrostGlide.circleCrop)
                     .into(icon.visible())
             else
                 icon.gone()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
index e8332955..8b196a64 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
@@ -106,7 +106,7 @@ class NotificationIItem(val notification: FrostNotif, val cookie: String) :
 
             val glide = glide
             glide.load(notif.img)
-                .transform(FrostGlide.roundCorner)
+                .transform(FrostGlide.circleCrop)
                 .into(avatar)
             if (notif.thumbnailUrl != null)
                 glide.load(notif.thumbnailUrl).into(thumbnail.visible())
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
index a466feec..e7efbf2a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt
@@ -41,7 +41,7 @@ import java.util.Locale
  * The enum name must match the css file name
  */
 enum class CssAssets(val folder: String = THEME_FOLDER) : InjectorContract {
-    MATERIAL_LIGHT, MATERIAL_DARK, MATERIAL_AMOLED, MATERIAL_GLASS, CUSTOM, ROUND_ICONS("components")
+    MATERIAL_LIGHT, MATERIAL_DARK, MATERIAL_AMOLED, MATERIAL_GLASS, CUSTOM
     ;
 
     @VisibleForTesting
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
index 292b7ff5..891a1dbf 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
@@ -26,7 +26,7 @@ import android.webkit.WebView
 enum class CssHider(vararg val items: String) : InjectorContract {
     CORE("[data-sigil=m_login_upsell]", "[role=progressbar]"),
     HEADER(
-        "#header", "#mJewelNav", "[data-sigil=MTopBlueBarHeader]",
+        "#header:not(.mFuturePageHeader):not(.titled)", "#mJewelNav", "[data-sigil=MTopBlueBarHeader]",
         "#header-notices", "[data-sigil*=m-promo-jewel-header]"
     ),
     ADS(
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
index e0be7977..ad42418e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -33,7 +33,7 @@ import java.util.Locale
  * The enum name must match the css file name
  */
 enum class JsAssets : InjectorContract {
-    MENU, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, HEADER_HIDER, TEXTAREA_LISTENER, NOTIF_MSG,
+    MENU, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, TEXTAREA_LISTENER, NOTIF_MSG,
     DOCUMENT_WATCHER
     ;
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
index 1b1ca796..a6437123 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt
@@ -28,7 +28,6 @@ import com.pitchedapps.frost.enums.Theme
 import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.REQUEST_NAV
-import com.pitchedapps.frost.utils.REQUEST_REFRESH
 import com.pitchedapps.frost.utils.REQUEST_TEXT_ZOOM
 import com.pitchedapps.frost.utils.frostEvent
 import com.pitchedapps.frost.utils.frostNavigationBar
@@ -155,13 +154,6 @@ fun SettingsActivity.getAppearancePrefs(): KPrefAdapterBuilder.() -> Unit = {
         onClick = { launchTabCustomizerActivity() }
     }
 
-    checkbox(R.string.rounded_icons, Prefs::showRoundedIcons, {
-        Prefs.showRoundedIcons = it
-        setFrostResult(REQUEST_REFRESH)
-    }) {
-        descRes = R.string.rounded_icons_desc
-    }
-
     checkbox(R.string.tint_nav, Prefs::tintNavBar, {
         Prefs.tintNavBar = it
         frostNavigationBar()
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 9a63f527..391d422a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -116,8 +116,6 @@ object Prefs : KPref() {
 
     var aggressiveRecents: Boolean by kpref("aggressive_recents", false)
 
-    var showRoundedIcons: Boolean by kpref("rounded_icons", true)
-
     var showComposer: Boolean by kpref("status_composer_feed", true)
 
     var showSuggestedFriends: Boolean by kpref("suggested_friends_feed", true)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
index d7a7de0e..d60ea7ed 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/views/AccountItem.kt
@@ -53,7 +53,7 @@ class AccountItem(val cookie: CookieModel?) : KauIItem<AccountItem, AccountItem.
             if (cookie != null) {
                 text.text = cookie.name
                 GlideApp.with(itemView).load(profilePictureUrl(cookie.id))
-                    .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
+                    .transform(FrostGlide.circleCrop).listener(object : RequestListener<Drawable> {
                         override fun onResourceReady(
                             resource: Drawable?,
                             model: Any?,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
index 6b186b1c..90c4c7e2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt
@@ -25,7 +25,6 @@ import android.view.View
 import android.webkit.WebView
 import ca.allanwang.kau.utils.withAlpha
 import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
-import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.injectors.CssHider
 import com.pitchedapps.frost.injectors.jsInject
 import com.pitchedapps.frost.utils.L
@@ -102,7 +101,6 @@ class DebugWebView @JvmOverloads constructor(
             injectBackgroundColor()
             if (url.isFacebookUrl)
                 view.jsInject(
-                    CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons),
 //                        CssHider.CORE,
                     CssHider.COMPOSER.maybe(!Prefs.showComposer),
                     CssHider.STORIES.maybe(!Prefs.showStories),
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index e162f9da..003ed7f9 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -27,7 +27,6 @@ import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.facebook.formattedFbUrl
-import com.pitchedapps.frost.injectors.CssAssets
 import com.pitchedapps.frost.injectors.CssHider
 import com.pitchedapps.frost.injectors.JsActions
 import com.pitchedapps.frost.injectors.JsAssets
@@ -91,7 +90,6 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
         injectBackgroundColor()
         if (url.isFacebookUrl)
             view.jsInject(
-                CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons),
 //                    CssHider.CORE,
                 CssHider.HEADER,
                 CssHider.COMPOSER.maybe(!Prefs.showComposer),
@@ -107,7 +105,6 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
                 JsAssets.CLICK_A,
                 CssHider.ADS.maybe(!Prefs.showFacebookAds),
                 JsAssets.CONTEXT_A,
-//                    JsAssets.HEADER_HIDER,
                 JsAssets.MEDIA
             )
         else
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index c21ce93b..1c300b03 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -98,7 +98,6 @@ class LoginWebView @JvmOverloads constructor(
             view.setBackgroundColor(Color.TRANSPARENT)
             if (url.isFacebookUrl)
                 view.jsInject(
-                    JsAssets.HEADER_HIDER,
                     CssHider.CORE,
                     Prefs.themeInjector
                 )
diff --git a/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml b/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml
index 711b8943..8299a26c 100644
--- a/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml
+++ b/app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Nastavit rozložení hlavního zobrazení aktivit</string>
     <string name="main_tabs">Hlavní záložky aktivit</string>
     <string name="main_tabs_desc">Nastavte záložky viditelné v hlavním pohledu</string>
-    <string name="rounded_icons">Kulaté ikony</string>
-    <string name="rounded_icons_desc">Ikony profilových fotek a skupinových konverzacích budou kulaté</string>
     <string name="tint_nav">Odstín navigační lišty</string>
     <string name="tint_nav_desc">Navigační lišta bude mít stejnou barvu jako je základní barva</string>
     <string name="web_text_scaling">Zvětšující se text na webu</string>
diff --git a/app/src/main/res/values-da-rDK/strings_pref_appearance.xml b/app/src/main/res/values-da-rDK/strings_pref_appearance.xml
index 3e73f42b..2b1f0130 100644
--- a/app/src/main/res/values-da-rDK/strings_pref_appearance.xml
+++ b/app/src/main/res/values-da-rDK/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Vælg hovedaktivitetslayout</string>
     <string name="main_tabs">Hovedaktivitetsfaner</string>
     <string name="main_tabs_desc">Vælg hvilke faner, du vil se i din hovedaktivitet</string>
-    <string name="rounded_icons">Afrundede ikoner</string>
-    <string name="rounded_icons_desc">Profilfotos og gruppesamtale-ikoner vil blive afrundet</string>
     <string name="tint_nav">Farv navigationsbjælke</string>
     <string name="tint_nav_desc">Navigationsbjælke vil have samme farve som headeren</string>
     <string name="web_text_scaling">Internettekstskalering</string>
diff --git a/app/src/main/res/values-de-rDE/strings_pref_appearance.xml b/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
index 46ff7a62..3082cb4f 100644
--- a/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
+++ b/app/src/main/res/values-de-rDE/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Setzte das Haupt-Aktivitäten Layout</string>
     <string name="main_tabs">Haupt-Aktivitäten Tabs</string>
     <string name="main_tabs_desc">Passen Sie die Tabs an, die Sie in Ihrer Hauptseite sehen wollen</string>
-    <string name="rounded_icons">Runde Symbole</string>
-    <string name="rounded_icons_desc">Profilfotos und Gruppengespräch Symbole werden abgerundet</string>
     <string name="tint_nav">Färbe Navigationsbar</string>
     <string name="tint_nav_desc">Navigationsleiste wird die gleiche Farbe wie die Kopfzeile sein</string>
     <string name="web_text_scaling">Web Textskalierung</string>
diff --git a/app/src/main/res/values-es-rES/strings_pref_appearance.xml b/app/src/main/res/values-es-rES/strings_pref_appearance.xml
index d36ad1e2..98bebc8d 100644
--- a/app/src/main/res/values-es-rES/strings_pref_appearance.xml
+++ b/app/src/main/res/values-es-rES/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Establecer Diseño de la Pantalla Principal</string>
     <string name="main_tabs">Pestañas de actividad</string>
     <string name="main_tabs_desc">Personaliza las pestañas que verás en la pantalla principal</string>
-    <string name="rounded_icons">Iconos redondeados</string>
-    <string name="rounded_icons_desc">Los iconos de conversación de grupo y fotos de perfil se redondearán</string>
     <string name="tint_nav">Colorear Barra de Navegación</string>
     <string name="tint_nav_desc">La barra de navegación será del mismo color que la cabecera</string>
     <string name="web_text_scaling">Tamaño de texto Web</string>
diff --git a/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml b/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
index 2a6ca45a..f1111b86 100644
--- a/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-fr-rFR/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Régler la disposition de l\'activité principale</string>
     <string name="main_tabs">Onglets de l\'activité principale</string>
     <string name="main_tabs_desc">Personnalisez les onglets que vous verrez dans votre activité principale</string>
-    <string name="rounded_icons">Icônes rondes</string>
-    <string name="rounded_icons_desc">Les photos de profil et les icônes de conversation de groupe seront arrondis</string>
     <string name="tint_nav">Teinter la barre de navigation</string>
     <string name="tint_nav_desc">La barre de navigation sera de la même couleur que l\'en-tête</string>
     <string name="web_text_scaling">Échelle de texte Web</string>
diff --git a/app/src/main/res/values-gl-rES/strings_pref_appearance.xml b/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
index b028d2a1..c23c57f7 100644
--- a/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
+++ b/app/src/main/res/values-gl-rES/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Deseño da pantalla principal</string>
     <string name="main_tabs">Lapelas da pantalla principal</string>
     <string name="main_tabs_desc">Personaliza as lapelas que verás como principais</string>
-    <string name="rounded_icons">Iconas arredondadas</string>
-    <string name="rounded_icons_desc">As fotos dos perfís e as iconas de conversas en grupo serán redondas</string>
     <string name="tint_nav">Cor da barra de navegación</string>
     <string name="tint_nav_desc">A barra de navegación terá a mesma cor que a cabeceira</string>
     <string name="web_text_scaling">Tamaño do texto web</string>
diff --git a/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml b/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml
index 12146223..4ca85c23 100644
--- a/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml
+++ b/app/src/main/res/values-hu-rHU/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Főképernyő kiosztása</string>
     <string name="main_tabs">Főképernyő lapjai</string>
     <string name="main_tabs_desc">Testreszabhatod, milyen lapokat szeretnél látni a főképernyőn</string>
-    <string name="rounded_icons">Kerek ikonok</string>
-    <string name="rounded_icons_desc">A profilképek és csoportos beszélgetések ikonjai kerekítve lesznek</string>
     <string name="tint_nav">Áttetsző navigációs sáv</string>
     <string name="tint_nav_desc">A navigációs sáv a fejléccel megegyező színű lesz</string>
     <string name="web_text_scaling">Webes szöveg méretezése</string>
diff --git a/app/src/main/res/values-in-rID/strings_pref_appearance.xml b/app/src/main/res/values-in-rID/strings_pref_appearance.xml
index 9253ba75..e7e4d189 100644
--- a/app/src/main/res/values-in-rID/strings_pref_appearance.xml
+++ b/app/src/main/res/values-in-rID/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Atur Aktifitas Tataletak Utama</string>
     <string name="main_tabs">Tab Tataletak Utama</string>
     <string name="main_tabs_desc">Sesuaikan tab yang akan Anda lihat di aktifitas utama Anda</string>
-    <string name="rounded_icons">Membulatkan Ikon</string>
-    <string name="rounded_icons_desc">Foto profil dan ikon percakapan grup akan dibulatkan</string>
     <string name="tint_nav">Warna Bilah Navigasi</string>
     <string name="tint_nav_desc">Bilah navigasi akan sama warna dengan header</string>
     <string name="web_text_scaling">Penskalaan Teks Web</string>
diff --git a/app/src/main/res/values-it-rIT/strings_pref_appearance.xml b/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
index 57cd7f09..16783936 100644
--- a/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
+++ b/app/src/main/res/values-it-rIT/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Imposta il Layout della Pagina Principale</string>
     <string name="main_tabs">Schede della Pagina Principale</string>
     <string name="main_tabs_desc">Imposta quali schede visualizzare nella pagina principale</string>
-    <string name="rounded_icons">Icone Arrotondate</string>
-    <string name="rounded_icons_desc">Le immagini profilo e le conversazioni di gruppo saranno arrotondate</string>
     <string name="tint_nav">Barra di Navigazione in Tinta</string>
     <string name="tint_nav_desc">La barra di navigazione sarà dello stesso colore dell\'intestazione</string>
     <string name="web_text_scaling">Ridimensionamento del Testo</string>
diff --git a/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml b/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
index e3dc9293..84aed31a 100644
--- a/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-ko-rKR/strings_pref_appearance.xml
@@ -10,8 +10,6 @@
     <string name="icon_color">아이콘 색상</string>
     <string name="global_customization">전역 사용자 지정</string>
     <string name="main_activity_layout">주 액티비티 구성</string>
-    <string name="rounded_icons">원형 아이콘</string>
-    <string name="rounded_icons_desc">프로필 사진과 그룹 대화 아이콘이 둥글어 집니다.</string>
     <string name="tint_nav">내비게이션 바 색상</string>
     <string name="tint_nav_desc">내비게이션 바가 헤더와 동일한 색상이 됩니다.</string>
     <string name="web_text_scaling">웹 텍스트 크기</string>
diff --git a/app/src/main/res/values-nl-rNL/strings_pref_appearance.xml b/app/src/main/res/values-nl-rNL/strings_pref_appearance.xml
index f2ecf4ab..df5216be 100644
--- a/app/src/main/res/values-nl-rNL/strings_pref_appearance.xml
+++ b/app/src/main/res/values-nl-rNL/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Stel de layout voor het hoofdscherm in</string>
     <string name="main_tabs">Tabs hoofdscherm</string>
     <string name="main_tabs_desc">Pas aan welke tabs zichtbaar zijn in het hoofdscherm</string>
-    <string name="rounded_icons">Afgeronde iconen</string>
-    <string name="rounded_icons_desc">Maak profielfoto\'s en iconen voor groepsgesprekken rond</string>
     <string name="tint_nav">Navigatiebalk kleuren</string>
     <string name="tint_nav_desc">Geef de navigatiebalk dezelfde kleur als de kop</string>
     <string name="web_text_scaling">Tekst schalen</string>
diff --git a/app/src/main/res/values-no-rNO/strings_pref_appearance.xml b/app/src/main/res/values-no-rNO/strings_pref_appearance.xml
index 03cdb8aa..1225d53f 100644
--- a/app/src/main/res/values-no-rNO/strings_pref_appearance.xml
+++ b/app/src/main/res/values-no-rNO/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Angi aktivitets oppsett</string>
     <string name="main_tabs">Aktivitetsfaner</string>
     <string name="main_tabs_desc">Tilpass hvilke faner som vises i din aktivitet</string>
-    <string name="rounded_icons">Avrundet ikoner</string>
-    <string name="rounded_icons_desc">Profilbilder og gruppe samtale-ikoner avrundes</string>
     <string name="tint_nav">Fargetone navigasjonslinje</string>
     <string name="tint_nav_desc">Navigasjonslinjen vil være samme farge som overskrifslinjen</string>
     <string name="web_text_scaling">Web tekst skalering</string>
diff --git a/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml b/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
index bfd0565b..7fae405c 100644
--- a/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pl-rPL/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Ustaw układ aktywności</string>
     <string name="main_tabs">Karty aktywności</string>
     <string name="main_tabs_desc">Dostosuj, które karty pojawią się w Twojej aktywności</string>
-    <string name="rounded_icons">Okrągłe ikony</string>
-    <string name="rounded_icons_desc">Zdjęcia profilowe i ikony konwersacji grupowych zostaną zaokrąglone</string>
     <string name="tint_nav">Koloruj pasek nawigacji</string>
     <string name="tint_nav_desc">Pasek nawigacyjny będzie miał taki sam kolor jak nagłówek</string>
     <string name="web_text_scaling">Skalowanie tekstu</string>
diff --git a/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml b/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
index 5bea9f6f..b67c4eff 100644
--- a/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pt-rBR/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Define o layout das abas principais</string>
     <string name="main_tabs">Layout das abas principais</string>
     <string name="main_tabs_desc">Personalize quais abas você verá em sua aba principal</string>
-    <string name="rounded_icons">Ícones Arredondados</string>
-    <string name="rounded_icons_desc">Fotos de perfil e ícones de conversas em grupo serão arredondados</string>
     <string name="tint_nav">Cor da Barra de Navegação</string>
     <string name="tint_nav_desc">A barra de navegação será da mesma cor que o cabeçalho</string>
     <string name="web_text_scaling">Escala de Texto da Web</string>
diff --git a/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml b/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml
index 4300a777..4ac01ace 100644
--- a/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml
+++ b/app/src/main/res/values-pt-rPT/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Definir o esquema da atividade principal</string>
     <string name="main_tabs">Separadores da atividade</string>
     <string name="main_tabs_desc">Personalizar os separadores a mostrar na atividade principal</string>
-    <string name="rounded_icons">Ícones redondos</string>
-    <string name="rounded_icons_desc">Utilizar ícones redondos para as conversas de grupo e para a fotografia do perfil</string>
     <string name="tint_nav">Colorir barra de navegação</string>
     <string name="tint_nav_desc">Barra de navegação será da mesma cor que o cabeçalho</string>
     <string name="web_text_scaling">Escala do texto</string>
diff --git a/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml b/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml
index 522f7380..3dfcbbd7 100644
--- a/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml
+++ b/app/src/main/res/values-ro-rRO/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Setează schema activității principale</string>
     <string name="main_tabs">Tab-urile activității principale</string>
     <string name="main_tabs_desc">Personalizează ce tab-uri vei vedea in activitatea ta principală</string>
-    <string name="rounded_icons">Iconițe rotunjite</string>
-    <string name="rounded_icons_desc">Fotografiile de profil şi pictogramele conversaţiilor de grup vor fi rotunjite</string>
     <string name="tint_nav">Semi Nav Bar</string>
     <string name="tint_nav_desc">Bara de navigare va fi aceeaşi culoare ca și antetul</string>
     <string name="web_text_scaling">Scalarea textului web</string>
diff --git a/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml b/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml
index 0c6288f6..3e0a7a34 100644
--- a/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml
+++ b/app/src/main/res/values-ru-rRU/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Задать внешний вид главного окна</string>
     <string name="main_tabs">Внешний вид главного окна</string>
     <string name="main_tabs_desc">Настройте вкладки которые вы увидите в вашей основной странице</string>
-    <string name="rounded_icons">Скруглённые иконки</string>
-    <string name="rounded_icons_desc">Фотографии профиля и значки групп будут округляться</string>
     <string name="tint_nav">Оттенок верхней панели</string>
     <string name="tint_nav_desc">Панель навигации будет токогоже цвет как и заголовок</string>
     <string name="web_text_scaling">Масштабирование текста</string>
diff --git a/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml b/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml
index db02b89e..6dfcdfb8 100644
--- a/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml
+++ b/app/src/main/res/values-sr-rSP/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Изабери делатност распореда</string>
     <string name="main_tabs">Основна делатност распореда</string>
     <string name="main_tabs_desc">Изаберите које картице желите да видите у главном делу активности</string>
-    <string name="rounded_icons">Заобљене иконице</string>
-    <string name="rounded_icons_desc">Профилне слике и иконице групне преписке биће заобљене</string>
     <string name="tint_nav">Тон боје Нав Бара</string>
     <string name="tint_nav_desc">Трака за навигацију ће бити исте боје као и заглавље</string>
     <string name="web_text_scaling">Подешавање скале текста Веба</string>
diff --git a/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml b/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml
index 6224c7e6..a1115dfe 100644
--- a/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml
+++ b/app/src/main/res/values-sv-rSE/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Välj Aktivitetsupplägg</string>
     <string name="main_tabs">Aktivitetsflikar</string>
     <string name="main_tabs_desc">Anpassa vilka flikar som du ser i din aktivitetsrad</string>
-    <string name="rounded_icons">Rundade ikoner</string>
-    <string name="rounded_icons_desc">Profilbilder och gruppkonversationsikoner avrundas</string>
     <string name="tint_nav">Färglägg navigationsraden</string>
     <string name="tint_nav_desc">Navigeringsfältet kommer att vara samma färg som header</string>
     <string name="web_text_scaling">Skalning av web-text</string>
diff --git a/app/src/main/res/values-th-rTH/strings_pref_appearance.xml b/app/src/main/res/values-th-rTH/strings_pref_appearance.xml
index e3b5f548..63e10453 100644
--- a/app/src/main/res/values-th-rTH/strings_pref_appearance.xml
+++ b/app/src/main/res/values-th-rTH/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">ตั้งเลเอ้าท์หน้าหลัก</string>
     <string name="main_tabs">แท็บหน้าหลัก</string>
     <string name="main_tabs_desc">ปรับแต่งแท็บที่คุณจะเห็นในหน้าหลักของคุณ</string>
-    <string name="rounded_icons">ไอคอนกลม</string>
-    <string name="rounded_icons_desc">รูปโปรไฟล์และไอคอนของกลุ่มสนทนาจะเป็นวงกลม</string>
     <string name="tint_nav">แถบนำทางสีอ่อน</string>
     <string name="tint_nav_desc">แถบนำทางจะเป็นสีเดียวกับส่วนหัว</string>
     <string name="web_text_scaling">ขนาดข้อความของเว็บ</string>
diff --git a/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml b/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml
index 71784914..3e3c0d7b 100644
--- a/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml
+++ b/app/src/main/res/values-tl-rPH/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Itakda ang Plano ng Pangunahing Aktibidad</string>
     <string name="main_tabs">Ang mga Tab ng Pangunahing Aktibidad</string>
     <string name="main_tabs_desc">Alin sa mga tab ang ipapasadya na makikita mo sa iyong pangunahing aktibidad</string>
-    <string name="rounded_icons">Pabilog na mga Imahe</string>
-    <string name="rounded_icons_desc">Ang mga litrato na propayl at mga imahe ng pag-uusap ng grupo ay gagawing pabilog</string>
     <string name="tint_nav">Kinukulayan ang Nav Bar</string>
     <string name="tint_nav_desc">Ang Nabigasyong bar ay gagawing kaparehas ng kulay ng header</string>
     <string name="web_text_scaling">Ang Iskala ng Teksto ng Web</string>
diff --git a/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml b/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml
index affc346d..4c3a7861 100644
--- a/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml
+++ b/app/src/main/res/values-tr-rTR/strings_pref_appearance.xml
@@ -13,9 +13,6 @@
     <string name="main_activity_layout_desc">Ana Etkinlik Yerleşimini Ayarla</string>
     <string name="main_tabs">Ana Etkinlik Sekmeleri</string>
     <string name="main_tabs_desc">Ana etkinliğinizde hangi sekmeleri göreceğinizi özelleştirin</string>
-    <string name="rounded_icons">Yuvarlak Simgeler</string>
-    <string name="rounded_icons_desc">Profil fotoğrafları ve grup konuşması simgeleri yuvarlaklaştırılacak
- </string>
     <string name="tint_nav">Renk tonu ayar göstergesi</string>
     <string name="tint_nav_desc">Gezinme çubuğu üstbilgi ile aynı renkte olacak</string>
     <string name="web_text_scaling">Web metin ölçekleme</string>
diff --git a/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml b/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml
index 51ddd847..5297d72b 100644
--- a/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml
+++ b/app/src/main/res/values-uk-rUA/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Встановити основну схему діяльності</string>
     <string name="main_tabs">Вкладки основної діяльності</string>
     <string name="main_tabs_desc">Налаштуйте, які вкладки ви побачите у своїй основній діяльності</string>
-    <string name="rounded_icons">Закруглені іконки</string>
-    <string name="rounded_icons_desc">Фотографії профілю та значки групової бесіди будуть округлені</string>
     <string name="tint_nav">Відтінок верхньої панелі</string>
     <string name="tint_nav_desc">На навігаційній панелі буде мати той самий колір, що й заголовок</string>
     <string name="web_text_scaling">Масштабування веб-тексту</string>
diff --git a/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml b/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
index a344d727..297fc63b 100644
--- a/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
+++ b/app/src/main/res/values-vi-rVN/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">Đặt giao diện màn hình chính</string>
     <string name="main_tabs">Giao diện màn hình chính</string>
     <string name="main_tabs_desc">Tuỳ chỉnh thẻ xuất hiện trên màn hình chính</string>
-    <string name="rounded_icons">Làm tròn biểu tượng</string>
-    <string name="rounded_icons_desc">Ảnh đại diện và biểu tượng hội thoại nhóm sẽ được làm tròn</string>
     <string name="tint_nav">Đổi màu thanh điều hướng</string>
     <string name="tint_nav_desc">Thanh điều hướng sẽ có màu như thanh tiêu đề</string>
     <string name="web_text_scaling">Cỡ chữ web</string>
diff --git a/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml b/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
index 496cc28c..c4b6037f 100644
--- a/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
+++ b/app/src/main/res/values-zh-rCN/strings_pref_appearance.xml
@@ -10,8 +10,6 @@
     <string name="icon_color">图标颜色</string>
     <string name="global_customization">全局定制</string>
     <string name="main_activity_layout">主要活动布局</string>
-    <string name="rounded_icons">圆形图标</string>
-    <string name="rounded_icons_desc">圆形图标说明</string>
     <string name="tint_nav">淡色导航栏</string>
     <string name="tint_nav_desc">导航栏将会作为标题相同的颜色</string>
     <string name="web_text_scaling">Web 文本缩放</string>
diff --git a/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml b/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml
index 39d18bd5..12103896 100644
--- a/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml
+++ b/app/src/main/res/values-zh-rTW/strings_pref_appearance.xml
@@ -13,8 +13,6 @@
     <string name="main_activity_layout_desc">設定主要活動版型</string>
     <string name="main_tabs">主要活動標籤</string>
     <string name="main_tabs_desc">自訂您想在主要活動中看到哪些標籤</string>
-    <string name="rounded_icons">圓型圖示</string>
-    <string name="rounded_icons_desc">個人檔案照以及群組會話的圖示將被截成圓形</string>
     <string name="tint_nav">同調導航欄</string>
     <string name="tint_nav_desc">導航欄將與標題同色</string>
     <string name="web_text_scaling">Web 文字縮放</string>
diff --git a/app/src/main/res/values/strings_pref_appearance.xml b/app/src/main/res/values/strings_pref_appearance.xml
index 4f74bae3..a77d70a3 100644
--- a/app/src/main/res/values/strings_pref_appearance.xml
+++ b/app/src/main/res/values/strings_pref_appearance.xml
@@ -18,9 +18,6 @@
     <string name="main_tabs">Main Activity Tabs</string>
     <string name="main_tabs_desc">Customize which tabs you\'ll see in your main activity</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>
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index b535b43c..c9b8477e 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -6,12 +6,17 @@
     <item text="" />
     -->
 
+    <version title="v2.2.4" />
+    <item text="Show top bar to allow sharing posts" />
+    <item text="" />
+    <item text="" />
+
     <version title="v2.2.3" />
     <item text="Add ability to hide stories" />
     <item text="Remove fbclid from urls" />
     <item text="Apply notification keyword filter to title as well" />
-    <item text="" />
-    <item text="" />
+    <item text="Remove round icon settings as they are the default in Facebook" />
+    <item text="Update theme" />
 
     <version title="v2.2.2" />
     <item text="New marketplace shortcut" />