kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fix or suppress warnings

Browse source 
100+ warnings left..

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-02-20 08:37:36 +02:00
parent bab264f2b1
commit b2da0b5e25
38 changed files with 252 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/AndroidManifest.xml
View file

@ -624,8 +624,7 @@
<activity
android:name="app.organicmaps.DownloadResourcesLegacyActivity"
android:configChanges="screenLayout|screenSize"
android:label="@string/app_name"/>
android:configChanges="screenLayout|screenSize"/>
<activity-alias
android:name="app.organicmaps.DownloadResourcesActivity"

1
android/res/xml/locales_config.xml
View file

@ -9,6 +9,7 @@
<locale android:name="da" />
<locale android:name="de" />
<locale android:name="el" />
<locale android:name="et" />
<locale android:name="en-GB" />
<locale android:name="es" />
<locale android:name="es-MX" />

5
android/src/app/organicmaps/ChartController.java
View file

@ -8,6 +8,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.components.Legend;
@ -140,7 +141,7 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
y.setLabelCount(CHART_Y_LABEL_COUNT, false);
y.setPosition(YAxis.YAxisLabelPosition.INSIDE_CHART);
y.setDrawGridLines(true);
y.setGridColor(mContext.getResources().getColor(R.color.black_12));
y.setGridColor(ContextCompat.getColor(mContext, R.color.black_12));
y.setEnabled(true);
y.setTextColor(Color.TRANSPARENT);
y.setAxisLineColor(Color.TRANSPARENT);
@ -172,7 +173,7 @@ public class ChartController implements OnChartValueSelectedListener, Initializa
set.setFillColor(color);
set.setDrawHorizontalHighlightIndicator(false);
set.setHighlightLineWidth(lineThickness);
set.setHighLightColor(mContext.getResources().getColor(R.color.base_accent_transparent));
set.setHighLightColor(ContextCompat.getColor(mContext, R.color.base_accent_transparent));
LineData data = new LineData(set);
data.setValueTextSize(mContext.getResources().getDimensionPixelSize(R.dimen.text_size_icon_title));

2
android/src/app/organicmaps/DownloadResourcesLegacyActivity.java
View file

@ -359,7 +359,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
if (ParsedMwmRequest.getCurrentRequest() != null)
{
// Wait for the result from MwmActivity for API callers.
startActivityForResult(intent, REQ_CODE_API_RESULT);
UiUtils.startActivityForResult(this, intent, REQ_CODE_API_RESULT);
return;
}
}

4
android/src/app/organicmaps/MwmActivity.java
View file

@ -416,6 +416,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
));
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
private void updateViewsInsets()
{
mPointChooser.setOnApplyWindowInsetsListener((view, windowInsets) -> {
@ -957,7 +958,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
intent.hasExtra(EXTRA_TASK) &&
((intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) == 0))
{
final MapTask mapTask = (MapTask) intent.getSerializableExtra(EXTRA_TASK);
final MapTask mapTask = Utils.getSerializable(intent, EXTRA_TASK, MapTask.class);
mTasks.add(mapTask);
intent.removeExtra(EXTRA_TASK);
@ -1388,6 +1389,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
@Override
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
public void onRoutingPlanStartAnimate(boolean show)
{
int offset = mCurrentWindowInsets.getSystemWindowInsetTop();

1
android/src/app/organicmaps/MwmJobIntentService.java
View file

@ -8,6 +8,7 @@ import androidx.core.app.JobIntentService;
import app.organicmaps.util.CrashlyticsUtils;
import app.organicmaps.util.log.Logger;
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/4531
public abstract class MwmJobIntentService extends JobIntentService
{
private static final String TAG = MwmJobIntentService.class.getSimpleName();

3
android/src/app/organicmaps/background/Notifier.java
View file

@ -12,6 +12,7 @@ import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import androidx.core.content.ContextCompat;
import app.organicmaps.MwmActivity;
import app.organicmaps.R;
@ -96,7 +97,7 @@ public final class Notifier
return new NotificationCompat.Builder(mContext, channel)
.setAutoCancel(true)
.setSmallIcon(R.drawable.ic_notification)
.setColor(UiUtils.getNotificationColor(mContext))
.setColor(ContextCompat.getColor(mContext, R.color.notification))
.setContentTitle(title)
.setContentText(content)
.setTicker(getTicker(title, content))

1
android/src/app/organicmaps/background/OsmUploadService.java
View file

@ -15,6 +15,7 @@ public class OsmUploadService extends MwmJobIntentService
/**
* Starts this service to upload map edits to osm servers.
*/
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/4531
public static void startActionUploadOsmChanges(@NonNull Context context)
{
final Intent intent = new Intent(context, OsmUploadService.class);

1
android/src/app/organicmaps/base/BaseMwmFragment.java
View file

@ -5,6 +5,7 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import app.organicmaps.util.Utils;

11
android/src/app/organicmaps/base/BaseMwmFragmentActivity.java
View file

@ -14,6 +14,8 @@ import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.core.content.IntentCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentFactory;
import androidx.fragment.app.FragmentManager;
@ -72,7 +74,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
// An intent that was skipped due to core wasn't initialized has to be used
// as a target intent for this activity, otherwise all input extras will be lost
// in a splash activity loop.
Intent initialIntent = getIntent().getParcelableExtra(SplashActivity.EXTRA_INITIAL_INTENT);
Intent initialIntent = Utils.getParcelable(getIntent(), SplashActivity.EXTRA_INITIAL_INTENT, Intent.class);
if (initialIntent != null)
setIntent(initialIntent);
@ -100,13 +102,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
if (layoutId != 0)
setContentView(layoutId);
// Use full-screen on Kindle Fire only
if (Utils.isAmazonDevice())
{
getWindow().addFlags(android.view.WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
}
attachDefaultFragment();
mBaseDelegate.onSafeCreate();
mSafeCreated = true;

1
android/src/app/organicmaps/base/MediaPlayerWrapper.java
View file

@ -112,6 +112,7 @@ public class MediaPlayerWrapper
return app.getMediaPlayer();
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3632
private static class InitPlayerTask extends AsyncTask<Integer, Void, InitializationResult>
{
@NonNull

1
android/src/app/organicmaps/bookmarks/BookmarksListFragment.java
View file

@ -777,6 +777,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
}
@Override
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);

3
android/src/app/organicmaps/bookmarks/Holders.java
View file

@ -22,6 +22,7 @@ import app.organicmaps.bookmarks.data.BookmarkInfo;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.Track;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.recycler.RecyclerClickListener;
import app.organicmaps.widget.recycler.RecyclerLongClickListener;
import app.organicmaps.util.Graphics;
@ -452,7 +453,7 @@ public class Holders
? category.getDescription()
: category.getAnnotation();
Spanned spannedDesc = Html.fromHtml(desc);
Spanned spannedDesc = Utils.fromHtml(desc);
mDescText.setText(spannedDesc);
}
}

2
android/src/app/organicmaps/downloader/ChunkTask.java
View file

@ -19,7 +19,7 @@ import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@SuppressWarnings("unused")
@SuppressWarnings({"unused", "deprecation"}) // https://github.com/organicmaps/organicmaps/issues/3632
class ChunkTask extends AsyncTask<Void, byte[], Integer>
{
private static final String TAG = ChunkTask.class.getSimpleName();

7
android/src/app/organicmaps/downloader/CountrySuggestFragment.java
View file

@ -11,6 +11,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
@ -208,8 +209,10 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
}
else if (id == R.id.btn__select_map)
{
BaseMwmFragmentActivity activity = Utils.castTo(requireActivity());
activity.replaceFragment(DownloaderFragment.class, null, null);
final FragmentActivity fragmentActivity = requireActivity();
if (!(fragmentActivity instanceof BaseMwmFragmentActivity))
throw new IllegalStateException("Activity is not instance of BaseMwmFragmentActivity");
((BaseMwmFragmentActivity) fragmentActivity).replaceFragment(DownloaderFragment.class, null, null);
}
else if (id == R.id.wpv__download_progress)
MapManager.nativeCancel(mDownloadingCountry.id);

1
android/src/app/organicmaps/downloader/DownloaderFragment.java
View file

@ -203,6 +203,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
}
@Override
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);

1
android/src/app/organicmaps/downloader/DownloaderToolbarController.java
View file

@ -58,6 +58,7 @@ class DownloaderToolbarController extends SearchToolbarController
}
@Override
@SuppressWarnings("deprecated") // https://github.com/organicmaps/organicmaps/issues/3630
protected void startVoiceRecognition(Intent intent, int code)
{
mFragment.startActivityForResult(intent, code);

3
android/src/app/organicmaps/editor/EditorFragment.java
View file

@ -22,6 +22,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -185,7 +186,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
mInputBuildingLevels.setError(isValid ? null
: context.getString(R.string.error_enter_correct_storey_number, Editor.nativeGetMaxEditableBuildingLevels()));
editText.setTextColor(isValid ? ThemeUtils.getColor(context, android.R.attr.textColorPrimary)
: context.getResources().getColor(R.color.base_red));
: ContextCompat.getColor(context, R.color.base_red));
}
});

3
android/src/app/organicmaps/maplayer/SearchWheel.java
View file

@ -21,6 +21,7 @@ import app.organicmaps.search.SearchEngine;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.concurrency.UiThread;
public class SearchWheel implements View.OnClickListener
@ -157,7 +158,7 @@ public class SearchWheel implements View.OnClickListener
public void restoreState(@NonNull Bundle savedState)
{
mCurrentOption = (SearchOption) savedState.getSerializable(EXTRA_CURRENT_OPTION);
mCurrentOption = Utils.getSerializable(savedState, EXTRA_CURRENT_OPTION, SearchOption.class);
}
public void reset()

16
android/src/app/organicmaps/routing/NavigationController.java
View file

@ -79,6 +79,16 @@ public class NavigationController implements Application.ActivityLifecycleCallba
}
};
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
private void addWindowsInsets(@NonNull View topFrame)
{
topFrame.findViewById(R.id.nav_next_turn_container).setOnApplyWindowInsetsListener((view, windowInsets) -> {
view.setPadding(windowInsets.getSystemWindowInsetLeft(), view.getPaddingTop(),
view.getPaddingRight(), view.getPaddingBottom());
return windowInsets;
});
}
public NavigationController(AppCompatActivity activity, @NonNull MapButtonsController mapButtonsController, View.OnClickListener onSettingsClickListener)
{
mFrame = activity.findViewById(R.id.navigation_frame);
@ -93,11 +103,7 @@ public class NavigationController implements Application.ActivityLifecycleCallba
mNextTurnDistance = turnFrame.findViewById(R.id.distance);
mCircleExit = turnFrame.findViewById(R.id.circle_exit);
topFrame.findViewById(R.id.nav_next_turn_container).setOnApplyWindowInsetsListener((view, windowInsets) -> {
view.setPadding(windowInsets.getSystemWindowInsetLeft(), view.getPaddingTop(),
view.getPaddingRight(), view.getPaddingBottom());
return windowInsets;
});
addWindowsInsets(topFrame);
mNextNextTurnFrame = topFrame.findViewById(R.id.nav_next_next_turn_frame);
mNextNextTurnImage = mNextNextTurnFrame.findViewById(R.id.turn);

8
android/src/app/organicmaps/routing/NavigationService.java
View file

@ -13,6 +13,7 @@ import android.content.Intent;
import android.content.res.Configuration;
import android.location.Location;
import android.os.Binder;
import android.os.Build;
import android.os.IBinder;
import android.widget.RemoteViews;
@ -185,13 +186,14 @@ public class NavigationService extends Service
{
Intent stopSelf = new Intent(this, NavigationService.class);
stopSelf.putExtra(EXTRA_STOP_SERVICE, true);
PendingIntent pStopSelf = PendingIntent.getService(this, 0,
stopSelf, PendingIntent.FLAG_CANCEL_CURRENT);
final int FLAG_IMMUTABLE = Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? 0 : PendingIntent.FLAG_IMMUTABLE;
PendingIntent pStopSelf = PendingIntent.getService(this, 0, stopSelf,
PendingIntent.FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE);
// TODO (@velichkomarija): restore navigation from notification.
PendingIntent activityPendingIntent = PendingIntent
.getActivity(this, 0,
new Intent(this, MwmActivity.class), 0);
new Intent(this, MwmActivity.class), FLAG_IMMUTABLE);
Builder builder = new Builder(this, CHANNEL_ID)
.addAction(R.drawable.ic_cancel, getString(R.string.button_exit),

9
android/src/app/organicmaps/search/SearchAdapter.java
View file

@ -16,6 +16,7 @@ import androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
@ -234,12 +235,12 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
final String string = resources.getString(R.string.closes_in, time);
UiUtils.setTextAndShow(mOpen, string);
mOpen.setTextColor(resources.getColor(R.color.base_yellow));
mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_yellow));
}
else
{
UiUtils.setTextAndShow(mOpen, resources.getString(R.string.editor_time_open));
mOpen.setTextColor(resources.getColor(R.color.base_green));
mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_green));
}
break;
@ -251,12 +252,12 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
final String string = resources.getString(R.string.opens_in, time);
UiUtils.setTextAndShow(mOpen, string);
mOpen.setTextColor(resources.getColor(R.color.base_red));
mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red));
}
else
{
UiUtils.setTextAndShow(mOpen, resources.getString(R.string.closed));
mOpen.setTextColor(resources.getColor(R.color.base_red));
mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red));
}
break;

2
android/src/app/organicmaps/search/SearchFragment.java
View file

@ -114,6 +114,7 @@ public class SearchFragment extends BaseMwmFragment
}
@Override
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
protected void startVoiceRecognition(Intent intent, int code)
{
startActivityForResult(intent, code);
@ -517,6 +518,7 @@ public class SearchFragment extends BaseMwmFragment
}
@Override
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
super.onActivityResult(requestCode, resultCode, data);

6
android/src/app/organicmaps/search/SearchHistoryFragment.java
View file

@ -55,13 +55,7 @@ public class SearchHistoryFragment extends BaseMwmRecyclerFragment<SearchHistory
}
});
updatePlaceholder();
}
@CallSuper
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState)
{
super.onActivityCreated(savedInstanceState);
((SearchFragment) getParentFragment()).setRecyclerScrollListener(getRecyclerView());
}
}

4
android/src/app/organicmaps/settings/BaseSettingsFragment.java
View file

@ -54,9 +54,9 @@ abstract class BaseSettingsFragment extends BaseMwmFragment
}
@Override
public void onActivityCreated(Bundle savedInstanceState)
public void onViewCreated(View view, Bundle savedInstanceState)
{
super.onActivityCreated(savedInstanceState);
super.onViewCreated(view, savedInstanceState);
savePaddings();
}

7
android/src/app/organicmaps/settings/SettingsPrefsFragment.java
View file

@ -1,5 +1,6 @@
package app.organicmaps.settings;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@ -126,7 +127,10 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
if (lang.downloaded)
setLanguage(lang);
else
startActivityForResult(new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA), REQUEST_INSTALL_DATA);
{
UiUtils.startActivityForResult(SettingsPrefsFragment.this,
new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA), REQUEST_INSTALL_DATA);
}
return false;
}
@ -320,6 +324,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
}
@Override
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
public void onActivityResult(int requestCode, int resultCode, Intent data)
{
// Do not check resultCode here as it is always RESULT_CANCELED

15
android/src/app/organicmaps/settings/StoragePathFragment.java
View file

@ -1,5 +1,6 @@
package app.organicmaps.settings;
import android.app.Dialog;
import android.app.ProgressDialog;
import android.os.Bundle;
import android.text.format.Formatter;
@ -102,10 +103,8 @@ public class StoragePathFragment extends BaseSettingsFragment
.show();
}
/**
* Shows a progress dialog and runs a move files thread.
*/
private void moveStorage(@NonNull final String newPath, @NonNull final String oldPath)
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3629
private Dialog showProgressDialog()
{
final ProgressDialog dialog = new ProgressDialog(requireActivity(), R.style.MwmTheme_AlertDialog);
dialog.setMessage(getString(R.string.wait_several_minutes));
@ -113,7 +112,15 @@ public class StoragePathFragment extends BaseSettingsFragment
dialog.setIndeterminate(true);
dialog.setCancelable(false);
dialog.show();
return dialog;
}
/**
* Shows a progress dialog and runs a move files thread.
*/
private void moveStorage(@NonNull final String newPath, @NonNull final String oldPath)
{
final Dialog dialog = showProgressDialog();
ThreadPool.getStorage().execute(() -> {
final boolean result = StoragePathManager.moveStorage(newPath, oldPath);

3
android/src/app/organicmaps/util/StorageUtils.java
View file

@ -97,8 +97,7 @@ public class StorageUtils
{
try
{
return application.getPackageManager()
.getApplicationInfo(BuildConfig.APPLICATION_ID, 0).sourceDir;
return Utils.getApplicationInfo(application.getPackageManager(), BuildConfig.APPLICATION_ID, 0).sourceDir;
}
catch (final PackageManager.NameNotFoundException e)
{

45
android/src/app/organicmaps/util/UiUtils.java
View file

@ -4,6 +4,7 @@ import android.animation.Animator;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.content.res.TypedArray;
@ -11,10 +12,8 @@ import android.graphics.Color;
import android.graphics.Rect;
import android.net.Uri;
import android.os.Build;
import android.text.Html;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.view.Gravity;
import android.view.MotionEvent;
import android.view.Surface;
import android.view.TouchDelegate;
@ -25,7 +24,6 @@ import android.view.Window;
import android.view.WindowInsets;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.AnyRes;
import androidx.annotation.AttrRes;
@ -34,13 +32,18 @@ import androidx.annotation.DimenRes;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.core.view.WindowInsetsControllerCompat;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textfield.TextInputLayout;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@ -65,7 +68,7 @@ public final class UiUtils
{
TextView policyView = view.findViewById(id);
Resources rs = policyView.getResources();
policyView.setText(Html.fromHtml(rs.getString(stringId, link)));
policyView.setText(Utils.fromHtml(rs.getString(stringId, link)));
policyView.setMovementMethod(LinkMovementMethod.getInstance());
}
@ -91,7 +94,7 @@ public final class UiUtils
public static void waitLayout(final View view, @NonNull final ViewTreeObserver.OnGlobalLayoutListener callback) {
view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@SuppressWarnings("deprecation")
@Override
public void onGlobalLayout() {
// viewTreeObserver can be dead(isAlive() == false), we should get a new one here.
@ -335,7 +338,7 @@ public final class UiUtils
layout.getEditText().setError(error == 0 ? null : layout.getContext().getString(error));
layout.getEditText().setTextColor(error == 0 ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary)
: layout.getContext().getResources().getColor(R.color.base_red));
: ContextCompat.getColor(layout.getContext(), R.color.base_red));
}
public static boolean isLandscape(@NonNull Context context)
@ -415,30 +418,35 @@ public final class UiUtils
setViewInsetsPaddingNoBottom(view, windowInsets);
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
public static void setViewInsetsPadding(View view, WindowInsets windowInsets)
{
view.setPadding(windowInsets.getSystemWindowInsetLeft(), windowInsets.getSystemWindowInsetTop(),
windowInsets.getSystemWindowInsetRight(), windowInsets.getSystemWindowInsetBottom());
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
public static void setViewInsetsPaddingNoTop(View view, WindowInsets windowInsets)
{
view.setPadding(windowInsets.getSystemWindowInsetLeft(), view.getPaddingTop(),
windowInsets.getSystemWindowInsetRight(), windowInsets.getSystemWindowInsetBottom());
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
public static void setViewInsetsPaddingSides(View view, WindowInsets windowInsets)
{
view.setPadding(windowInsets.getSystemWindowInsetLeft(), view.getPaddingTop(),
windowInsets.getSystemWindowInsetRight(), view.getPaddingBottom());
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
public static void setViewInsetsPaddingBottom(View view, WindowInsets windowInsets)
{
view.setPadding(view.getPaddingLeft(), view.getPaddingTop(),
view.getPaddingRight(), windowInsets.getSystemWindowInsetBottom());
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
public static void setViewInsetsPaddingNoBottom(View view, WindowInsets windowInsets)
{
view.setPadding(windowInsets.getSystemWindowInsetLeft(), windowInsets.getSystemWindowInsetTop(),
@ -530,19 +538,6 @@ public final class UiUtils
});
}
@ColorInt
public static int getNotificationColor(@NonNull Context context)
{
return context.getResources().getColor(R.color.notification);
}
public static void showToastAtTop(@NonNull Context context, @StringRes int stringId)
{
Toast toast = Toast.makeText(context, stringId, Toast.LENGTH_LONG);
toast.setGravity(Gravity.TOP, 0, 0);
toast.show();
}
public static void showRecyclerItemView(boolean show, @NonNull View view)
{
if (show)
@ -559,6 +554,18 @@ public final class UiUtils
}
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
public static void startActivityForResult(@NonNull AppCompatActivity activity, @NonNull Intent intent, int requestCode)
{
activity.startActivityForResult(intent, requestCode);
}
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
public static void startActivityForResult(@NonNull Fragment fragment, @NonNull Intent intent, int requestCode)
{
fragment.startActivityForResult(intent, requestCode);
}
// utility class
private UiUtils() {}
}

155
android/src/app/organicmaps/util/Utils.java
View file

@ -6,12 +6,16 @@ import android.content.ActivityNotFoundException;
import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.text.Html;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
@ -34,6 +38,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.google.android.material.snackbar.Snackbar;
import app.organicmaps.BuildConfig;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@ -44,6 +49,7 @@ import app.organicmaps.util.log.LogsManager;
import java.io.Closeable;
import java.io.IOException;
import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.text.DateFormat;
import java.text.NumberFormat;
@ -88,11 +94,6 @@ public class Utils
return Build.VERSION.SDK_INT >= target;
}
public static boolean isAmazonDevice()
{
return "Amazon".equalsIgnoreCase(Build.MANUFACTURER);
}
/**
* Enable to keep screen on.
* Disable to let system turn it off automatically.
@ -105,16 +106,23 @@ public class Utils
w.clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}
public static void showOnLockScreen(boolean enable, Activity activity)
@SuppressWarnings("deprecation")
private static void showOnLockScreenOld(boolean enable, Activity activity)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
activity.setShowWhenLocked(enable);
else if (enable)
if (enable)
activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
else
activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
}
public static void showOnLockScreen(boolean enable, Activity activity)
{
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1)
showOnLockScreenOld(enable, activity);
else
activity.setShowWhenLocked(enable);
}
public static void showSnackbar(@NonNull View view, @NonNull String message)
{
Snackbar snackbar = Snackbar.make(view, message, Snackbar.LENGTH_LONG);
@ -151,9 +159,18 @@ public class Utils
showSnackbarAbove(view, viewAbove, message);
}
@SuppressWarnings("deprecated")
private static @Nullable ResolveInfo resolveActivity(@NonNull PackageManager pm, @NonNull Intent intent, int flags)
{
return pm.resolveActivity(intent, flags);
}
public static boolean isIntentSupported(@NonNull Context context, @NonNull Intent intent)
{
return context.getPackageManager().resolveActivity(intent, 0) != null;
final PackageManager pm = context.getPackageManager();
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
return resolveActivity(pm, intent, 0) != null;
return pm.resolveActivity(intent, PackageManager.ResolveInfoFlags.of(0)) != null;
}
public static @Nullable Intent makeSystemLocationSettingIntent(@NonNull Context context)
@ -206,21 +223,6 @@ public class Utils
return "[" + joined + "]";
}
public static boolean isPackageInstalled(@NonNull Context context, String packageUri)
{
PackageManager pm = context.getPackageManager();
boolean installed;
try
{
pm.getPackageInfo(packageUri, PackageManager.GET_ACTIVITIES);
installed = true;
} catch (PackageManager.NameNotFoundException e)
{
installed = false;
}
return installed;
}
public static Uri buildMailUri(String to, String subject, String body)
{
String uriString = Constants.Url.MAILTO_SCHEME + Uri.encode(to) +
@ -250,7 +252,7 @@ public class Utils
try
{
// Exception is thrown if we don't have installed Facebook application.
activity.getPackageManager().getPackageInfo(Constants.Package.FB_PACKAGE, 0);
getPackageInfo(activity.getPackageManager(), Constants.Package.FB_PACKAGE, 0);
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.Url.FB_OM_COMMUNITY_NATIVE)));
} catch (final Exception e)
{
@ -312,13 +314,6 @@ public class Utils
return url.startsWith("http://") || url.startsWith("https://");
}
@NonNull
public static <T> T castTo(@NonNull Object instance)
{
// Noinspection unchecked
return (T) instance;
}
public static void closeSafely(@NonNull Closeable... closeable)
{
for (Closeable each : closeable)
@ -408,7 +403,7 @@ public class Utils
try
{
PackageManager pm = context.getPackageManager();
pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES);
getPackageInfo(pm, packageName, PackageManager.GET_ACTIVITIES);
return true;
} catch (PackageManager.NameNotFoundException e)
{
@ -812,19 +807,93 @@ public class Utils
}
}
@Nullable
public static <T> T getParcelable(Bundle args, String key, Class<T> clazz)
{
args.setClassLoader(clazz.getClassLoader());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
return args.getParcelable(key, clazz);
return getParcelableOld(args, key);
}
@SuppressWarnings({"deprecation", "unchecked"})
@Nullable
private static <T> T getParcelableOld(Bundle args, String key)
{
return (T) args.getParcelable(key);
}
@Nullable
public static <T> T getParcelable(@NonNull Intent intent, String key, Class<T> clazz)
{
final Bundle args = intent.getExtras();
return (args == null) ? null : getParcelable(args, key, clazz);
}
@Nullable
public static <T> T getParcelable(@NonNull Bundle args, String key, Class<T> clazz)
{
args.setClassLoader(clazz.getClassLoader());
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
return getParcelableOld(args, key);
return args.getParcelable(key, clazz);
}
@SuppressWarnings({"deprecation", "unchecked"})
@Nullable
private static <T extends Serializable> T getSerializableOld(Bundle args, String key)
{
return (T) args.getSerializable(key);
}
@Nullable
public static <T extends Serializable> T getSerializable(@NonNull Bundle args, String key, Class<T> clazz)
{
args.setClassLoader(clazz.getClassLoader());
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
return getSerializableOld(args, key);
return args.getSerializable(key, clazz);
}
@Nullable
public static <T extends Serializable> T getSerializable(@NonNull Intent intent, String key, Class<T> clazz)
{
final Bundle args = intent.getExtras();
return (args == null) ? null : getSerializable(args, key, clazz);
}
@SuppressWarnings("deprecation")
private static Spanned fromHtmlOld(@NonNull String htmlDescription)
{
return Html.fromHtml(htmlDescription);
}
public static Spanned fromHtml(@NonNull String htmlDescription)
{
if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.N)
return fromHtmlOld(htmlDescription);
return Html.fromHtml(htmlDescription, Html.FROM_HTML_MODE_LEGACY);
}
@SuppressWarnings("deprecation")
private static ApplicationInfo getApplicationInfoOld(@NonNull PackageManager manager, @NonNull String packageName, int flags)
throws PackageManager.NameNotFoundException
{
return manager.getApplicationInfo(packageName, flags);
}
public static ApplicationInfo getApplicationInfo(@NonNull PackageManager manager, @NonNull String packageName,
int flags)
throws PackageManager.NameNotFoundException
{
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
return getApplicationInfoOld(manager, packageName, flags);
return manager.getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags));
}
@SuppressWarnings("deprecation")
private static PackageInfo getPackageInfoOld(@NonNull PackageManager manager, @NonNull String packageName, int flags)
throws PackageManager.NameNotFoundException
{
return manager.getPackageInfo(packageName, flags);
}
public static PackageInfo getPackageInfo(@NonNull PackageManager manager, @NonNull String packageName, int flags)
throws PackageManager.NameNotFoundException
{
if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
return getPackageInfoOld(manager, packageName, flags);
return manager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags));
}
}

4
android/src/app/organicmaps/widget/StackedButtonsDialog.java
View file

@ -132,8 +132,8 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
{
mContext = context;
mTitle = mContext.getString(android.R.string.dialog_alert_title);
mPositive = mContext.getString(android.R.string.ok);
mNegative = mContext.getString(android.R.string.no);
mPositive = mContext.getString(R.string.ok);
mNegative = mContext.getString(R.string.cancel);
}
@NonNull

2
android/src/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
View file

@ -1,5 +1,6 @@
package app.organicmaps.widget.placepage;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
@ -58,6 +59,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
final IconsAdapter adapter = new IconsAdapter(requireActivity(), icons);
adapter.chooseItem(mIconColor);
@SuppressLint("InflateParams")
final GridView gView = (GridView) LayoutInflater.from(requireActivity()).inflate(R.layout.fragment_color_grid, null);
gView.setAdapter(adapter);
gView.setOnItemClickListener(new AdapterView.OnItemClickListener()

44
android/src/app/organicmaps/widget/placepage/EditBookmarkFragment.java
View file

@ -15,6 +15,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentFactory;
import androidx.fragment.app.FragmentManager;
import app.organicmaps.R;
@ -60,7 +61,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
args.putLong(EXTRA_CATEGORY_ID, categoryId);
args.putLong(EXTRA_BOOKMARK_ID, bookmarkId);
String name = EditBookmarkFragment.class.getName();
final EditBookmarkFragment fragment = (EditBookmarkFragment) Fragment.instantiate(context, name, args);
final FragmentFactory factory = manager.getFragmentFactory();
final EditBookmarkFragment fragment = (EditBookmarkFragment) factory.instantiate(context.getClassLoader(), name);
fragment.setArguments(args);
fragment.setEditBookmarkListener(listener);
fragment.show(manager, name);
@ -165,12 +167,15 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
final Bundle args = new Bundle();
final List<BookmarkCategory> categories = BookmarkManager.INSTANCE.getCategories();
final int index = categories.indexOf(mBookmarkCategory);
args.putInt(ChooseBookmarkCategoryFragment.CATEGORY_POSITION, index);
final FragmentManager manager = getChildFragmentManager();
String className = ChooseBookmarkCategoryFragment.class.getName();
ChooseBookmarkCategoryFragment frag =
(ChooseBookmarkCategoryFragment) Fragment.instantiate(requireActivity(), className, args);
frag.show(getChildFragmentManager(), null);
final FragmentFactory factory = manager.getFragmentFactory();
final ChooseBookmarkCategoryFragment frag =
(ChooseBookmarkCategoryFragment) factory.instantiate(getContext().getClassLoader(), className);
frag.setArguments(args);
frag.show(manager, null);
}
private void selectBookmarkColor()
@ -180,23 +185,22 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
final Bundle args = new Bundle();
args.putInt(BookmarkColorDialogFragment.ICON_TYPE, mIcon.getColor());
final BookmarkColorDialogFragment dialogFragment = (BookmarkColorDialogFragment) BookmarkColorDialogFragment.
instantiate(requireActivity(), BookmarkColorDialogFragment.class.getName(), args);
dialogFragment.setOnColorSetListener(new BookmarkColorDialogFragment.OnBookmarkColorChangeListener()
{
@Override
public void onBookmarkColorSet(int colorPos)
{
final Icon newIcon = BookmarkManager.ICONS.get(colorPos);
final String from = mIcon.getName();
final String to = newIcon.getName();
if (TextUtils.equals(from, to))
return;
final FragmentManager manager = getChildFragmentManager();
String className = BookmarkColorDialogFragment.class.getName();
final FragmentFactory factory = manager.getFragmentFactory();
final BookmarkColorDialogFragment dialogFragment =
(BookmarkColorDialogFragment) factory.instantiate(getContext().getClassLoader(), className);
dialogFragment.setArguments(args);
dialogFragment.setOnColorSetListener(colorPos -> {
final Icon newIcon = BookmarkManager.ICONS.get(colorPos);
final String from = mIcon.getName();
final String to = newIcon.getName();
if (TextUtils.equals(from, to))
return;
mIcon = newIcon;
refreshColorMarker();
}
mIcon = newIcon;
refreshColorMarker();
});
dialogFragment.show(requireActivity().getSupportFragmentManager(), null);

2
android/src/app/organicmaps/widget/placepage/PlacePageBookmarkFragment.java
View file

@ -104,7 +104,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
else
{
mTvBookmarkNote.setText(notes);
Linkify.addLinks(mTvBookmarkNote, Linkify.ALL);
Linkify.addLinks(mTvBookmarkNote, Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES | Linkify.PHONE_NUMBERS);
UiUtils.show(mTvBookmarkNote);
if (mWvBookmarkNote != null)
UiUtils.hide(mWvBookmarkNote);

2
android/src/app/organicmaps/widget/placepage/PlacePageController.java
View file

@ -229,6 +229,7 @@ public class PlacePageController implements Initializable<Activity>,
* Set the min and max height of the place page to prevent jumps when switching from one map object
* to the other.
*/
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
private void setPlacePageHeightBounds()
{
final int peekHeight = calculatePeekHeight();
@ -273,6 +274,7 @@ public class PlacePageController implements Initializable<Activity>,
* Using the animate param in setPeekHeight does not work when adding removing fragments
* from inside the place page so we manually animate the peek height with ValueAnimator
*/
@SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3631
private void animatePeekHeight(int peekHeight)
{
// Make sure to start from the current height of the place page

3
android/src/app/organicmaps/widget/placepage/PlacePageOpeningHoursFragment.java
View file

@ -10,6 +10,7 @@ import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
@ -171,7 +172,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
// Show that place is closed today.
if (!containsCurrentWeekday)
{
refreshTodayOpeningHours(resources.getString(R.string.day_off_today), resources.getColor(R.color.base_red));
refreshTodayOpeningHours(resources.getString(R.string.day_off_today), ContextCompat.getColor(getContext(), R.color.base_red));
UiUtils.hide(mTodayNonBusinessTime);
}
}

6
android/src/app/organicmaps/widget/placepage/PlacePageView.java
View file

@ -20,6 +20,7 @@ import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.Observer;
@ -46,6 +47,7 @@ import app.organicmaps.routing.RoutingController;
import app.organicmaps.settings.RoadType;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.widget.ArrowView;
@ -421,7 +423,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
private <T extends Fragment> void updateViewFragment(Class<T> controllerClass, String fragmentTag, @IdRes int containerId, boolean enabled)
{
final FragmentManager fm = getChildFragmentManager();
final T fragment = (T) fm.findFragmentByTag(fragmentTag);
final Fragment fragment = fm.findFragmentByTag(fragmentTag);
if (enabled && fragment == null)
{
fm.beginTransaction()
@ -476,7 +478,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
int end = text.lastIndexOf("★") + 1;
if (start > -1)
{
sb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.base_yellow)),
sb.setSpan(new ForegroundColorSpan(ContextCompat.getColor(getContext(), R.color.base_yellow)),
start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
}
mTvSubtitle.setText(sb);

3
android/src/app/organicmaps/widget/placepage/PlacePageWikipediaFragment.java
View file

@ -1,7 +1,6 @@
package app.organicmaps.widget.placepage;
import android.os.Bundle;
import android.text.Html;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.view.LayoutInflater;
@ -69,7 +68,7 @@ public class PlacePageWikipediaFragment extends Fragment implements Observer<Map
if (paragraphStart == 0 && paragraphEnd != -1)
htmlDescription = htmlDescription.substring(3, paragraphEnd);
Spanned description = Html.fromHtml(htmlDescription);
Spanned description = Utils.fromHtml(htmlDescription);
if (description.length() > mDescriptionMaxLength)
{
description = (Spanned) new SpannableStringBuilder(description)