From 92c08e40ef3b55a852b758c1eb6cf2002777fa55 Mon Sep 17 00:00:00 2001
From: arcarum <134963929+arcarum@users.noreply.github.com>
Date: Mon, 1 Jan 2024 20:45:42 +0400
Subject: [PATCH] Remove ic_setup_earth and address some warnings (#369)

---
 .../latin/setup/SetupWizardActivity.java      | 18 ++++++++-------
 app/src/main/res/drawable/ic_setup_earth.xml  | 22 -------------------
 .../drawable/sym_keyboard_language_switch.xml |  1 -
 3 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_setup_earth.xml

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java
index b5dfb7fa7..47d40a678 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/setup/SetupWizardActivity.java
@@ -82,7 +82,7 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         }
 
         @Override
-        public void handleMessage(final Message msg) {
+        public void handleMessage(@NonNull final Message msg) {
             final SetupWizardActivity setupWizardActivity = getOwnerInstance();
             if (setupWizardActivity == null) {
                 return;
@@ -156,7 +156,7 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         mSetupStepGroup.addStep(step1);
 
         final SetupStep step2 = new SetupStep(STEP_2, applicationName,
-                (TextView)findViewById(R.id.setup_step2_bullet), findViewById(R.id.setup_step2),
+                findViewById(R.id.setup_step2_bullet), findViewById(R.id.setup_step2),
                 R.string.setup_step2_title, R.string.setup_step2_instruction,
                 0 /* finishedInstruction */, R.drawable.ic_setup_select,
                 R.string.setup_step2_action);
@@ -164,9 +164,9 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         mSetupStepGroup.addStep(step2);
 
         final SetupStep step3 = new SetupStep(STEP_3, applicationName,
-                (TextView)findViewById(R.id.setup_step3_bullet), findViewById(R.id.setup_step3),
+                findViewById(R.id.setup_step3_bullet), findViewById(R.id.setup_step3),
                 R.string.setup_step3_title, R.string.setup_step3_instruction,
-                0 /* finishedInstruction */, R.drawable.ic_setup_earth,
+                0 /* finishedInstruction */, R.drawable.sym_keyboard_language_switch,
                 R.string.setup_step3_action);
         step3.setAction(() -> {
             final Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
@@ -202,6 +202,7 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
         mActionNext.setOnClickListener(this);
         mActionFinish = findViewById(R.id.setup_finish);
         final Drawable finishDrawable = ContextCompat.getDrawable(this, R.drawable.ic_setup_check);
+        assert finishDrawable != null;
         DrawableCompat.setTintList(finishDrawable, new ColorStateList(new int[][]{{android.R.attr.state_focused}, {android.R.attr.state_pressed}, {}},
                 new int[]{Color.WHITE, Color.WHITE, step1.mActivatedColor}));
         mActionFinish.setCompoundDrawablesRelativeWithIntrinsicBounds(finishDrawable, null, null, null);
@@ -291,13 +292,13 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
     }
 
     @Override
-    protected void onSaveInstanceState(final Bundle outState) {
+    protected void onSaveInstanceState(@NonNull final Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(STATE_STEP, mStepNumber);
     }
 
     @Override
-    protected void onRestoreInstanceState(final Bundle savedInstanceState) {
+    protected void onRestoreInstanceState(@NonNull final Bundle savedInstanceState) {
         super.onRestoreInstanceState(savedInstanceState);
         mStepNumber = savedInstanceState.getInt(STATE_STEP);
     }
@@ -434,8 +435,9 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL
                 final int paddingEnd = mActionLabel.getPaddingEnd();
                 mActionLabel.setPaddingRelative(paddingEnd, 0, paddingEnd, 0);
             } else {
-                mActionLabel.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                        actionIconDrawable, null, null, null);
+                int size = (int) (24 * res.getDisplayMetrics().density);  // width and height of drawables is 24dp
+                actionIconDrawable.setBounds(0,0, size, size);
+                mActionLabel.setCompoundDrawablesRelative(actionIconDrawable, null, null, null);
             }
         }
 
diff --git a/app/src/main/res/drawable/ic_setup_earth.xml b/app/src/main/res/drawable/ic_setup_earth.xml
deleted file mode 100644
index 939b6b42b..000000000
--- a/app/src/main/res/drawable/ic_setup_earth.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2013 The Android Open Source Project
-    SPDX-License-Identifier: Apache-2.0
-    Modified
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="288"
-    android:viewportWidth="288">
-    <path android:fillColor="#FFF"
-        android:pathData="M133 23a102 102 0 0 0-25 5 109 109 0 0 0-32 15 138 138 0 0 0-38 40 122 122 0 0 0 172 164 138 138 0 0 0 38-39 125 125 0 0 0 10-105l-10-21-3-4a138 138 0 0 0-39-38 114 114 0 0 0-54-17h-19zm36 16c13 4 14 5 12 11l-4 8c-2 5-3 7-12 14l-10 9-7 6-3 2-2-2c-4-3-5-9-4-14l3-9v-9c-1-8-2-9-6-9l-4-1c0-3 2-8 4-8 3-1 27 0 33 2zm-43-1-2 2-2 1-6 3c-1-1 0-4 3-5 3-2 6-2 7-1zm-17 8c4 1 5 4 5 5-2 3-10-1-10-5 0-2 1-2 5 0zm-5 10h6c3-1 5 0 4 1l5 7 6 7-2 4-4 7-4 3c-2 0-8-4-8-5l3-4 4-4c0-1-4-5-7-5-2-1-2-1-3 2l-5 6c-3 2-3 3-1 4v3c0 1-3 1-3-1s-2-1-6 2c-5 4-9 9-9 12 0 2 6 8 8 8l3 2c2 2 5 1 6-3a242 242 0 0 1 5-11l3-3 8 3c5 3 7 5 10 14l4 7c1 3 0 6-3 6-2 0-2-1-2-3 0-3 0-3-3-3s-9 3-9 4l1 2c3 0 3 2 2 4l-11 6c-7 3-8 5-14 13-3 5-5 8-5 11 0 4-1 4-5 0-2-3-3-3-9-4-5 0-6 0-9 4-4 3-4 4-4 8 0 5 0 5 8 3 3 0 4 0 4 2 2 5 7 11 10 11l14 1c16 1 20 3 26 11 4 4 6 6 9 7 17 5 18 6 14 18s-4 13-10 17c-5 3-8 7-18 19-2 2-6 2-11-1l-8-3-5-3v-7c-1-7-1-9-7-20s-6-12-6-16l2-7c4-5 1-11-7-15l-15-7c-9-4-11-5-16-13l-7-9a112 112 0 0 1 19-65c6-8 9-11 13-11 3 1 4 0 2-2-1-2-1-2 4-7l7-6c3-2 7-1 7 1 1 1 0 3-5 8l-3 4 6-1 6-2 6-8c4-5 4-5 6-4 1 1 2 2 3 1zm-12 1c-1 3-3 4-3 1 0-2 1-3 2-3l1 2zm129 12 6 6 6 9c12 14 21 40 21 62a118 118 0 0 1-23 66c-8 10-18 20-22 22h-2l-5-17a290 290 0 0 1-8-26l-2-4c-2-2-3-2-14-3-11 0-12-1-16-4l-4-3v-7c0-6 0-7 6-19 6-11 7-14 7-17-1-4 1-8 6-10 3-1 3-1 2-4l1-5c1-2 1-2-1-5-3-3-3-4-3-7 0-5 2-6 3-3l3 5c2 3 2 4 1 5-3 3 1 1 10-6 5-3 5-3 7-1l4 1c2 0 15-11 14-12 0-1-1-2-3-2l-3-3-1-2c-1 0-8 11-8 13s-3 1-7-4c-4-3-5-5-5-6l8-11c11-15 15-16 22-8zm-38 8c1 2-2 5-5 5-3-1-4-5-1-5h5z"/>
-    <path android:fillColor="#FFF"
-        android:pathData="M97.1,63.3c-3.4,7 -2.3,10.9 2.1,7.4 2.6,-2 3.3,-11.7 0.8,-11.7 -0.5,-0 -1.8,1.9 -2.9,4.3z"/>
-    <path android:fillColor="#FFF"
-        android:pathData="M86.5,118c-0.4,0.6 -0.3,1.6 0.3,2.2 0.6,0.6 1.2,0.6 1.7,-0.2 0.4,-0.6 0.3,-1.6 -0.3,-2.2 -0.6,-0.6 -1.2,-0.6 -1.7,0.2z"/>
-    <path android:fillColor="#FFF"
-        android:pathData="M224.4,121.4c-0.3,0.8 -0.4,2.3 -0.2,3.3 0.3,1.5 1.5,1.9 7.1,2.1 5.3,0.2 6.7,-0 6.7,-1.1 0,-0.8 -0.8,-1.8 -1.7,-2.1 -1,-0.3 -2.9,-1.3 -4.3,-2.1 -3.2,-1.9 -6.9,-1.9 -7.6,-0.1z"/>
-    <path android:fillColor="#FFF"
-        android:pathData="M202.2,124.5c0.6,1.4 1.7,2.5 2.5,2.5 0.8,-0 1.3,1.2 1.3,3 0,4 -1.9,3.8 -4.9,-0.5 -3.4,-5 -7.9,-4.9 -15.2,0.6 -7.4,5.5 -7.1,6.5 2.1,6.1l7.5,-0.3 5.4,4.7c5,4.5 5.7,4.8 10.5,4.7 2.9,-0.1 7.9,-0.8 11.3,-1.7 3.3,-0.9 7,-1.6 8.1,-1.6 2.1,-0 3.5,-2.2 2.6,-4.3 -0.6,-1.6 -11,-4.8 -16.2,-4.9 -3.5,-0 -4.6,-0.6 -8,-4.3 -2.1,-2.3 -4.8,-4.8 -6,-5.4 -2.1,-1.1 -2.1,-1 -1,1.4z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sym_keyboard_language_switch.xml b/app/src/main/res/drawable/sym_keyboard_language_switch.xml
index 336bb88db..2945bd0a7 100644
--- a/app/src/main/res/drawable/sym_keyboard_language_switch.xml
+++ b/app/src/main/res/drawable/sym_keyboard_language_switch.xml
@@ -4,7 +4,6 @@
     SPDX-License-Identifier: Apache-2.0
     Modified
 -->
-<!-- TODO: use "ic_setup_earth" and change the size in code to be able to delete this file -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"