From b010e1d82e9e8d5f9d87973e3341945a063aefad Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 25 Sep 2013 16:53:28 -0500 Subject: [PATCH] Remove about activity, unused keys and strings --- api/src/main/res/values/keys.xml | 2 - .../astrid/activity/AboutActivity.java | 67 ------------------- astrid/src/main/res/values-ca/strings.xml | 2 - astrid/src/main/res/values-cs/strings.xml | 3 - astrid/src/main/res/values-de/strings.xml | 3 - astrid/src/main/res/values-es/strings.xml | 3 - astrid/src/main/res/values-fr/strings.xml | 3 - astrid/src/main/res/values-it/strings.xml | 4 -- astrid/src/main/res/values-iw/strings.xml | 3 - astrid/src/main/res/values-ja/strings.xml | 1 - astrid/src/main/res/values-ko/strings.xml | 4 -- astrid/src/main/res/values-nl/strings.xml | 3 - astrid/src/main/res/values-pl/strings.xml | 3 - astrid/src/main/res/values-pt-rBR/strings.xml | 3 - astrid/src/main/res/values-ru/strings.xml | 3 - astrid/src/main/res/values-sv/strings.xml | 3 - astrid/src/main/res/values-tr/strings.xml | 3 - astrid/src/main/res/values-uk/strings.xml | 1 - astrid/src/main/res/values-zh-rCN/strings.xml | 3 - astrid/src/main/res/values-zh-rTW/strings.xml | 3 - astrid/src/main/res/values/keys-opencrx.xml | 2 - astrid/src/main/res/values/keys.xml | 27 +------- astrid/src/main/res/values/strings-core.xml | 21 +----- bin/find-unused-drawables.sh | 25 +++---- bin/find-unused-layouts.sh | 27 ++++---- bin/find-unused-strings.rb | 2 +- 26 files changed, 30 insertions(+), 194 deletions(-) delete mode 100644 astrid/src/main/java/com/todoroo/astrid/activity/AboutActivity.java diff --git a/api/src/main/res/values/keys.xml b/api/src/main/res/values/keys.xml index 0106ccb5e..844d5e9eb 100644 --- a/api/src/main/res/values/keys.xml +++ b/api/src/main/res/values/keys.xml @@ -24,8 +24,6 @@ sync_status - sync_bgwifi - sync_sync sync_forget diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/AboutActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AboutActivity.java deleted file mode 100644 index dae351351..000000000 --- a/astrid/src/main/java/com/todoroo/astrid/activity/AboutActivity.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2008 Google Inc. - * - * 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 com.todoroo.astrid.activity; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.res.Resources; -import android.text.Html; -import android.text.Spanned; -import android.text.method.LinkMovementMethod; -import android.widget.TextView; - -import org.tasks.R; - -/** - * Displays an About dialog. - */ -class About { - /** - * Displays the About dialog from the settings menu. - * - * @param activity For context. - */ - public static void showAbout(final Activity activity, final String versionName) { - - Resources r = activity.getResources(); - - StringBuilder aboutText = new StringBuilder(); - aboutText.append("").append(r.getString(R.string.app_name)).append("
"). - append(r.getString(R.string.p_about_text, versionName).replace("\n", "
")).append("

"). - append("Source Code
"). - append("Privacy Policy
"). - append("Terms of Use

"). - append("Visit astrid.com " + - "for more information, to add translations or help make Astrid better!"); - - final AlertDialog.Builder d = new AlertDialog.Builder(activity); - - Spanned body = Html.fromHtml(aboutText.toString()); - TextView textView = new TextView(activity); - textView.setText(body); - textView.setMovementMethod(LinkMovementMethod.getInstance()); - textView.setPadding(5, 0, 5, 0); - - d.setIcon(android.R.drawable.ic_dialog_info); - d.setView(textView); - d.setTitle(r.getString(R.string.p_about)); - d.show(); - } - - private About() { - // don't construct me - } -} diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index 4330be2b7..ce45facb1 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -141,7 +141,6 @@ Filtre nou Llista nova No heu seleccionat cap filtre. Seleccioneu un filtre o una llista. - Quan Resum de la tasca Importància A alguna hora en concret? @@ -234,7 +233,6 @@ Llista buida S\'està carregant… Seleccionar les tasques a veure ... - Quant a l\'Tasks Sembla que utilitzes una aplicació que pot matar pocessos (%s)! Si pots, afegeix l\'Tasks a la llista d\'exclusió per tal de no ser morta. En cas contrari podria ser que l\'Tasks no t\'informés de les tasques quan vencin.\n No mataré l\'Tasks! Uh oh! It looks like you may have a corrupted database. diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index c90cd862b..526b06f48 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -131,7 +131,6 @@ Nový Filtr Nový seznam Není vybrán žádný filtr! Vyberte prosím filtr nebo seznam. - Kdy Souhrn úkolu Důležitost V přesně daný čas? @@ -261,8 +260,6 @@ Prázdný seznam! Nahrávám... Označte úkol pro zobrazení... - O Tasks - Současná verze: %s\n\n Tasks je open-source a je vytvořena Todoroo, Inc. Vypadá to, že používate aplikaci, která ukončuje programy(%s)! Pokud můžete, přidejte Tasks do vyjímek, aby nebyla ukončována. Jinak se může stát, že vás nebude upozorňovat na úkoly.\n Neukončím Tasks! Poškozená databáze diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index cb8917c1a..6df587cc5 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -160,7 +160,6 @@ Neuer Filter Neue Liste Kein Filter ausgewählt. Bitte Filter oder Liste auswählen. - Wann Aufgabenname Priorität Fälligkeitsdatum setzen @@ -367,8 +366,6 @@ Erlaubt Tasks, die Gebietschema-App zum Senden von Benachrichtigunen basierend auf Filterregeln zu benutzen. Benötigt Gebietsschema-Plugin. Ladevorgang … Aufgaben zum Anzeigen wählen … - Über Tasks - Aktuelle Version: %s\n\n Tasks ist Open-Source und wird stolz von Todoroo, Inc. gepflegt. Tasks bewerten? Schön, dass ich helfen konnte. Gibst du mir eine 5-Sterne-Bewertung? Bewertung hinterlassen? diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index 36c2b68c1..9a6358d87 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -167,7 +167,6 @@ Nuevo filtro Nueva lista No hay filtro seleccionado! Por favor seleccione un filtro o lista. - Cuando Nombre de la tarea Prioridad Establece la fecha @@ -370,8 +369,6 @@ Permitir a Tasks utilizar la aplicación Locale para enviarle notificaciones basadas en filtros. Requiere el complemento Locale. Cargando… Seleccione las tareas que ver... - Sobre Tasks - Versión actual: %s\n\n Tasks es código abierto y orgullosamente mantenido por Todoroo, Inc. ¡Parece que está usando una app que puede matar procesos (%s)! Si puede, agregue Tasks a la lista de exclusión para que no se cierre. Si no lo hace, Tasks podría no avisarle cuanto venza una tarea.\n diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index 535075f6c..eb2dd048a 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -162,7 +162,6 @@ Nouveau filtre Nouvelle liste Aucun filtre sélectionné ! Veuillez sélectionner un filtre ou une liste. - Quand Nom de la tâche Priorité Définir une date d\'échéance @@ -375,8 +374,6 @@ Autorise Tasks à utiliser l\'application de localisation pour vous envoyer des notifications en fonction de filtres. Nécessite la localisation Chargement… Sélectionnez les tâches à afficher… - À propos d\'Tasks - Version actuelle : %s\n\n Tasks est un logiciel libre maintenu fièrement par Todoroo, Inc. Evaluer Tasks ? Content de savoir que je suis utile ! Prenez un instant pour nous donner 5 étoiles Laisser un avis? diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index 232909a94..49b84407f 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -153,7 +153,6 @@ Nuovo Filtro Nuova lista Filtro non selezionato! Perfavore seleziona un filtro o una lista. - Quando Priorità In un orario specifico? Nessuna @@ -324,9 +323,6 @@ Consenti ad Tasks di usare l\'applicazione Locale per inviarti notifiche in base ai tuoi filtri. è richiesta l\'applicazione Locale. Caricamento... Seleziona le attività da visualizzare... - Informazioni su Tasks - Versione attuale: %s\n\n -Tasks è un open-source ed è sostenuto con orgoglio da Todoroo, Inc. Sembra che si stia utilizzando un\'applicazione che può terminare i processi (%s)! Se è possibile, aggiungere Tasks all\'elenco di esclusione in modo che non venga terminato. Contrariamente, Tasks potrebbe non avvisarti quando le tue attività saranno compiute.\n Voglio terminare Tasks! Database corrotto diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index 4915d105e..f215a239b 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -159,7 +159,6 @@ מַסְנֵן חדש רשימה חדשה לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה. - מתי עדיפות בזמן מסויים? ללא @@ -364,8 +363,6 @@ אפשר לאסטריד להשתמש בתכונות \"מציאת מקום\" על מנת לשלוח לך התראות מבוססות על תנאי סינון. עליך להפעיל שירותי מיקום. טוענת... בחר משימות להצגה... - אודות אסטריד - גירסא נוכחית: %s\n אסטריד היא תכנת קוד פתוח המתוחזקת בגאווה ע״י Todoroo, Inc. ככל הנראה הנך משתמש ביישום אשר יכול להרוג תהליכים (%s)! .אם הדבר אפשרי, אנא הוסף את אסטריד לרשימת היישומים אשר ישום זה לא יהרוג. אחרת , יתכן שאסטריד לא תוכל להודיע לך כאשר זמן היעד של המשימות שלך יגיע. diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index 4a5240d45..041175abb 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -119,7 +119,6 @@ ショートカット %s を作成しました 新しいフィルタ 新しいリスト - いつ 優先順位 時刻を設定する なし diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index 237ee498c..5f4fe2d55 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -169,7 +169,6 @@ 새 필터 새 목록 필터를 선택하지 않았습니다! 필터나 목록을 선택하세요. - 언제 일정 이름 우선순위 마감일 설정 @@ -384,9 +383,6 @@ 아스트리드에서 위치 앱을 사용합니다. 위치 앱에서 설정한 필터 조건에 따라 알림을 보내줍니다. 위치 서비스를 사용합니다. 로드 중… 열람할 일정 선택... - 아스트리드 정보 - 현재 버전: %s\n\n -아스트리드는 오픈소스이며 Todoroo, Inc가 관리하고 있습니다. 평가할까요? 도움이 되었다니 기쁘네요! 평가를 위해 잠시 시간을 내주실래요? 피드백을 남길까요? diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index b53bcdba5..9ebf85947 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -163,7 +163,6 @@ Nieuw Filter Nieuwe lijst Geen filter geselecteerd! Selecteer een filter of lijst. - Wanneer Taak naam Prioriteit Stel de einddatum in @@ -374,8 +373,6 @@ Sta toe dat Tasks gebruik maakt van de Locale applicatie om je notificaties te sturen gebaseerd op de filter voorwaarden. Locale vereist. Laden… Selecteer weer te geven taken... - Over Tasks - Huidige versie: %s\n\n Tasks is open-source en wordt trots onderhouden door Todoroo, Inc. Beoordeel Tasks? Fijn dat ik kon helpen! Heb je een momentje om ons een 5-ster waardering te geven? Geef feedback? diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index dc2466fe0..f751b7e38 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -162,7 +162,6 @@ Nowy filtr Nowa lista Nie wybraon filtra! Wybierz filtr lub listę. - Kiedy Tytuł zadania Priorytet Dokładna godzina? @@ -369,8 +368,6 @@ Umożliwia Tasks wykorzystanie aplikacji obsługującej języki, by wysyłać ci powiadomienia oparte o filtry. Wymaga wtyczki Locale. Ładowanie... Wybierz zadania do wyświetlenia - O Tasks - Bieżąca wersja: %s\n\n Tasks ma otwarte źródła i jest zarządzana z dumą przez Todoroo, Inc. Ocenić Tasks? Cieszę się, że mogłem pomóc! Masz chwilę aby pomóc nam pięciogwiazdkową oceną? Nie teraz diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index 0e02e66a8..2ca13b8af 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -154,7 +154,6 @@ Novo Filtro Nova lista Sem filtro selecionado! Selecione um filtro ou lista. - Quando Prioridade Num horário específico? Nenhum @@ -326,8 +325,6 @@ Permitir que o Tasks faça uso do aplicativo Locale para mandar notificações a você com base nas condições de filtro. Requer Locale. Carregando... Selecionar tarefas para visualização... - Sobre Tasks - Versão atual: %s\n\n Tasks é open-source e orgulhosamente mantido pela Todoroo, Inc. Parece que você está usando um aplicativo que pode eliminar processos (%s)! Se você puder, adicione o Tasks à lista de exclusão para que ele não seja eliminado. Caso contrário, o Tasks pode não avisar para você quando suas tarefas estiverem vencidas.\n Eu não vou excluir o Tasks! Banco de Dados Corrompido diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index d35815868..23ca8a6df 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -163,7 +163,6 @@ Новый фильтр Новый список Фильтры не выбраны! Пожалуйста, выберите фильтр или список - Когда Имя задачи Приоритет В указанное время? @@ -368,8 +367,6 @@ Разрешает Tasks использовать приложение Locale, чтобы посылать вам фильтрованные извещения. Нужно приложение Locale. Загрузка... Выберите задачи для просмотра… - О Tasks - Текущая версия: %s\n\n Tasks имеет открытый исходный код и с гордостью поддерживается Todoroo, Inc. Возможно вы используете менеджер задач (%s). По возможности добавьте Tasks в список исключений иначе возможны сложности с напоминаниями.\n Я не хочу убивать Tasks! Поврежденная база данных diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index d15781a26..2d66f939f 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -152,7 +152,6 @@ Nytt filter Ny lista Inget filter valt! Välj ett filter eller en lista. - När Prioritet Vid bestämd tid? Ingen @@ -330,8 +329,6 @@ Låter Tasks använda Locale-applikationen för att skicka anpassade meddelanden. Kräver Locale. Laddar... Välj uppgifter att se på... - Om Tasks - Aktuell version: %s\n\n Tasks är öppen programvara och underhålls av Todoroo, Inc. Det ser ut att du använder en app som kan avsluta processer (%s)! Om du kan, lägg till Tasks i exklusionslistan så att den inte avslutas. Annars kan det hända att Tasks inte meddelar när dina uppgifter förfaller.\n Jag önskar inte avsluta Tasks! Korrupt databas diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index efb1b6ffe..d4907ae0f 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -151,7 +151,6 @@ Yeni Filtre Yeni Liste Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin. - Ne Zaman Belirli bir zamanda? Hiçbiri Görev %s\'e kadar gizli kalacak @@ -311,8 +310,6 @@ Tasks Power Pack Yükleniyor... Görüntülenecek görevi seç... - Tasks Hakkında - Güncel versiyon: %s\n\n Tasks açık kaynak kodlu olarak Todoroo, Inc tarafından gururla sürdürülmektedir. Gönürüyor ki, işlemleri kapatabilen bir uygulama kullanıyorsunuz (%s)! Mümkünse, Tasks\'i programın muafiyet listesine ekleyin ki kapatılamasın. Aksi takdirde, Tasks görevlerin tarihi geldiğinde size bildiremeyebilir.\n Tasks\'i Kapatmayacağım! Bozuk Veritabanı diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index c6b8c1f86..131fcd9ad 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -165,7 +165,6 @@ Новий фільтр Новий список Не вибраний жодний фільтр! Будь ласка, виберіть фільтр або список. - Коли Ім\'я завдання Пріоритет Встановити кінцеву дату diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index b51333482..df1eb7f01 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -154,7 +154,6 @@ 新建过滤器 新建列表 还没有选定过滤器呢！请选择一个过滤器或列表呗。 - 时间 于指定时间？ 无 任务将会被隐藏，直到 %s @@ -304,8 +303,6 @@ 在过滤的条件下，允许清单小助理利用场所应用推送通知。现在就获取场所插件。 载入中... 选择任务以显示... - 关于清单小助理 - 当前版本： %s\n\n清单小助理是由 Todoroo, Inc. 维护的开源软件。 似乎您正在使用会删除进程的应用程序(%s)！可以的话，请将 清单小助理加入到例外列表避免被杀死。否则 清单小助理可能无法通知您任务已到期。\n 我不要中止清单小助理! 数据库已经受损 diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index a20614b7a..4089ccc6f 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -154,7 +154,6 @@ 新建過濾器 新建列表 還沒有選定過濾器呢！請選擇一個過濾器或列表唄。 - 時間 指定時間? 無 任務工作將會被隱藏，直到 %s @@ -324,8 +323,6 @@ 在過濾的條件下，允許Tasks利用場所應用推送通知。現在就買場所插件。 載入中... 選擇工作顯示... - 關於 Tasks - 當前版本： %s\n\n Tasks 是由Todoroo, Inc. 維護的開源軟件。 似乎您正在使用會刪除進程的應用程序(%s)！可以的話，請將Tasks 加入到例外列表避免被殺死。否則Tasks可能無法通知您任​​務已到期。\n 我不會中止 Tasks! 數據庫已經受損 diff --git a/astrid/src/main/res/values/keys-opencrx.xml b/astrid/src/main/res/values/keys-opencrx.xml index ad9e00891..eff5bba71 100644 --- a/astrid/src/main/res/values/keys-opencrx.xml +++ b/astrid/src/main/res/values/keys-opencrx.xml @@ -5,8 +5,6 @@ --> opencrx_sync_freq - opencrx_email - opencrx_password opencrx_defaultcreator opencrx_host opencrx_segment diff --git a/astrid/src/main/res/values/keys.xml b/astrid/src/main/res/values/keys.xml index e237a7383..5ec536490 100644 --- a/astrid/src/main/res/values/keys.xml +++ b/astrid/src/main/res/values/keys.xml @@ -33,9 +33,6 @@ notification_ringtone - - notification_voice - notif_theme @@ -94,14 +91,7 @@ 730 1460 - - - - 0 - 1 - 2 - - + 0 @@ -334,15 +324,9 @@ p_def_reminders - - - p_def_addtocalendar - + rmd_default_reminder_mode - - - p_swipe_lists_perf p_swipe_lists_enabled @@ -376,8 +360,6 @@ sync_status - sync_bgwifi - sync_sync sync_forget @@ -406,10 +388,7 @@ default_calendar_id - - - - + @string/TEA_control_when @string/TEA_control_importance diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index 541917e7f..f4cf651e0 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -262,16 +262,7 @@ No filter selected! Please select a filter or list. - - - - - - - - - When - + Task name @@ -810,16 +801,6 @@ Select tasks to view... - - - - - About Tasks - - - Current version: %s\n\n - -Tasks is open-source and proudly maintained by Todoroo, Inc. diff --git a/bin/find-unused-drawables.sh b/bin/find-unused-drawables.sh index b0d491717..5cb0ba2fb 100755 --- a/bin/find-unused-drawables.sh +++ b/bin/find-unused-drawables.sh @@ -1,16 +1,17 @@ #!/bin/bash -DIR="../astrid/src/main/res/drawable" -for file in $(ls -l ${DIR} | awk '{ print $9}' | sed 's/\..\+//g'); do - if [ ! -f ${DIR}/${file} ]; then - echo "ignoring ${file}" - continue - fi; - filename=`basename ${file}` - filename=${filename%%.*} - git grep -q ${filename} .. - if [ $? -ne 0 ]; then - echo -e "${file} not used" - fi; +for DIR in $(ls -d **/src/main/res/drawable*); do + for file in $(ls -l ${DIR} | awk '{ print $9}' | sed 's/\..\+//g'); do + if [ ! -f ${DIR}/${file} ]; then + echo "ignoring ${file}" + continue + fi; + filename=`basename ${file}` + filename=${filename%%.*} + git grep -q ${filename} . + if [ $? -ne 0 ]; then + echo -e "${DIR}/${file} not used" + fi; + done; done; #let "count+=$(grep -c @drawable/$file $SRCFILE)"; #let "count+=$(grep -c R.drawable.$file $SRCFILE)"; diff --git a/bin/find-unused-layouts.sh b/bin/find-unused-layouts.sh index 5b87359fc..424a11348 100755 --- a/bin/find-unused-layouts.sh +++ b/bin/find-unused-layouts.sh @@ -1,17 +1,14 @@ #!/bin/bash -PROJECT=$(cd `dirname $0`/..; pwd) -pushd ${PROJECT} -echo ${PROJECT} -path=astrid/src/main/res/layout -for file in $(ls -l ${path} | awk '{ print $9}' | sed 's/\..\+//g'); do - if [ ! -f ${path}/${file} ]; then - continue - fi; - filename=`basename ${file}` - filename=${filename%.*} - git grep -q ${filename} - if [ $? -ne 0 ]; then - echo -e "${file} not used" - fi; +for DIR in $(ls -d **/src/main/res/layout*); do + for file in $(ls -l ${DIR} | awk '{ print $9}' | sed 's/\..\+//g'); do + if [ ! -f ${DIR}/${file} ]; then + continue + fi; + filename=`basename ${file}` + filename=${filename%.*} + git grep -q ${filename} . + if [ $? -ne 0 ]; then + echo -e "${DIR}/${file} not used" + fi; + done; done; -popd diff --git a/bin/find-unused-strings.rb b/bin/find-unused-strings.rb index 423eb67bf..a5117e88b 100644 --- a/bin/find-unused-strings.rb +++ b/bin/find-unused-strings.rb @@ -1,4 +1,4 @@ -files = Dir.glob('api/src/main/res/values/strings.xml') + Dir.glob('astrid/src/main/res/values/strings-*.xml') +files = Dir.glob('**/src/main/res/values/*.xml') files.each do |path| file = File.new(path) file.read.scan(//) do |match|