From 09238d80563f9e7267ebdd8a71c71461faad70b9 Mon Sep 17 00:00:00 2001
From: Emil Kosz <ekosz@int.pl>
Date: Fri, 8 Nov 2024 18:00:59 +0100
Subject: [PATCH] Small misc. changes, renames, etc.

---
 LintProfile.xml                               | 24 ++++++++++---------
 app/src/main/AndroidManifest.xml              |  4 ++--
 app/src/main/res/drawable/button.xml          |  6 +++--
 .../res/drawable/{icon.xml => ic_app.xml}     |  0
 .../{icon_round.xml => ic_app_round.xml}      |  0
 .../{clipboard.xml => ic_clipboard.xml}       |  0
 .../{trashcan.xml => ic_trashcan.xml}         |  0
 app/src/main/res/layout/clip.xml              |  2 +-
 app/src/main/res/layout/input.xml             |  2 +-
 app/src/main/res/values/bools.xml             |  1 -
 app/src/main/res/values/strings.xml           | 12 +---------
 app/src/main/res/xml/preferences.xml          |  7 ------
 12 files changed, 22 insertions(+), 36 deletions(-)
 rename app/src/main/res/drawable/{icon.xml => ic_app.xml} (100%)
 rename app/src/main/res/drawable/{icon_round.xml => ic_app_round.xml} (100%)
 rename app/src/main/res/drawable/{clipboard.xml => ic_clipboard.xml} (100%)
 rename app/src/main/res/drawable/{trashcan.xml => ic_trashcan.xml} (100%)

diff --git a/LintProfile.xml b/LintProfile.xml
index 00118d4..f543c57 100644
--- a/LintProfile.xml
+++ b/LintProfile.xml
@@ -1,4 +1,3 @@
-<!--suppress IncorrectFormatting, LongLine -->
 <profile version="1.0">
   <option name="myName" value="Very strict" />
   <inspection_tool class="AbsoluteAlignmentInUserInterface" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -18,7 +17,6 @@
   </inspection_tool>
   <inspection_tool class="AccessToStaticFieldLockedOnInstance" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="AddConversionCallMigration" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="AlphaUnsortedPropertiesFile" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
   <inspection_tool class="AmbiguousExpressionInWhenBranchMigration" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="AmbiguousFieldAccess" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="AmbiguousMethodCall" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -80,7 +78,6 @@
   <inspection_tool class="AssignmentToNull" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="AssignmentToStaticFieldFromInstanceMethod" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="AssignmentToSuperclassField" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="AutoUnboxing" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="AwaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="AwaitWithoutCorrespondingSignal" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="BadExceptionCaught" enabled="true" level="WARNING" enabled_by_default="true">
@@ -232,7 +229,6 @@
   <inspection_tool class="DollarSignInName" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="DoubleLiteralMayBeFloatLiteral" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="DriverManagerGetConnection" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="DuplicatePropertyInspection" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="DuplicateStringLiteralInspection" enabled="true" level="WARNING" enabled_by_default="true">
     <option name="MIN_STRING_LENGTH" value="5" />
     <option name="IGNORE_PROPERTY_KEYS" value="false" />
@@ -288,7 +284,6 @@
   <inspection_tool class="FieldMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="FieldNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="FieldNotUsedInToString" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="FinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="Finalize" enabled="true" level="WARNING" enabled_by_default="true">
     <option name="ignoreTrivialFinalizers" value="true" />
   </inspection_tool>
@@ -410,7 +405,19 @@
     <option name="ignoreNonEmtpyLoops" value="false" />
   </inspection_tool>
   <inspection_tool class="Guava" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="HardCodedStringLiteral" enabled="true" level="WARNING" enabled_by_default="true">
+  <inspection_tool class="HardCodedStringLiteral" enabled="true" level="WARNING" enabled_by_default="false">
+    <scope name="Project Source Files" level="WARNING" enabled="true">
+      <option name="ignoreForAssertStatements" value="true" />
+      <option name="ignoreForExceptionConstructors" value="true" />
+      <option name="ignoreForSpecifiedExceptionConstructors" value="" />
+      <option name="ignoreForJUnitAsserts" value="true" />
+      <option name="ignoreForClassReferences" value="true" />
+      <option name="ignoreForPropertyKeyReferences" value="true" />
+      <option name="ignoreForNonAlpha" value="true" />
+      <option name="ignoreAssignedToConstants" value="false" />
+      <option name="ignoreToString" value="false" />
+      <option name="nonNlsCommentPattern" value="NON-NLS" />
+    </scope>
     <option name="ignoreForAssertStatements" value="true" />
     <option name="ignoreForExceptionConstructors" value="true" />
     <option name="ignoreForSpecifiedExceptionConstructors" value="" />
@@ -448,7 +455,6 @@
   <inspection_tool class="IncompleteDestructuring" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="InconsistentLanguageLevel" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-  <inspection_tool class="IncorrectFormatting" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
   <inspection_tool class="IncorrectProcessCanceledExceptionHandling" enabled="true" level="ERROR" enabled_by_default="true" />
   <inspection_tool class="IncrementDecrementUsedAsExpression" enabled="true" level="WARNING" enabled_by_default="true" />
   <inspection_tool class="InlineClassDeprecatedMigration" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -677,10 +683,6 @@
     <option name="m_minLength" value="3" />
     <option name="m_maxLength" value="16" />
   </inspection_tool>
-  <inspection_tool class="PackageVisibleInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
-    <option name="ignoreEnums" value="false" />
-    <option name="ignoreInterfaces" value="false" />
-  </inspection_tool>
   <inspection_tool class="PackageWithTooFewClasses" enabled="true" level="WARNING" enabled_by_default="true">
     <option name="limit" value="3" />
   </inspection_tool>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16f0896..0382a50 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,9 +24,9 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:icon="@drawable/icon"
+        android:icon="@drawable/ic_app"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/icon_round"
+        android:roundIcon="@drawable/ic_app_round"
         android:supportsRtl="true"
         tools:targetApi="31">
         <profileable
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
index 907a7a7..50394c4 100644
--- a/app/src/main/res/drawable/button.xml
+++ b/app/src/main/res/drawable/button.xml
@@ -16,11 +16,13 @@
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item app:state_toggled="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/button_toggled" />
-            <corners android:bottomLeftRadius="@dimen/default_border_radius" android:bottomRightRadius="@dimen/default_border_radius" />
+            <corners android:bottomLeftRadius="@dimen/default_border_radius"
+                android:bottomRightRadius="@dimen/default_border_radius" />
         </shape>
     </item>
     <item android:state_pressed="false">
diff --git a/app/src/main/res/drawable/icon.xml b/app/src/main/res/drawable/ic_app.xml
similarity index 100%
rename from app/src/main/res/drawable/icon.xml
rename to app/src/main/res/drawable/ic_app.xml
diff --git a/app/src/main/res/drawable/icon_round.xml b/app/src/main/res/drawable/ic_app_round.xml
similarity index 100%
rename from app/src/main/res/drawable/icon_round.xml
rename to app/src/main/res/drawable/ic_app_round.xml
diff --git a/app/src/main/res/drawable/clipboard.xml b/app/src/main/res/drawable/ic_clipboard.xml
similarity index 100%
rename from app/src/main/res/drawable/clipboard.xml
rename to app/src/main/res/drawable/ic_clipboard.xml
diff --git a/app/src/main/res/drawable/trashcan.xml b/app/src/main/res/drawable/ic_trashcan.xml
similarity index 100%
rename from app/src/main/res/drawable/trashcan.xml
rename to app/src/main/res/drawable/ic_trashcan.xml
diff --git a/app/src/main/res/layout/clip.xml b/app/src/main/res/layout/clip.xml
index e761570..0147500 100644
--- a/app/src/main/res/layout/clip.xml
+++ b/app/src/main/res/layout/clip.xml
@@ -41,6 +41,6 @@
         android:layout_height="@dimen/button_size"
         android:background="@drawable/button_transparent"
         android:contentDescription="@string/delete_button_description"
-        android:src="@drawable/trashcan"
+        android:src="@drawable/ic_trashcan"
         tools:ignore="UnusedAttribute" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/input.xml b/app/src/main/res/layout/input.xml
index b487c00..81c8b40 100644
--- a/app/src/main/res/layout/input.xml
+++ b/app/src/main/res/layout/input.xml
@@ -53,7 +53,7 @@
         android:layout_toLeftOf="@id/state_button"
         android:background="@drawable/button"
         android:contentDescription="@string/clipboard_button_description"
-        android:src="@drawable/clipboard"
+        android:src="@drawable/ic_clipboard"
         tools:ignore="UnusedAttribute" />
 
     <Button
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
index a636b9a..a685ba9 100644
--- a/app/src/main/res/values/bools.xml
+++ b/app/src/main/res/values/bools.xml
@@ -17,5 +17,4 @@
   -->
 
 <resources>
-    <bool name="floating_ui_default">false</bool>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2aaa32..bb7c9ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,23 +34,13 @@
     </string>
     <string name="clip_default_text">Clip</string>
 
-    <string name="preferences_label_floating_interface">Floating interface</string>
-    <string name="preferences_label_cycle_speed">Cycling speed</string>
+    <string name="preferences_label_cycle_speed">Symbol cycling speed</string>
     <string name="preferences_label_clipboard_size">Clipboard size</string>
     <string name="preferences_label_keymaps">Keymaps</string>
     <string name="preferences_label_copyright_info">
         Copyleft 🄯 Emil Kosz, 2024. License: GPLv3
     </string>
 
-    <string name="preferences_summary_floating_interface">
-        Make the interface appear over the app near the cursor when typing or tapping a text field
-        instead of occupying screen space (Android 5+)
-    </string>
-    <string name="preferences_summary_cycle_speed">
-        The speed of switching to the next symbol
-    </string>
-
-    <string name="preferences_key_floating_interface">floating_interface</string>
     <string name="preferences_key_keymaps">selected_keymaps</string>
     <string name="preferences_key_cycle_speed">cycle_speed</string>
     <string name="preferences_key_clipboard_size">clipboard_size</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 2de54a1..a25b1f4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -19,18 +19,11 @@
 
 <!--suppress DeprecatedClassUsageInspection -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="@bool/floating_ui_default"
-        android:enabled="false"
-        android:key="@string/preferences_key_floating_interface"
-        android:summary="@string/preferences_summary_floating_interface"
-        android:title="@string/preferences_label_floating_interface" />
     <ListPreference
         android:defaultValue="@string/cycle_speed_default"
         android:entries="@array/preferences_cycle_speed_labels"
         android:entryValues="@array/preferences_cycle_speeds"
         android:key="@string/preferences_key_cycle_speed"
-        android:summary="@string/preferences_summary_cycle_speed"
         android:title="@string/preferences_label_cycle_speed" />
     <ListPreference
         android:defaultValue="@string/clipboard_size_default"