From 0630325f707d13df157024e99eee1d03295e8d2d Mon Sep 17 00:00:00 2001 From: Taras Smakula <tarassmakula@gmail.com> Date: Fri, 8 Mar 2024 15:44:54 +0200 Subject: [PATCH] Remove unused res --- .../futo/circles/view/SimpleTextWatcher.kt | 37 --------------- .../futo/circles/view/UriContentListener.kt | 45 ------------------- app/src/main/res/drawable/bg_code_block.xml | 8 ---- app/src/main/res/drawable/ic_check_box.xml | 10 ----- .../main/res/drawable/ic_composer_bold.xml | 10 ----- .../res/drawable/ic_composer_bullet_list.xml | 12 ----- .../res/drawable/ic_composer_code_block.xml | 10 ----- .../main/res/drawable/ic_composer_indent.xml | 13 ------ .../res/drawable/ic_composer_inline_code.xml | 15 ------- .../main/res/drawable/ic_composer_italic.xml | 10 ----- .../main/res/drawable/ic_composer_link.xml | 12 ----- .../drawable/ic_composer_numbered_list.xml | 24 ---------- .../drawable/ic_composer_strikethrough.xml | 12 ----- .../res/drawable/ic_composer_underlined.xml | 13 ------ .../res/drawable/ic_composer_unindent.xml | 13 ------ .../main/res/layout/list_item_style_bar.xml | 21 --------- app/src/main/res/values/colors.xml | 2 - app/src/main/res/values/strings.xml | 14 ------ auth/src/main/res/values/color.xml | 2 - auth/src/main/res/values/strings.xml | 8 ---- core/src/main/res/values/strings.xml | 3 -- 21 files changed, 294 deletions(-) delete mode 100644 app/src/main/java/org/futo/circles/view/SimpleTextWatcher.kt delete mode 100644 app/src/main/java/org/futo/circles/view/UriContentListener.kt delete mode 100644 app/src/main/res/drawable/bg_code_block.xml delete mode 100644 app/src/main/res/drawable/ic_check_box.xml delete mode 100644 app/src/main/res/drawable/ic_composer_bold.xml delete mode 100644 app/src/main/res/drawable/ic_composer_bullet_list.xml delete mode 100644 app/src/main/res/drawable/ic_composer_code_block.xml delete mode 100644 app/src/main/res/drawable/ic_composer_indent.xml delete mode 100644 app/src/main/res/drawable/ic_composer_inline_code.xml delete mode 100644 app/src/main/res/drawable/ic_composer_italic.xml delete mode 100644 app/src/main/res/drawable/ic_composer_link.xml delete mode 100644 app/src/main/res/drawable/ic_composer_numbered_list.xml delete mode 100644 app/src/main/res/drawable/ic_composer_strikethrough.xml delete mode 100644 app/src/main/res/drawable/ic_composer_underlined.xml delete mode 100644 app/src/main/res/drawable/ic_composer_unindent.xml delete mode 100644 app/src/main/res/layout/list_item_style_bar.xml diff --git a/app/src/main/java/org/futo/circles/view/SimpleTextWatcher.kt b/app/src/main/java/org/futo/circles/view/SimpleTextWatcher.kt deleted file mode 100644 index d471738bd..000000000 --- a/app/src/main/java/org/futo/circles/view/SimpleTextWatcher.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2019 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.futo.circles.view - -import android.text.Editable -import android.text.TextWatcher - -/** - * TextWatcher with default no op implementation. - */ -open class SimpleTextWatcher : TextWatcher { - override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { - // No op - } - - override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { - // No op - } - - override fun afterTextChanged(s: Editable) { - // No op - } -} diff --git a/app/src/main/java/org/futo/circles/view/UriContentListener.kt b/app/src/main/java/org/futo/circles/view/UriContentListener.kt deleted file mode 100644 index 3cc04857f..000000000 --- a/app/src/main/java/org/futo/circles/view/UriContentListener.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2023 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.futo.circles.view - -import android.content.ClipData -import android.net.Uri -import android.view.View -import androidx.core.view.ContentInfoCompat -import androidx.core.view.OnReceiveContentListener - -class UriContentListener( - private val onContent: (uri: Uri) -> Unit -) : OnReceiveContentListener { - override fun onReceiveContent(view: View, payload: ContentInfoCompat): ContentInfoCompat? { - val split = payload.partition { item -> item.uri != null } - val uriContent = split.first - val remaining = split.second - - if (uriContent != null) { - val clip: ClipData = uriContent.clip - for (i in 0 until clip.itemCount) { - val uri = clip.getItemAt(i).uri - // ... app-specific logic to handle the URI ... - onContent(uri) - } - } - // Return anything that we didn't handle ourselves. This preserves the default platform - // behavior for text and anything else for which we are not implementing custom handling. - return remaining - } -} diff --git a/app/src/main/res/drawable/bg_code_block.xml b/app/src/main/res/drawable/bg_code_block.xml deleted file mode 100644 index ef7227f68..000000000 --- a/app/src/main/res/drawable/bg_code_block.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="#F4F6FA" /> - <stroke - android:width="@dimen/code_block_border_width" - android:color="#E3E8F0" /> - <corners android:radius="@dimen/code_block_border_radius" /> -</shape> diff --git a/app/src/main/res/drawable/ic_check_box.xml b/app/src/main/res/drawable/ic_check_box.xml deleted file mode 100644 index 92c21a81c..000000000 --- a/app/src/main/res/drawable/ic_check_box.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="@color/menu_icon_color" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#000000" - android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM17.99,9l-1.41,-1.42 -6.59,6.59 -2.58,-2.57 -1.42,1.41 4,3.99z" /> -</vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_composer_bold.xml b/app/src/main/res/drawable/ic_composer_bold.xml deleted file mode 100644 index d2e26cf1e..000000000 --- a/app/src/main/res/drawable/ic_composer_bold.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:viewportWidth="44" - android:viewportHeight="44"> - <path - android:fillColor="@color/blue" - android:fillType="evenOdd" - android:pathData="M16,14.5C16,13.672 16.672,13 17.5,13H22.288C25.139,13 27.25,15.466 27.25,18.25C27.25,19.38 26.902,20.458 26.298,21.34C27.765,22.268 28.75,23.882 28.75,25.75C28.75,28.689 26.311,31 23.393,31H17.5C16.672,31 16,30.328 16,29.5V14.5ZM19,16V20.5H22.288C23.261,20.5 24.25,19.608 24.25,18.25C24.25,16.892 23.261,16 22.288,16H19ZM19,23.5V28H23.393C24.735,28 25.75,26.953 25.75,25.75C25.75,24.547 24.735,23.5 23.393,23.5H19Z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_bullet_list.xml b/app/src/main/res/drawable/ic_composer_bullet_list.xml deleted file mode 100644 index d372209ce..000000000 --- a/app/src/main/res/drawable/ic_composer_bullet_list.xml +++ /dev/null @@ -1,12 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:viewportWidth="44" - android:viewportHeight="44"> - <group> - <clip-path android:pathData="M10,10h24v24h-24z" /> - <path - android:fillColor="@color/blue" - android:pathData="M14,20.5C13.17,20.5 12.5,21.17 12.5,22C12.5,22.83 13.17,23.5 14,23.5C14.83,23.5 15.5,22.83 15.5,22C15.5,21.17 14.83,20.5 14,20.5ZM14,14.5C13.17,14.5 12.5,15.17 12.5,16C12.5,16.83 13.17,17.5 14,17.5C14.83,17.5 15.5,16.83 15.5,16C15.5,15.17 14.83,14.5 14,14.5ZM14,26.5C13.17,26.5 12.5,27.18 12.5,28C12.5,28.82 13.18,29.5 14,29.5C14.82,29.5 15.5,28.82 15.5,28C15.5,27.18 14.83,26.5 14,26.5ZM18,29H30C30.55,29 31,28.55 31,28C31,27.45 30.55,27 30,27H18C17.45,27 17,27.45 17,28C17,28.55 17.45,29 18,29ZM18,23H30C30.55,23 31,22.55 31,22C31,21.45 30.55,21 30,21H18C17.45,21 17,21.45 17,22C17,22.55 17.45,23 18,23ZM17,16C17,16.55 17.45,17 18,17H30C30.55,17 31,16.55 31,16C31,15.45 30.55,15 30,15H18C17.45,15 17,15.45 17,16Z" /> - </group> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_code_block.xml b/app/src/main/res/drawable/ic_composer_code_block.xml deleted file mode 100644 index aaa3dbe78..000000000 --- a/app/src/main/res/drawable/ic_composer_code_block.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:tint="@color/menu_icon_color" - android:viewportWidth="44" - android:viewportHeight="44"> - <path - android:fillColor="@color/white" - android:pathData="m18,22c0.7,-0.72 1.4,-1.4 2.1,-2.1 0.68,-0.98 -0.93,-1.9 -1.5,-0.96 -0.87,0.88 -1.8,1.7 -2.6,2.6 -0.45,0.67 0.27,1.2 0.7,1.6 0.75,0.74 1.5,1.5 2.2,2.2 0.98,0.68 1.9,-0.93 0.96,-1.5l-1.9,-1.9zM26.6,22c-0.71,0.72 -1.5,1.4 -2.1,2.2 -0.68,0.98 0.93,1.9 1.5,0.96 0.88,-0.89 1.8,-1.8 2.6,-2.7 0.45,-0.67 -0.27,-1.2 -0.7,-1.6 -0.75,-0.74 -1.5,-1.5 -2.2,-2.2 -0.99,-0.66 -2,0.94 -0.96,1.5l1.9,1.9zM13.6,32c-1.1,0.021 -1.9,-1 -1.7,-2.1 0.005,-5.7 -0.011,-11 0.008,-17 0.088,-1 1.1,-1.7 2.1,-1.5 5.6,0.005 11,-0.011 17,0.008 1,0.088 1.7,1.1 1.5,2.1 -0.005,5.6 0.011,11 -0.008,17 -0.088,1 -1.1,1.7 -2.1,1.5h-17zM13.6,30.3h17v-17h-17v17z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_indent.xml b/app/src/main/res/drawable/ic_composer_indent.xml deleted file mode 100644 index cbef73665..000000000 --- a/app/src/main/res/drawable/ic_composer_indent.xml +++ /dev/null @@ -1,13 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:tint="@color/menu_icon_color" - android:viewportWidth="44" - android:viewportHeight="44"> - <group> - <clip-path android:pathData="M10,10h24v24h-24z" /> - <path - android:fillColor="@color/blue" - android:pathData="M14,31H30C30.55,31 31,30.55 31,30C31,29.45 30.55,29 30,29H14C13.45,29 13,29.45 13,30C13,30.55 13.45,31 14,31ZM13,19.21V24.8C13,25.25 13.54,25.47 13.85,25.15L16.64,22.36C16.84,22.16 16.84,21.85 16.64,21.65L13.85,18.85C13.54,18.54 13,18.76 13,19.21ZM22,27H30C30.55,27 31,26.55 31,26C31,25.45 30.55,25 30,25H22C21.45,25 21,25.45 21,26C21,26.55 21.45,27 22,27ZM13,14C13,14.55 13.45,15 14,15H30C30.55,15 31,14.55 31,14C31,13.45 30.55,13 30,13H14C13.45,13 13,13.45 13,14ZM22,19H30C30.55,19 31,18.55 31,18C31,17.45 30.55,17 30,17H22C21.45,17 21,17.45 21,18C21,18.55 21.45,19 22,19ZM22,23H30C30.55,23 31,22.55 31,22C31,21.45 30.55,21 30,21H22C21.45,21 21,21.45 21,22C21,22.55 21.45,23 22,23Z" /> - </group> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_inline_code.xml b/app/src/main/res/drawable/ic_composer_inline_code.xml deleted file mode 100644 index bc054e639..000000000 --- a/app/src/main/res/drawable/ic_composer_inline_code.xml +++ /dev/null @@ -1,15 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:viewportWidth="44" - android:viewportHeight="44"> - <path - android:fillColor="@color/blue" - android:pathData="M24.958,15.621C25.117,15.092 24.816,14.534 24.287,14.375C23.758,14.217 23.201,14.517 23.042,15.046L19.042,28.379C18.883,28.908 19.184,29.466 19.713,29.624C20.242,29.783 20.799,29.483 20.958,28.954L24.958,15.621Z" /> - <path - android:fillColor="@color/blue" - android:pathData="M15.974,17.232C15.549,16.878 14.919,16.936 14.565,17.36L11.232,21.36C10.923,21.731 10.923,22.269 11.232,22.64L14.565,26.64C14.919,27.065 15.549,27.122 15.974,26.768C16.398,26.415 16.455,25.784 16.102,25.36L13.302,22L16.102,18.64C16.455,18.216 16.398,17.585 15.974,17.232Z" /> - <path - android:fillColor="@color/blue" - android:pathData="M28.027,17.232C28.451,16.878 29.081,16.936 29.435,17.36L32.768,21.36C33.077,21.731 33.077,22.269 32.768,22.64L29.435,26.64C29.081,27.065 28.451,27.122 28.027,26.768C27.602,26.415 27.545,25.784 27.898,25.36L30.698,22L27.898,18.64C27.545,18.216 27.602,17.585 28.027,17.232Z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_italic.xml b/app/src/main/res/drawable/ic_composer_italic.xml deleted file mode 100644 index 15c40a206..000000000 --- a/app/src/main/res/drawable/ic_composer_italic.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:viewportWidth="44" - android:viewportHeight="44"> - <path - android:pathData="M22.619,14.999L19.747,29.005H17.2C16.758,29.005 16.4,29.363 16.4,29.805C16.4,30.247 16.758,30.605 17.2,30.605H20.389C20.397,30.605 20.405,30.605 20.412,30.605H23.6C24.042,30.605 24.4,30.247 24.4,29.805C24.4,29.363 24.042,29.005 23.6,29.005H21.381L24.253,14.999H26.8C27.242,14.999 27.6,14.64 27.6,14.199C27.6,13.757 27.242,13.399 26.8,13.399H23.615C23.604,13.398 23.594,13.398 23.583,13.399H20.4C19.958,13.399 19.6,13.757 19.6,14.199C19.6,14.64 19.958,14.999 20.4,14.999H22.619Z" - android:fillColor="@color/blue" - android:fillType="evenOdd" /> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_link.xml b/app/src/main/res/drawable/ic_composer_link.xml deleted file mode 100644 index be76286af..000000000 --- a/app/src/main/res/drawable/ic_composer_link.xml +++ /dev/null @@ -1,12 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:viewportWidth="44" - android:viewportHeight="44"> - <path - android:fillColor="#00000000" - android:pathData="M22.566,16.151L23.101,15.616C24.577,14.14 26.956,14.126 28.415,15.585C29.874,17.044 29.86,19.423 28.383,20.899L25.844,23.438C24.368,24.915 21.989,24.929 20.53,23.47M21.434,27.849L20.899,28.383C19.423,29.86 17.044,29.874 15.585,28.415C14.126,26.956 14.14,24.577 15.616,23.101L18.156,20.562C19.632,19.086 22.011,19.071 23.47,20.53" - android:strokeWidth="1.5" - android:strokeColor="@color/blue" - android:strokeLineCap="round" /> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_numbered_list.xml b/app/src/main/res/drawable/ic_composer_numbered_list.xml deleted file mode 100644 index 5690e2de9..000000000 --- a/app/src/main/res/drawable/ic_composer_numbered_list.xml +++ /dev/null @@ -1,24 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:viewportWidth="44" - android:viewportHeight="44"> - <path - android:pathData="m14.5,20h-2c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5h1.3l-1.68,1.96C12.04,23.05 12,23.17 12,23.28v0.22c0,0.28 0.22,0.5 0.5,0.5h2C14.78,24 15,23.78 15,23.5 15,23.22 14.78,23 14.5,23h-1.3l1.68,-1.96C14.96,20.95 15,20.83 15,20.72V20.5C15,20.22 14.78,20 14.5,20Z" - android:fillColor="@color/blue" /> - <path - android:pathData="M12.5,15H13v2.5c0,0.28 0.22,0.5 0.5,0.5 0.28,0 0.5,-0.22 0.5,-0.5v-3C14,14.22 13.78,14 13.5,14h-1c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5z" - android:fillColor="@color/blue" /> - <path - android:pathData="m14.5,26h-2c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5H14v0.5h-0.5c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5H14V29h-1.5c-0.28,0 -0.5,0.22 -0.5,0.5 0,0.28 0.22,0.5 0.5,0.5h2c0.28,0 0.5,-0.22 0.5,-0.5v-3C15,26.22 14.78,26 14.5,26Z" - android:fillColor="@color/blue" /> - <path - android:pathData="M30,21H18c-0.55,0 -1,0.45 -1,1 0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1z" - android:fillColor="@color/blue" /> - <path - android:pathData="M30,27H18c-0.55,0 -1,0.45 -1,1 0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1z" - android:fillColor="@color/blue" /> - <path - android:pathData="m18,17h12c0.55,0 1,-0.45 1,-1 0,-0.55 -0.45,-1 -1,-1H18c-0.55,0 -1,0.45 -1,1 0,0.55 0.45,1 1,1z" - android:fillColor="@color/blue" /> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_strikethrough.xml b/app/src/main/res/drawable/ic_composer_strikethrough.xml deleted file mode 100644 index 593cd3aca..000000000 --- a/app/src/main/res/drawable/ic_composer_strikethrough.xml +++ /dev/null @@ -1,12 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:viewportWidth="44" - android:viewportHeight="44"> - <path - android:pathData="M24.897,17.154C24.235,15.821 22.876,15.21 21.374,15.372C19.05,15.622 18.44,17.423 18.722,18.592C19.032,19.872 20.046,20.37 21.839,20.826H29.92C30.517,20.826 31,21.351 31,22C31,22.648 30.517,23.174 29.92,23.174H14.08C13.483,23.174 13,22.648 13,22C13,21.351 13.483,20.826 14.08,20.826H17.355C17.041,20.377 16.791,19.839 16.633,19.189C16.003,16.581 17.554,13.424 21.16,13.036C23.285,12.807 25.615,13.661 26.798,16.038C27.081,16.608 26.886,17.32 26.361,17.629C25.836,17.937 25.181,17.725 24.897,17.154Z" - android:fillColor="@color/blue" /> - <path - android:pathData="M25.427,25.13H27.67C27.888,26.306 27.721,27.56 27.05,28.632C26.114,30.125 24.37,31 21.985,31C18.076,31 16.279,28.584 15.912,26.986C15.768,26.357 16.12,25.72 16.698,25.563C17.277,25.406 17.863,25.788 18.008,26.417C18.119,26.902 19.002,28.652 21.985,28.652C23.907,28.652 24.854,27.965 25.264,27.31C25.642,26.707 25.708,25.909 25.427,25.13Z" - android:fillColor="@color/blue" /> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_underlined.xml b/app/src/main/res/drawable/ic_composer_underlined.xml deleted file mode 100644 index c0b515adf..000000000 --- a/app/src/main/res/drawable/ic_composer_underlined.xml +++ /dev/null @@ -1,13 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:tint="@color/menu_icon_color" - android:viewportWidth="44" - android:viewportHeight="44"> - <group> - <clip-path android:pathData="M10,10h24v24h-24z" /> - <path - android:fillColor="@color/blue" - android:pathData="M22.79,26.95C25.82,26.56 28,23.84 28,20.79V14.25C28,13.56 27.44,13 26.75,13C26.06,13 25.5,13.56 25.5,14.25V20.9C25.5,22.57 24.37,24.09 22.73,24.42C20.48,24.89 18.5,23.17 18.5,21V14.25C18.5,13.56 17.94,13 17.25,13C16.56,13 16,13.56 16,14.25V21C16,24.57 19.13,27.42 22.79,26.95ZM15,30C15,30.55 15.45,31 16,31H28C28.55,31 29,30.55 29,30C29,29.45 28.55,29 28,29H16C15.45,29 15,29.45 15,30Z" /> - </group> -</vector> diff --git a/app/src/main/res/drawable/ic_composer_unindent.xml b/app/src/main/res/drawable/ic_composer_unindent.xml deleted file mode 100644 index a4a7fc69a..000000000 --- a/app/src/main/res/drawable/ic_composer_unindent.xml +++ /dev/null @@ -1,13 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="44dp" - android:height="44dp" - android:tint="@color/menu_icon_color" - android:viewportWidth="44" - android:viewportHeight="44"> - <group> - <clip-path android:pathData="M10,10h24v24h-24z" /> - <path - android:fillColor="@color/blue" - android:pathData="M22,27H30C30.55,27 31,26.55 31,26C31,25.45 30.55,25 30,25H22C21.45,25 21,25.45 21,26C21,26.55 21.45,27 22,27ZM13.35,22.35L16.14,25.14C16.46,25.46 17,25.24 17,24.79V19.21C17,18.76 16.46,18.54 16.15,18.86L13.36,21.65C13.16,21.84 13.16,22.16 13.35,22.35ZM14,31H30C30.55,31 31,30.55 31,30C31,29.45 30.55,29 30,29H14C13.45,29 13,29.45 13,30C13,30.55 13.45,31 14,31ZM13,14C13,14.55 13.45,15 14,15H30C30.55,15 31,14.55 31,14C31,13.45 30.55,13 30,13H14C13.45,13 13,13.45 13,14ZM22,19H30C30.55,19 31,18.55 31,18C31,17.45 30.55,17 30,17H22C21.45,17 21,17.45 21,18C21,18.55 21.45,19 22,19ZM22,23H30C30.55,23 31,22.55 31,22C31,21.45 30.55,21 30,21H22C21.45,21 21,21.45 21,22C21,22.55 21.45,23 22,23Z" /> - </group> -</vector> diff --git a/app/src/main/res/layout/list_item_style_bar.xml b/app/src/main/res/layout/list_item_style_bar.xml deleted file mode 100644 index 4709beb7b..000000000 --- a/app/src/main/res/layout/list_item_style_bar.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/cvOption" - android:layout_width="48dp" - android:layout_height="48dp" - android:clickable="true" - android:elevation="4dp" - android:focusable="true" - android:foreground="?selectableItemBackground" - app:cardCornerRadius="8dp" - app:cardUseCompatPadding="true"> - - <ImageView - android:id="@+id/ivIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:src="@drawable/ic_mention" /> - -</androidx.cardview.widget.CardView> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ed95017c7..07d86d8a7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,11 +10,9 @@ <color name="status_bar_color">#20111111</color> <color name="green">#34C759</color> - <color name="purple">#AF52DE</color> <color name="yellow">#FFCC00</color> <color name="orange">#FF9500</color> <color name="red">#FF3B30</color> - <color name="pink">#FF2D55</color> <color name="gray">#8E8E93</color> <color name="close_background">#80000000</color> <color name="highlight_color">#4D0E7AFE</color> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab5bee724..4e073536a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,6 @@ <string name="my_circles">My Circles</string> <string name="share">Share</string> <string name="fix">Fix</string> - <string name="followers">Followers</string> <string name="known_users">Known users</string> <string name="ignored_users">Ignored users</string> <string name="suggestions">Suggestions</string> @@ -27,7 +26,6 @@ <string name="requests_format">Requests %d</string> <string name="create_post">Create post</string> <string name="create_poll">Create poll</string> - <string name="send">Send</string> <string name="enter_your_message_here">Enter your message here</string> <string name="compressing">Compressing</string> <string name="encrypting">Encrypting</string> @@ -187,7 +185,6 @@ <string name="circles_empty_message">Create your first Circle</string> <string name="people_category_empty_message">%s will be shown here</string> <string name="creating_timeline">Creating timeline</string> - <string name="session">Session</string> <string name="help">Help</string> <string name="optional_request_message">Optional: Request message</string> <string name="media_storage">Media storage</string> @@ -200,17 +197,6 @@ <string name="ignored">Ignored</string> <!-- Rich text editor --> - <string name="rich_text_editor_format_bold">Apply bold format</string> - <string name="rich_text_editor_format_italic">Apply italic format</string> - <string name="rich_text_editor_format_strikethrough">Apply strikethrough format</string> - <string name="rich_text_editor_format_underline">Apply underline format</string> - <string name="rich_text_editor_link">Set link</string> - <string name="rich_text_editor_numbered_list">Toggle numbered list</string> - <string name="rich_text_editor_bullet_list">Toggle bullet list</string> - <string name="rich_text_editor_indent">Indent</string> - <string name="rich_text_editor_unindent">Unindent</string> - <string name="rich_text_editor_quote">Toggle quote</string> - <string name="rich_text_editor_code_block">Toggle code block</string> <string name="general">General</string> <string name="empty_media_storage_info">0 MB used</string> <string name="in_timeline_format">(in %1$s / %2$s)</string> diff --git a/auth/src/main/res/values/color.xml b/auth/src/main/res/values/color.xml index 49fde422f..e0ba5413a 100644 --- a/auth/src/main/res/values/color.xml +++ b/auth/src/main/res/values/color.xml @@ -7,7 +7,5 @@ <color name="red">#FF3B30</color> <color name="green">#34C759</color> <color name="teal_700">#FF018786</color> - <color name="purple">#AF52DE</color> - <color name="pink">#FF2D55</color> </resources> \ No newline at end of file diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml index 8ecd1c556..d7879e36f 100644 --- a/auth/src/main/res/values/strings.xml +++ b/auth/src/main/res/values/strings.xml @@ -7,18 +7,13 @@ <string name="initial_device_name">FUTO Circles (Android)</string> <string name="initial_sync">Initial sync</string> <string name="session_sync">Session sync</string> - <string name="not_found_login_flow_for_user">Log In flow for user not found</string> <string name="unsupported_login_method">Unsupported login method</string> <string name="discard_current_auth_progress">Discard current auth progress?</string> <string name="set_password">Set password</string> <string name="log_in">Log In</string> <string name="wrong_signup_config">Wrong signup config!</string> - <string name="us_server_format"><![CDATA[<b>US</b> - (%s)]]></string> - <string name="eu_server_format"><![CDATA[<b>EU</b> - (%s)]]></string> - <string name="sign_up_using_active_subscription">Sign Up using your active subscription</string> <string name="sign_up">Sign Up</string> <string name="sign_up_stage_subtitle_format">Stage %1$d of %2$d</string> - <string name="no_backup_message">Keys backup not found</string> <string name="username_can_not_be_empty">Username can not be empty.</string> <string name="confirm_auth">Confirm auth</string> <string name="email">Email</string> @@ -68,7 +63,6 @@ <string name="save">Save</string> <string name="skip">Skip</string> <string name="subscriptions">Subscriptions</string> - <string name="subscription">Subscription</string> <string name="manage_subscription">Manage subscription</string> <string name="enter_your_username">Enter your username</string> <string name="set_username">Set username</string> @@ -84,7 +78,6 @@ <string name="upload_recovery_key_file">Upload Recovery Key file</string> <string name="restore">Restore</string> <string name="validate_your_email">Validate your email</string> - <string name="not_supported_navigation_event">Not supported navigation event</string> <string name="feature_not_supported">Feature is not supported</string> <string name="service_unavailable">Service unavailable</string> <string name="item_unavailable">Item is unavailable</string> @@ -112,7 +105,6 @@ <string name="other_sessions">Other sessions</string> <string name="invalid_auth">Invalid auth</string> <string name="scan_with_one_of_devices_message">Scan QR code with one of your devices to finish verification</string> - <string name="cross_signed">cross signed</string> <string name="waiting_for_other_device_verification">Waiting for other device to start verification</string> <string name="session_verified">Session verified</string> <string name="verification_canceled">Verification canceled</string> diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index f5bbf5566..5e2533502 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -135,9 +135,6 @@ <string name="public_circle_explanation">Other users can ask to join</string> <string name="private_type">Private</string> <string name="private_circle_explanation">Accessible only by invitation</string> - <string name="gallery_name">Gallery name</string> - <string name="group_name">Group name</string> - <string name="group_topic">Group topic</string> <string name="remove_from_this_circle_but_do_not_unfollow">Remove from this circle, but do not unfollow</string> <string name="unfollow_completely_remove_from_all_circles">Unfollow completely (remove from all circles)</string> <string name="no_internet_connection">No Internet connection</string> -- GitLab