From a49021c096f18cfef2fa54b2369ed044341187c5 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 31 Mar 2019 22:44:06 -0400 Subject: Remove round icon settings --- .../com/pitchedapps/frost/glide/RoundCornerTransformation.kt | 5 ++--- app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt | 2 +- app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt | 7 ------- app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 2 -- app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt | 1 - .../main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 1 - app/src/web/assets/css/components/round_icons.css | 4 ---- app/src/web/assets/css/components/round_icons.scss | 4 ---- 8 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 app/src/web/assets/css/components/round_icons.css delete mode 100644 app/src/web/assets/css/components/round_icons.scss diff --git a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt b/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt index 564224ea..b63c5588 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt @@ -33,7 +33,7 @@ import java.security.MessageDigest class RoundCornerTransformation : BitmapTransformation() { override fun updateDiskCacheKey(messageDigest: MessageDigest) { - messageDigest.update("FrostRoundCornerTransform-${Prefs.showRoundedIcons}".toByteArray()) + messageDigest.update("FrostRoundCornerTransform".toByteArray()) } override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap { @@ -44,8 +44,7 @@ class RoundCornerTransformation : BitmapTransformation() { 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 radius = Math.min(width, height) * 0.5f val canvas = Canvas(bitmap) val paint = Paint() 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/settings/Appearance.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt index 1b1ca796..c8431464 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Appearance.kt @@ -155,13 +155,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/web/DebugWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt index 6b186b1c..80edd62e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt @@ -102,7 +102,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..bac27010 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -91,7 +91,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), diff --git a/app/src/web/assets/css/components/round_icons.css b/app/src/web/assets/css/components/round_icons.css deleted file mode 100644 index 5477f7c0..00000000 --- a/app/src/web/assets/css/components/round_icons.css +++ /dev/null @@ -1,4 +0,0 @@ -#threadlist_rows, [role*=presentation] img._1e_c, -i.img.profpic:not(._1_0m):not(#MStoriesTray), ._42b6._42b6._42b6, ._5i9c.img, img._2cu2, i.img.l, [id*=threadlist] i.img:not(._1_0m) { - border-radius: 50% !important; -} diff --git a/app/src/web/assets/css/components/round_icons.scss b/app/src/web/assets/css/components/round_icons.scss deleted file mode 100644 index b4662e60..00000000 --- a/app/src/web/assets/css/components/round_icons.scss +++ /dev/null @@ -1,4 +0,0 @@ -#threadlist_rows, [role*=presentation] img._1e_c, -i.img.profpic:not(._1_0m):not(#MStoriesTray), ._42b6._42b6._42b6, ._5i9c.img, img._2cu2, i.img.l, [id*=threadlist] i.img:not(._1_0m) { - border-radius: 50% !important; -} -- cgit v1.2.3 From 3a24b8dc01ca1f20c0803aefd48ae69e0b5c3e04 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 31 Mar 2019 22:47:14 -0400 Subject: Remove round icon texts --- app/src/main/res/values-cs-rCZ/strings_pref_appearance.xml | 2 -- app/src/main/res/values-da-rDK/strings_pref_appearance.xml | 2 -- app/src/main/res/values-de-rDE/strings_pref_appearance.xml | 2 -- app/src/main/res/values-es-rES/strings_pref_appearance.xml | 2 -- app/src/main/res/values-fr-rFR/strings_pref_appearance.xml | 2 -- app/src/main/res/values-gl-rES/strings_pref_appearance.xml | 2 -- app/src/main/res/values-hu-rHU/strings_pref_appearance.xml | 2 -- app/src/main/res/values-in-rID/strings_pref_appearance.xml | 2 -- app/src/main/res/values-it-rIT/strings_pref_appearance.xml | 2 -- app/src/main/res/values-ko-rKR/strings_pref_appearance.xml | 2 -- app/src/main/res/values-nl-rNL/strings_pref_appearance.xml | 2 -- app/src/main/res/values-no-rNO/strings_pref_appearance.xml | 2 -- app/src/main/res/values-pl-rPL/strings_pref_appearance.xml | 2 -- app/src/main/res/values-pt-rBR/strings_pref_appearance.xml | 2 -- app/src/main/res/values-pt-rPT/strings_pref_appearance.xml | 2 -- app/src/main/res/values-ro-rRO/strings_pref_appearance.xml | 2 -- app/src/main/res/values-ru-rRU/strings_pref_appearance.xml | 2 -- app/src/main/res/values-sr-rSP/strings_pref_appearance.xml | 2 -- app/src/main/res/values-sv-rSE/strings_pref_appearance.xml | 2 -- app/src/main/res/values-th-rTH/strings_pref_appearance.xml | 2 -- app/src/main/res/values-tl-rPH/strings_pref_appearance.xml | 2 -- app/src/main/res/values-tr-rTR/strings_pref_appearance.xml | 3 --- app/src/main/res/values-uk-rUA/strings_pref_appearance.xml | 2 -- app/src/main/res/values-vi-rVN/strings_pref_appearance.xml | 2 -- app/src/main/res/values-zh-rCN/strings_pref_appearance.xml | 2 -- app/src/main/res/values-zh-rTW/strings_pref_appearance.xml | 2 -- app/src/main/res/values/strings_pref_appearance.xml | 3 --- 27 files changed, 56 deletions(-) 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 @@ Nastavit rozložení hlavního zobrazení aktivit Hlavní záložky aktivit Nastavte záložky viditelné v hlavním pohledu - Kulaté ikony - Ikony profilových fotek a skupinových konverzacích budou kulaté Odstín navigační lišty Navigační lišta bude mít stejnou barvu jako je základní barva Zvětšující se text na webu 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 @@ Vælg hovedaktivitetslayout Hovedaktivitetsfaner Vælg hvilke faner, du vil se i din hovedaktivitet - Afrundede ikoner - Profilfotos og gruppesamtale-ikoner vil blive afrundet Farv navigationsbjælke Navigationsbjælke vil have samme farve som headeren Internettekstskalering 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 @@ Setzte das Haupt-Aktivitäten Layout Haupt-Aktivitäten Tabs Passen Sie die Tabs an, die Sie in Ihrer Hauptseite sehen wollen - Runde Symbole - Profilfotos und Gruppengespräch Symbole werden abgerundet Färbe Navigationsbar Navigationsleiste wird die gleiche Farbe wie die Kopfzeile sein Web Textskalierung 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 @@ Establecer Diseño de la Pantalla Principal Pestañas de actividad Personaliza las pestañas que verás en la pantalla principal - Iconos redondeados - Los iconos de conversación de grupo y fotos de perfil se redondearán Colorear Barra de Navegación La barra de navegación será del mismo color que la cabecera Tamaño de texto Web 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 @@ Régler la disposition de l\'activité principale Onglets de l\'activité principale Personnalisez les onglets que vous verrez dans votre activité principale - Icônes rondes - Les photos de profil et les icônes de conversation de groupe seront arrondis Teinter la barre de navigation La barre de navigation sera de la même couleur que l\'en-tête Échelle de texte Web 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 @@ Deseño da pantalla principal Lapelas da pantalla principal Personaliza as lapelas que verás como principais - Iconas arredondadas - As fotos dos perfís e as iconas de conversas en grupo serán redondas Cor da barra de navegación A barra de navegación terá a mesma cor que a cabeceira Tamaño do texto web 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 @@ Főképernyő kiosztása Főképernyő lapjai Testreszabhatod, milyen lapokat szeretnél látni a főképernyőn - Kerek ikonok - A profilképek és csoportos beszélgetések ikonjai kerekítve lesznek Áttetsző navigációs sáv A navigációs sáv a fejléccel megegyező színű lesz Webes szöveg méretezése 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 @@ Atur Aktifitas Tataletak Utama Tab Tataletak Utama Sesuaikan tab yang akan Anda lihat di aktifitas utama Anda - Membulatkan Ikon - Foto profil dan ikon percakapan grup akan dibulatkan Warna Bilah Navigasi Bilah navigasi akan sama warna dengan header Penskalaan Teks Web 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 @@ Imposta il Layout della Pagina Principale Schede della Pagina Principale Imposta quali schede visualizzare nella pagina principale - Icone Arrotondate - Le immagini profilo e le conversazioni di gruppo saranno arrotondate Barra di Navigazione in Tinta La barra di navigazione sarà dello stesso colore dell\'intestazione Ridimensionamento del Testo 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 @@ 아이콘 색상 전역 사용자 지정 주 액티비티 구성 - 원형 아이콘 - 프로필 사진과 그룹 대화 아이콘이 둥글어 집니다. 내비게이션 바 색상 내비게이션 바가 헤더와 동일한 색상이 됩니다. 웹 텍스트 크기 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 @@ Stel de layout voor het hoofdscherm in Tabs hoofdscherm Pas aan welke tabs zichtbaar zijn in het hoofdscherm - Afgeronde iconen - Maak profielfoto\'s en iconen voor groepsgesprekken rond Navigatiebalk kleuren Geef de navigatiebalk dezelfde kleur als de kop Tekst schalen 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 @@ Angi aktivitets oppsett Aktivitetsfaner Tilpass hvilke faner som vises i din aktivitet - Avrundet ikoner - Profilbilder og gruppe samtale-ikoner avrundes Fargetone navigasjonslinje Navigasjonslinjen vil være samme farge som overskrifslinjen Web tekst skalering 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 @@ Ustaw układ aktywności Karty aktywności Dostosuj, które karty pojawią się w Twojej aktywności - Okrągłe ikony - Zdjęcia profilowe i ikony konwersacji grupowych zostaną zaokrąglone Koloruj pasek nawigacji Pasek nawigacyjny będzie miał taki sam kolor jak nagłówek Skalowanie tekstu 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 @@ Define o layout das abas principais Layout das abas principais Personalize quais abas você verá em sua aba principal - Ícones Arredondados - Fotos de perfil e ícones de conversas em grupo serão arredondados Cor da Barra de Navegação A barra de navegação será da mesma cor que o cabeçalho Escala de Texto da Web 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 @@ Definir o esquema da atividade principal Separadores da atividade Personalizar os separadores a mostrar na atividade principal - Ícones redondos - Utilizar ícones redondos para as conversas de grupo e para a fotografia do perfil Colorir barra de navegação Barra de navegação será da mesma cor que o cabeçalho Escala do texto 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 @@ Setează schema activității principale Tab-urile activității principale Personalizează ce tab-uri vei vedea in activitatea ta principală - Iconițe rotunjite - Fotografiile de profil şi pictogramele conversaţiilor de grup vor fi rotunjite Semi Nav Bar Bara de navigare va fi aceeaşi culoare ca și antetul Scalarea textului web 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 @@ Задать внешний вид главного окна Внешний вид главного окна Настройте вкладки которые вы увидите в вашей основной странице - Скруглённые иконки - Фотографии профиля и значки групп будут округляться Оттенок верхней панели Панель навигации будет токогоже цвет как и заголовок Масштабирование текста 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 @@ Изабери делатност распореда Основна делатност распореда Изаберите које картице желите да видите у главном делу активности - Заобљене иконице - Профилне слике и иконице групне преписке биће заобљене Тон боје Нав Бара Трака за навигацију ће бити исте боје као и заглавље Подешавање скале текста Веба 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 @@ Välj Aktivitetsupplägg Aktivitetsflikar Anpassa vilka flikar som du ser i din aktivitetsrad - Rundade ikoner - Profilbilder och gruppkonversationsikoner avrundas Färglägg navigationsraden Navigeringsfältet kommer att vara samma färg som header Skalning av web-text 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 @@ ตั้งเลเอ้าท์หน้าหลัก แท็บหน้าหลัก ปรับแต่งแท็บที่คุณจะเห็นในหน้าหลักของคุณ - ไอคอนกลม - รูปโปรไฟล์และไอคอนของกลุ่มสนทนาจะเป็นวงกลม แถบนำทางสีอ่อน แถบนำทางจะเป็นสีเดียวกับส่วนหัว ขนาดข้อความของเว็บ 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 @@ Itakda ang Plano ng Pangunahing Aktibidad Ang mga Tab ng Pangunahing Aktibidad Alin sa mga tab ang ipapasadya na makikita mo sa iyong pangunahing aktibidad - Pabilog na mga Imahe - Ang mga litrato na propayl at mga imahe ng pag-uusap ng grupo ay gagawing pabilog Kinukulayan ang Nav Bar Ang Nabigasyong bar ay gagawing kaparehas ng kulay ng header Ang Iskala ng Teksto ng Web 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 @@ Ana Etkinlik Yerleşimini Ayarla Ana Etkinlik Sekmeleri Ana etkinliğinizde hangi sekmeleri göreceğinizi özelleştirin - Yuvarlak Simgeler - Profil fotoğrafları ve grup konuşması simgeleri yuvarlaklaştırılacak -  Renk tonu ayar göstergesi Gezinme çubuğu üstbilgi ile aynı renkte olacak Web metin ölçekleme 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 @@ Встановити основну схему діяльності Вкладки основної діяльності Налаштуйте, які вкладки ви побачите у своїй основній діяльності - Закруглені іконки - Фотографії профілю та значки групової бесіди будуть округлені Відтінок верхньої панелі На навігаційній панелі буде мати той самий колір, що й заголовок Масштабування веб-тексту 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 @@ Đặt giao diện màn hình chính Giao diện màn hình chính Tuỳ chỉnh thẻ xuất hiện trên màn hình chính - Làm tròn biểu tượng - Ảnh đại diện và biểu tượng hội thoại nhóm sẽ được làm tròn Đổi màu thanh điều hướng Thanh điều hướng sẽ có màu như thanh tiêu đề Cỡ chữ web 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 @@ 图标颜色 全局定制 主要活动布局 - 圆形图标 - 圆形图标说明 淡色导航栏 导航栏将会作为标题相同的颜色 Web 文本缩放 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 @@ 設定主要活動版型 主要活動標籤 自訂您想在主要活動中看到哪些標籤 - 圓型圖示 - 個人檔案照以及群組會話的圖示將被截成圓形 同調導航欄 導航欄將與標題同色 Web 文字縮放 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 @@ Main Activity Tabs Customize which tabs you\'ll see in your main activity - Rounded Icons - Profile photos and group conversation icons will be rounded - Tint Nav Bar Navigation bar will be the same color as the header Web Text Scaling -- cgit v1.2.3 From fc375400411de3e7113a296b618940ef7b2b655c Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 31 Mar 2019 22:51:32 -0400 Subject: Remove round transformations --- .../pitchedapps/frost/activities/LoginActivity.kt | 2 +- .../com/pitchedapps/frost/glide/GlideUtils.kt | 2 - .../frost/glide/RoundCornerTransformation.kt | 60 ---------------------- .../com/pitchedapps/frost/iitems/MenuIItem.kt | 2 +- .../pitchedapps/frost/iitems/NotificationIItem.kt | 2 +- .../com/pitchedapps/frost/views/AccountItem.kt | 2 +- 6 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt 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 { cont -> profileLoader.load(profilePictureUrl(id)) - .transform(FrostGlide.roundCorner).listener(object : RequestListener { + .transform(FrostGlide.circleCrop).listener(object : RequestListener { 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 b63c5588..00000000 --- a/app/src/main/kotlin/com/pitchedapps/frost/glide/RoundCornerTransformation.kt +++ /dev/null @@ -1,60 +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 . - */ -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".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) * 0.5f - - 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/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 { + .transform(FrostGlide.circleCrop).listener(object : RequestListener { override fun onResourceReady( resource: Drawable?, model: Any?, -- cgit v1.2.3