From 0768dcd3742d09afb05bd67976889ddf4ab3bc9d Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Tue, 12 Sep 2023 18:11:06 +0200 Subject: [PATCH] Cleanup unused resources (#4013) redo of https://github.com/tuskyapp/Tusky/pull/3599 --- app/lint-baseline.xml | 1785 ++++++++++++++++- .../scheduled/ScheduledStatusActivity.kt | 2 +- .../search/fragments/SearchFragment.kt | 2 +- app/src/main/res/drawable/ic_blobmoji.xml | 11 - app/src/main/res/drawable/ic_emoji_34dp.xml | 9 - .../drawable/ic_notifications_off_24dp.xml | 12 - app/src/main/res/drawable/ic_twemoji.xml | 9 - app/src/main/res/layout/item_emoji_pref.xml | 114 -- app/src/main/res/values/donottranslate.xml | 21 - 9 files changed, 1786 insertions(+), 179 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_blobmoji.xml delete mode 100644 app/src/main/res/drawable/ic_emoji_34dp.xml delete mode 100644 app/src/main/res/drawable/ic_notifications_off_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_twemoji.xml delete mode 100644 app/src/main/res/layout/item_emoji_pref.xml diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index 2da497cdd..88124ee88 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + @@ -40,6 +73,28 @@ file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.pageseeder.diffx/pso-diffx/1.1.1/b655ebc87588a857a4f3d88cf98bcefa87a6105b/pso-diffx-1.1.1.jar"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt index 38df7fd4a..d7e72812c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt @@ -127,7 +127,7 @@ class ScheduledStatusActivity : } override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { - menuInflater.inflate(R.menu.activity_announcements, menu) + menuInflater.inflate(R.menu.activity_scheduled_status, menu) menu.findItem(R.id.action_search)?.apply { icon = IconicsDrawable(this@ScheduledStatusActivity, GoogleMaterial.Icon.gmd_search).apply { sizeDp = 20 diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt index 28790c2fb..48a9c38aa 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt @@ -107,7 +107,7 @@ abstract class SearchFragment : } override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { - menuInflater.inflate(R.menu.fragment_timeline, menu) + menuInflater.inflate(R.menu.fragment_search, menu) menu.findItem(R.id.action_refresh)?.apply { icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply { sizeDp = 20 diff --git a/app/src/main/res/drawable/ic_blobmoji.xml b/app/src/main/res/drawable/ic_blobmoji.xml deleted file mode 100644 index be3332ce7..000000000 --- a/app/src/main/res/drawable/ic_blobmoji.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_emoji_34dp.xml b/app/src/main/res/drawable/ic_emoji_34dp.xml deleted file mode 100644 index b00cb9684..000000000 --- a/app/src/main/res/drawable/ic_emoji_34dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_notifications_off_24dp.xml b/app/src/main/res/drawable/ic_notifications_off_24dp.xml deleted file mode 100644 index 627eafd22..000000000 --- a/app/src/main/res/drawable/ic_notifications_off_24dp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_twemoji.xml b/app/src/main/res/drawable/ic_twemoji.xml deleted file mode 100644 index 70c4b513b..000000000 --- a/app/src/main/res/drawable/ic_twemoji.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/layout/item_emoji_pref.xml b/app/src/main/res/layout/item_emoji_pref.xml deleted file mode 100644 index a10a5ffe7..000000000 --- a/app/src/main/res/layout/item_emoji_pref.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 43bffbd40..b2acec4ee 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -29,14 +29,6 @@ largest - - night - day - black - auto - auto_system - - @string/system_default Català @@ -260,17 +252,4 @@ NEWEST_FIRST - - warn - hide - - - - home - notifications - public - thread - account - -