From 63d29f2097f5b8f40dfd170d632f4e98bb35e981 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 16 Sep 2019 19:44:34 +0200
Subject: [PATCH] Cleanup.

---
 .../de/dennisguse/opentracks/ChartView.java   |  3 +-
 .../ChooseActivityTypeDialogFragment.java     | 30 +++++++------------
 src/main/res/layout/about.xml                 |  1 +
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/ChartView.java b/src/main/java/de/dennisguse/opentracks/ChartView.java
index 62d56a1f1..bc35f0d57 100644
--- a/src/main/java/de/dennisguse/opentracks/ChartView.java
+++ b/src/main/java/de/dennisguse/opentracks/ChartView.java
@@ -449,8 +449,7 @@ public class ChartView extends View {
                     synchronized (waypoints) {
                         for (int i = 0; i < waypoints.size(); i++) {
                             Waypoint waypoint = waypoints.get(i);
-                            int distance = Math.abs(
-                                    getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
+                            int distance = Math.abs(getX(getWaypointXValue(waypoint)) - (int) event.getX() - getScrollX());
                             if (distance < minDistance) {
                                 minDistance = distance;
                                 nearestWaypoint = waypoint;
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
index 380897dbf..7f80c37b4 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
@@ -16,12 +16,12 @@
 
 package de.dennisguse.opentracks.fragments;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -57,8 +57,8 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
         return fragment;
     }
 
-    public static Dialog getDialog(final Activity activity, final String category, final ChooseActivityTypeCaller caller) {
-        View view = activity.getLayoutInflater().inflate(R.layout.choose_activity_type, null);
+    public static Dialog getDialog(final Context context, final String category, final ChooseActivityTypeCaller caller) {
+        View view = LayoutInflater.from(context).inflate(R.layout.choose_activity_type, null);
         GridView gridView = view.findViewById(R.id.choose_activity_type_grid_view);
 
         List<Integer> imageIds = new ArrayList<>();
@@ -69,16 +69,16 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
         final ChooseActivityTypeImageAdapter imageAdapter = new ChooseActivityTypeImageAdapter(imageIds);
         gridView.setAdapter(imageAdapter);
 
-        final AlertDialog alertDialog = new AlertDialog.Builder(activity).setTitle(R.string.track_edit_activity_type_hint).setView(view).create();
+        final AlertDialog alertDialog = new AlertDialog.Builder(context).setTitle(R.string.track_edit_activity_type_hint).setView(view).create();
         alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
             @Override
             public void onShow(DialogInterface dialog) {
-                int position = getPosition(activity, category);
+                int position = getPosition(context, category);
                 if (position != -1) {
                     imageAdapter.setSelected(position);
                     imageAdapter.notifyDataSetChanged();
                 }
-                DialogUtils.setDialogTitleDivider(activity, alertDialog);
+                DialogUtils.setDialogTitleDivider(context, alertDialog);
             }
         });
 
@@ -92,25 +92,17 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
         return alertDialog;
     }
 
-    private static int getPosition(Activity activity, String category) {
+    private static int getPosition(Context context, String category) {
         if (category == null) {
             return -1;
         }
-        String iconValue = TrackIconUtils.getIconValue(activity, category);
-        if (iconValue.equals("")) {
-            return -1;
-        }
-        List<String> iconValues = TrackIconUtils.getAllIconValues();
-        for (int i = 0; i < iconValues.size(); i++) {
-            if (iconValues.get(i).equals(iconValue)) {
-                return i;
-            }
-        }
-        return -1;
+        String iconValue = TrackIconUtils.getIconValue(context, category);
+
+        return TrackIconUtils.getAllIconValues().indexOf(iconValue);
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         try {
             caller = (ChooseActivityTypeCaller) context;
diff --git a/src/main/res/layout/about.xml b/src/main/res/layout/about.xml
index e4e7b8f41..2d1e4d09a 100644
--- a/src/main/res/layout/about.xml
+++ b/src/main/res/layout/about.xml
@@ -9,6 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="239dp"
         android:scaleType="fitCenter"
+        android:contentDescription="@string/app_name"
         android:src="@drawable/ic_logo_color_24dp" />
 
     <TextView