From 257a40eefa31aa6018f88782477219ebccb797c0 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sat, 21 Sep 2024 14:42:37 +0200
Subject: [PATCH] Remove some unused resources (and increase severity of check)

---
 app/build.gradle                              |  1 -
 app/lint.xml                                  |  7 +++++-
 .../main/res/color/dialog_button_color.xml    |  5 ----
 .../res/color/dialog_button_ripple_color.xml  | 23 -------------------
 .../drawable/ic_outline_filter_list_24.xml    | 10 --------
 .../main/res/drawable/rounded_background.xml  |  6 -----
 app/src/main/res/values-w600dp/dimens.xml     |  3 ---
 app/src/main/res/values-w60dp/dimens.xml      |  3 ---
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/dimens.xml            |  4 ----
 app/src/main/res/values/strings.xml           | 12 +++++-----
 app/src/main/res/values/themes.xml            |  2 +-
 12 files changed, 14 insertions(+), 64 deletions(-)
 delete mode 100644 app/src/main/res/color/dialog_button_color.xml
 delete mode 100644 app/src/main/res/color/dialog_button_ripple_color.xml
 delete mode 100644 app/src/main/res/drawable/ic_outline_filter_list_24.xml
 delete mode 100644 app/src/main/res/drawable/rounded_background.xml
 delete mode 100644 app/src/main/res/values-w600dp/dimens.xml
 delete mode 100644 app/src/main/res/values-w60dp/dimens.xml

diff --git a/app/build.gradle b/app/build.gradle
index 97cbac61e4..4fc2bbab9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -108,7 +108,6 @@ android {
     lint {
         abortOnError true
         checkDependencies true
-        disable 'MissingQuantity', 'MissingTranslation'
     }
     buildFeatures {
         buildConfig true
diff --git a/app/lint.xml b/app/lint.xml
index 4cdb0450b5..f9f30d6e63 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <issue id="MissingTranslation" severity="ignore" />
+    <issue id="MissingQuantity" severity="ignore" />
     <issue id="InvalidPackage">
         <ignore regexp="X509LDAPCertStoreSpi" />
     </issue>
     <issue id="NotificationPermission">
         <ignore regexp="com.bumptech.glide.request.target.NotificationTarget" />
     </issue>
-    <issue id="ResourceType" severity="Warning" />
+    <issue id="UnusedResources" severity="error">
+        <ignore path="res/raw/aboutlibraries.json" />
+        <ignore regexp="res/mipmap.*/ic_launcher_debug.*.png" />
+    </issue>
 </lint>
diff --git a/app/src/main/res/color/dialog_button_color.xml b/app/src/main/res/color/dialog_button_color.xml
deleted file mode 100644
index 6abb6590fd..0000000000
--- a/app/src/main/res/color/dialog_button_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorSecondary" android:state_enabled="true"/>
-    <item android:alpha="0.38" android:color="?attr/colorSecondary"/>
-</selector>
diff --git a/app/src/main/res/color/dialog_button_ripple_color.xml b/app/src/main/res/color/dialog_button_ripple_color.xml
deleted file mode 100644
index d5a3e9d93b..0000000000
--- a/app/src/main/res/color/dialog_button_ripple_color.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <!--
-        Copyright 2017 The Android Open Source Project
-        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.
-    -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:alpha="@dimen/mtrl_low_ripple_pressed_alpha" android:color="?attr/colorSecondary" android:state_pressed="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_focused_alpha" android:color="?attr/colorSecondary" android:state_focused="true" android:state_hovered="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_focused_alpha" android:color="?attr/colorSecondary" android:state_focused="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_hovered_alpha" android:color="?attr/colorSecondary" android:state_hovered="true"/>
-    <item android:alpha="@dimen/mtrl_low_ripple_default_alpha" android:color="?attr/colorSecondary"/>
-
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_outline_filter_list_24.xml b/app/src/main/res/drawable/ic_outline_filter_list_24.xml
deleted file mode 100644
index ac6b976198..0000000000
--- a/app/src/main/res/drawable/ic_outline_filter_list_24.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="?attr/colorControlNormal"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M400,720L400,640L560,640L560,720L400,720ZM240,520L240,440L720,440L720,520L240,520ZM120,320L120,240L840,240L840,320L120,320Z" />
-</vector>
diff --git a/app/src/main/res/drawable/rounded_background.xml b/app/src/main/res/drawable/rounded_background.xml
deleted file mode 100644
index 682c748a9f..0000000000
--- a/app/src/main/res/drawable/rounded_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorSurfaceContainerLow"/>
-    <corners android:radius="4dp"/>
-    <padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp"/>
-</shape>
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index 311a717f8b..0000000000
--- a/app/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="auth_leader_text_size">36sp</dimen>
-</resources>
diff --git a/app/src/main/res/values-w60dp/dimens.xml b/app/src/main/res/values-w60dp/dimens.xml
deleted file mode 100644
index f93bfa8c5d..0000000000
--- a/app/src/main/res/values-w60dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <dimen name="auth_leader_text_size">32sp</dimen>
-</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 08860e029a..38d4593774 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
     <color name="md_theme_light_primary">#2b5bb5</color>
     <color name="md_theme_light_onPrimary">#ffffff</color>
     <color name="md_theme_light_primaryContainer">#d9e2ff</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 48b396f653..104bdeb936 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,8 +1,4 @@
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="list_item_height">48dp</dimen>
-    <dimen name="auth_leader_text_size">46sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd6cb2fd37..79d77d9f0c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">Aegis</string>
     <string name="app_name_full" translatable="false">Aegis Authenticator</string>
     <string name="org_name_full" translatable="false">Beem Development</string>
@@ -555,23 +555,23 @@
     <string name="pref_account_name_position_end">Next to the issuer</string>
     <string name="pref_account_name_position_below">Below the issuer</string>
 
-    <plurals name="time_elapsed_seconds">
+    <plurals name="time_elapsed_seconds" tools:ignore="UnusedResources">
         <item quantity="one">%d second ago</item>
         <item quantity="other">%d seconds ago</item>
     </plurals>
-    <plurals name="time_elapsed_minutes">
+    <plurals name="time_elapsed_minutes" tools:ignore="UnusedResources">
         <item quantity="one">%d minute ago</item>
         <item quantity="other">%d minutes ago</item>
     </plurals>
-    <plurals name="time_elapsed_hours">
+    <plurals name="time_elapsed_hours" tools:ignore="UnusedResources">
         <item quantity="one">%d hour ago</item>
         <item quantity="other">%d hours ago</item>
     </plurals>
-    <plurals name="time_elapsed_days">
+    <plurals name="time_elapsed_days" tools:ignore="UnusedResources">
         <item quantity="one">%d day ago</item>
         <item quantity="other">%d days ago</item>
     </plurals>
-    <plurals name="time_elapsed_years">
+    <plurals name="time_elapsed_years" tools:ignore="UnusedResources">
         <item quantity="one">%d year ago</item>
         <item quantity="other">%d years ago</item>
     </plurals>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f6529d4c81..8f84698ca0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -248,7 +248,7 @@
 
     <style name="ThemeOverlay.Aegis.AlertDialog.Warning">
         <item name="android:alertDialogIcon">@drawable/ic_outline_warning_24</item>
-        <item name="materialAlertDialogTitleIconStyle">@style/Widget.Aegis.AlertDialog.Icon.Error</item>
+        <item name="materialAlertDialogTitleIconStyle">@style/Widget.Aegis.AlertDialog.Icon.Warning</item>
     </style>
 
     <style name="Widget.Aegis.AlertDialog.Icon.Error" parent="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked">