[android] Fix Android Studio warnings

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-11-28 14:49:37 +01:00
committed by x7z4w
parent acdcfe62a4
commit 22d7cf3969
16 changed files with 27 additions and 66 deletions

View File

@@ -48,7 +48,6 @@ import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentFactory;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.ViewModelProvider;

View File

@@ -547,7 +547,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
updateChargeSockets(socketIndex, socket);
})
.setNegativeButton(R.string.cancel, (dialog, which) -> { dialog.dismiss(); });
.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
}
// Helper method for validation logic
@@ -643,17 +643,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
count.setText(getString(R.string.count_label, socket.count()));
}
itemView.setOnClickListener(v -> {
buildChargeSocketDialog(currentIndex, socket.type(), socket.count(), socket.power()).show();
});
itemView.setOnClickListener(v -> buildChargeSocketDialog(currentIndex, socket.type(), socket.count(), socket.power()).show());
socketsGrid.addView(itemView);
}
// add a 'new item' button at the end, to create new sockets
View btnNewItemView = inflater.inflate(R.layout.button_new_item, socketsGrid, false);
btnNewItemView.setOnClickListener(v -> {
buildChargeSocketDialog(-1, "unknown", -1, -1).show();
});
btnNewItemView.setOnClickListener(v -> buildChargeSocketDialog(-1, "unknown", -1, -1).show());
socketsGrid.addView(btnNewItemView);
}

View File

@@ -2,14 +2,12 @@ package app.organicmaps.maplayer;
import android.content.Context;
import android.view.View;
import androidx.annotation.AttrRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.sdk.maplayer.Mode;
import app.organicmaps.util.ThemeUtils;
public class LayerBottomSheetItem
{
@@ -37,27 +35,25 @@ public class LayerBottomSheetItem
@DrawableRes
int drawableResId = 0;
@StringRes
int buttonTextResource = R.string.layers_title;
switch (mode)
{
case OUTDOORS:
drawableResId = R.drawable.ic_layers_outdoors;
buttonTextResource = R.string.button_layer_outdoor;
break;
case SUBWAY:
drawableResId = R.drawable.ic_layers_subway;
buttonTextResource = R.string.subway;
break;
case ISOLINES:
drawableResId = R.drawable.ic_layers_isoline;
buttonTextResource = R.string.button_layer_isolines;
break;
case TRAFFIC:
drawableResId = R.drawable.ic_layers_traffic;
buttonTextResource = R.string.button_layer_traffic;
break;
}
return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener);
int buttonTextResource = switch (mode) {
case OUTDOORS -> {
drawableResId = R.drawable.ic_layers_outdoors;
yield R.string.button_layer_outdoor;
}
case SUBWAY -> {
drawableResId = R.drawable.ic_layers_subway;
yield R.string.subway;
}
case ISOLINES -> {
drawableResId = R.drawable.ic_layers_isoline;
yield R.string.button_layer_isolines;
}
case TRAFFIC -> {
drawableResId = R.drawable.ic_layers_traffic;
yield R.string.button_layer_traffic;
}
};
return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener);
}
@NonNull

View File

@@ -5,10 +5,8 @@ import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.fragment.app.Fragment;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.util.ThemeUtils;
public class SearchActivity extends BaseMwmFragmentActivity
{

View File

@@ -3,7 +3,6 @@ package app.organicmaps.widget;
import android.content.Context;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;

View File

@@ -7,7 +7,6 @@ import androidx.annotation.DrawableRes;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.AppCompatRadioButton;
import app.organicmaps.R;
import app.organicmaps.util.ThemeUtils;
public class RoutingToolbarButton extends AppCompatRadioButton
{

View File

@@ -32,7 +32,6 @@ import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import app.organicmaps.BuildConfig;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@@ -57,7 +56,6 @@ import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.OhState;
import app.organicmaps.sdk.editor.OpeningHours;
import app.organicmaps.sdk.editor.data.HoursMinutes;
import app.organicmaps.sdk.editor.data.Timetable;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.location.SensorListener;

View File

@@ -8,8 +8,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.GridLayout;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
@@ -23,7 +21,6 @@ import app.organicmaps.R;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.bookmarks.data.ChargeSocketDescriptor;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.widget.placepage.PlacePageViewModel;
import java.text.DecimalFormat;

View File

@@ -16,8 +16,7 @@
android:background="?cardBackground"
android:fadeScrollbars="false"
android:fillViewport="true"
android:clipToPadding="false"
tools:ignore="DuplicateIds">
android:clipToPadding="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -36,7 +35,6 @@
android:orientation="vertical"
android:padding="@dimen/margin_base">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"

View File

@@ -6,8 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
tools:context=".editor.EditorActivity"
tools:ignore="DuplicateIds">
tools:context=".editor.EditorActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@@ -16,8 +16,7 @@
android:background="?cardBackground"
android:fadeScrollbars="false"
android:fillViewport="true"
android:clipToPadding="false"
tools:ignore="DuplicateIds">
android:clipToPadding="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -27,7 +26,6 @@
android:padding="@dimen/margin_base"
tools:ignore="ScrollViewSize">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"

View File

@@ -1,7 +1,5 @@
package app.organicmaps.sdk.bookmarks.data;
import java.text.DecimalFormat;
/**
* represents the details of the socket available on a particular charging station
*

View File

@@ -16,7 +16,7 @@ public class PredefinedColors
public @interface Color
{}
/// @note Color format: ARGB
/// note Color format: ARGB
@ColorInt
private static final int[] PREDEFINED_COLORS = nativeGetPredefinedColors();

View File

@@ -13,19 +13,6 @@ public final class OsmOAuth
{
private OsmOAuth() {}
public enum AuthType
{
OSM("OSM"),
GOOGLE("Google");
public final String name;
AuthType(String name)
{
this.name = name;
}
}
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private static SharedPreferences mPrefs;

View File

@@ -32,7 +32,6 @@ public final class Constants
public static final String OPENING_HOURS_MANUAL = "file:///android_asset/opening_hours_how_to_edit.html";
public static final String OSM_REGISTER = "https://www.openstreetmap.org/user/new";
public static final String OSM_RECOVER_PASSWORD = "https://www.openstreetmap.org/user/forgot-password";
private Url() {}
}

View File

@@ -33,7 +33,7 @@ public final class Distance
}
}
/// @todo What is the difference with cpp: kNarrowNonBreakingSpace = "\u202F" ?
/// todo What is the difference with cpp: kNarrowNonBreakingSpace = "\u202F" ?
private static final char NON_BREAKING_SPACE = '\u00A0';
public final double mDistance;