diff --git a/build.gradle b/build.gradle index bb2fc7c2a..afd00ecde 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ def getVersionCode = { -> return Integer.parseInt(stdout.toString().trim()) } catch (ignored) { - return -1; + return -1 } } @@ -41,7 +41,7 @@ def getVersionName = { -> return stdout.toString().trim() } catch (ignored) { - return null; + return null } } diff --git a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java index 2fed77724..0a052ffc0 100644 --- a/src/main/java/de/dennisguse/opentracks/SearchListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/SearchListActivity.java @@ -17,7 +17,6 @@ package de.dennisguse.opentracks; import android.app.SearchManager; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; @@ -38,6 +37,13 @@ import android.widget.ListView; import androidx.annotation.NonNull; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedSet; + import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.SearchEngine; import de.dennisguse.opentracks.content.SearchEngine.ScoredResult; @@ -57,14 +63,6 @@ import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.util.TrackIconUtils; import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils; -import de.dennisguse.opentracks.R; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedSet; /** * An activity to display a list of search results. diff --git a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java index 6aa93db81..8ac12c497 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackDetailActivity.java @@ -17,7 +17,6 @@ package de.dennisguse.opentracks; import android.Manifest; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; @@ -37,7 +36,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; -import androidx.core.app.TaskStackBuilder; import androidx.core.content.FileProvider; import androidx.viewpager.widget.ViewPager; diff --git a/src/main/java/de/dennisguse/opentracks/content/ContentTypeIds.java b/src/main/java/de/dennisguse/opentracks/content/ContentTypeIds.java deleted file mode 100644 index 4459b7565..000000000 --- a/src/main/java/de/dennisguse/opentracks/content/ContentTypeIds.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2010 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 de.dennisguse.opentracks.content; - -/** - * Utilities for serializing primitive types. - * - * @author Rodrigo Damazio - */ -public class ContentTypeIds { - - public static final byte BOOLEAN_TYPE_ID = 0; - public static final byte LONG_TYPE_ID = 1; - public static final byte INT_TYPE_ID = 2; - public static final byte FLOAT_TYPE_ID = 3; - public static final byte DOUBLE_TYPE_ID = 4; - public static final byte STRING_TYPE_ID = 5; - public static final byte BLOB_TYPE_ID = 6; - private ContentTypeIds() { - } -} diff --git a/src/main/java/de/dennisguse/opentracks/content/DataSource.java b/src/main/java/de/dennisguse/opentracks/content/DataSource.java index d254c4b98..d10d17c09 100644 --- a/src/main/java/de/dennisguse/opentracks/content/DataSource.java +++ b/src/main/java/de/dennisguse/opentracks/content/DataSource.java @@ -23,7 +23,6 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.database.ContentObserver; import android.net.Uri; -import de.dennisguse.opentracks.Constants; import de.dennisguse.opentracks.util.PreferencesUtils; /** diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java index 2f8b0c714..a7c713647 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java @@ -32,13 +32,13 @@ import android.widget.GridView; import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; -import de.dennisguse.opentracks.util.DialogUtils; -import de.dennisguse.opentracks.util.TrackIconUtils; -import de.dennisguse.opentracks.R; - import java.util.ArrayList; import java.util.List; +import de.dennisguse.opentracks.R; +import de.dennisguse.opentracks.util.DialogUtils; +import de.dennisguse.opentracks.util.TrackIconUtils; + /** * A DialogFragment to choose an activity type. * @@ -119,11 +119,6 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment { return -1; } - private static void updateWeightContainer(View weightContainer, int position) { - boolean showWeight = position == 0 || position == 1 || position == 2; - weightContainer.setVisibility(showWeight ? View.VISIBLE : View.GONE); - } - @Override public void onAttach(Context context) { super.onAttach(context); diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java index 6f101ab60..3397ee849 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java @@ -23,10 +23,10 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; -import de.dennisguse.opentracks.R; - import java.util.List; +import de.dennisguse.opentracks.R; + /** * Image adapter for choosing an activity type. * @@ -41,8 +41,7 @@ public class ChooseActivityTypeImageAdapter extends BaseAdapter { private final int padding; private int selected = -1; - public ChooseActivityTypeImageAdapter( - Context context, List imageIds, int width, int height, int padding) { + public ChooseActivityTypeImageAdapter(Context context, List imageIds, int width, int height, int padding) { this.context = context; this.imageIds = imageIds; this.width = width; diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index 4598d7f02..d4ee9a441 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java @@ -16,7 +16,6 @@ package de.dennisguse.opentracks.io.file.exporter; -import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.util.Log; diff --git a/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java b/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java index 02e1e9ba2..a7f6a5109 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ResetDialogPreference.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.DialogInterface; import android.preference.DialogPreference; import android.util.AttributeSet; -import android.view.View; import android.widget.Toast; import de.dennisguse.opentracks.R; @@ -16,11 +15,6 @@ public class ResetDialogPreference extends DialogPreference { super(context, attrs); } - @Override - protected View onCreateDialogView() { - return super.onCreateDialogView(); - } - @Override public void onClick(DialogInterface dialog, int which) { super.onClick(dialog, which); diff --git a/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java index eda81514a..97890cd4a 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/StatsSettingsActivity.java @@ -22,9 +22,8 @@ import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceActivity; -import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.util.StringUtils; +import de.dennisguse.opentracks.util.PreferencesUtils; /** * An activity for accessing stats settings. diff --git a/src/main/java/de/dennisguse/opentracks/stats/DoubleBuffer.java b/src/main/java/de/dennisguse/opentracks/stats/DoubleBuffer.java index dc6d8052e..3cbd26f59 100644 --- a/src/main/java/de/dennisguse/opentracks/stats/DoubleBuffer.java +++ b/src/main/java/de/dennisguse/opentracks/stats/DoubleBuffer.java @@ -77,30 +77,6 @@ public class DoubleBuffer { return sum / numberOfEntries; } - /** - * Gets the average and the variance of the buffer. - * - * @return an array of two elements - the first is the average, the second is - * the variance - */ - public double[] getAverageAndVariance() { - int numberOfEntries = isFull ? buffer.length : index; - if (numberOfEntries == 0) { - return new double[]{0, 0}; - } - - double sum = 0; - double sumSquares = 0; - for (int i = 0; i < numberOfEntries; i++) { - sum += buffer[i]; - sumSquares += Math.pow(buffer[i], 2); - } - - double average = sum / numberOfEntries; - double variance = sumSquares / numberOfEntries - Math.pow(average, 2); - return new double[]{average, variance}; - } - /** * Adds a double to the buffer. If the buffer is full the oldest element is * overwritten. diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java index 357d2452c..02cb22257 100644 --- a/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/TrackNameUtils.java @@ -17,19 +17,14 @@ package de.dennisguse.opentracks.util; import android.content.Context; -import android.location.Address; -import android.location.Geocoder; -import android.location.Location; import androidx.annotation.VisibleForTesting; -import de.dennisguse.opentracks.R; - -import java.io.IOException; import java.text.SimpleDateFormat; -import java.util.List; import java.util.Locale; +import de.dennisguse.opentracks.R; + /** * Utilities for track name. * diff --git a/src/main/res/layout/marker_list.xml b/src/main/res/layout/marker_list.xml index f42d57294..d987eb1c8 100644 --- a/src/main/res/layout/marker_list.xml +++ b/src/main/res/layout/marker_list.xml @@ -25,5 +25,5 @@ limitations under the License. + android:text="@string/marker_list_empty_message" /> \ No newline at end of file diff --git a/src/main/res/layout/search_list.xml b/src/main/res/layout/search_list.xml index 616f27522..76d4a0d65 100644 --- a/src/main/res/layout/search_list.xml +++ b/src/main/res/layout/search_list.xml @@ -25,5 +25,5 @@ limitations under the License. + android:text="@string/search_list_empty_message" /> \ No newline at end of file diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml index f6e004917..75566a6b6 100644 --- a/src/main/res/layout/track_list.xml +++ b/src/main/res/layout/track_list.xml @@ -73,7 +73,7 @@ limitations under the License. android:layout_weight="22" android:gravity="left" android:text="@string/track_list_empty_message" - android:textColor="@color/list_empty_text"> + android:textColor="@color/list_empty_text" />