drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 13:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Re-format java code by clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-07-29 22:31:32 +07:00
parent 65b5234396
commit 5333ad3597
348 changed files with 4770 additions and 5563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java
View File

@@ -8,10 +8,10 @@ import android.app.PendingIntent;
import android.content.Context;
import android.location.Location;
import android.os.Looper;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresPermission;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.log.Logger;
import com.google.android.gms.common.api.ApiException;
import com.google.android.gms.common.api.ResolvableApiException;
import com.google.android.gms.location.FusedLocationProviderClient;
@@ -26,9 +26,6 @@ import com.google.android.gms.location.LocationSettingsStatusCodes;
import com.google.android.gms.location.Priority;
import com.google.android.gms.location.SettingsClient;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.log.Logger;
class GoogleFusedLocationProvider extends BaseLocationProvider
{
private static final String TAG = GoogleFusedLocationProvider.class.getSimpleName();
@@ -72,9 +69,11 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
{
Logger.d(TAG);
final LocationRequest locationRequest = new LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, interval)
// Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the device immediately.
// https://github.com/organicmaps/organicmaps/issues/2149
final LocationRequest locationRequest =
new LocationRequest
.Builder(Priority.PRIORITY_HIGH_ACCURACY, interval)
// Wait a few seconds for accurate locations initially, when accurate locations could not be computed on the
// device immediately. https://github.com/organicmaps/organicmaps/issues/2149
.setWaitForAccurateLocation(true)
// The desired location granularity should correspond to the client permission level. The client will be
// delivered fine locations while it has the Manifest.permission.ACCESS_FINE_LOCATION permission, coarse
@@ -90,10 +89,12 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
builder.setAlwaysShow(true); // improves the wording/appearance of the dialog
final LocationSettingsRequest locationSettingsRequest = builder.build();
mSettingsClient.checkLocationSettings(locationSettingsRequest).addOnSuccessListener(locationSettingsResponse -> {
mSettingsClient.checkLocationSettings(locationSettingsRequest)
.addOnSuccessListener(locationSettingsResponse -> {
Logger.d(TAG, "Service is available");
mFusedLocationClient.requestLocationUpdates(locationRequest, mCallback, Looper.myLooper());
}).addOnFailureListener(e -> {
})
.addOnFailureListener(e -> {
try
{
int statusCode = ((ApiException) e).getStatusCode();
@@ -104,10 +105,10 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
// 2. Google Location Accuracy a.k.a High Accuracy;
// 3. Both Wi-Fi && Mobile Data together (needed for 2).
//
// PendingIntent below will show a special Google "For better experience... enable (1) and/or (2) and/or (3)"
// dialog. This system dialog can change system settings if "Yes" is pressed. We can't do it from our app.
// However, we don't want to annoy a user who disabled (2) or (3) intentionally. GPS (1) is mandatory to
// continue, while (2) and (3) are not dealbreakers here.
// PendingIntent below will show a special Google "For better experience... enable (1) and/or (2) and/or
// (3)" dialog. This system dialog can change system settings if "Yes" is pressed. We can't do it from our
// app. However, we don't want to annoy a user who disabled (2) or (3) intentionally. GPS (1) is mandatory
// to continue, while (2) and (3) are not dealbreakers here.
//
// See https://github.com/organicmaps/organicmaps/issues/3846
//

9
android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java
View File

@@ -1,13 +1,11 @@
package app.organicmaps.sdk.location;
import android.content.Context;
import androidx.annotation.NonNull;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.log.Logger;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
public class LocationProviderFactory
{
@@ -18,7 +16,8 @@ public class LocationProviderFactory
return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS;
}
public static BaseLocationProvider getProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
public static BaseLocationProvider getProvider(@NonNull Context context,
@NonNull BaseLocationProvider.Listener listener)
{
if (isGoogleLocationAvailable(context) && Config.useGoogleServices())
{

26
android/app/src/main/java/app/organicmaps/ChartController.java
View File

@@ -5,10 +5,16 @@ import android.content.res.Resources;
import android.graphics.Color;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.placepage.AxisValueFormatter;
import app.organicmaps.widget.placepage.CurrentLocationMarkerView;
import app.organicmaps.widget.placepage.FloatingMarkerView;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.components.Legend;
import com.github.mikephil.charting.components.MarkerView;
@@ -20,16 +26,6 @@ import com.github.mikephil.charting.data.LineDataSet;
import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
import app.organicmaps.widget.placepage.AxisValueFormatter;
import app.organicmaps.widget.placepage.CurrentLocationMarkerView;
import app.organicmaps.widget.placepage.FloatingMarkerView;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.Utils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -184,15 +180,15 @@ public class ChartController implements OnChartValueSelectedListener,
}
@Override
public void onValueSelected(Entry e, Highlight h) {
public void onValueSelected(Entry e, Highlight h)
{
mFloatingMarkerView.updateOffsets(e, h);
Highlight curPos = getCurrentPosHighlight();
if (mCurrentPositionOutOfTrack)
mChart.highlightValues(Collections.singletonList(h), Collections.singletonList(mFloatingMarkerView));
else
mChart.highlightValues(Arrays.asList(curPos, h), Arrays.asList(mCurrentLocationMarkerView,
mFloatingMarkerView));
mChart.highlightValues(Arrays.asList(curPos, h), Arrays.asList(mCurrentLocationMarkerView, mFloatingMarkerView));
if (mTrackId == Utils.INVALID_ID)
return;

27
android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
View File

@@ -18,7 +18,6 @@ import android.location.Location;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.CallSuper;
@@ -28,10 +27,10 @@ import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
import androidx.core.view.ViewCompat;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.intent.Factory;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.intent.Factory;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.ConnectionState;
@@ -39,13 +38,11 @@ import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.progressindicator.LinearProgressIndicator;
import com.google.android.material.textview.MaterialTextView;
import java.util.List;
import java.util.Objects;
@@ -81,8 +78,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
private int mCountryDownloadListenerSlot;
private final LocationListener mLocationListener = new LocationListener()
{
private final LocationListener mLocationListener = new LocationListener() {
@Override
public void onLocationUpdated(Location location)
{
@@ -117,8 +113,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
}
};
private final app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener mResourcesDownloadListener = new app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener()
{
private final app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener mResourcesDownloadListener =
new app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener() {
@Override
public void onProgress(final int percent)
{
@@ -143,8 +139,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
}
};
private final MapManager.StorageCallback mCountryDownloadListener = new MapManager.StorageCallback()
{
private final MapManager.StorageCallback mCountryDownloadListener = new MapManager.StorageCallback() {
@Override
public void onStatusChanged(List<MapManager.StorageCallbackData> data)
{
@@ -237,8 +232,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
private void setDownloadMessage(int bytesToDownload)
{
mTvMessage.setText(getString(R.string.download_resources,
StringUtils.getFileSizeString(this, bytesToDownload)));
mTvMessage.setText(getString(R.string.download_resources, StringUtils.getFileSizeString(this, bytesToDownload)));
}
private boolean prepareFilesDownload(boolean showMap)
@@ -399,8 +393,10 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
if (mAlertDialog != null && mAlertDialog.isShowing())
return;
@StringRes final int titleId;
@StringRes final int messageId = switch (result)
@StringRes
final int titleId;
@StringRes
final int messageId = switch (result)
{
case ERR_NOT_ENOUGH_FREE_SPACE ->
{
@@ -431,7 +427,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
.setMessage(messageId)
.setCancelable(true)
.setOnCancelListener((dialog) -> setAction(PAUSE))
.setPositiveButton(R.string.try_again, (dialog, which) -> {
.setPositiveButton(R.string.try_again,
(dialog, which) -> {
setAction(TRY_AGAIN);
onTryAgainClicked();
})

8
android/app/src/main/java/app/organicmaps/MapFragment.java
View File

@@ -10,17 +10,14 @@ import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.res.ConfigurationHelper;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.MapRenderingListener;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.sdk.util.log.Logger;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
public class MapFragment extends BaseMwmFragment implements View.OnTouchListener, SurfaceHolder.Callback
@@ -71,7 +68,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height)
{
Logger.d(TAG);
mMap.onSurfaceChanged(requireContext(), surfaceHolder.getSurface(), surfaceHolder.getSurfaceFrame(), surfaceHolder.isCreating());
mMap.onSurfaceChanged(requireContext(), surfaceHolder.getSurface(), surfaceHolder.getSurfaceFrame(),
surfaceHolder.isCreating());
}
@Override

5
android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java
View File

@@ -2,10 +2,8 @@ package app.organicmaps;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.sdk.display.DisplayChangedListener;
import app.organicmaps.sdk.display.DisplayManager;
@@ -34,8 +32,7 @@ public class MapPlaceholderActivity extends BaseMwmFragmentActivity implements D
public void onDisplayChangedToDevice(@NonNull Runnable onTaskFinishedCallback)
{
mRemoveDisplayListener = false;
startActivity(new Intent(this, MwmActivity.class)
.putExtra(MwmActivity.EXTRA_UPDATE_THEME, true));
startActivity(new Intent(this, MwmActivity.class).putExtra(MwmActivity.EXTRA_UPDATE_THEME, true));
finish();
onTaskFinishedCallback.run();
}

353
android/app/src/main/java/app/organicmaps/MwmActivity.java
View File

@@ -1,5 +1,18 @@
package app.organicmaps;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static android.Manifest.permission.POST_NOTIFICATIONS;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_ADD_PLACE_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
import static app.organicmaps.sdk.location.LocationState.FOLLOW;
import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Dialog;
@@ -23,7 +36,6 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
import android.widget.Toast;
import androidx.activity.result.ActivityResult;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.IntentSenderRequest;
@@ -48,116 +60,92 @@ import app.organicmaps.backup.PeriodicBackupRunner;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.base.OnBackPressListener;
import app.organicmaps.bookmarks.BookmarkCategoriesActivity;
import app.organicmaps.downloader.DownloaderActivity;
import app.organicmaps.downloader.DownloaderFragment;
import app.organicmaps.downloader.OnmapDownloader;
import app.organicmaps.editor.EditorActivity;
import app.organicmaps.editor.EditorHostFragment;
import app.organicmaps.editor.FeatureCategoryActivity;
import app.organicmaps.editor.OsmLoginActivity;
import app.organicmaps.editor.ReportFragment;
import app.organicmaps.help.HelpActivity;
import app.organicmaps.intent.Factory;
import app.organicmaps.intent.IntentProcessor;
import app.organicmaps.leftbutton.LeftButton;
import app.organicmaps.leftbutton.LeftButtonsHolder;
import app.organicmaps.leftbutton.LeftToggleButton;
import app.organicmaps.location.TrackRecordingService;
import app.organicmaps.maplayer.MapButtonsController;
import app.organicmaps.maplayer.MapButtonsViewModel;
import app.organicmaps.maplayer.ToggleMapLayerFragment;
import app.organicmaps.routing.ManageRouteBottomSheet;
import app.organicmaps.routing.NavigationController;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.routing.RoutingBottomMenuListener;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.routing.RoutingErrorDialogFragment;
import app.organicmaps.routing.RoutingPlanFragment;
import app.organicmaps.routing.RoutingPlanInplaceController;
import app.organicmaps.sdk.ChoosePositionMode;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.MapRenderingListener;
import app.organicmaps.sdk.PlacePageActivationListener;
import app.organicmaps.sdk.Router;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.display.DisplayChangedListener;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.downloader.DownloaderActivity;
import app.organicmaps.downloader.DownloaderFragment;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.downloader.OnmapDownloader;
import app.organicmaps.sdk.downloader.UpdateInfo;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.editor.EditorActivity;
import app.organicmaps.editor.EditorHostFragment;
import app.organicmaps.editor.FeatureCategoryActivity;
import app.organicmaps.editor.OsmLoginActivity;
import app.organicmaps.sdk.editor.OsmOAuth;
import app.organicmaps.editor.ReportFragment;
import app.organicmaps.help.HelpActivity;
import app.organicmaps.intent.Factory;
import app.organicmaps.intent.IntentProcessor;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.sdk.location.SensorListener;
import app.organicmaps.sdk.location.TrackRecorder;
import app.organicmaps.location.TrackRecordingService;
import app.organicmaps.maplayer.MapButtonsController;
import app.organicmaps.maplayer.MapButtonsViewModel;
import app.organicmaps.maplayer.ToggleMapLayerFragment;
import app.organicmaps.sdk.maplayer.isolines.IsolinesState;
import app.organicmaps.routing.ManageRouteBottomSheet;
import app.organicmaps.routing.NavigationController;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.sdk.routing.RouteMarkType;
import app.organicmaps.routing.RoutingBottomMenuListener;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.routing.RoutingErrorDialogFragment;
import app.organicmaps.sdk.routing.RoutingOptions;
import app.organicmaps.routing.RoutingPlanFragment;
import app.organicmaps.routing.RoutingPlanInplaceController;
import app.organicmaps.sdk.ChoosePositionMode;
import app.organicmaps.sdk.PlacePageActivationListener;
import app.organicmaps.sdk.Router;
import app.organicmaps.search.FloatingSearchToolbarController;
import app.organicmaps.search.SearchActivity;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.search.SearchFragment;
import app.organicmaps.settings.DrivingOptionsActivity;
import app.organicmaps.sdk.settings.RoadType;
import app.organicmaps.settings.SettingsActivity;
import app.organicmaps.sdk.settings.UnitLocale;
import app.organicmaps.leftbutton.LeftButton;
import app.organicmaps.leftbutton.LeftButtonsHolder;
import app.organicmaps.leftbutton.LeftToggleButton;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.PowerManagment;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.sdk.util.ThemeSwitcher;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.sdk.widget.placepage.PlacePageData;
import app.organicmaps.search.FloatingSearchToolbarController;
import app.organicmaps.search.SearchActivity;
import app.organicmaps.search.SearchFragment;
import app.organicmaps.settings.DrivingOptionsActivity;
import app.organicmaps.settings.SettingsActivity;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.widget.StackedButtonsDialog;
import app.organicmaps.widget.menu.MainMenu;
import app.organicmaps.widget.placepage.PlacePageController;
import app.organicmaps.sdk.widget.placepage.PlacePageData;
import app.organicmaps.widget.placepage.PlacePageViewModel;
import com.google.android.material.appbar.MaterialToolbar;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.util.ArrayList;
import java.util.Objects;
import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static android.Manifest.permission.POST_NOTIFICATIONS;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static app.organicmaps.sdk.location.LocationState.FOLLOW;
import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_ADD_PLACE_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
public class MwmActivity extends BaseMwmFragmentActivity
implements PlacePageActivationListener,
View.OnTouchListener,
MapRenderingListener,
RoutingController.Container,
LocationListener,
SensorListener,
LocationState.ModeChangeListener,
RoutingPlanInplaceController.RoutingPlanListener,
RoutingBottomMenuListener,
BookmarkManager.BookmarksLoadingListener,
FloatingSearchToolbarController.SearchToolbarListener,
implements PlacePageActivationListener, View.OnTouchListener, MapRenderingListener, RoutingController.Container,
LocationListener, SensorListener, LocationState.ModeChangeListener,
RoutingPlanInplaceController.RoutingPlanListener, RoutingBottomMenuListener,
BookmarkManager.BookmarksLoadingListener, FloatingSearchToolbarController.SearchToolbarListener,
MenuBottomSheetFragment.MenuBottomSheetInterfaceWithHeader,
PlacePageController.PlacePageRouteSettingsListener,
MapButtonsController.MapButtonClickListener,
PlacePageController.PlacePageRouteSettingsListener, MapButtonsController.MapButtonClickListener,
DisplayChangedListener
{
private static final String TAG = MwmActivity.class.getSimpleName();
@@ -170,14 +158,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
private static final String EXTRA_CONSUMED = "mwm.extra.intent.processed";
private boolean mPreciseLocationDialogShown = false;
private static final String[] DOCKED_FRAGMENTS = { SearchFragment.class.getName(),
DownloaderFragment.class.getName(),
private static final String[] DOCKED_FRAGMENTS = {SearchFragment.class.getName(), DownloaderFragment.class.getName(),
RoutingPlanFragment.class.getName(),
EditorHostFragment.class.getName(),
ReportFragment.class.getName() };
EditorHostFragment.class.getName(), ReportFragment.class.getName()};
public final ActivityResultLauncher<Intent> startDrivingOptionsForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult ->
{
public final ActivityResultLauncher<Intent> startDrivingOptionsForResult =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() == Activity.RESULT_OK)
rebuildLastRoute();
});
@@ -274,8 +260,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
public static Intent createShowMapIntent(@NonNull Context context, @Nullable String countryId)
{
return new Intent(context, DownloadResourcesLegacyActivity.class)
.putExtra(EXTRA_COUNTRY_ID, countryId);
return new Intent(context, DownloadResourcesLegacyActivity.class).putExtra(EXTRA_COUNTRY_ID, countryId);
}
@Override
@@ -369,7 +354,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
// Notify user to re-login
dismissAlertDialog();
final DialogInterface.OnClickListener navigateToLoginHandler = (dialog, which) -> startActivity(new Intent(MwmActivity.this, OsmLoginActivity.class));
final DialogInterface.OnClickListener navigateToLoginHandler =
(dialog, which) -> startActivity(new Intent(MwmActivity.this, OsmLoginActivity.class));
final int marginBase = getResources().getDimensionPixelSize(R.dimen.margin_base);
final float textSize = getResources().getDimension(R.dimen.line_spacing_extra_1);
@@ -397,8 +383,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
protected int getFragmentContentResId()
{
return (mIsTabletLayout ? R.id.fragment_container
: super.getFragmentContentResId());
return (mIsTabletLayout ? R.id.fragment_container : super.getFragmentContentResId());
}
@Nullable
@@ -416,7 +401,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
@Override
public void replaceFragment(@NonNull Class<? extends Fragment> fragmentClass, @Nullable Bundle args, @Nullable Runnable completionListener)
public void replaceFragment(@NonNull Class<? extends Fragment> fragmentClass, @Nullable Bundle args,
@Nullable Runnable completionListener)
{
if (mPanelAnimator.isVisible() && getFragment(fragmentClass) != null)
{
@@ -533,7 +519,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
final int newUiMode = newConfig.uiMode & Configuration.UI_MODE_TYPE_MASK;
final boolean newUiModeIsCarConnected = newUiMode == Configuration.UI_MODE_TYPE_CAR;
final boolean newUiModeIsCarDisconnected = mLastUiMode == Configuration.UI_MODE_TYPE_CAR && newUiMode == Configuration.UI_MODE_TYPE_NORMAL;
final boolean newUiModeIsCarDisconnected =
mLastUiMode == Configuration.UI_MODE_TYPE_CAR && newUiMode == Configuration.UI_MODE_TYPE_NORMAL;
mLastUiMode = newUiMode;
if (newUiModeIsCarConnected || newUiModeIsCarDisconnected)
@@ -565,8 +552,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mMapButtonsViewModel.getLayoutMode().observe(this, this::initNavigationButtons);
mSearchController = new FloatingSearchToolbarController(this, this);
mSearchController.getToolbar()
.getViewTreeObserver();
mSearchController.getToolbar().getViewTreeObserver();
// Note: You must call registerForActivityResult() before the fragment or activity is created.
mLocationPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(),
@@ -575,11 +561,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
this::onLocationResolutionResult);
mPostNotificationPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestPermission(),
this::onPostNotificationPermissionResult);
mPowerSaveSettings = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
this::onPowerSaveResult);
mPowerSaveSettings =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), this::onPowerSaveResult);
mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
this::onSettingsResult);
mSettingsLauncher =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), this::onSettingsResult);
mShareLauncher = SharingUtils.RegisterLauncher(this);
@@ -621,7 +607,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
Intent data = activityResult.getData();
if (data != null && data.hasExtra(MwmActivity.this.getString(R.string.pref_left_button)))
{
MapButtonsController mMapButtonsController = (MapButtonsController) getSupportFragmentManager().findFragmentById(R.id.map_buttons);
MapButtonsController mMapButtonsController =
(MapButtonsController) getSupportFragmentManager().findFragmentById(R.id.map_buttons);
if (mMapButtonsController != null)
{
mMapButtonsController.reloadLeftButton(buttonsHolder.getActiveButton());
@@ -632,11 +619,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void refreshLightStatusBar()
{
UiUtils.setLightStatusBar(this, !(
ThemeUtils.isNightTheme(this)
|| RoutingController.get().isPlanning()
|| ChoosePositionMode.get() != ChoosePositionMode.None
));
UiUtils.setLightStatusBar(this, !(ThemeUtils.isNightTheme(this) || RoutingController.get().isPlanning()
|| ChoosePositionMode.get() != ChoosePositionMode.None));
}
private void updateViewsInsets()
@@ -644,13 +628,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
ViewCompat.setOnApplyWindowInsetsListener(mPointChooser, (view, windowInsets) -> {
UiUtils.setViewInsetsPaddingBottom(mPointChooser, windowInsets);
UiUtils.setViewInsetsPaddingNoBottom(mPointChooserToolbar, windowInsets);
final int trackRecorderOffset = TrackRecorder.nativeIsTrackRecordingEnabled() ? UiUtils.dimen(this, R.dimen.map_button_size) : 0;
final int trackRecorderOffset =
TrackRecorder.nativeIsTrackRecordingEnabled() ? UiUtils.dimen(this, R.dimen.map_button_size) : 0;
mNavBarHeight = isFullscreen() ? 0 : windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
// For the first loading, set compass top margin to status bar size
// The top inset will be then be updated by the routing controller
if (mCurrentWindowInsets == null)
{
updateCompassOffset(trackRecorderOffset + windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top, windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).right);
updateCompassOffset(trackRecorderOffset + windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top,
windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).right);
}
refreshLightStatusBar();
updateBottomWidgetsOffset(windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).left);
@@ -676,7 +662,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
removeCurrentFragment(false);
}
mNavigationController = new NavigationController(this, v -> onSettingsOptionSelected(), this::updateBottomWidgetsOffset);
mNavigationController =
new NavigationController(this, v -> onSettingsOptionSelected(), this::updateBottomWidgetsOffset);
// TrafficManager.INSTANCE.attach(mNavigationController);
initMainMenu();
@@ -693,9 +680,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mPointChooserToolbar = mPointChooser.findViewById(R.id.toolbar_point_chooser);
UiUtils.showHomeUpButton(mPointChooserToolbar);
mPointChooserToolbar.setNavigationOnClickListener(v -> closePositionChooser());
mPointChooser.findViewById(R.id.done).setOnClickListener(
v ->
{
mPointChooser.findViewById(R.id.done).setOnClickListener(v -> {
switch (ChoosePositionMode.get())
{
case Api:
@@ -720,8 +705,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
.show();
}
break;
case None:
throw new IllegalStateException("Unexpected Framework.nativeGetChoosePositionMode()");
case None: throw new IllegalStateException("Unexpected Framework.nativeGetChoosePositionMode()");
}
closePositionChooser();
});
@@ -749,7 +733,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
}
/** Hides/shows UI while keeping state
/**
*Hides/shows UI while keeping state
* @param isUiHidden True to hide the UI
**/
public void hideOrShowUIWithoutClosingPlacePage(boolean isUiHidden)
@@ -810,8 +795,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
final FragmentFactory factory = manager.getFragmentFactory();
mMapFragment = (MapFragment) factory.instantiate(getClassLoader(), MapFragment.class.getName());
mMapFragment.setArguments(args);
manager
.beginTransaction()
manager.beginTransaction()
.replace(R.id.map_fragment_container, mMapFragment, MapFragment.class.getName())
.commit();
}
@@ -832,8 +816,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void prepareNavigationButtons()
{
buttonsHolder = LeftButtonsHolder.getInstance(this);
buttonsHolder.registerButton(new LeftButton()
{
buttonsHolder.registerButton(new LeftButton() {
@Override
public String getCode()
{
@@ -859,8 +842,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
MwmActivity.this.startActivity(intent);
}
});
buttonsHolder.registerButton(new LeftButton()
{
buttonsHolder.registerButton(new LeftButton() {
@Override
public String getCode()
{
@@ -885,8 +867,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
onAddPlace();
}
});
buttonsHolder.registerButton(new LeftButton()
{
buttonsHolder.registerButton(new LeftButton() {
@Override
public String getCode()
{
@@ -912,8 +893,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
});
buttonsHolder.registerButton(new LeftToggleButton()
{
buttonsHolder.registerButton(new LeftToggleButton() {
private boolean isRecording = TrackRecorder.nativeIsTrackRecordingEnabled();
@Override
@@ -939,8 +919,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
imageView.setImageResource(R.drawable.ic_track_recording_off);
int color = isRecording
? ContextCompat.getColor(MwmActivity.this, R.color.active_track_recording)
int color = isRecording ? ContextCompat.getColor(MwmActivity.this, R.color.active_track_recording)
: ThemeUtils.getColor(MwmActivity.this, R.attr.iconTint);
ColorStateList colorStateList = ColorStateList.valueOf(color);
@@ -964,8 +943,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
MapButtonsController mapButtonsController = new MapButtonsController();
mapButtonsController.setLeftButton(buttonsHolder.getActiveButton());
FragmentTransaction transaction = getSupportFragmentManager()
.beginTransaction().replace(R.id.map_buttons, mapButtonsController);
FragmentTransaction transaction =
getSupportFragmentManager().beginTransaction().replace(R.id.map_buttons, mapButtonsController);
transaction.commit();
mPreviousMapLayoutMode = layoutMode;
}
@@ -1003,11 +982,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
}
private boolean closeBottomSheet(String id)
{
MenuBottomSheetFragment bottomSheet =
(MenuBottomSheetFragment) getSupportFragmentManager().findFragmentByTag(id);
MenuBottomSheetFragment bottomSheet = (MenuBottomSheetFragment) getSupportFragmentManager().findFragmentByTag(id);
if (bottomSheet == null || !bottomSheet.isAdded())
return false;
bottomSheet.dismiss();
@@ -1245,7 +1222,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
.setTitle(R.string.downloader_update_maps)
.setMessage(R.string.isolines_activation_error_dialog)
.setPositiveButton(R.string.ok, (dialog, which) -> startActivity(new Intent(this, DownloaderActivity.class)))
.setPositiveButton(R.string.ok,
(dialog, which) -> startActivity(new Intent(this, DownloaderActivity.class)))
.setNegativeButton(R.string.cancel, null)
.setOnDismissListener(dialog -> mAlertDialog = null)
.show();
@@ -1258,8 +1236,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
super.onNewIntent(intent);
if (isMapRendererActive())
processIntent();
if (intent.getAction() != null && intent.getAction()
.equals(TrackRecordingService.STOP_TRACK_RECORDING))
if (intent.getAction() != null && intent.getAction().equals(TrackRecordingService.STOP_TRACK_RECORDING))
{
// closes the bottom sheet in case it is opened to deal with updation of track recording status in bottom sheet.
closeBottomSheet(MAIN_MENU_ID);
@@ -1267,11 +1244,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
}
private boolean isMapRendererActive()
{
return mMapFragment != null && Map.isEngineCreated()
&& mMapFragment.isContextCreated();
return mMapFragment != null && Map.isEngineCreated() && mMapFragment.isContextCreated();
}
@CallSuper
@@ -1385,10 +1360,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void onBackPressed()
{
final RoutingController routingController = RoutingController.get();
if (!closeBottomSheet(MAIN_MENU_ID) && !closeBottomSheet(LAYERS_MENU_ID) &&
!collapseNavMenu() && !closePlacePage() && !closeSearchToolbar(true, true) &&
!closeSidePanel() && !closePositionChooser() &&
!routingController.resetToPlanningStateIfNavigating() && !routingController.cancel())
if (!closeBottomSheet(MAIN_MENU_ID) && !closeBottomSheet(LAYERS_MENU_ID) && !collapseNavMenu() && !closePlacePage()
&& !closeSearchToolbar(true, true) && !closeSidePanel() && !closePositionChooser()
&& !routingController.resetToPlanningStateIfNavigating() && !routingController.cancel())
{
try
{
@@ -1420,9 +1394,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (fm.isDestroyed())
return;
fm.beginTransaction()
.remove(fragment)
.commitAllowingStateLoss();
fm.beginTransaction().remove(fragment).commitAllowingStateLoss();
fm.executePendingTransactions();
}
@@ -1483,8 +1455,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void setFullscreen(boolean isFullscreen)
{
if (RoutingController.get().isNavigating()
|| RoutingController.get().isBuilding()
if (RoutingController.get().isNavigating() || RoutingController.get().isBuilding()
|| RoutingController.get().isPlanning())
return;
@@ -1495,13 +1466,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
private boolean isFullscreen()
{
// Buttons are hidden in position chooser mode but we are not in fullscreen
return Boolean.TRUE.equals(mMapButtonsViewModel.getButtonsHidden().getValue()) &&
ChoosePositionMode.get() == ChoosePositionMode.None;
return Boolean.TRUE.equals(mMapButtonsViewModel.getButtonsHidden().getValue())
&& ChoosePositionMode.get() == ChoosePositionMode.None;
}
@Override
public boolean dispatchGenericMotionEvent(MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
public boolean dispatchGenericMotionEvent(MotionEvent event)
{
if (event.getActionMasked() == MotionEvent.ACTION_SCROLL)
{
int exponent = event.getAxisValue(MotionEvent.AXIS_VSCROLL) < 0 ? -1 : 1;
Map.onScale(Math.pow(1.7f, exponent), event.getX(), event.getY(), true);
return true;
@@ -1540,7 +1513,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
Map.onCompassUpdated(north, true);
}
public void onMapBottomButtonsHeightChange(float height) {
public void onMapBottomButtonsHeightChange(float height)
{
updateBottomWidgetsOffset();
}
@@ -1607,8 +1581,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mMainMenu.setState(MainMenu.State.MENU, isFullscreen());
}
private boolean showAddStartOrFinishFrame(@NonNull RoutingController controller,
boolean showFrame)
private boolean showAddStartOrFinishFrame(@NonNull RoutingController controller, boolean showFrame)
{
// S - start, F - finish, L - my position
// -S-F-L -> Start
@@ -1683,7 +1656,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
// TODO This code section may be called when insets are not yet initialized
// This is only a workaround to prevent crashes but a proper fix should be implemented
if (mCurrentWindowInsets == null) {
if (mCurrentWindowInsets == null)
{
return;
}
int offsetY = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
@@ -1879,8 +1853,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onCommonBuildError(int lastResultCode, @NonNull String[] lastMissingMaps)
{
RoutingErrorDialogFragment fragment = RoutingErrorDialogFragment.create(getSupportFragmentManager().getFragmentFactory(),
getApplicationContext(), lastResultCode, lastMissingMaps);
RoutingErrorDialogFragment fragment = RoutingErrorDialogFragment.create(
getSupportFragmentManager().getFragmentFactory(), getApplicationContext(), lastResultCode, lastMissingMaps);
fragment.show(getSupportFragmentManager(), RoutingErrorDialogFragment.class.getSimpleName());
}
@@ -1888,10 +1862,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void onDrivingOptionsBuildError()
{
dismissAlertDialog();
mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
mAlertDialog =
new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
.setTitle(R.string.unable_to_calc_alert_title)
.setMessage(R.string.unable_to_calc_alert_subtitle)
.setPositiveButton(R.string.settings, (dialog, which) -> DrivingOptionsActivity.start(this, startDrivingOptionsForResult))
.setPositiveButton(R.string.settings,
(dialog, which) -> DrivingOptionsActivity.start(this, startDrivingOptionsForResult))
.setNegativeButton(R.string.cancel, null)
.setOnDismissListener(dialog -> mAlertDialog = null)
.show();
@@ -1903,7 +1879,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
return true;
final StringBuilder builder = new StringBuilder();
for (int resId : new int[]{R.string.dialog_routing_disclaimer_priority, R.string.dialog_routing_disclaimer_precision,
for (int resId :
new int[] {R.string.dialog_routing_disclaimer_priority, R.string.dialog_routing_disclaimer_precision,
R.string.dialog_routing_disclaimer_recommendations, R.string.dialog_routing_disclaimer_borders,
R.string.dialog_routing_disclaimer_beware})
builder.append(getString(resId)).append("\n\n");
@@ -1914,7 +1891,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
.setMessage(builder.toString())
.setCancelable(false)
.setNegativeButton(R.string.decline, null)
.setPositiveButton(R.string.accept, (dlg, which) -> {
.setPositiveButton(R.string.accept,
(dlg, which) -> {
Config.acceptRoutingDisclaimer();
onRoutingStart();
})
@@ -1985,10 +1963,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
Logger.i(LOCATION_TAG, "Requesting ACCESS_FINE_LOCATION + ACCESS_FINE_LOCATION permissions");
dismissLocationErrorDialog();
mLocationPermissionRequest.launch(new String[]{
ACCESS_COARSE_LOCATION,
ACCESS_FINE_LOCATION
});
mLocationPermissionRequest.launch(new String[] {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION});
return;
}
@@ -1999,10 +1974,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
// Try to optimistically request FINE permission for FOLLOW and FOLLOW_AND_ROTATE modes.
Logger.i(LOCATION_TAG, "Requesting ACCESS_FINE_LOCATION permission for " + LocationState.nameOf(newMode));
dismissLocationErrorDialog();
mLocationPermissionRequest.launch(new String[]{
ACCESS_COARSE_LOCATION,
ACCESS_FINE_LOCATION
});
mLocationPermissionRequest.launch(new String[] {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION});
}
}
@@ -2066,16 +2038,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
@UiThread
public void onCompassCalibrationRecommended()
{
Toast.makeText(this, getString(R.string.compass_calibration_recommended),
Toast.LENGTH_LONG).show();
Toast.makeText(this, getString(R.string.compass_calibration_recommended), Toast.LENGTH_LONG).show();
}
@Override
@UiThread
public void onCompassCalibrationRequired()
{
Toast.makeText(this, getString(R.string.compass_calibration_required),
Toast.LENGTH_LONG).show();
Toast.makeText(this, getString(R.string.compass_calibration_required), Toast.LENGTH_LONG).show();
}
/**
@@ -2083,8 +2053,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
*/
public void requestPostNotificationsPermission()
{
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
ActivityCompat.checkSelfPermission(this, POST_NOTIFICATIONS) == PERMISSION_GRANTED)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
|| ActivityCompat.checkSelfPermission(this, POST_NOTIFICATIONS) == PERMISSION_GRANTED)
{
Logger.i(TAG, "Permissions POST_NOTIFICATIONS is granted");
return;
@@ -2138,7 +2108,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (!mPreciseLocationDialogShown)
{
mPreciseLocationDialogShown = true;
final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
final MaterialAlertDialogBuilder builder =
new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
.setTitle("⚠ " + getString(R.string.limited_accuracy))
.setMessage(R.string.precise_location_is_disabled_long_text)
.setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
@@ -2348,11 +2319,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
dismissAlertDialog();
final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
final MaterialAlertDialogBuilder builder =
new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
.setTitle(R.string.current_location_unknown_error_title)
.setCancelable(true)
.setMessage(R.string.power_save_dialog_summary)
.setNegativeButton(R.string.not_now, (dialog, which) -> {
.setNegativeButton(R.string.not_now,
(dialog, which) -> {
Logger.d(POWER_MANAGEMENT_TAG, "The Power Save disclaimer was ignored");
mPowerSaveDisclaimerShown = true;
})
@@ -2371,12 +2344,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void onBookmarksFileUnsupported(@NonNull Uri uri)
{
dismissAlertDialog();
mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
mAlertDialog =
new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
.setTitle(R.string.load_kmz_title)
.setMessage(getString(R.string.unknown_file_type, uri))
.setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.report_a_bug, (dialog, which) -> Utils.sendBugReport(mShareLauncher, this,
getString(R.string.load_kmz_title), getString(R.string.unknown_file_type, uri)))
.setNegativeButton(R.string.report_a_bug,
(dialog, which)
-> Utils.sendBugReport(mShareLauncher, this, getString(R.string.load_kmz_title),
getString(R.string.unknown_file_type, uri)))
.setOnDismissListener(dialog -> mAlertDialog = null)
.show();
}
@@ -2385,12 +2361,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
public void onBookmarksFileDownloadFailed(@NonNull Uri uri, @NonNull String error)
{
dismissAlertDialog();
mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
mAlertDialog =
new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
.setTitle(R.string.load_kmz_title)
.setMessage(getString(R.string.failed_to_open_file, uri, error))
.setPositiveButton(R.string.ok, null)
.setNegativeButton(R.string.report_a_bug, (dialog, which) -> Utils.sendBugReport(mShareLauncher, this,
getString(R.string.load_kmz_title), getString(R.string.failed_to_open_file, uri, error)))
.setNegativeButton(R.string.report_a_bug,
(dialog, which)
-> Utils.sendBugReport(mShareLauncher, this, getString(R.string.load_kmz_title),
getString(R.string.failed_to_open_file, uri, error)))
.setOnDismissListener(dialog -> mAlertDialog = null)
.show();
}
@@ -2438,12 +2417,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
switch (keyCode)
{
case KeyEvent.KEYCODE_DPAD_DOWN:
Map.zoomOut();
return true;
case KeyEvent.KEYCODE_DPAD_UP:
Map.zoomIn();
return true;
case KeyEvent.KEYCODE_DPAD_DOWN: Map.zoomOut(); return true;
case KeyEvent.KEYCODE_DPAD_UP: Map.zoomIn(); return true;
case KeyEvent.KEYCODE_ESCAPE:
final Intent currIntent = getIntent();
final String backUrl = Framework.nativeGetParsedBackUrl();
@@ -2453,8 +2428,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
return true;
}
return super.onKeyUp(keyCode, event);
default:
return super.onKeyUp(keyCode, event);
default: return super.onKeyUp(keyCode, event);
}
}
@@ -2552,8 +2526,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
if (TrackRecorder.nativeIsTrackRecordingEmpty())
{
Toast.makeText(this, R.string.track_recording_toast_nothing_to_save, Toast.LENGTH_SHORT)
.show();
Toast.makeText(this, R.string.track_recording_toast_nothing_to_save, Toast.LENGTH_SHORT).show();
stopTrackRecording();
return;
}
@@ -2564,11 +2537,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
.setCancelable(false)
// Negative/Positive/Neutral do not have their usual meaning here.
.setNegativeButton(R.string.continue_recording, (dialog, which) -> mAlertDialog = null)
.setNeutralButton(R.string.stop_without_saving, (dialog, which) -> {
.setNeutralButton(R.string.stop_without_saving,
(dialog, which) -> {
stopTrackRecording();
mAlertDialog = null;
})
.setPositiveButton(R.string.save, (dialog, which) -> {
.setPositiveButton(R.string.save,
(dialog, which) -> {
saveAndStopTrackRecording();
mAlertDialog = null;
})
@@ -2592,9 +2567,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
if (!BUTTON_ADD_PLACE_CODE.equals(activeLeftButton))
items.add(new MenuBottomSheetItem(R.string.placepage_add_place_button, R.drawable.ic_plus, this::onAddPlaceOptionSelected));
items.add(new MenuBottomSheetItem(R.string.placepage_add_place_button, R.drawable.ic_plus,
this::onAddPlaceOptionSelected));
items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(), this::onDownloadMapsOptionSelected));
items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(),
this::onDownloadMapsOptionSelected));
mDonatesUrl = Config.getDonateUrl(getApplicationContext());
if (!mDonatesUrl.isEmpty())
@@ -2604,9 +2581,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
items.add(new MenuBottomSheetItem(R.string.settings, R.drawable.ic_settings, this::onSettingsOptionSelected));
if (!BUTTON_RECORD_TRACK_CODE.equals(activeLeftButton))
items.add(new MenuBottomSheetItem(R.string.start_track_recording, R.drawable.ic_track_recording_off, -1, this::onTrackRecordingOptionSelected));
items.add(new MenuBottomSheetItem(R.string.start_track_recording, R.drawable.ic_track_recording_off, -1,
this::onTrackRecordingOptionSelected));
items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected));
items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share,
this::onShareLocationOptionSelected));
if (!BUTTON_HELP_CODE.equals(activeLeftButton))
items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_logo_monochrome, this::showHelp));

22
android/app/src/main/java/app/organicmaps/MwmApplication.java
View File

@@ -7,7 +7,6 @@ import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
@@ -15,30 +14,28 @@ import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ProcessLifecycleOwner;
import java.io.IOException;
import java.lang.ref.WeakReference;
import app.organicmaps.background.OsmUploadWork;
import app.organicmaps.downloader.Android7RootCertificateWorkaround;
import app.organicmaps.downloader.DownloaderNotifier;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.location.TrackRecordingService;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.OrganicMaps;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.sdk.location.SensorHelper;
import app.organicmaps.sdk.location.TrackRecorder;
import app.organicmaps.location.TrackRecordingService;
import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
import app.organicmaps.sdk.maplayer.subway.SubwayManager;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.OrganicMaps;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.ConnectionState;
import app.organicmaps.util.Utils;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.sdk.util.log.LogsManager;
import app.organicmaps.util.Utils;
import java.io.IOException;
import java.lang.ref.WeakReference;
public class MwmApplication extends Application implements Application.ActivityLifecycleCallbacks
{
@@ -146,8 +143,7 @@ public class MwmApplication extends Application implements Application.ActivityL
});
}
private final LifecycleObserver mProcessLifecycleObserver = new DefaultLifecycleObserver()
{
private final LifecycleObserver mProcessLifecycleObserver = new DefaultLifecycleObserver() {
@Override
public void onStart(@NonNull LifecycleOwner owner)
{

17
android/app/src/main/java/app/organicmaps/PanelAnimator.java
View File

@@ -5,21 +5,19 @@ import android.animation.ValueAnimator;
import android.os.Bundle;
import android.view.View;
import android.view.animation.AccelerateInterpolator;
import androidx.annotation.IntegerRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import org.chromium.base.ObserverList;
import app.organicmaps.sdk.util.UiUtils;
import org.chromium.base.ObserverList;
class PanelAnimator
{
private final MwmActivity mActivity;
private final ObserverList<MwmActivity.LeftAnimationTrackListener> mAnimationTrackListeners = new ObserverList<>();
private final ObserverList.RewindableIterator<MwmActivity.LeftAnimationTrackListener> mAnimationTrackIterator = mAnimationTrackListeners.rewindableIterator();
private final ObserverList.RewindableIterator<MwmActivity.LeftAnimationTrackListener> mAnimationTrackIterator =
mAnimationTrackListeners.rewindableIterator();
private final View mPanel;
private final int mWidth;
@IntegerRes
@@ -50,7 +48,8 @@ class PanelAnimator
}
/** @param completionListener will be called before the fragment becomes actually visible */
public void show(final Class<? extends Fragment> clazz, final Bundle args, @Nullable final Runnable completionListener)
public void show(final Class<? extends Fragment> clazz, final Bundle args,
@Nullable final Runnable completionListener)
{
if (isVisible())
{
@@ -78,8 +77,7 @@ class PanelAnimator
ValueAnimator animator = ValueAnimator.ofFloat(-mWidth, 0.0f);
animator.addUpdateListener(this::track);
animator.addListener(new UiUtils.SimpleAnimatorListener()
{
animator.addListener(new UiUtils.SimpleAnimatorListener() {
@Override
public void onAnimationEnd(Animator animation)
{
@@ -109,8 +107,7 @@ class PanelAnimator
ValueAnimator animator = ValueAnimator.ofFloat(0.0f, -mWidth);
animator.addUpdateListener(this::track);
animator.addListener(new UiUtils.SimpleAnimatorListener()
{
animator.addListener(new UiUtils.SimpleAnimatorListener() {
@Override
public void onAnimationEnd(Animator animation)
{

41
android/app/src/main/java/app/organicmaps/SplashActivity.java
View File

@@ -9,7 +9,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.Keep;
@@ -21,20 +20,18 @@ import androidx.core.graphics.Insets;
import androidx.core.view.OnApplyWindowInsetsListener;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.downloader.DownloaderActivity;
import app.organicmaps.intent.Factory;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.io.IOException;
import java.util.Objects;
@@ -109,10 +106,7 @@ public class SplashActivity extends AppCompatActivity
if (!Config.isLocationRequested() && !LocationUtils.checkLocationPermission(this))
{
Logger.d(TAG, "Requesting location permissions");
mPermissionRequest.launch(new String[]{
ACCESS_COARSE_LOCATION,
ACCESS_FINE_LOCATION
});
mPermissionRequest.launch(new String[] {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION});
return;
}
@@ -144,13 +138,7 @@ public class SplashActivity extends AppCompatActivity
.setMessage(messageId)
.setPositiveButton(
R.string.report_a_bug,
(dialog, which) -> Utils.sendBugReport(
mShareLauncher,
this,
"Fatal Error",
Log.getStackTraceString(error)
)
)
(dialog, which) -> Utils.sendBugReport(mShareLauncher, this, "Fatal Error", Log.getStackTraceString(error)))
.setCancelable(false)
.show();
}
@@ -162,7 +150,8 @@ public class SplashActivity extends AppCompatActivity
try
{
asyncContinue = app.initOrganicMaps(this::processNavigation);
} catch (IOException error)
}
catch (IOException error)
{
showFatalErrorDialog(R.string.dialog_error_storage_title, R.string.dialog_error_storage_message, error);
return;
@@ -195,9 +184,12 @@ public class SplashActivity extends AppCompatActivity
// https://github.com/organicmaps/organicmaps/issues/6944
final Intent intent = Objects.requireNonNull(getIntent());
if (isManageSpaceActivity(intent)) {
if (isManageSpaceActivity(intent))
{
intent.setComponent(new ComponentName(this, DownloaderActivity.class));
} else {
}
else
{
intent.setComponent(new ComponentName(this, DownloadResourcesLegacyActivity.class));
}
@@ -219,11 +211,14 @@ public class SplashActivity extends AppCompatActivity
finish();
}
private boolean isManageSpaceActivity(Intent intent) {
private boolean isManageSpaceActivity(Intent intent)
{
var component = intent.getComponent();
if (!Intent.ACTION_VIEW.equals(intent.getAction())) return false;
if (component == null) return false;
if (!Intent.ACTION_VIEW.equals(intent.getAction()))
return false;
if (component == null)
return false;
var manageSpaceActivityName = BuildConfig.APPLICATION_ID + ".ManageSpaceActivity";

8
android/app/src/main/java/app/organicmaps/WebContainerDelegate.java
View File

@@ -7,9 +7,7 @@ import android.net.Uri;
import android.view.View;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
import app.organicmaps.base.OnBackPressListener;
import app.organicmaps.sdk.util.UiUtils;
@@ -21,8 +19,7 @@ public abstract class WebContainerDelegate implements OnBackPressListener
@SuppressLint("SetJavaScriptEnabled")
private void initWebView(String url)
{
mWebView.setWebViewClient(new WebViewClient()
{
mWebView.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url)
{
@@ -46,8 +43,7 @@ public abstract class WebContainerDelegate implements OnBackPressListener
return true;
}
doStartActivity(new Intent(Intent.ACTION_VIEW)
.setData(Uri.parse(url)));
doStartActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse(url)));
return true;
}
});

16
android/app/src/main/java/app/organicmaps/adapter/DisabledChildSimpleExpandableListAdapter.java
View File

@@ -4,18 +4,23 @@ import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import android.widget.SimpleExpandableListAdapter;
import java.util.List;
import java.util.Map;
/**
* Disables child selections, also fixes bug with SimpleExpandableListAdapter not switching expandedGroupLayout and collapsedGroupLayout correctly.
* Disables child selections, also fixes bug with SimpleExpandableListAdapter not switching expandedGroupLayout and
* collapsedGroupLayout correctly.
*/
public class DisabledChildSimpleExpandableListAdapter extends SimpleExpandableListAdapter
{
public DisabledChildSimpleExpandableListAdapter(Context context, List<? extends Map<String, ?>> groupData, int expandedGroupLayout, int collapsedGroupLayout, String[] groupFrom, int[] groupTo, List<? extends List<? extends Map<String, ?>>> childData, int childLayout, String[] childFrom, int[] childTo)
public DisabledChildSimpleExpandableListAdapter(Context context, List<? extends Map<String, ?>> groupData,
int expandedGroupLayout, int collapsedGroupLayout, String[] groupFrom,
int[] groupTo,
List<? extends List<? extends Map<String, ?>>> childData,
int childLayout, String[] childFrom, int[] childTo)
{
super(context, groupData, expandedGroupLayout, collapsedGroupLayout, groupFrom, groupTo, childData, childLayout, childFrom, childTo);
super(context, groupData, expandedGroupLayout, collapsedGroupLayout, groupFrom, groupTo, childData, childLayout,
childFrom, childTo);
}
@Override
@@ -29,8 +34,7 @@ public class DisabledChildSimpleExpandableListAdapter extends SimpleExpandableLi
* See http://stackoverflow.com/questions/19520037/simpleexpandablelistadapter-and-expandedgrouplayout for details
*/
@Override
public View getGroupView(int groupPosition, boolean isExpanded, View convertView,
ViewGroup parent)
public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent)
{
return super.getGroupView(groupPosition, isExpanded, null, parent);
}

1
android/app/src/main/java/app/organicmaps/adapter/OnItemClickListener.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.adapter;
import android.view.View;
import androidx.annotation.NonNull;
public interface OnItemClickListener<T>

2
android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.background;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.work.Constraints;
import androidx.work.NetworkType;
@@ -17,7 +16,6 @@ import app.organicmaps.sdk.util.log.Logger;
public class OsmUploadWork extends Worker
{
private static final String TAG = OsmUploadWork.class.getSimpleName();
private final Context mContext;
private final WorkerParameters mWorkerParameters;

32
android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
View File

@@ -1,8 +1,8 @@
package app.organicmaps.backup;
import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAULT_COUNT;
import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY;
import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
import android.content.Context;
import android.content.SharedPreferences;
@@ -12,25 +12,23 @@ import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.AbsoluteSizeSpan;
import androidx.annotation.NonNull;
import androidx.documentfile.provider.DocumentFile;
import app.organicmaps.R;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.sdk.util.log.Logger;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import app.organicmaps.R;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.sdk.util.log.Logger;
public class BackupUtils
{
private static final String BACKUP_PREFIX = "backup_";
private static final String BACKUP_EXTENSION = ".kmz";
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss").withLocale(Locale.US);
private static final DateTimeFormatter DATE_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss").withLocale(Locale.US);
private static final String TAG = BackupUtils.class.getSimpleName();
public static CharSequence formatReadableFolderPath(Context context, @NonNull Uri uri)
@@ -57,8 +55,10 @@ public class BackupUtils
volumeName = context.getString(R.string.maps_storage_removable);
SpannableStringBuilder sb = new SpannableStringBuilder();
sb.append(volumeName + ": \n", new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_3)), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sb.append("/" + subPath, new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_4)), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sb.append(volumeName + ": \n", new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_3)),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
sb.append("/" + subPath, new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_4)),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return sb;
}
@@ -68,12 +68,14 @@ public class BackupUtils
try
{
return Integer.parseInt(rawValue);
} catch (NumberFormatException e)
}
catch (NumberFormatException e)
{
Logger.e(TAG, "Failed to parse max backups count, raw value: " + rawValue + " set to default: " + MAX_BACKUPS_DEFAULT_COUNT, e);
prefs.edit()
.putString(MAX_BACKUPS_KEY, String.valueOf(MAX_BACKUPS_DEFAULT_COUNT))
.apply();
Logger.e(
TAG,
"Failed to parse max backups count, raw value: " + rawValue + " set to default: " + MAX_BACKUPS_DEFAULT_COUNT,
e);
prefs.edit().putString(MAX_BACKUPS_KEY, String.valueOf(MAX_BACKUPS_DEFAULT_COUNT)).apply();
return MAX_BACKUPS_DEFAULT_COUNT;
}
}

19
android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
View File

@@ -1,22 +1,14 @@
package app.organicmaps.backup;
import static app.organicmaps.backup.BackupUtils.getBackupName;
import static app.organicmaps.backup.BackupUtils.getBackupFolders;
import static app.organicmaps.backup.BackupUtils.getBackupName;
import static app.organicmaps.sdk.util.StorageUtils.copyFileToDocumentFile;
import static app.organicmaps.sdk.util.StorageUtils.deleteDirectoryRecursive;
import android.app.Activity;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.documentfile.provider.DocumentFile;
import java.io.File;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
@@ -24,6 +16,11 @@ import app.organicmaps.sdk.bookmarks.data.KmlFileType;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import java.io.File;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
public class LocalBackupManager implements BookmarkManager.BookmarksSharingListener
{
@@ -139,8 +136,8 @@ public class LocalBackupManager implements BookmarkManager.BookmarksSharingListe
}
}
cleanOldBackups(parentFolder);
} catch (Exception e)
}
catch (Exception e)
{
Logger.e(TAG, "Failed to save backup", e);
}

8
android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java
View File

@@ -8,9 +8,7 @@ import static app.organicmaps.settings.BackupSettingsFragment.LAST_BACKUP_TIME_K
import android.app.Activity;
import android.content.SharedPreferences;
import androidx.preference.PreferenceManager;
import app.organicmaps.sdk.util.log.Logger;
public class PeriodicBackupRunner
@@ -67,7 +65,8 @@ public class PeriodicBackupRunner
try
{
return Long.parseLong(prefs.getString(BACKUP_INTERVAL_KEY, defaultValue));
} catch (NumberFormatException e)
}
catch (NumberFormatException e)
{
return 0;
}
@@ -76,8 +75,7 @@ public class PeriodicBackupRunner
private void performBackup(String backupFolderPath, int maxBackups)
{
LocalBackupManager backupManager = new LocalBackupManager(activity, backupFolderPath, maxBackups);
backupManager.setListener(new LocalBackupManager.Listener()
{
backupManager.setListener(new LocalBackupManager.Listener() {
@Override
public void onBackupStarted()
{

3
android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
View File

@@ -3,12 +3,10 @@ package app.organicmaps.base;
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.fragment.app.DialogFragment;
import app.organicmaps.R;
import app.organicmaps.util.ThemeUtils;
@@ -62,5 +60,4 @@ public class BaseMwmDialogFragment extends DialogFragment
throw new IllegalStateException("Before call this method make sure that the context exists");
return (Application) context.getApplicationContext();
}
}

3
android/app/src/main/java/app/organicmaps/base/BaseMwmFragment.java
View File

@@ -1,9 +1,7 @@
package app.organicmaps.base;
import android.content.Context;
import androidx.fragment.app.Fragment;
import app.organicmaps.util.Utils;
public class BaseMwmFragment extends Fragment implements OnBackPressListener
@@ -20,5 +18,4 @@ public class BaseMwmFragment extends Fragment implements OnBackPressListener
{
return false;
}
}

24
android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
View File

@@ -7,7 +7,6 @@ import android.graphics.Color;
import android.media.AudioManager;
import android.os.Bundle;
import android.view.MenuItem;
import androidx.activity.EdgeToEdge;
import androidx.activity.SystemBarStyle;
import androidx.annotation.CallSuper;
@@ -18,18 +17,15 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentFactory;
import androidx.fragment.app.FragmentManager;
import com.google.android.material.appbar.MaterialToolbar;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.SplashActivity;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.util.RtlUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.util.RtlUtils;
import app.organicmaps.util.ThemeUtils;
import com.google.android.material.appbar.MaterialToolbar;
import java.util.Objects;
public abstract class BaseMwmFragmentActivity extends AppCompatActivity
@@ -216,11 +212,13 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
/**
* Replace attached fragment with the new one.
*/
public void replaceFragment(@NonNull Class<? extends Fragment> fragmentClass, @Nullable Bundle args, @Nullable Runnable completionListener)
public void replaceFragment(@NonNull Class<? extends Fragment> fragmentClass, @Nullable Bundle args,
@Nullable Runnable completionListener)
{
final int resId = getFragmentContentResId();
if (resId <= 0 || findViewById(resId) == null)
throw new IllegalStateException("Fragment can't be added, since getFragmentContentResId() isn't implemented or returns wrong resourceId.");
throw new IllegalStateException(
"Fragment can't be added, since getFragmentContentResId() isn't implemented or returns wrong resourceId.");
String name = fragmentClass.getName();
Fragment potentialInstance = getSupportFragmentManager().findFragmentByTag(name);
@@ -230,9 +228,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
final FragmentFactory factory = manager.getFragmentFactory();
final Fragment fragment = factory.instantiate(getClassLoader(), name);
fragment.setArguments(args);
manager.beginTransaction()
.replace(resId, fragment, name)
.commitAllowingStateLoss();
manager.beginTransaction().replace(resId, fragment, name).commitAllowingStateLoss();
manager.executePendingTransactions();
if (completionListener != null)
completionListener.run();
@@ -240,8 +236,8 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
}
/**
* Override to automatically attach fragment in onCreate. Tag applied to fragment in back stack is set to fragment name, too.
* WARNING : if custom layout for activity is set, getFragmentContentResId() must be implemented, too.
* Override to automatically attach fragment in onCreate. Tag applied to fragment in back stack is set to fragment
* name, too. WARNING : if custom layout for activity is set, getFragmentContentResId() must be implemented, too.
* @return class of the fragment, eg FragmentClass.getClass()
*/
protected Class<? extends Fragment> getFragmentClass()

8
android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
View File

@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.CallSuper;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
@@ -14,14 +13,12 @@ import androidx.core.view.ViewCompat;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.appbar.MaterialToolbar;
import app.organicmaps.R;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
import app.organicmaps.widget.PlaceholderView;
import com.google.android.material.appbar.MaterialToolbar;
public abstract class BaseMwmRecyclerFragment<T extends RecyclerView.Adapter> extends Fragment
{
@@ -39,8 +36,7 @@ public abstract class BaseMwmRecyclerFragment<T extends RecyclerView.Adapter> ex
private T mAdapter;
@NonNull
private final View.OnClickListener mNavigationClickListener
= view -> Utils.navigateToParent(requireActivity());
private final View.OnClickListener mNavigationClickListener = view -> Utils.navigateToParent(requireActivity());
@NonNull
protected abstract T createAdapter();

2
android/app/src/main/java/app/organicmaps/base/BaseMwmToolbarFragment.java
View File

@@ -2,10 +2,8 @@ package app.organicmaps.base;
import android.os.Bundle;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.widget.ToolbarController;
public class BaseMwmToolbarFragment extends BaseMwmFragment

18
android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.base;
import android.os.Bundle;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -10,12 +9,10 @@ import androidx.core.view.ViewCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentFactory;
import androidx.fragment.app.FragmentManager;
import com.google.android.material.appbar.MaterialToolbar;
import app.organicmaps.R;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
import com.google.android.material.appbar.MaterialToolbar;
public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
{
@@ -73,23 +70,20 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
return R.id.fragment_container;
}
public Fragment stackFragment(@NonNull Class<? extends Fragment> fragmentClass,
@Nullable String title, @Nullable Bundle args)
public Fragment stackFragment(@NonNull Class<? extends Fragment> fragmentClass, @Nullable String title,
@Nullable Bundle args)
{
final int resId = getFragmentContentResId();
if (resId <= 0 || findViewById(resId) == null)
throw new IllegalStateException("Fragment can't be added, since getFragmentContentResId() " +
"isn't implemented or returns wrong resourceId.");
throw new IllegalStateException("Fragment can't be added, since getFragmentContentResId() "
+ "isn't implemented or returns wrong resourceId.");
String name = fragmentClass.getName();
final FragmentManager manager = getSupportFragmentManager();
final FragmentFactory factory = manager.getFragmentFactory();
final Fragment fragment = factory.instantiate(getClassLoader(), name);
fragment.setArguments(args);
manager.beginTransaction()
.replace(resId, fragment, name)
.addToBackStack(null)
.commitAllowingStateLoss();
manager.beginTransaction().replace(resId, fragment, name).addToBackStack(null).commitAllowingStateLoss();
manager.executePendingTransactions();
if (title != null)

7
android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java
View File

@@ -1,16 +1,12 @@
package app.organicmaps.bookmarks;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import java.util.List;
public abstract class BaseBookmarkCategoryAdapter<V extends RecyclerView.ViewHolder>
extends RecyclerView.Adapter<V>
public abstract class BaseBookmarkCategoryAdapter<V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V>
{
@NonNull
private final Context mContext;
@@ -54,6 +50,5 @@ public abstract class BaseBookmarkCategoryAdapter<V extends RecyclerView.ViewHol
if (position < 0 || position > categories.size() - 1)
throw new ArrayIndexOutOfBoundsException(position);
return categories.get(position);
}
}

2
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java
View File

@@ -3,13 +3,11 @@ package app.organicmaps.bookmarks;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.fragment.app.Fragment;
import app.organicmaps.R;
import app.organicmaps.base.BaseToolbarActivity;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;

7
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java
View File

@@ -7,16 +7,13 @@ import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import java.util.List;
public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<RecyclerView.ViewHolder>
@@ -122,8 +119,7 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
case TYPE_ACTION_HEADER ->
{
HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
headerViewHolder.setAction(mMassOperationAction,
BookmarkManager.INSTANCE.areAllCategoriesInvisible());
headerViewHolder.setAction(mMassOperationAction, BookmarkManager.INSTANCE.areAllCategoriesInvisible());
headerViewHolder.getText().setText(R.string.bookmark_lists);
}
case TYPE_CATEGORY_ITEM ->
@@ -191,7 +187,6 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
private int toCategoryPosition(int adapterPosition)
{
int type = getItemViewType(adapterPosition);
if (type != TYPE_CATEGORY_ITEM)
throw new AssertionError("An element at specified position is not category!");

88
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java
View File

@@ -12,7 +12,6 @@ import android.os.Bundle;
import android.provider.DocumentsContract;
import android.view.View;
import android.widget.Toast;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.CallSuper;
@@ -20,42 +19,35 @@ import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.sdk.bookmarks.data.KmlFileType;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.PlaceholderView;
import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding;
import app.organicmaps.sdk.util.StorageUtils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import app.organicmaps.widget.PlaceholderView;
import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<BookmarkCategoriesAdapter>
implements BookmarkManager.BookmarksLoadingListener,
CategoryListCallback,
OnItemClickListener<BookmarkCategory>,
OnItemMoreClickListener<BookmarkCategory>,
OnItemLongClickListener<BookmarkCategory>,
BookmarkManager.BookmarksSharingListener,
MenuBottomSheetFragment.MenuBottomSheetInterface
implements BookmarkManager.BookmarksLoadingListener, CategoryListCallback, OnItemClickListener<BookmarkCategory>,
OnItemMoreClickListener<BookmarkCategory>, OnItemLongClickListener<BookmarkCategory>,
BookmarkManager.BookmarksSharingListener, MenuBottomSheetFragment.MenuBottomSheetInterface
{
private static final String TAG = BookmarkCategoriesFragment.class.getSimpleName();
@@ -75,22 +67,25 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
@NonNull
private DataChangedListener mCategoriesAdapterObserver;
private final ActivityResultLauncher<Intent> startBookmarkListForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
private final ActivityResultLauncher<Intent> startBookmarkListForResult =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() == Activity.RESULT_OK)
onDeleteActionSelected(getSelectedCategory());
});
private final ActivityResultLauncher<Intent> startImportDirectoryForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult ->
{
private final ActivityResultLauncher<Intent> startImportDirectoryForResult =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
if (activityResult.getResultCode() == Activity.RESULT_OK)
onImportDirectoryResult(activityResult.getData());
});
private final ActivityResultLauncher<Intent> startBookmarkSettingsForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
private final ActivityResultLauncher<Intent> startBookmarkSettingsForResult =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
activityResult
-> {
// not handled at the moment
});
@Override
@LayoutRes
protected int getLayoutRes()
@@ -119,7 +114,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
getAdapter().setCategoryListCallback(this);
RecyclerView rw = getRecyclerView();
if (rw == null) return;
if (rw == null)
return;
rw.setNestedScrollingEnabled(false);
RecyclerView.ItemDecoration decor = new DividerItemDecorationWithPadding(requireContext());
@@ -191,27 +187,18 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
if (mSelectedCategory != null)
{
items.add(new MenuBottomSheetItem(
R.string.edit,
R.drawable.ic_settings,
items.add(new MenuBottomSheetItem(R.string.edit, R.drawable.ic_settings,
() -> onSettingsActionSelected(mSelectedCategory)));
items.add(new MenuBottomSheetItem(
mSelectedCategory.isVisible() ? R.string.hide : R.string.show,
items.add(new MenuBottomSheetItem(mSelectedCategory.isVisible() ? R.string.hide : R.string.show,
mSelectedCategory.isVisible() ? R.drawable.ic_hide : R.drawable.ic_show,
() -> onShowActionSelected(mSelectedCategory)));
items.add(new MenuBottomSheetItem(
R.string.export_file,
R.drawable.ic_file_kmz,
items.add(new MenuBottomSheetItem(R.string.export_file, R.drawable.ic_file_kmz,
() -> onShareActionSelected(mSelectedCategory, KmlFileType.Text)));
items.add(new MenuBottomSheetItem(
R.string.export_file_gpx,
R.drawable.ic_file_gpx,
items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
() -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx)));
// Disallow deleting the last category
if (getAdapter().getBookmarkCategories().size() > 1)
items.add(new MenuBottomSheetItem(
R.string.delete,
R.drawable.ic_delete,
items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
() -> onDeleteActionSelected(mSelectedCategory)));
}
return items;
@@ -245,15 +232,10 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
{
mCategoryEditor = BookmarkManager.INSTANCE::createCategory;
EditTextDialogFragment dialogFragment =
EditTextDialogFragment.show(getString(R.string.bookmarks_create_new_group),
getString(R.string.bookmarks_new_list_hint),
getString(R.string.bookmark_set_name),
getString(R.string.create),
getString(R.string.cancel),
MAX_CATEGORY_NAME_LENGTH,
this,
new CategoryValidator());
EditTextDialogFragment dialogFragment = EditTextDialogFragment.show(
getString(R.string.bookmarks_create_new_group), getString(R.string.bookmarks_new_list_hint),
getString(R.string.bookmark_set_name), getString(R.string.create), getString(R.string.cancel),
MAX_CATEGORY_NAME_LENGTH, this, new CategoryValidator());
dialogFragment.setTextSaveListener(this::onSaveText);
}
@@ -280,7 +262,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
showNoFileManagerError();
}
private void showNoFileManagerError() {
private void showNoFileManagerError()
{
new MaterialAlertDialogBuilder(requireActivity())
.setMessage(R.string.error_no_file_manager_app)
.setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss())
@@ -341,8 +324,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
final ContentResolver resolver = context.getContentResolver();
ThreadPool.getStorage().execute(() -> {
AtomicInteger found = new AtomicInteger(0);
StorageUtils.listContentProviderFilesRecursively(
resolver, rootUri, uri -> {
StorageUtils.listContentProviderFilesRecursively(resolver, rootUri, uri -> {
if (BookmarkManager.INSTANCE.importBookmarksFile(resolver, uri, tempDir))
found.incrementAndGet();
});
@@ -350,8 +332,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
if (dialog.isShowing())
dialog.dismiss();
int found_val = found.get();
String message = context.getResources().getQuantityString(
R.plurals.bookmarks_detect_message, found_val, found_val);
String message =
context.getResources().getQuantityString(R.plurals.bookmarks_detect_message, found_val, found_val);
Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show();
});
});

5
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java
View File

@@ -1,11 +1,9 @@
package app.organicmaps.bookmarks;
import android.content.Intent;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
@@ -32,7 +30,8 @@ public class BookmarkCategorySettingsActivity extends BaseMwmFragmentActivity
return BookmarkCategorySettingsFragment.class;
}
public static void startForResult(@NonNull Fragment fragment, ActivityResultLauncher<Intent> startBookmarkSettingsForResult,
public static void startForResult(@NonNull Fragment fragment,
ActivityResultLauncher<Intent> startBookmarkSettingsForResult,
@NonNull BookmarkCategory category)
{
android.content.Intent intent = new Intent(fragment.requireActivity(), BookmarkCategorySettingsActivity.class)

22
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
View File

@@ -11,21 +11,17 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.util.Utils;
import app.organicmaps.util.InputUtils;
import app.organicmaps.util.Utils;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
import java.util.Objects;
public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
@@ -49,14 +45,13 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
{
super.onCreate(savedInstanceState);
final Bundle args = requireArguments();
mCategory = Objects.requireNonNull(Utils.getParcelable(args,
BookmarkCategorySettingsActivity.EXTRA_BOOKMARK_CATEGORY, BookmarkCategory.class));
mCategory = Objects.requireNonNull(
Utils.getParcelable(args, BookmarkCategorySettingsActivity.EXTRA_BOOKMARK_CATEGORY, BookmarkCategory.class));
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState)
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
{
View root = inflater.inflate(R.layout.fragment_bookmark_category_settings, container, false);
setHasOptionsMenu(true);
@@ -73,10 +68,10 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
InputFilter[] f = {new InputFilter.LengthFilter(TEXT_LENGTH_LIMIT)};
mEditCategoryNameView.setFilters(f);
mEditCategoryNameView.requestFocus();
mEditCategoryNameView.addTextChangedListener(new TextWatcher()
{
mEditCategoryNameView.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2)
{}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2)
@@ -85,7 +80,8 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
}
@Override
public void afterTextChanged(Editable editable) {}
public void afterTextChanged(Editable editable)
{}
});
mEditDescView = root.findViewById(R.id.edit_description);
mEditDescView.setText(mCategory.getDescription());

25
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java
View File

@@ -3,18 +3,15 @@ package app.organicmaps.bookmarks;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.util.UiUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
@@ -23,7 +20,8 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
{
@Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_HEADER_ITEM, TYPE_CATEGORY_ITEM})
public @interface SectionType { }
public @interface SectionType
{}
private final static int TYPE_CATEGORY_ITEM = BookmarkManager.CATEGORY;
private final static int TYPE_HEADER_ITEM = 3;
@@ -63,8 +61,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
}
}
BookmarkCollectionAdapter(@NonNull BookmarkCategory bookmarkCategory,
@NonNull List<BookmarkCategory> itemsCategories)
BookmarkCollectionAdapter(@NonNull BookmarkCategory bookmarkCategory, @NonNull List<BookmarkCategory> itemsCategories)
{
mBookmarkCategory = bookmarkCategory;
// noinspection AssignmentOrReturnOfFieldWithMutableType
@@ -129,18 +126,15 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent,
@SectionType int viewType)
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, @SectionType int viewType)
{
LayoutInflater inflater = LayoutInflater.from(parent.getContext());
RecyclerView.ViewHolder holder = null;
if (viewType == TYPE_HEADER_ITEM)
holder = new Holders.HeaderViewHolder(inflater.inflate(R.layout.item_bookmark_group_list_header,
parent, false));
holder = new Holders.HeaderViewHolder(inflater.inflate(R.layout.item_bookmark_group_list_header, parent, false));
if (viewType == TYPE_CATEGORY_ITEM)
holder = new Holders.CollectionViewHolder(inflater.inflate(R.layout.item_bookmark_collection,
parent, false));
holder = new Holders.CollectionViewHolder(inflater.inflate(R.layout.item_bookmark_collection, parent, false));
if (holder == null)
throw new AssertionError("Unsupported view type: " + viewType);
@@ -170,8 +164,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
throw new AssertionError("Position not found: " + position);
}
private void bindCollectionHolder(RecyclerView.ViewHolder holder, SectionPosition position,
@SectionType int type)
private void bindCollectionHolder(RecyclerView.ViewHolder holder, SectionPosition position, @SectionType int type)
{
final BookmarkCategory category = getGroupByPosition(position, type);
Holders.CollectionViewHolder collectionViewHolder = (Holders.CollectionViewHolder) holder;
@@ -188,8 +181,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
private void bindHeaderHolder(@NonNull RecyclerView.ViewHolder holder, int nextSectionPosition)
{
Holders.HeaderViewHolder headerViewHolder = (Holders.HeaderViewHolder) holder;
headerViewHolder.getText()
.setText(holder.itemView.getResources().getString(R.string.bookmarks));
headerViewHolder.getText().setText(holder.itemView.getResources().getString(R.string.bookmarks));
final boolean visibility = !BookmarkManager.INSTANCE.areAllCategoriesVisible();
headerViewHolder.setAction(mMassOperationAction, visibility);
updateVisibility(headerViewHolder.itemView);
@@ -251,4 +243,3 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
}
}
}

5
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java
View File

@@ -2,13 +2,11 @@ package app.organicmaps.bookmarks;
import android.content.Intent;
import android.os.Bundle;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import androidx.fragment.app.Fragment;
import app.organicmaps.R;
import app.organicmaps.base.BaseToolbarActivity;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
@@ -58,7 +56,8 @@ public class BookmarkListActivity extends BaseToolbarActivity
return R.layout.bookmarks_activity;
}
static void startForResult(@NonNull Fragment fragment, ActivityResultLauncher<Intent> startBookmarkListForResult, @NonNull BookmarkCategory category)
static void startForResult(@NonNull Fragment fragment, ActivityResultLauncher<Intent> startBookmarkListForResult,
@NonNull BookmarkCategory category)
{
Bundle args = new Bundle();
Intent intent = new Intent(fragment.requireActivity(), BookmarkListActivity.class);

77
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java
View File

@@ -4,13 +4,9 @@ import android.content.res.Resources;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
@@ -20,7 +16,7 @@ import app.organicmaps.sdk.bookmarks.data.SortedBlock;
import app.organicmaps.sdk.content.DataSource;
import app.organicmaps.widget.recycler.RecyclerClickListener;
import app.organicmaps.widget.recycler.RecyclerLongClickListener;
import com.google.android.material.textview.MaterialTextView;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -62,12 +58,14 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
mDataSource = dataSource;
}
public BookmarkCategory getCategory() { return mDataSource.getData(); }
public BookmarkCategory getCategory()
{
return mDataSource.getData();
}
boolean hasDescription()
{
return (!mDataSource.getData().getAnnotation().isEmpty() ||
!mDataSource.getData().getDescription().isEmpty());
return (!mDataSource.getData().getAnnotation().isEmpty() || !mDataSource.getData().getDescription().isEmpty());
}
void invalidate()
@@ -115,7 +113,10 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
}
@Override
public int getSectionsCount() { return mSectionsCount; }
public int getSectionsCount()
{
return mSectionsCount;
}
@Override
public boolean isEditable(int sectionIndex)
@@ -124,7 +125,10 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
}
@Override
public boolean hasTitle(int sectionIndex) { return true; }
public boolean hasTitle(int sectionIndex)
{
return true;
}
@Nullable
public String getTitle(int sectionIndex, @NonNull Resources rs)
@@ -172,15 +176,13 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
@Override
public long getBookmarkId(@NonNull SectionPosition pos)
{
return BookmarkManager.INSTANCE.getBookmarkIdByPosition(getCategory().getId(),
pos.getItemIndex());
return BookmarkManager.INSTANCE.getBookmarkIdByPosition(getCategory().getId(), pos.getItemIndex());
}
@Override
public long getTrackId(@NonNull SectionPosition pos)
{
return BookmarkManager.INSTANCE.getTrackIdByPosition(getCategory().getId(),
pos.getItemIndex());
return BookmarkManager.INSTANCE.getTrackIdByPosition(getCategory().getId(), pos.getItemIndex());
}
}
@@ -189,30 +191,47 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
@NonNull
private final List<Long> mSearchResults;
SearchResultsSectionsDataSource(@NonNull DataSource<BookmarkCategory> dataSource,
@NonNull List<Long> searchResults)
SearchResultsSectionsDataSource(@NonNull DataSource<BookmarkCategory> dataSource, @NonNull List<Long> searchResults)
{
super(dataSource);
mSearchResults = searchResults;
}
@Override
public int getSectionsCount() { return 1; }
public int getSectionsCount()
{
return 1;
}
@Override
public boolean isEditable(int sectionIndex) { return true; }
public boolean isEditable(int sectionIndex)
{
return true;
}
@Override
public boolean hasTitle(int sectionIndex) { return false; }
public boolean hasTitle(int sectionIndex)
{
return false;
}
@Nullable
public String getTitle(int sectionIndex, @NonNull Resources rs) { return null; }
public String getTitle(int sectionIndex, @NonNull Resources rs)
{
return null;
}
@Override
public int getItemsCount(int sectionIndex) { return mSearchResults.size(); }
public int getItemsCount(int sectionIndex)
{
return mSearchResults.size();
}
@Override
public int getItemsType(int sectionIndex) { return TYPE_BOOKMARK; }
public int getItemsType(int sectionIndex)
{
return TYPE_BOOKMARK;
}
@Override
public void onDelete(@NonNull SectionPosition pos)
@@ -238,8 +257,7 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
@NonNull
private final List<SortedBlock> mSortedBlocks;
SortedSectionsDataSource(@NonNull DataSource<BookmarkCategory> dataSource,
@NonNull List<SortedBlock> sortedBlocks)
SortedSectionsDataSource(@NonNull DataSource<BookmarkCategory> dataSource, @NonNull List<SortedBlock> sortedBlocks)
{
super(dataSource);
mSortedBlocks = sortedBlocks;
@@ -272,7 +290,10 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
}
@Override
public boolean hasTitle(int sectionIndex) { return true; }
public boolean hasTitle(int sectionIndex)
{
return true;
}
@Nullable
public String getTitle(int sectionIndex, @NonNull Resources rs)
@@ -423,8 +444,7 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
{
case TYPE_TRACK:
Holders.TrackViewHolder trackHolder =
new Holders.TrackViewHolder(inflater.inflate(R.layout.item_track, parent,
false));
new Holders.TrackViewHolder(inflater.inflate(R.layout.item_track, parent, false));
trackHolder.setOnClickListener(mClickListener);
trackHolder.setOnLongClickListener(mLongClickListener);
trackHolder.setTrackIconClickListener(mIconClickListener);
@@ -433,8 +453,7 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
break;
case TYPE_BOOKMARK:
Holders.BookmarkViewHolder bookmarkHolder =
new Holders.BookmarkViewHolder(inflater.inflate(R.layout.item_bookmark, parent,
false));
new Holders.BookmarkViewHolder(inflater.inflate(R.layout.item_bookmark, parent, false));
bookmarkHolder.setOnClickListener(mClickListener);
bookmarkHolder.setOnLongClickListener(mLongClickListener);
holder = bookmarkHolder;

118
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
View File

@@ -11,7 +11,6 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.CallSuper;
@@ -40,9 +39,9 @@ import app.organicmaps.sdk.bookmarks.data.SortedBlock;
import app.organicmaps.sdk.bookmarks.data.Track;
import app.organicmaps.sdk.search.BookmarkSearchListener;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
@@ -53,16 +52,13 @@ import app.organicmaps.widget.placepage.EditBookmarkFragment;
import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding;
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
import com.google.android.material.imageview.ShapeableImageView;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter>
implements BookmarkManager.BookmarksSharingListener,
BookmarkManager.BookmarksSortingListener,
BookmarkManager.BookmarksLoadingListener,
BookmarkSearchListener,
implements BookmarkManager.BookmarksSharingListener, BookmarkManager.BookmarksSortingListener,
BookmarkManager.BookmarksLoadingListener, BookmarkSearchListener,
ChooseBookmarksSortingTypeFragment.ChooseSortingTypeListener,
MenuBottomSheetFragment.MenuBottomSheetInterface
{
@@ -75,12 +71,14 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private static final String OPTIONS_MENU_ID = "OPTIONS_MENU_BOTTOM_SHEET";
private ActivityResultLauncher<SharingUtils.SharingIntent> shareLauncher;
private final ActivityResultLauncher<Intent> startBookmarkListForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
private final ActivityResultLauncher<Intent> startBookmarkListForResult =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
System.out.println("resultCode: " + activityResult.getResultCode());
handleActivityResult();
});
private final ActivityResultLauncher<Intent> startBookmarkSettingsForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
private final ActivityResultLauncher<Intent> startBookmarkSettingsForResult =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
System.out.println("resultCode: " + activityResult.getResultCode());
handleActivityResult();
});
@@ -104,8 +102,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private ExtendedFloatingActionButton mFabViewOnMap;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private final RecyclerView.OnScrollListener mRecyclerListener = new RecyclerView.OnScrollListener()
{
private final RecyclerView.OnScrollListener mRecyclerListener = new RecyclerView.OnScrollListener() {
@Override
public void onScrollStateChanged(RecyclerView recyclerView, int newState)
{
@@ -148,16 +145,15 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
{
List<BookmarkCategory> mCategoryItems = BookmarkManager.INSTANCE.getChildrenCategories(categoryId);
BookmarkCollectionAdapter adapter = new BookmarkCollectionAdapter(getCategoryOrThrow(),
mCategoryItems);
adapter.setOnClickListener((v, item) -> BookmarkListActivity.startForResult(this, startBookmarkListForResult, item));
BookmarkCollectionAdapter adapter = new BookmarkCollectionAdapter(getCategoryOrThrow(), mCategoryItems);
adapter.setOnClickListener(
(v, item) -> BookmarkListActivity.startForResult(this, startBookmarkListForResult, item));
return adapter;
}
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState)
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
{
return inflater.inflate(R.layout.fragment_bookmark_list, container, false);
}
@@ -202,8 +198,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
// recycler view already has an InsetListener in BaseMwmRecyclerFragment
// here we must reset it, because the logic is different from a common use case
ViewCompat.setOnApplyWindowInsetsListener(
getRecyclerView(),
new WindowInsetUtils.ScrollableContentInsetsListener(getRecyclerView(), mFabViewOnMap));
getRecyclerView(), new WindowInsetUtils.ScrollableContentInsetsListener(getRecyclerView(), mFabViewOnMap));
updateLoadingPlaceholder(view, false);
}
@@ -261,8 +256,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private void configureFab(@NonNull View view)
{
mFabViewOnMap = view.findViewById(R.id.show_on_map_fab);
mFabViewOnMap.setOnClickListener(v ->
{
mFabViewOnMap.setOnClickListener(v -> {
final Intent i = makeMwmActivityIntent();
i.putExtra(MwmActivity.EXTRA_CATEGORY_ID, mCategoryDataSource.getData().getId());
i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -288,13 +282,11 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
{
if (isEmptySearchResults())
{
requirePlaceholder().setContent(R.string.search_not_found,
R.string.search_not_found_query);
requirePlaceholder().setContent(R.string.search_not_found, R.string.search_not_found_query);
}
else if (isEmpty())
{
requirePlaceholder().setContent(R.string.bookmarks_empty_list_title,
R.string.bookmarks_empty_list_message);
requirePlaceholder().setContent(R.string.bookmarks_empty_list_title, R.string.bookmarks_empty_list_message);
}
boolean isEmptyRecycler = isEmpty() || isEmptySearchResults();
@@ -330,9 +322,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
SearchEngine.INSTANCE.cancel();
mLastQueryTimestamp = System.nanoTime();
if (SearchEngine.INSTANCE.searchInBookmarks(query,
mCategoryDataSource.getData().getId(),
mLastQueryTimestamp))
if (SearchEngine.INSTANCE.searchInBookmarks(query, mCategoryDataSource.getData().getId(), mLastQueryTimestamp))
{
mToolbarController.showProgress(true);
}
@@ -431,8 +421,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
final double lon = hasMyPosition ? loc.getLongitude() : 0;
BookmarkManager.INSTANCE.setLastSortingType(catId, sortingType);
BookmarkManager.INSTANCE.getSortedCategory(catId, sortingType, hasMyPosition, lat, lon,
mLastSortTimestamp);
BookmarkManager.INSTANCE.getSortedCategory(catId, sortingType, hasMyPosition, lat, lon, mLastSortTimestamp);
updateSortingProgressBar();
}
@@ -446,8 +435,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
@NonNull
private BookmarkCollectionAdapter getBookmarkCollectionAdapter()
{
return (BookmarkCollectionAdapter) getAdapter().getAdapters()
.get(INDEX_BOOKMARKS_COLLECTION_ADAPTER);
return (BookmarkCollectionAdapter) getAdapter().getAdapters().get(INDEX_BOOKMARKS_COLLECTION_ADAPTER);
}
@Override
@@ -525,7 +513,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private int getLastAvailableSortingType()
{
int currentType = getLastSortingType();
@BookmarkManager.SortingType int[] types = getAvailableSortingTypes();
@BookmarkManager.SortingType
int[] types = getAvailableSortingTypes();
for (@BookmarkManager.SortingType int type : types)
{
if (type == currentType)
@@ -536,14 +525,12 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private boolean isEmpty()
{
return !getBookmarkListAdapter().isSearchResults()
&& getBookmarkListAdapter().getItemCount() == 0;
return !getBookmarkListAdapter().isSearchResults() && getBookmarkListAdapter().getItemCount() == 0;
}
private boolean isEmptySearchResults()
{
return getBookmarkListAdapter().isSearchResults()
&& getBookmarkListAdapter().getItemCount() == 0;
return getBookmarkListAdapter().isSearchResults() && getBookmarkListAdapter().getItemCount() == 0;
}
private boolean isLastOwnedCategory()
@@ -589,8 +576,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
i.putExtra(MwmActivity.EXTRA_TRACK_ID, track.getTrackId());
}
private void onBookmarkClicked(int position, @NonNull Intent i,
@NonNull BookmarkListAdapter adapter)
private void onBookmarkClicked(int position, @NonNull Intent i, @NonNull BookmarkListAdapter adapter)
{
final BookmarkInfo bookmark = (BookmarkInfo) adapter.getItem(position);
i.putExtra(MwmActivity.EXTRA_CATEGORY_ID, bookmark.getCategoryId());
@@ -603,7 +589,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
mSelectedPosition = position;
final Track mTrack = (Track) adapter.getItem(mSelectedPosition);
if (mTrack == null) return;
if (mTrack == null)
return;
final Bundle args = new Bundle();
args.putInt(BookmarkColorDialogFragment.ICON_TYPE, Icon.getColorPosition(mTrack.getColor()));
final FragmentManager manager = getChildFragmentManager();
@@ -618,9 +605,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
if (from == to)
return;
BookmarkManager.INSTANCE.changeTrackColor(mTrack.getTrackId(), to);
Drawable circle = Graphics.drawCircle(to,
R.dimen.track_circle_size,
requireContext().getResources());
Drawable circle = Graphics.drawCircle(to, R.dimen.track_circle_size, requireContext().getResources());
v.setImageDrawable(circle);
});
@@ -714,10 +699,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
{
BookmarkListAdapter adapter = getBookmarkListAdapter();
BookmarkInfo info = (BookmarkInfo) adapter.getItem(mSelectedPosition);
EditBookmarkFragment.editBookmark(
info.getCategoryId(), info.getBookmarkId(), requireActivity(), getChildFragmentManager(),
(bookmarkId, movedFromCategory) ->
{
EditBookmarkFragment.editBookmark(info.getCategoryId(), info.getBookmarkId(), requireActivity(),
getChildFragmentManager(), (bookmarkId, movedFromCategory) -> {
if (movedFromCategory)
resetSearchAndSort();
else
@@ -728,10 +711,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private void onTrackEditActionSelected()
{
Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition);
EditBookmarkFragment.editTrack(
track.getCategoryId(), track.getTrackId(), requireActivity(), getChildFragmentManager(),
(trackId, movedFromCategory) ->
{
EditBookmarkFragment.editTrack(track.getCategoryId(), track.getTrackId(), requireActivity(),
getChildFragmentManager(), (trackId, movedFromCategory) -> {
if (movedFromCategory)
resetSearchAndSort();
else
@@ -754,8 +735,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private void onSortOptionSelected()
{
ChooseBookmarksSortingTypeFragment.chooseSortingType(getAvailableSortingTypes(),
getLastSortingType(), requireActivity(), getChildFragmentManager());
ChooseBookmarksSortingTypeFragment.chooseSortingType(getAvailableSortingTypes(), getLastSortingType(),
requireActivity(), getChildFragmentManager());
}
private void onShareOptionSelected(KmlFileType kmlFileType)
@@ -766,7 +747,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private void onSettingsOptionSelected()
{
BookmarkCategorySettingsActivity.startForResult(this, startBookmarkSettingsForResult, mCategoryDataSource.getData());
BookmarkCategorySettingsActivity.startForResult(this, startBookmarkSettingsForResult,
mCategoryDataSource.getData());
}
private void onDeleteOptionSelected()
@@ -777,14 +759,17 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private ArrayList<MenuBottomSheetItem> getOptionsMenuItems()
{
@BookmarkManager.SortingType int[] types = getAvailableSortingTypes();
@BookmarkManager.SortingType
int[] types = getAvailableSortingTypes();
ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
if (!isEmpty())
{
if (types.length > 0)
items.add(new MenuBottomSheetItem(R.string.sort, R.drawable.ic_sort, this::onSortOptionSelected));
items.add(new MenuBottomSheetItem(R.string.export_file, R.drawable.ic_file_kmz, () -> onShareOptionSelected(KmlFileType.Text)));
items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx, () -> onShareOptionSelected(KmlFileType.Gpx)));
items.add(new MenuBottomSheetItem(R.string.export_file, R.drawable.ic_file_kmz,
() -> onShareOptionSelected(KmlFileType.Text)));
items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
() -> onShareOptionSelected(KmlFileType.Gpx)));
}
items.add(new MenuBottomSheetItem(R.string.edit, R.drawable.ic_settings, this::onSettingsOptionSelected));
if (!isLastOwnedCategory())
@@ -805,9 +790,12 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
{
ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
items.add(new MenuBottomSheetItem(R.string.edit, R.drawable.ic_edit, this::onTrackEditActionSelected));
items.add(new MenuBottomSheetItem(R.string.export_file, R.drawable.ic_file_kmz, () -> onShareTrackSelected(track.getTrackId(), KmlFileType.Text)));
items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx, () -> onShareTrackSelected(track.getTrackId(), KmlFileType.Gpx)));
items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete, () -> onDeleteTrackSelected(track.getTrackId())));
items.add(new MenuBottomSheetItem(R.string.export_file, R.drawable.ic_file_kmz,
() -> onShareTrackSelected(track.getTrackId(), KmlFileType.Text)));
items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
() -> onShareTrackSelected(track.getTrackId(), KmlFileType.Gpx)));
items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
() -> onDeleteTrackSelected(track.getTrackId())));
return items;
}
@@ -853,15 +841,19 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
@Nullable
public ArrayList<MenuBottomSheetItem> getMenuBottomSheetItems(String id)
{
switch (id) {
case BOOKMARKS_MENU_ID -> {
switch (id)
{
case BOOKMARKS_MENU_ID ->
{
return getBookmarkMenuItems();
}
case TRACK_MENU_ID -> {
case TRACK_MENU_ID ->
{
final Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition);
return getTrackMenuItems(track);
}
case OPTIONS_MENU_ID -> {
case OPTIONS_MENU_ID ->
{
return getOptionsMenuItems();
}
}

6
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
View File

@@ -2,25 +2,21 @@ package app.organicmaps.bookmarks;
import android.app.Activity;
import android.app.ProgressDialog;
import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.sdk.bookmarks.data.KmlFileType;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.util.SharingUtils;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.ArrayList;
import java.util.List;
public enum BookmarksSharingHelper
{
INSTANCE;

5
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksToolbarController.java
View File

@@ -2,9 +2,7 @@ package app.organicmaps.bookmarks;
import android.app.Activity;
import android.view.View;
import androidx.annotation.NonNull;
import app.organicmaps.widget.SearchToolbarController;
public class BookmarksToolbarController extends SearchToolbarController
@@ -12,8 +10,7 @@ public class BookmarksToolbarController extends SearchToolbarController
@NonNull
private final BookmarksListFragment mFragment;
BookmarksToolbarController(@NonNull View root, @NonNull Activity activity,
@NonNull BookmarksListFragment fragment)
BookmarksToolbarController(@NonNull View root, @NonNull Activity activity, @NonNull BookmarksListFragment fragment)
{
super(root, activity);
mFragment = fragment;

4
android/app/src/main/java/app/organicmaps/bookmarks/CategoryValidator.java
View File

@@ -2,13 +2,11 @@ package app.organicmaps.bookmarks;
import android.app.Activity;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
class CategoryValidator implements EditTextDialogFragment.Validator
{

14
android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java
View File

@@ -4,19 +4,16 @@ import android.content.Context;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.radiobutton.MaterialRadioButton;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import com.google.android.material.radiobutton.MaterialRadioButton;
import com.google.android.material.textview.MaterialTextView;
import java.util.List;
public class ChooseBookmarkCategoryAdapter extends BaseBookmarkCategoryAdapter<ChooseBookmarkCategoryAdapter.SingleChoiceHolder>
public class ChooseBookmarkCategoryAdapter
extends BaseBookmarkCategoryAdapter<ChooseBookmarkCategoryAdapter.SingleChoiceHolder>
{
public static final int VIEW_TYPE_CATEGORY = 0;
public static final int VIEW_TYPE_ADD_NEW = 1;
@@ -32,8 +29,7 @@ public class ChooseBookmarkCategoryAdapter extends BaseBookmarkCategoryAdapter<C
private CategoryListener mListener;
public ChooseBookmarkCategoryAdapter(Context context, int pos,
@NonNull List<BookmarkCategory> categories)
public ChooseBookmarkCategoryAdapter(Context context, int pos, @NonNull List<BookmarkCategory> categories)
{
super(context, categories);
mCheckedPosition = pos;

18
android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
View File

@@ -5,23 +5,20 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.dialog.EditTextDialogFragment;
import java.util.List;
public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment
implements ChooseBookmarkCategoryAdapter.CategoryListener
public class ChooseBookmarkCategoryFragment
extends BaseMwmDialogFragment implements ChooseBookmarkCategoryAdapter.CategoryListener
{
public static final String CATEGORY_POSITION = "ExtraCategoryPosition";
@@ -126,13 +123,8 @@ public class ChooseBookmarkCategoryFragment extends BaseMwmDialogFragment
@Override
public void onCategoryCreate()
{
EditTextDialogFragment dialogFragment =
EditTextDialogFragment.show(getString(R.string.bookmark_set_name),
null,
getString(R.string.ok),
null,
this,
new CategoryValidator());
EditTextDialogFragment dialogFragment = EditTextDialogFragment.show(
getString(R.string.bookmark_set_name), null, getString(R.string.ok), null, this, new CategoryValidator());
dialogFragment.setTextSaveListener(this::createCategory);
}
}

31
android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
View File

@@ -6,19 +6,17 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RadioGroup;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.util.UiUtils;
public class ChooseBookmarksSortingTypeFragment extends BaseMwmDialogFragment
implements RadioGroup.OnCheckedChangeListener
public class ChooseBookmarksSortingTypeFragment
extends BaseMwmDialogFragment implements RadioGroup.OnCheckedChangeListener
{
private static final String EXTRA_SORTING_TYPES = "sorting_types";
private static final String EXTRA_CURRENT_SORT_TYPE = "current_sort_type";
@@ -32,17 +30,15 @@ public class ChooseBookmarksSortingTypeFragment extends BaseMwmDialogFragment
void onSort(@BookmarkManager.SortingType int sortingType);
}
public static void chooseSortingType(@NonNull @BookmarkManager.SortingType int[] availableTypes,
int currentType, @NonNull Context context,
@NonNull FragmentManager manager)
public static void chooseSortingType(@NonNull @BookmarkManager.SortingType int[] availableTypes, int currentType,
@NonNull Context context, @NonNull FragmentManager manager)
{
Bundle args = new Bundle();
args.putIntArray(EXTRA_SORTING_TYPES, availableTypes);
args.putInt(EXTRA_CURRENT_SORT_TYPE, currentType);
String name = ChooseBookmarksSortingTypeFragment.class.getName();
final ChooseBookmarksSortingTypeFragment fragment = (ChooseBookmarksSortingTypeFragment) manager
.getFragmentFactory()
.instantiate(context.getClassLoader(), name);
final ChooseBookmarksSortingTypeFragment fragment =
(ChooseBookmarksSortingTypeFragment) manager.getFragmentFactory().instantiate(context.getClassLoader(), name);
fragment.setArguments(args);
fragment.show(manager, name);
}
@@ -68,14 +64,10 @@ public class ChooseBookmarksSortingTypeFragment extends BaseMwmDialogFragment
{
switch (sortingType)
{
case BookmarkManager.SORT_BY_TYPE:
return R.id.sort_by_type;
case BookmarkManager.SORT_BY_DISTANCE:
return R.id.sort_by_distance;
case BookmarkManager.SORT_BY_TIME:
return R.id.sort_by_time;
case BookmarkManager.SORT_BY_NAME:
return R.id.sort_by_name;
case BookmarkManager.SORT_BY_TYPE: return R.id.sort_by_type;
case BookmarkManager.SORT_BY_DISTANCE: return R.id.sort_by_distance;
case BookmarkManager.SORT_BY_TIME: return R.id.sort_by_time;
case BookmarkManager.SORT_BY_NAME: return R.id.sort_by_name;
}
}
return R.id.sort_by_default;
@@ -117,8 +109,7 @@ public class ChooseBookmarksSortingTypeFragment extends BaseMwmDialogFragment
private void onAttachInternal()
{
mListener = (ChooseSortingTypeListener) (getParentFragment() == null ? getTargetFragment()
: getParentFragment());
mListener = (ChooseSortingTypeListener) (getParentFragment() == null ? getTargetFragment() : getParentFragment());
}
@Override

76
android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
View File

@@ -6,16 +6,10 @@ import android.location.Location;
import android.text.Spanned;
import android.text.TextUtils;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.PluralsRes;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textview.MaterialTextView;
import com.google.android.material.checkbox.MaterialCheckBox;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
@@ -24,11 +18,14 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.IconClickListener;
import app.organicmaps.sdk.bookmarks.data.Track;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.recycler.RecyclerClickListener;
import app.organicmaps.widget.recycler.RecyclerLongClickListener;
import app.organicmaps.util.Graphics;
import app.organicmaps.sdk.util.UiUtils;
import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textview.MaterialTextView;
public class Holders
{
@@ -66,7 +63,6 @@ public class Holders
@NonNull
private final MaterialTextView mText;
HeaderViewHolder(@NonNull View itemView)
{
super(itemView);
@@ -86,23 +82,16 @@ public class Holders
return mButton;
}
void setAction(@NonNull HeaderAction action,
final boolean showAll)
void setAction(@NonNull HeaderAction action, final boolean showAll)
{
mButton.setText(showAll
? R.string.bookmark_lists_show_all
: R.string.bookmark_lists_hide_all);
mButton.setText(showAll ? R.string.bookmark_lists_show_all : R.string.bookmark_lists_hide_all);
mButton.setOnClickListener(new ToggleShowAllClickListener(action, showAll));
}
void setAction(@NonNull HeaderActionChildCategories action,
final boolean showAll)
void setAction(@NonNull HeaderActionChildCategories action, final boolean showAll)
{
mButton.setText(showAll
? R.string.bookmark_lists_show_all
: R.string.bookmark_lists_hide_all);
mButton.setOnClickListener(new ToggleShowAllChildCategoryClickListener(
action, showAll));
mButton.setText(showAll ? R.string.bookmark_lists_show_all : R.string.bookmark_lists_hide_all);
mButton.setOnClickListener(new ToggleShowAllChildCategoryClickListener(action, showAll));
}
public interface HeaderAction
@@ -124,8 +113,7 @@ public class Holders
private final HeaderActionChildCategories mAction;
private final boolean mShowAll;
ToggleShowAllChildCategoryClickListener(@NonNull HeaderActionChildCategories action,
boolean showAll)
ToggleShowAllChildCategoryClickListener(@NonNull HeaderActionChildCategories action, boolean showAll)
{
mAction = action;
mShowAll = showAll;
@@ -223,7 +211,6 @@ public class Holders
{
return resources.getQuantityString(plural, size, size);
}
}
static class CollectionViewHolder extends CategoryViewHolderBase
{
@@ -354,17 +341,17 @@ public class Holders
}
@Override
void bind(@NonNull SectionPosition position,
@NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
void bind(@NonNull SectionPosition position, @NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
{
final long bookmarkId = sectionsDataSource.getBookmarkId(position);
BookmarkInfo bookmark = new BookmarkInfo(sectionsDataSource.getCategory().getId(),
bookmarkId);
BookmarkInfo bookmark = new BookmarkInfo(sectionsDataSource.getCategory().getId(), bookmarkId);
mName.setText(bookmark.getName());
final Location loc = MwmApplication.from(mIcon.getContext()).getLocationHelper().getSavedLocation();
String distanceValue = loc == null ? "" : bookmark.getDistance(loc.getLatitude(),
loc.getLongitude(), 0.0).toString(mDistance.getContext());
String distanceValue =
loc == null
? ""
: bookmark.getDistance(loc.getLatitude(), loc.getLongitude(), 0.0).toString(mDistance.getContext());
String separator = "";
if (!distanceValue.isEmpty() && !bookmark.getFeatureType().isEmpty())
separator = " • ";
@@ -373,11 +360,9 @@ public class Holders
UiUtils.hideIf(TextUtils.isEmpty(subtitleValue), mDistance);
mIcon.setImageResource(bookmark.getIcon().getResId());
Drawable circle = Graphics.drawCircleAndImage(bookmark.getIcon().argb(),
R.dimen.track_circle_size,
bookmark.getIcon().getResId(),
R.dimen.bookmark_icon_size,
mIcon.getContext());
Drawable circle =
Graphics.drawCircleAndImage(bookmark.getIcon().argb(), R.dimen.track_circle_size,
bookmark.getIcon().getResId(), R.dimen.bookmark_icon_size, mIcon.getContext());
mIcon.setImageDrawable(circle);
}
}
@@ -402,19 +387,18 @@ public class Holders
}
@Override
void bind(@NonNull SectionPosition position,
@NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
void bind(@NonNull SectionPosition position, @NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
{
final long trackId = sectionsDataSource.getTrackId(position);
Track track = BookmarkManager.INSTANCE.getTrack(trackId);
mName.setText(track.getName());
mDistance.setText(new StringBuilder().append(mDistance.getContext()
.getString(R.string.length))
mDistance.setText(new StringBuilder()
.append(mDistance.getContext().getString(R.string.length))
.append(" ")
.append(track.getLength().toString(mDistance.getContext()))
.toString());
Drawable circle = Graphics.drawCircle(track.getColor(), R.dimen.track_circle_size,
mIcon.getContext().getResources());
Drawable circle =
Graphics.drawCircle(track.getColor(), R.dimen.track_circle_size, mIcon.getContext().getResources());
mIcon.setImageDrawable(circle);
}
@@ -441,8 +425,7 @@ public class Holders
}
@Override
void bind(@NonNull SectionPosition position,
@NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
void bind(@NonNull SectionPosition position, @NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
{
mView.setText(sectionsDataSource.getTitle(position.getSectionIndex(), mView.getResources()));
}
@@ -465,8 +448,7 @@ public class Holders
}
@Override
void bind(@NonNull SectionPosition position,
@NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
void bind(@NonNull SectionPosition position, @NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
{
mTitle.setText(sectionsDataSource.getCategory().getName());
bindDescription(sectionsDataSource.getCategory());
@@ -474,9 +456,7 @@ public class Holders
private void bindDescription(@NonNull BookmarkCategory category)
{
String desc = TextUtils.isEmpty(category.getAnnotation())
? category.getDescription()
: category.getAnnotation();
String desc = TextUtils.isEmpty(category.getAnnotation()) ? category.getDescription() : category.getAnnotation();
String formattedDesc = desc.replace("\n", "<br>");
Spanned spannedDesc = Utils.fromHtml(formattedDesc);

18
android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java
View File

@@ -6,13 +6,10 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import com.google.android.material.imageview.ShapeableImageView;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.Icon;
import app.organicmaps.util.Graphics;
import com.google.android.material.imageview.ShapeableImageView;
import java.util.List;
public class IconsAdapter extends ArrayAdapter<Icon>
@@ -43,18 +40,13 @@ public class IconsAdapter extends ArrayAdapter<Icon>
Drawable circle;
if (icon.getColor() == mCheckedIconColor)
{
circle = Graphics.drawCircleAndImage(getItem(position).argb(),
R.dimen.track_circle_size,
R.drawable.ic_bookmark_none,
R.dimen.bookmark_icon_size,
getContext());
circle = Graphics.drawCircleAndImage(getItem(position).argb(), R.dimen.track_circle_size,
R.drawable.ic_bookmark_none, R.dimen.bookmark_icon_size, getContext());
}
else
{
circle = Graphics.drawCircle(getItem(position).argb(),
R.dimen.select_color_circle_size,
getContext().getResources());
circle =
Graphics.drawCircle(getItem(position).argb(), R.dimen.select_color_circle_size, getContext().getResources());
}
holder.icon.setImageDrawable(circle);
return convertView;

1
android/app/src/main/java/app/organicmaps/bookmarks/OnItemLongClickListener.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.bookmarks;
import android.view.View;
import androidx.annotation.NonNull;
public interface OnItemLongClickListener<T>

1
android/app/src/main/java/app/organicmaps/bookmarks/OnItemMoreClickListener.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.bookmarks;
import android.view.View;
import androidx.annotation.NonNull;
public interface OnItemMoreClickListener<T>

11
android/app/src/main/java/app/organicmaps/bookmarks/OperationStatus.java
View File

@@ -2,10 +2,8 @@ package app.organicmaps.bookmarks;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.Nullable;
import androidx.core.os.ParcelCompat;
import app.organicmaps.sdk.bookmarks.data.Error;
import app.organicmaps.sdk.bookmarks.data.Result;
@@ -28,8 +26,7 @@ public class OperationStatus implements Parcelable
mError = ParcelCompat.readParcelable(in, Error.class.getClassLoader(), Error.class);
}
public static final Creator<OperationStatus> CREATOR = new Creator<>()
{
public static final Creator<OperationStatus> CREATOR = new Creator<>() {
@Override
public OperationStatus createFromParcel(Parcel in)
{
@@ -59,9 +56,7 @@ public class OperationStatus implements Parcelable
@Override
public String toString()
{
return "OperationStatus{" +
"mResult=" + mResult +
", mError=" + mError +
'}';
return "OperationStatus{"
+ "mResult=" + mResult + ", mError=" + mError + '}';
}
}

8
android/app/src/main/java/app/organicmaps/car/CarAppService.java
View File

@@ -3,7 +3,6 @@ package app.organicmaps.car;
import android.content.ComponentName;
import android.content.Intent;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
@@ -15,7 +14,6 @@ import androidx.car.app.validation.HostValidator;
import androidx.core.app.NotificationChannelCompat;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import app.organicmaps.BuildConfig;
import app.organicmaps.R;
import app.organicmaps.api.Const;
@@ -66,7 +64,8 @@ public final class CarAppService extends androidx.car.app.CarAppService
final Intent intent = new Intent(Intent.ACTION_VIEW)
.setComponent(new ComponentName(context, CarAppService.class))
.setData(Uri.fromParts(Const.API_SCHEME, CarAppService.API_CAR_HOST, CarAppService.ACTION_SHOW_NAVIGATION_SCREEN));
.setData(Uri.fromParts(Const.API_SCHEME, CarAppService.API_CAR_HOST,
CarAppService.ACTION_SHOW_NAVIGATION_SCREEN));
mCarNotificationExtender = new CarAppExtender.Builder()
.setImportance(NotificationManagerCompat.IMPORTANCE_MIN)
.setContentIntent(CarPendingIntent.getCarApp(context, intent.hashCode(), intent, 0))
@@ -79,7 +78,8 @@ public final class CarAppService extends androidx.car.app.CarAppService
{
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
final NotificationChannelCompat notificationChannel =
new NotificationChannelCompat.Builder(ANDROID_AUTO_NOTIFICATION_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_MIN)
new NotificationChannelCompat
.Builder(ANDROID_AUTO_NOTIFICATION_CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_MIN)
.setName(getString(R.string.car_notification_channel_name))
.setLightsEnabled(false) // less annoying
.setVibrationEnabled(false) // less annoying

29
android/app/src/main/java/app/organicmaps/car/CarAppSession.java
View File

@@ -2,7 +2,6 @@ package app.organicmaps.car;
import android.content.Intent;
import android.content.res.Configuration;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.Screen;
@@ -11,11 +10,8 @@ import androidx.car.app.Session;
import androidx.car.app.SessionInfo;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.sdk.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.car.screens.ErrorScreen;
import app.organicmaps.car.screens.MapPlaceholderScreen;
import app.organicmaps.car.screens.MapScreen;
@@ -30,23 +26,24 @@ import app.organicmaps.car.util.CurrentCountryChangedListener;
import app.organicmaps.car.util.IntentUtils;
import app.organicmaps.car.util.ThemeUtils;
import app.organicmaps.car.util.UserActionRequired;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.PlacePageActivationListener;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.display.DisplayChangedListener;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.PlacePageActivationListener;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.sdk.widget.placepage.PlacePageData;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public final class CarAppSession extends Session implements DefaultLifecycleObserver,
LocationState.ModeChangeListener, DisplayChangedListener, PlacePageActivationListener
public final class CarAppSession extends Session implements DefaultLifecycleObserver, LocationState.ModeChangeListener,
DisplayChangedListener, PlacePageActivationListener
{
private static final String TAG = CarAppSession.class.getSimpleName();
@@ -167,9 +164,12 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
MwmApplication.from(getCarContext()).initOrganicMaps(() -> {
Config.setFirstStartDialogSeen(getCarContext());
if (DownloaderHelpers.isWorldMapsDownloadNeeded())
mScreenManager.push(new DownloadMapsScreenBuilder(getCarContext()).setDownloaderType(DownloadMapsScreenBuilder.DownloaderType.FirstLaunch).build());
mScreenManager.push(new DownloadMapsScreenBuilder(getCarContext())
.setDownloaderType(DownloadMapsScreenBuilder.DownloaderType.FirstLaunch)
.build());
});
} catch (IOException e)
}
catch (IOException e)
{
mInitFailed = true;
Logger.e(TAG, "Failed to initialize the app.");
@@ -254,7 +254,8 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
Framework.nativeDeactivatePopup();
return;
}
final PlaceScreen placeScreen = new PlaceScreen.Builder(getCarContext(), mSurfaceRenderer).setMapObject(mapObject).build();
final PlaceScreen placeScreen =
new PlaceScreen.Builder(getCarContext(), mSurfaceRenderer).setMapObject(mapObject).build();
mScreenManager.popToRoot();
mScreenManager.push(placeScreen);
}
@@ -282,7 +283,9 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
final RoutingController routingController = RoutingController.get();
if (routingController.isPlanning() || routingController.isNavigating() || routingController.hasSavedRoute())
{
final PlaceScreen placeScreen = new PlaceScreen.Builder(getCarContext(), mSurfaceRenderer).setMapObject(routingController.getEndPoint()).build();
final PlaceScreen placeScreen = new PlaceScreen.Builder(getCarContext(), mSurfaceRenderer)
.setMapObject(routingController.getEndPoint())
.build();
mScreenManager.popToRoot();
mScreenManager.push(placeScreen);
}

11
android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
View File

@@ -4,7 +4,6 @@ import static app.organicmaps.sdk.display.DisplayType.Car;
import android.graphics.Rect;
import android.view.Surface;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.AppManager;
@@ -15,11 +14,10 @@ import androidx.car.app.SurfaceContainer;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.MapRenderingListener;
import app.organicmaps.R;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.settings.UnitLocale;
import app.organicmaps.sdk.util.concurrency.UiThread;
@@ -58,12 +56,9 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
mSurface.release();
mSurface = surfaceContainer.getSurface();
mMap.onSurfaceCreated(
mCarContext,
mSurface,
mMap.onSurfaceCreated(mCarContext, mSurface,
new Rect(0, 0, surfaceContainer.getWidth(), surfaceContainer.getHeight()),
surfaceContainer.getDpi()
);
surfaceContainer.getDpi());
mMap.updateBottomWidgetsOffset(mCarContext, -1, -1);
}

17
android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java
View File

@@ -14,22 +14,18 @@ import androidx.car.app.model.ItemList;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.screens.search.SearchOnMapScreen;
import app.organicmaps.car.util.ThemeUtils;
import app.organicmaps.car.util.UiHelpers;
import java.util.Arrays;
import java.util.List;
public class CategoriesScreen extends BaseMapScreen
{
private record CategoryData(@StringRes int nameResId, @DrawableRes int iconResId, @DrawableRes int iconNightResId)
{
}
private record CategoryData(@StringRes int nameResId, @DrawableRes int iconResId, @DrawableRes int iconNightResId) {}
private static final List<CategoryData> CATEGORIES = Arrays.asList(
new CategoryData(R.string.category_fuel, R.drawable.ic_category_fuel, R.drawable.ic_category_fuel_night),
@@ -38,8 +34,7 @@ public class CategoriesScreen extends BaseMapScreen
new CategoryData(R.string.category_food, R.drawable.ic_category_food, R.drawable.ic_category_food_night),
new CategoryData(R.string.category_hotel, R.drawable.ic_category_hotel, R.drawable.ic_category_hotel_night),
new CategoryData(R.string.category_toilet, R.drawable.ic_category_toilet, R.drawable.ic_category_toilet_night),
new CategoryData(R.string.category_rv, R.drawable.ic_category_rv, R.drawable.ic_category_rv_night)
);
new CategoryData(R.string.category_rv, R.drawable.ic_category_rv, R.drawable.ic_category_rv_night));
private final int MAX_CATEGORIES_SIZE;
@@ -79,11 +74,15 @@ public class CategoriesScreen extends BaseMapScreen
{
final GridItem.Builder itemBuilder = new GridItem.Builder();
final String title = getCarContext().getString(CATEGORIES.get(i).nameResId);
@DrawableRes final int iconResId = isNightMode ? CATEGORIES.get(i).iconNightResId : CATEGORIES.get(i).iconResId;
@DrawableRes
final int iconResId = isNightMode ? CATEGORIES.get(i).iconNightResId : CATEGORIES.get(i).iconResId;
itemBuilder.setTitle(title);
itemBuilder.setImage(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), iconResId)).build());
itemBuilder.setOnClickListener(() -> getScreenManager().push(new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer()).setCategory(title).build()));
itemBuilder.setOnClickListener(
()
-> getScreenManager().push(
new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer()).setCategory(title).build()));
builder.addItem(itemBuilder.build());
}
return new GridTemplate.Builder().setHeader(createHeader()).setSingleList(builder.build()).build();

9
android/app/src/main/java/app/organicmaps/car/screens/ErrorScreen.java
View File

@@ -8,7 +8,6 @@ import androidx.car.app.model.Action;
import androidx.car.app.model.Header;
import androidx.car.app.model.MessageTemplate;
import androidx.car.app.model.Template;
import app.organicmaps.R;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.car.util.Colors;
@@ -58,15 +57,15 @@ public class ErrorScreen extends BaseScreen implements UserActionRequired
builder.addAction(new Action.Builder()
.setBackgroundColor(Colors.BUTTON_ACCEPT)
.setTitle(getCarContext().getString(mPositiveButtonText))
.setOnClickListener(this::onPositiveButton).build()
);
.setOnClickListener(this::onPositiveButton)
.build());
}
if (mNegativeButtonText != -1)
{
builder.addAction(new Action.Builder()
.setTitle(getCarContext().getString(mNegativeButtonText))
.setOnClickListener(this::onNegativeButton).build()
);
.setOnClickListener(this::onNegativeButton)
.build());
}
return builder.build();

4
android/app/src/main/java/app/organicmaps/car/screens/FreeDriveScreen.java
View File

@@ -8,7 +8,6 @@ import androidx.car.app.model.CarIcon;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.NavigationTemplate;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
@@ -36,7 +35,8 @@ public class FreeDriveScreen extends BaseMapScreen
private ActionStrip createActionStrip()
{
final Action.Builder finishActionBuilder = new Action.Builder();
finishActionBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_close)).build());
finishActionBuilder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_close)).build());
finishActionBuilder.setOnClickListener(this::finish);
final ActionStrip.Builder builder = new ActionStrip.Builder();

13
android/app/src/main/java/app/organicmaps/car/screens/MapPlaceholderScreen.java
View File

@@ -8,7 +8,6 @@ import androidx.car.app.model.Header;
import androidx.car.app.model.MessageTemplate;
import androidx.car.app.model.Template;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.sdk.display.DisplayManager;
@@ -25,15 +24,19 @@ public class MapPlaceholderScreen extends BaseScreen
@Override
public Template onGetTemplate()
{
final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.car_used_on_the_phone_screen));
final MessageTemplate.Builder builder =
new MessageTemplate.Builder(getCarContext().getString(R.string.car_used_on_the_phone_screen));
final Header.Builder headerBuilder = new Header.Builder();
headerBuilder.setStartHeaderAction(Action.APP_ICON);
headerBuilder.setTitle(getCarContext().getString(R.string.app_name));
builder.setHeader(headerBuilder.build());
builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_phone_android)).build());
builder.addAction(new Action.Builder().setTitle(getCarContext().getString(R.string.car_continue_in_the_car))
.setOnClickListener(() -> DisplayManager.from(getCarContext()).changeDisplay(DisplayType.Car)).build());
builder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_phone_android)).build());
builder.addAction(new Action.Builder()
.setTitle(getCarContext().getString(R.string.car_continue_in_the_car))
.setOnClickListener(() -> DisplayManager.from(getCarContext()).changeDisplay(DisplayType.Car))
.build());
return builder.build();
}

19
android/app/src/main/java/app/organicmaps/car/screens/MapScreen.java
View File

@@ -13,7 +13,6 @@ import androidx.car.app.model.ItemList;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
@@ -56,8 +55,10 @@ public class MapScreen extends BaseMapScreen
private ActionStrip createActionStrip()
{
final Action.Builder freeDriveScreenBuilder = new Action.Builder();
freeDriveScreenBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_steering_wheel)).build());
freeDriveScreenBuilder.setOnClickListener(() -> getScreenManager().push(new FreeDriveScreen(getCarContext(), getSurfaceRenderer())));
freeDriveScreenBuilder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_steering_wheel)).build());
freeDriveScreenBuilder.setOnClickListener(
() -> getScreenManager().push(new FreeDriveScreen(getCarContext(), getSurfaceRenderer())));
final ActionStrip.Builder builder = new ActionStrip.Builder();
builder.addAction(freeDriveScreenBuilder.build());
@@ -83,7 +84,8 @@ public class MapScreen extends BaseMapScreen
@NonNull
private Item createSearchItem()
{
final CarIcon iconSearch = new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search)).build();
final CarIcon iconSearch =
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search)).build();
final GridItem.Builder builder = new GridItem.Builder();
builder.setTitle(getCarContext().getString(R.string.search));
@@ -95,7 +97,8 @@ public class MapScreen extends BaseMapScreen
@NonNull
private Item createCategoriesItem()
{
final CarIcon iconCategories = new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_address)).build();
final CarIcon iconCategories =
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_address)).build();
final GridItem.Builder builder = new GridItem.Builder();
builder.setImage(iconCategories);
@@ -107,7 +110,8 @@ public class MapScreen extends BaseMapScreen
@NonNull
private Item createBookmarksItem()
{
final CarIcon iconBookmarks = new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_bookmarks)).build();
final CarIcon iconBookmarks =
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_bookmarks)).build();
final GridItem.Builder builder = new GridItem.Builder();
builder.setImage(iconBookmarks);
@@ -119,7 +123,8 @@ public class MapScreen extends BaseMapScreen
@NonNull
private Item createSettingsItem()
{
final CarIcon iconSettings = new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_settings)).build();
final CarIcon iconSettings =
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_settings)).build();
final GridItem.Builder builder = new GridItem.Builder();
builder.setImage(iconSettings);

26
android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
View File

@@ -17,8 +17,6 @@ import androidx.car.app.navigation.model.TravelEstimate;
import androidx.car.app.navigation.model.Trip;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.sdk.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.car.CarAppService;
@@ -29,16 +27,16 @@ import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.RoutingUtils;
import app.organicmaps.car.util.ThemeUtils;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.routing.JunctionInfo;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.routing.RoutingInfo;
import app.organicmaps.sdk.sound.TtsPlayer;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.log.Logger;
import java.util.List;
import java.util.Objects;
@@ -75,7 +73,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
public Template onGetTemplate()
{
final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
builder.setBackgroundColor(ThemeUtils.isNightMode(getCarContext()) ? Colors.NAVIGATION_TEMPLATE_BACKGROUND_NIGHT : Colors.NAVIGATION_TEMPLATE_BACKGROUND_DAY);
builder.setBackgroundColor(ThemeUtils.isNightMode(getCarContext()) ? Colors.NAVIGATION_TEMPLATE_BACKGROUND_NIGHT
: Colors.NAVIGATION_TEMPLATE_BACKGROUND_DAY);
builder.setActionStrip(createActionStrip());
builder.setMapActionStrip(UiHelpers.createMapActionStrip(getCarContext(), getSurfaceRenderer()));
@@ -121,7 +120,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
public void onNavigationCancelled()
{
if (!mNavigationCancelled)
CarToast.makeText(getCarContext(), getCarContext().getString(R.string.trip_finished), CarToast.LENGTH_LONG).show();
CarToast.makeText(getCarContext(), getCarContext().getString(R.string.trip_finished), CarToast.LENGTH_LONG)
.show();
finish();
getScreenManager().popToRoot();
}
@@ -137,7 +137,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
MwmApplication.from(getCarContext()).getLocationHelper().addListener(mLocationListener);
if (LocationUtils.checkFineLocationPermission(getCarContext()))
NavigationService.startForegroundService(getCarContext(), CarAppService.getCarNotificationExtender(getCarContext()));
NavigationService.startForegroundService(getCarContext(),
CarAppService.getCarNotificationExtender(getCarContext()));
updateTrip();
}
@@ -166,7 +167,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
private ActionStrip createActionStrip()
{
final Action.Builder stopActionBuilder = new Action.Builder();
stopActionBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_close)).build());
stopActionBuilder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_close)).build());
stopActionBuilder.setOnClickListener(() -> {
mNavigationCancelled = true;
mRoutingController.cancel();
@@ -195,7 +197,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
@NonNull
private NavigationTemplate.NavigationInfo getNavigationInfo()
{
final androidx.car.app.navigation.model.RoutingInfo.Builder builder = new androidx.car.app.navigation.model.RoutingInfo.Builder();
final androidx.car.app.navigation.model.RoutingInfo.Builder builder =
new androidx.car.app.navigation.model.RoutingInfo.Builder();
if (mTrip.isLoading())
{
@@ -228,7 +231,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
private Action createTtsAction()
{
final Action.Builder ttsActionBuilder = new Action.Builder();
@DrawableRes final int imgRes = TtsPlayer.isEnabled() ? R.drawable.ic_voice_on : R.drawable.ic_voice_off;
@DrawableRes
final int imgRes = TtsPlayer.isEnabled() ? R.drawable.ic_voice_on : R.drawable.ic_voice_off;
ttsActionBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), imgRes)).build());
ttsActionBuilder.setOnClickListener(() -> {
TtsPlayer.setEnabled(!TtsPlayer.isEnabled());

40
android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java
View File

@@ -7,7 +7,6 @@ import android.content.Intent;
import android.net.Uri;
import android.text.SpannableString;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
@@ -25,12 +24,8 @@ import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.sdk.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder;
@@ -41,10 +36,12 @@ import app.organicmaps.car.util.RoutingHelpers;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.routing.ResultCodesHelper;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.routing.RoutingInfo;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Router;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.sdk.routing.RoutingInfo;
import app.organicmaps.sdk.util.Config;
import java.util.Objects;
public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.Callback, RoutingController.Container
@@ -95,7 +92,8 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
mRoutingController.restoreRoute();
else
{
final boolean hasIncorrectEndPoint = mRoutingController.isPlanning() && (!MapObject.same(mMapObject, mRoutingController.getEndPoint()));
final boolean hasIncorrectEndPoint =
mRoutingController.isPlanning() && (!MapObject.same(mMapObject, mRoutingController.getEndPoint()));
final boolean hasIncorrectRouterType = mRoutingController.getLastRouterType() != ROUTER;
final boolean isNotPlanningMode = !mRoutingController.isPlanning();
if (hasIncorrectRouterType)
@@ -105,7 +103,8 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
}
else if (hasIncorrectEndPoint || isNotPlanningMode)
{
mRoutingController.prepare(MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition(), mMapObject);
mRoutingController.prepare(MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition(),
mMapObject);
}
}
}
@@ -159,7 +158,8 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
if (routingInfo != null)
builder.addRow(getPlaceRouteInfo(routingInfo));
final Row placeOpeningHours = UiHelpers.getPlaceOpeningHoursRow(Objects.requireNonNull(mMapObject), getCarContext());
final Row placeOpeningHours =
UiHelpers.getPlaceOpeningHoursRow(Objects.requireNonNull(mMapObject), getCarContext());
if (placeOpeningHours != null)
builder.addRow(placeOpeningHours);
@@ -195,7 +195,8 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
builder.setTitle(time);
final SpannableString distance = new SpannableString(" ");
distance.setSpan(DistanceSpan.create(RoutingHelpers.createDistance(routingInfo.distToTarget)), 0, 1, SPAN_INCLUSIVE_INCLUSIVE);
distance.setSpan(DistanceSpan.create(RoutingHelpers.createDistance(routingInfo.distToTarget)), 0, 1,
SPAN_INCLUSIVE_INCLUSIVE);
distance.setSpan(ForegroundCarColorSpan.create(Colors.DISTANCE), 0, 1, SPAN_EXCLUSIVE_EXCLUSIVE);
builder.addText(distance);
@@ -211,8 +212,10 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
{
final String phoneNumber = phones.split(";", 1)[0];
final Action.Builder openDialBuilder = new Action.Builder();
openDialBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_phone)).build());
openDialBuilder.setOnClickListener(() -> getCarContext().startCarApp(new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + phoneNumber))));
openDialBuilder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_phone)).build());
openDialBuilder.setOnClickListener(
() -> getCarContext().startCarApp(new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + phoneNumber))));
builder.addAction(openDialBuilder.build());
}
@@ -224,7 +227,8 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
startRouteBuilder.setBackgroundColor(Colors.START_NAVIGATION);
startRouteBuilder.setFlags(Action.FLAG_DEFAULT);
startRouteBuilder.setTitle(getCarContext().getString(R.string.p2p_start));
startRouteBuilder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_follow_and_rotate)).build());
startRouteBuilder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_follow_and_rotate)).build());
startRouteBuilder.setOnClickListener(() -> {
Config.acceptRoutingDisclaimer();
mRoutingController.start();
@@ -238,7 +242,10 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
{
return new Action.Builder()
.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_settings)).build())
.setOnClickListener(() -> getScreenManager().pushForResult(new DrivingOptionsScreen(getCarContext(), getSurfaceRenderer()), this::onDrivingOptionsResult))
.setOnClickListener(
()
-> getScreenManager().pushForResult(new DrivingOptionsScreen(getCarContext(), getSurfaceRenderer()),
this::onDrivingOptionsResult))
.build();
}
@@ -310,8 +317,7 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
else
mRoutingController.checkAndBuildRoute();
invalidate();
}
);
});
else
{
CarToast.makeText(getCarContext(), R.string.unable_to_calc_alert_title, CarToast.LENGTH_LONG).show();

1
android/app/src/main/java/app/organicmaps/car/screens/base/BaseMapScreen.java
View File

@@ -2,7 +2,6 @@ package app.organicmaps.car.screens.base;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
import app.organicmaps.car.SurfaceRenderer;
public abstract class BaseMapScreen extends BaseScreen

9
android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarkCategoriesScreen.java
View File

@@ -10,14 +10,12 @@ import androidx.car.app.model.ListTemplate;
import androidx.car.app.model.Row;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import java.util.ArrayList;
import java.util.List;
@@ -65,7 +63,8 @@ public class BookmarkCategoriesScreen extends BaseMapScreen
Row.Builder itemBuilder = new Row.Builder();
itemBuilder.setTitle(bookmarkCategory.getName());
itemBuilder.addText(bookmarkCategory.getDescription());
itemBuilder.setOnClickListener(() -> getScreenManager().push(new BookmarksScreen(getCarContext(), getSurfaceRenderer(), bookmarkCategory)));
itemBuilder.setOnClickListener(
() -> getScreenManager().push(new BookmarksScreen(getCarContext(), getSurfaceRenderer(), bookmarkCategory)));
itemBuilder.setBrowsable(true);
builder.addItem(itemBuilder.build());
}

28
android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksLoader.java
View File

@@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable;
import android.location.Location;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
@@ -15,21 +14,19 @@ import androidx.car.app.model.ForegroundCarColorSpan;
import androidx.car.app.model.ItemList;
import androidx.car.app.model.Row;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.RoutingHelpers;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.Icon;
import app.organicmaps.sdk.bookmarks.data.SortedBlock;
import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.RoutingHelpers;
import app.organicmaps.sdk.util.Distance;
import app.organicmaps.util.Graphics;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.util.Graphics;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -63,7 +60,8 @@ class BookmarksLoader implements BookmarkManager.BookmarksSortingListener
private final long mBookmarkCategoryId;
private final int mBookmarksListSize;
public BookmarksLoader(@NonNull CarContext carContext, @NonNull BookmarkCategory bookmarkCategory, @NonNull OnBookmarksLoaded onBookmarksLoaded)
public BookmarksLoader(@NonNull CarContext carContext, @NonNull BookmarkCategory bookmarkCategory,
@NonNull OnBookmarksLoaded onBookmarksLoaded)
{
final ConstraintManager constraintManager = carContext.getCarService(ConstraintManager.class);
final int maxCategoriesSize = constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST);
@@ -71,7 +69,8 @@ class BookmarksLoader implements BookmarkManager.BookmarksSortingListener
mCarContext = carContext;
mOnBookmarksLoaded = onBookmarksLoaded;
mBookmarkCategoryId = bookmarkCategory.getId();
mBookmarksListSize = Math.min(bookmarkCategory.getBookmarksCount(), Math.min(maxCategoriesSize, MAX_BOOKMARKS_SIZE));
mBookmarksListSize =
Math.min(bookmarkCategory.getBookmarksCount(), Math.min(maxCategoriesSize, MAX_BOOKMARKS_SIZE));
}
public void load()
@@ -161,12 +160,10 @@ class BookmarksLoader implements BookmarkManager.BookmarksSortingListener
final Icon icon = bookmarkInfo.getIcon();
if (!iconsCache.containsKey(icon))
{
final Drawable drawable = Graphics.drawCircleAndImage(icon.argb(),
R.dimen.track_circle_size,
icon.getResId(),
R.dimen.bookmark_icon_size,
mCarContext);
final CarIcon carIcon = new CarIcon.Builder(IconCompat.createWithBitmap(Graphics.drawableToBitmap(drawable))).build();
final Drawable drawable = Graphics.drawCircleAndImage(icon.argb(), R.dimen.track_circle_size, icon.getResId(),
R.dimen.bookmark_icon_size, mCarContext);
final CarIcon carIcon =
new CarIcon.Builder(IconCompat.createWithBitmap(Graphics.drawableToBitmap(drawable))).build();
iconsCache.put(icon, carIcon);
}
itemBuilder.setImage(Objects.requireNonNull(iconsCache.get(icon)));
@@ -184,7 +181,8 @@ class BookmarksLoader implements BookmarkManager.BookmarksSortingListener
{
result.append(" ");
final Distance distance = bookmark.getDistance(location.getLatitude(), location.getLongitude(), 0.0);
result.setSpan(DistanceSpan.create(RoutingHelpers.createDistance(distance)), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
result.setSpan(DistanceSpan.create(RoutingHelpers.createDistance(distance)), 0, 1,
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
result.setSpan(ForegroundCarColorSpan.create(Colors.DISTANCE), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
}

9
android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java
View File

@@ -12,12 +12,11 @@ import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
public class BookmarksScreen extends BaseMapScreen
{
@@ -32,7 +31,8 @@ public class BookmarksScreen extends BaseMapScreen
private boolean mIsOnSortingScreen = false;
public BookmarksScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer, @NonNull BookmarkCategory bookmarkCategory)
public BookmarksScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer,
@NonNull BookmarkCategory bookmarkCategory)
{
super(carContext, surfaceRenderer);
mBookmarkCategory = bookmarkCategory;
@@ -90,7 +90,8 @@ public class BookmarksScreen extends BaseMapScreen
builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_sort)).build());
builder.setOnClickListener(() -> {
mIsOnSortingScreen = true;
getScreenManager().pushForResult(new SortingScreen(getCarContext(), getSurfaceRenderer(), mBookmarkCategory), this::onSortingResult);
getScreenManager().pushForResult(new SortingScreen(getCarContext(), getSurfaceRenderer(), mBookmarkCategory),
this::onSortingResult);
});
return builder.build();
}

25
android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.car.screens.bookmarks;
import android.location.Location;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.car.app.CarContext;
@@ -15,15 +14,13 @@ import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import java.util.Arrays;
import java.util.stream.IntStream;
@@ -41,11 +38,14 @@ class SortingScreen extends BaseMapScreen
private @BookmarkManager.SortingType int mNewSortingType;
public SortingScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer, @NonNull BookmarkCategory bookmarkCategory)
public SortingScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer,
@NonNull BookmarkCategory bookmarkCategory)
{
super(carContext, surfaceRenderer);
mRadioButtonIcon = new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_unchecked)).build();
mRadioButtonSelectedIcon = new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_checked)).build();
mRadioButtonIcon =
new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_unchecked)).build();
mRadioButtonSelectedIcon =
new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_checked)).build();
mBookmarkCategoryId = bookmarkCategory.getId();
mLastSortingType = mNewSortingType = getLastSortingType();
@@ -90,10 +90,12 @@ class SortingScreen extends BaseMapScreen
}
@NonNull
private ItemList createSortingTypesList(@NonNull final @BookmarkManager.SortingType int[] availableSortingTypes, final int lastSortingType)
private ItemList createSortingTypesList(@NonNull final @BookmarkManager.SortingType int[] availableSortingTypes,
final int lastSortingType)
{
final ItemList.Builder builder = new ItemList.Builder();
for (int type : IntStream.concat(IntStream.of(DEFAULT_SORTING_TYPE), Arrays.stream(availableSortingTypes)).toArray())
for (int type :
IntStream.concat(IntStream.of(DEFAULT_SORTING_TYPE), Arrays.stream(availableSortingTypes)).toArray())
{
final Row.Builder rowBuilder = new Row.Builder();
rowBuilder.setTitle(getCarContext().getString(sortingTypeToStringRes(type)));
@@ -148,7 +150,8 @@ class SortingScreen extends BaseMapScreen
private int getLastAvailableSortingType()
{
int currentType = getLastSortingType();
@BookmarkManager.SortingType int[] types = getAvailableSortingTypes();
@BookmarkManager.SortingType
int[] types = getAvailableSortingTypes();
for (@BookmarkManager.SortingType int type : types)
{
if (type == currentType)

5
android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java
View File

@@ -2,11 +2,9 @@ package app.organicmaps.car.screens.download;
import android.location.Location;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.car.app.model.Action;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.sdk.downloader.CountryItem;
@@ -25,7 +23,8 @@ class DownloadMapsForFirstLaunchScreen extends DownloadMapsScreen
@Override
public void onResume(@NonNull LifecycleOwner owner)
{
// Attempting to streamline initial download by including the current country in the list of missing maps for simultaneous retrieval.
// Attempting to streamline initial download by including the current country in the list of missing maps for
// simultaneous retrieval.
final Location location = MwmApplication.from(getCarContext()).getLocationHelper().getSavedLocation();
if (location == null)
return;

12
android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForRouteScreen.java
View File

@@ -2,10 +2,8 @@ package app.organicmaps.car.screens.download;
import androidx.annotation.NonNull;
import androidx.car.app.model.Action;
import app.organicmaps.R;
import app.organicmaps.routing.ResultCodesHelper;
import java.util.Objects;
class DownloadMapsForRouteScreen extends DownloadMapsScreen
@@ -17,8 +15,11 @@ class DownloadMapsForRouteScreen extends DownloadMapsScreen
{
super(builder);
mTitle = ResultCodesHelper.getDialogTitleSubtitle(builder.mCarContext, builder.mResultCode, Objects.requireNonNull(builder.mMissingMaps).length)
.getTitleMessage().first;
mTitle = ResultCodesHelper
.getDialogTitleSubtitle(builder.mCarContext, builder.mResultCode,
Objects.requireNonNull(builder.mMissingMaps).length)
.getTitleMessage()
.first;
}
@NonNull
@@ -35,7 +36,8 @@ class DownloadMapsForRouteScreen extends DownloadMapsScreen
final int mapsCount = getMissingMaps().size();
if (mapsCount == 1)
return DownloaderHelpers.getCountryName(getMissingMaps().get(0)) + "\n" + mapsSize;
return getCarContext().getString(R.string.downloader_status_maps) + " (" + getMissingMaps().size() + "): " + mapsSize;
return getCarContext().getString(R.string.downloader_status_maps) + " (" + getMissingMaps().size()
+ "): " + mapsSize;
}
@NonNull

1
android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForViewScreen.java
View File

@@ -2,7 +2,6 @@ package app.organicmaps.car.screens.download;
import androidx.annotation.NonNull;
import androidx.car.app.model.Action;
import app.organicmaps.R;
class DownloadMapsForViewScreen extends DownloadMapsScreen

5
android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java
View File

@@ -7,13 +7,11 @@ import androidx.car.app.model.Header;
import androidx.car.app.model.MessageTemplate;
import androidx.car.app.model.Template;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.car.util.Colors;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.util.StringUtils;
import java.util.List;
public abstract class DownloadMapsScreen extends BaseScreen
@@ -100,7 +98,8 @@ public abstract class DownloadMapsScreen extends BaseScreen
private void onDownload()
{
getScreenManager().pushForResult(new DownloaderScreen(getCarContext(), mMissingMaps, mIsCancelActionDisabled), result -> {
getScreenManager().pushForResult(new DownloaderScreen(getCarContext(), mMissingMaps, mIsCancelActionDisabled),
result -> {
setResult(result);
finish();
});

2
android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreenBuilder.java
View File

@@ -3,9 +3,7 @@ package app.organicmaps.car.screens.download;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
import app.organicmaps.routing.ResultCodesHelper;
import java.util.Objects;
public class DownloadMapsScreenBuilder

3
android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java
View File

@@ -1,13 +1,10 @@
package app.organicmaps.car.screens.download;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.BuildConfig;
import app.organicmaps.sdk.downloader.CountryItem;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

9
android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.car.screens.download;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
import androidx.car.app.constraints.ConstraintManager;
@@ -10,7 +9,6 @@ import androidx.car.app.model.Header;
import androidx.car.app.model.MessageTemplate;
import androidx.car.app.model.Template;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.car.screens.ErrorScreen;
import app.organicmaps.car.screens.base.BaseScreen;
@@ -18,7 +16,6 @@ import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.concurrency.UiThread;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,8 +33,7 @@ class DownloaderScreen extends BaseScreen
private boolean mIsDownloadFailed = false;
@NonNull
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback()
{
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback() {
@Override
public void onStatusChanged(@NonNull final List<MapManager.StorageCallbackData> data)
{
@@ -85,7 +81,8 @@ class DownloaderScreen extends BaseScreen
}
};
DownloaderScreen(@NonNull final CarContext carContext, @NonNull final List<CountryItem> missingMaps, final boolean isCancelActionDisabled)
DownloaderScreen(@NonNull final CarContext carContext, @NonNull final List<CountryItem> missingMaps,
final boolean isCancelActionDisabled)
{
super(carContext);
setMarker(DownloadMapsScreen.MARKER);

3
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java
View File

@@ -7,16 +7,13 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationManagerCompat;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.sdk.util.LocationUtils;
import java.util.Objects;
public class RequestPermissionsActivity extends BaseMwmFragmentActivity

6
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java
View File

@@ -4,12 +4,10 @@ import static android.Manifest.permission.POST_NOTIFICATIONS;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
import androidx.car.app.Screen;
import androidx.core.content.ContextCompat;
import app.organicmaps.sdk.util.log.Logger;
public class RequestPermissionsScreenBuilder
@@ -18,8 +16,8 @@ public class RequestPermissionsScreenBuilder
public static Screen build(@NonNull CarContext carContext, @NonNull Runnable permissionsGrantedCallback)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
ContextCompat.checkSelfPermission(carContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
&& ContextCompat.checkSelfPermission(carContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
{
Logger.w(TAG, "Permission POST_NOTIFICATIONS is not granted, using API-based permissions request");
return new RequestPermissionsScreenWithApi(carContext, permissionsGrantedCallback);

20
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java
View File

@@ -13,14 +13,12 @@ import androidx.car.app.model.ParkedOnlyOnClickListener;
import androidx.car.app.model.Template;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.car.screens.ErrorScreen;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.UserActionRequired;
import app.organicmaps.sdk.util.LocationUtils;
import java.util.Arrays;
import java.util.List;
@@ -41,11 +39,14 @@ public class RequestPermissionsScreenWithApi extends BaseScreen implements UserA
@Override
public Template onGetTemplate()
{
final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.aa_request_permission_activity_text));
final Action grantPermissions = new Action.Builder()
final MessageTemplate.Builder builder =
new MessageTemplate.Builder(getCarContext().getString(R.string.aa_request_permission_activity_text));
final Action grantPermissions =
new Action.Builder()
.setTitle(getCarContext().getString(R.string.aa_grant_permissions))
.setBackgroundColor(Colors.BUTTON_ACCEPT)
.setOnClickListener(ParkedOnlyOnClickListener.create(() -> getCarContext().requestPermissions(LOCATION_PERMISSIONS, this::onRequestPermissionsResult)))
.setOnClickListener(ParkedOnlyOnClickListener.create(
() -> getCarContext().requestPermissions(LOCATION_PERMISSIONS, this::onRequestPermissionsResult)))
.build();
final Header.Builder headerBuilder = new Header.Builder();
@@ -53,7 +54,8 @@ public class RequestPermissionsScreenWithApi extends BaseScreen implements UserA
headerBuilder.setTitle(getCarContext().getString(R.string.app_name));
builder.setHeader(headerBuilder.build());
builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_location_off)).build());
builder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_location_off)).build());
builder.addAction(grantPermissions);
return builder.build();
}
@@ -70,15 +72,15 @@ public class RequestPermissionsScreenWithApi extends BaseScreen implements UserA
}
}
private void onRequestPermissionsResult(@NonNull List<String> grantedPermissions, @NonNull List<String> rejectedPermissions)
private void onRequestPermissionsResult(@NonNull List<String> grantedPermissions,
@NonNull List<String> rejectedPermissions)
{
if (grantedPermissions.isEmpty())
{
getScreenManager().push(new ErrorScreen.Builder(getCarContext())
.setErrorMessage(R.string.location_is_disabled_long_text)
.setNegativeButton(R.string.close, null)
.build()
);
.build());
return;
}

15
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java
View File

@@ -5,7 +5,6 @@ import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Intent;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresPermission;
import androidx.car.app.CarContext;
@@ -19,7 +18,6 @@ import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.car.CarAppService;
import app.organicmaps.car.screens.base.BaseScreen;
@@ -27,7 +25,6 @@ import app.organicmaps.car.util.UserActionRequired;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import java.util.concurrent.ExecutorService;
public class RequestPermissionsScreenWithNotification extends BaseScreen implements UserActionRequired
@@ -40,7 +37,8 @@ public class RequestPermissionsScreenWithNotification extends BaseScreen impleme
@NonNull
private final Runnable mPermissionsGrantedCallback;
public RequestPermissionsScreenWithNotification(@NonNull CarContext carContext, @NonNull Runnable permissionsGrantedCallback)
public RequestPermissionsScreenWithNotification(@NonNull CarContext carContext,
@NonNull Runnable permissionsGrantedCallback)
{
super(carContext);
mBackgroundExecutor = ThreadPool.getWorker();
@@ -51,14 +49,16 @@ public class RequestPermissionsScreenWithNotification extends BaseScreen impleme
@Override
public Template onGetTemplate()
{
final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(R.string.aa_location_permissions_request));
final MessageTemplate.Builder builder =
new MessageTemplate.Builder(getCarContext().getString(R.string.aa_location_permissions_request));
final Header.Builder headerBuilder = new Header.Builder();
headerBuilder.setStartHeaderAction(Action.APP_ICON);
headerBuilder.setTitle(getCarContext().getString(R.string.aa_grant_permissions));
builder.setHeader(headerBuilder.build());
builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_location_off)).build());
builder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_location_off)).build());
return builder.build();
}
@@ -107,7 +107,8 @@ public class RequestPermissionsScreenWithNotification extends BaseScreen impleme
final PendingIntent pendingIntent = PendingIntent.getActivity(getCarContext(), 0, contentIntent,
PendingIntent.FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE);
final NotificationCompat.Builder builder = new NotificationCompat.Builder(getCarContext(), CarAppService.ANDROID_AUTO_NOTIFICATION_CHANNEL_ID);
final NotificationCompat.Builder builder =
new NotificationCompat.Builder(getCarContext(), CarAppService.ANDROID_AUTO_NOTIFICATION_CHANNEL_ID);
builder.setCategory(NotificationCompat.CATEGORY_NAVIGATION)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setOngoing(true)

17
android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.car.screens.search;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
@@ -16,15 +15,14 @@ import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.search.SearchListener;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.sdk.search.SearchListener;
import app.organicmaps.sdk.search.SearchRecents;
import app.organicmaps.sdk.search.SearchResult;
import app.organicmaps.sdk.util.Config;
@@ -125,8 +123,12 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
{
builder.setBrowsable(true);
builder.setTitle(result.suggestion);
builder.setImage(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search)).build());
builder.setOnClickListener(() -> getScreenManager().push(new Builder(getCarContext(), getSurfaceRenderer()).setQuery(result.suggestion).build()));
builder.setImage(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search)).build());
builder.setOnClickListener(
()
-> getScreenManager().push(
new Builder(getCarContext(), getSurfaceRenderer()).setQuery(result.suggestion).build()));
}
return builder.build();
}
@@ -147,7 +149,8 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
final double lat = hasLocation ? location.getLat() : 0;
final double lon = hasLocation ? location.getLon() : 0;
SearchEngine.INSTANCE.searchInteractive(mQuery, mIsCategory, mLocale, System.nanoTime(), true /* isMapAndTable */, hasLocation, lat, lon);
SearchEngine.INSTANCE.searchInteractive(mQuery, mIsCategory, mLocale, System.nanoTime(), true /* isMapAndTable */,
hasLocation, lat, lon);
}
@Override

28
android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.car.screens.search;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
@@ -15,14 +14,13 @@ import androidx.car.app.model.SearchTemplate;
import androidx.car.app.model.Template;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.sdk.search.SearchListener;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.sdk.search.SearchListener;
import app.organicmaps.sdk.search.SearchRecents;
import app.organicmaps.sdk.search.SearchResult;
import app.organicmaps.sdk.util.Config;
@@ -137,9 +135,8 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
if (result.type == SearchResult.TYPE_RESULT)
{
final String title = result.getTitle(getCarContext());
final CharSequence description = SearchUiHelpers.concatenateStrings(
SearchUiHelpers.getDistanceText(result),
result.description.description,
final CharSequence description =
SearchUiHelpers.concatenateStrings(SearchUiHelpers.getDistanceText(result), result.description.description,
SearchUiHelpers.getOpeningHoursText(getCarContext(), result));
final String region = result.description.region;
builder.setTitle(title);
@@ -158,7 +155,8 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
{
builder.setBrowsable(true);
builder.setTitle(result.suggestion);
builder.setImage(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search)).build());
builder.setImage(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search)).build());
builder.setOnClickListener(() -> onSearchSubmitted(result.suggestion));
}
return builder.build();
@@ -166,7 +164,8 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
private boolean loadRecents()
{
final CarIcon iconRecent = new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search_recent)).build();
final CarIcon iconRecent =
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_search_recent)).build();
final ItemList.Builder builder = new ItemList.Builder();
builder.setNoItemsMessage(getCarContext().getString(R.string.search_history_text));
@@ -190,9 +189,14 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
private ActionStrip createActionStrip()
{
final Action.Builder builder = new Action.Builder();
builder.setIcon(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_show_on_map)).build());
builder.setOnClickListener(() ->
getScreenManager().push(new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer()).setQuery(mQuery).setLocale(mLocale).build()));
builder.setIcon(
new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), R.drawable.ic_show_on_map)).build());
builder.setOnClickListener(
()
-> getScreenManager().push(new SearchOnMapScreen.Builder(getCarContext(), getSurfaceRenderer())
.setQuery(mQuery)
.setLocale(mLocale)
.build()));
return new ActionStrip.Builder().addAction(builder.build()).build();
}

12
android/app/src/main/java/app/organicmaps/car/screens/search/SearchUiHelpers.java
View File

@@ -3,18 +3,15 @@ package app.organicmaps.car.screens.search;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
import androidx.car.app.model.CarColor;
import androidx.car.app.model.DistanceSpan;
import androidx.car.app.model.ForegroundCarColorSpan;
import app.organicmaps.R;
import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.RoutingHelpers;
import app.organicmaps.sdk.search.SearchResult;
import java.util.ArrayList;
import java.util.List;
@@ -50,7 +47,8 @@ public final class SearchUiHelpers
return "";
final SpannableStringBuilder distance = new SpannableStringBuilder(" ");
distance.setSpan(DistanceSpan.create(RoutingHelpers.createDistance(searchResult.description.distance)), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
distance.setSpan(DistanceSpan.create(RoutingHelpers.createDistance(searchResult.description.distance)), 0, 1,
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
distance.setSpan(ForegroundCarColorSpan.create(Colors.DISTANCE), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return distance;
}
@@ -67,8 +65,7 @@ public final class SearchUiHelpers
case SearchResult.OPEN_NOW_YES:
if (searchResult.description.minutesUntilClosed < 60) // less than 1 hour
{
final String time = searchResult.description.minutesUntilClosed + " " +
carContext.getString(R.string.minute);
final String time = searchResult.description.minutesUntilClosed + " " + carContext.getString(R.string.minute);
text = carContext.getString(R.string.closes_in, time);
color = Colors.OPENING_HOURS_CLOSES_SOON;
}
@@ -81,8 +78,7 @@ public final class SearchUiHelpers
case SearchResult.OPEN_NOW_NO:
if (searchResult.description.minutesUntilOpen < 60) // less than 1 hour
{
final String time = searchResult.description.minutesUntilOpen + " " +
carContext.getString(R.string.minute);
final String time = searchResult.description.minutesUntilOpen + " " + carContext.getString(R.string.minute);
text = carContext.getString(R.string.opens_in, time);
}
else

18
android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
View File

@@ -12,7 +12,6 @@ import androidx.car.app.model.Row;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
@@ -20,7 +19,6 @@ import app.organicmaps.car.util.Toggle;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.routing.RoutingOptions;
import app.organicmaps.sdk.settings.RoadType;
import java.util.HashMap;
import java.util.Map;
@@ -28,16 +26,12 @@ public class DrivingOptionsScreen extends BaseMapScreen
{
public static final Object DRIVING_OPTIONS_RESULT_CHANGED = 0x1;
private record DrivingOption(RoadType roadType, @StringRes int text)
{
}
private record DrivingOption(RoadType roadType, @StringRes int text) {}
private final DrivingOption[] mDrivingOptions = {
new DrivingOption(RoadType.Toll, R.string.avoid_tolls),
private final DrivingOption[] mDrivingOptions = {new DrivingOption(RoadType.Toll, R.string.avoid_tolls),
new DrivingOption(RoadType.Dirty, R.string.avoid_unpaved),
new DrivingOption(RoadType.Ferry, R.string.avoid_ferry),
new DrivingOption(RoadType.Motorway, R.string.avoid_motorways)
};
new DrivingOption(RoadType.Motorway, R.string.avoid_motorways)};
@NonNull
private final Map<RoadType, Boolean> mInitialDrivingOptionsState = new HashMap<>();
@@ -64,7 +58,8 @@ public class DrivingOptionsScreen extends BaseMapScreen
{
for (final DrivingOption drivingOption : mDrivingOptions)
{
if (Boolean.TRUE.equals(mInitialDrivingOptionsState.get(drivingOption.roadType)) != RoutingOptions.hasOption(drivingOption.roadType))
if (Boolean.TRUE.equals(mInitialDrivingOptionsState.get(drivingOption.roadType))
!= RoutingOptions.hasOption(drivingOption.roadType))
{
setResult(DRIVING_OPTIONS_RESULT_CHANGED);
return;
@@ -93,7 +88,8 @@ public class DrivingOptionsScreen extends BaseMapScreen
@NonNull
private Row createDrivingOptionsToggle(RoadType roadType, @StringRes int title)
{
final OnClickListener listener = () -> {
final OnClickListener listener = () ->
{
if (RoutingOptions.hasOption(roadType))
RoutingOptions.removeOption(roadType);
else

3
android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java
View File

@@ -10,13 +10,12 @@ import androidx.car.app.model.ListTemplate;
import androidx.car.app.model.Row;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import app.organicmaps.BuildConfig;
import app.organicmaps.sdk.Framework;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.util.DateUtils;
public class HelpScreen extends BaseMapScreen

17
android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java
View File

@@ -12,14 +12,13 @@ import androidx.car.app.model.OnClickListener;
import androidx.car.app.model.Row;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import app.organicmaps.sdk.Framework;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.ThemeUtils;
import app.organicmaps.car.util.Toggle;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.util.Config;
public class SettingsScreen extends BaseMapScreen
@@ -66,7 +65,8 @@ public class SettingsScreen extends BaseMapScreen
builder.addItem(createRoutingOptionsItem());
builder.addItem(create3dBuildingsItem());
builder.addItem(createSharedPrefsToggle(R.string.big_font, Config::isLargeFontsSize, Config::setLargeFontsSize));
builder.addItem(createSharedPrefsToggle(R.string.transliteration_title, Config::isTransliteration, Config::setTransliteration));
builder.addItem(
createSharedPrefsToggle(R.string.transliteration_title, Config::isTransliteration, Config::setTransliteration));
builder.addItem(createHelpItem());
return new ListTemplate.Builder().setHeader(createHeader()).setSingleList(builder.build()).build();
}
@@ -87,7 +87,10 @@ public class SettingsScreen extends BaseMapScreen
{
final Row.Builder builder = new Row.Builder();
builder.setTitle(getCarContext().getString(R.string.driving_options_title));
builder.setOnClickListener(() -> getScreenManager().pushForResult(new DrivingOptionsScreen(getCarContext(), getSurfaceRenderer()), this::setResult));
builder.setOnClickListener(
()
-> getScreenManager().pushForResult(new DrivingOptionsScreen(getCarContext(), getSurfaceRenderer()),
this::setResult));
builder.setBrowsable(true);
return builder.build();
}
@@ -98,7 +101,8 @@ public class SettingsScreen extends BaseMapScreen
final Framework.Params3dMode _3d = new Framework.Params3dMode();
Framework.nativeGet3dMode(_3d);
final OnClickListener listener = () -> {
final OnClickListener listener = () ->
{
Framework.nativeSet3dMode(_3d.enabled, !_3d.buildings);
invalidate();
};
@@ -119,7 +123,8 @@ public class SettingsScreen extends BaseMapScreen
private Row createSharedPrefsToggle(@StringRes int titleRes, @NonNull PrefsGetter getter, @NonNull PrefsSetter setter)
{
final boolean enabled = getter.get();
final OnClickListener listener = () -> {
final OnClickListener listener = () ->
{
setter.set(!enabled);
invalidate();
};

7
android/app/src/main/java/app/organicmaps/car/screens/settings/ThemeScreen.java
View File

@@ -11,7 +11,6 @@ import androidx.car.app.model.Row;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
@@ -28,8 +27,10 @@ public class ThemeScreen extends BaseMapScreen
public ThemeScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
{
super(carContext, surfaceRenderer);
mRadioButtonIcon = new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_unchecked)).build();
mRadioButtonSelectedIcon = new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_checked)).build();
mRadioButtonIcon =
new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_unchecked)).build();
mRadioButtonSelectedIcon =
new CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_radio_button_checked)).build();
}
@NonNull

8
android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java
View File

@@ -3,7 +3,6 @@ package app.organicmaps.car.util;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import android.location.Location;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresPermission;
import androidx.car.app.CarContext;
@@ -13,11 +12,9 @@ import androidx.car.app.hardware.info.CarHardwareLocation;
import androidx.car.app.hardware.info.CarSensors;
import androidx.car.app.hardware.info.Compass;
import androidx.core.content.ContextCompat;
import app.organicmaps.sdk.Map;
import app.organicmaps.MwmApplication;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.util.log.Logger;
import java.util.List;
import java.util.concurrent.Executor;
@@ -53,7 +50,8 @@ public class CarSensorsManager
MwmApplication.from(mCarContext).getLocationHelper().start();
if (mIsCarLocationUsed)
mCarSensors.addCarHardwareLocationListener(CarSensors.UPDATE_RATE_FASTEST, executor, this::onCarLocationDataAvailable);
mCarSensors.addCarHardwareLocationListener(CarSensors.UPDATE_RATE_FASTEST, executor,
this::onCarLocationDataAvailable);
}
public void onStop()

10
android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java
View File

@@ -1,17 +1,15 @@
package app.organicmaps.car.util;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
import androidx.car.app.ScreenManager;
import app.organicmaps.car.screens.download.DownloadMapsScreen;
import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.routing.RoutingController;
public class CurrentCountryChangedListener implements MapManager.CurrentCountryChangedListener
{
@@ -45,12 +43,10 @@ public class CurrentCountryChangedListener implements MapManager.CurrentCountryC
return;
mPreviousCountryId = countryId;
screenManager.push(
new DownloadMapsScreenBuilder(mCarContext)
screenManager.push(new DownloadMapsScreenBuilder(mCarContext)
.setDownloaderType(DownloadMapsScreenBuilder.DownloaderType.View)
.setMissingMaps(new String[] {countryId})
.build()
);
.build());
}
public void onStart(@NonNull final CarContext carContext)

43
android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
View File

@@ -4,25 +4,23 @@ import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Intent;
import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
import androidx.car.app.Screen;
import androidx.car.app.ScreenManager;
import androidx.car.app.notification.CarPendingIntent;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.api.Const;
import app.organicmaps.sdk.api.ParsedSearchRequest;
import app.organicmaps.sdk.api.RequestType;
import app.organicmaps.car.CarAppService;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.NavigationScreen;
import app.organicmaps.car.screens.search.SearchScreen;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.api.ParsedSearchRequest;
import app.organicmaps.sdk.api.RequestType;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.util.log.Logger;
public final class IntentUtils
@@ -31,7 +29,8 @@ public final class IntentUtils
private static final int SEARCH_IN_VIEWPORT_ZOOM = 16;
public static void processIntent(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer, @NonNull Intent intent)
public static void processIntent(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer,
@NonNull Intent intent)
{
final String action = intent.getAction();
if (CarContext.ACTION_NAVIGATE.equals(action))
@@ -50,10 +49,11 @@ public final class IntentUtils
}
// https://developer.android.com/reference/androidx/car/app/CarContext#startCarApp(android.content.Intent)
private static void processNavigationIntent(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer, @NonNull Intent intent)
private static void processNavigationIntent(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer,
@NonNull Intent intent)
{
// TODO (AndrewShkrob): This logic will need to be revised when we introduce support for adding stops during navigation or route planning.
// Skip navigation intents during navigation
// TODO (AndrewShkrob): This logic will need to be revised when we introduce support for adding stops during
// navigation or route planning. Skip navigation intents during navigation
if (RoutingController.get().isNavigating())
return;
@@ -64,8 +64,7 @@ public final class IntentUtils
final ScreenManager screenManager = carContext.getCarService(ScreenManager.class);
switch (Framework.nativeParseAndSetApiUrl(uri.toString()))
{
case RequestType.INCORRECT:
return;
case RequestType.INCORRECT: return;
case RequestType.MAP:
screenManager.popToRoot();
Map.executeMapApiRequest();
@@ -91,25 +90,17 @@ public final class IntentUtils
screenManager.popToRoot();
screenManager.push(builder.build());
return;
case RequestType.ROUTE:
Logger.e(TAG, "Route API is not supported by Android Auto: " + uri);
return;
case RequestType.CROSSHAIR:
Logger.e(TAG, "Crosshair API is not supported by Android Auto: " + uri);
return;
case RequestType.MENU:
Logger.e(TAG, "Menu API is not supported by Android Auto: " + uri);
return;
case RequestType.SETTINGS:
Logger.e(TAG, "Settings API is not supported by Android Auto: " + uri);
case RequestType.ROUTE: Logger.e(TAG, "Route API is not supported by Android Auto: " + uri); return;
case RequestType.CROSSHAIR: Logger.e(TAG, "Crosshair API is not supported by Android Auto: " + uri); return;
case RequestType.MENU: Logger.e(TAG, "Menu API is not supported by Android Auto: " + uri); return;
case RequestType.SETTINGS: Logger.e(TAG, "Settings API is not supported by Android Auto: " + uri);
}
}
private static void processViewIntent(@NonNull CarContext carContext, @NonNull Intent intent)
{
final Uri uri = intent.getData();
if (uri != null
&& Const.API_SCHEME.equals(uri.getScheme())
if (uri != null && Const.API_SCHEME.equals(uri.getScheme())
&& CarAppService.API_CAR_HOST.equals(uri.getSchemeSpecificPart())
&& CarAppService.ACTION_SHOW_NAVIGATION_SCREEN.equals(uri.getFragment()))
{

10
android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java
View File

@@ -7,7 +7,6 @@ import androidx.car.app.model.Distance;
import androidx.car.app.navigation.model.LaneDirection;
import androidx.car.app.navigation.model.Maneuver;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.sdk.routing.CarDirection;
import app.organicmaps.sdk.routing.LaneWay;
@@ -33,7 +32,8 @@ public final class RoutingHelpers
public static LaneDirection createLaneDirection(@NonNull LaneWay laneWay, boolean isRecommended)
{
int shape = LaneDirection.SHAPE_UNKNOWN;
shape = switch (laneWay) {
shape = switch (laneWay)
{
case REVERSE -> LaneDirection.SHAPE_U_TURN_LEFT;
case SHARP_LEFT -> LaneDirection.SHAPE_SHARP_LEFT;
case LEFT -> LaneDirection.SHAPE_NORMAL_LEFT;
@@ -49,7 +49,8 @@ public final class RoutingHelpers
}
@NonNull
public static Maneuver createManeuver(@NonNull final CarContext context, @NonNull CarDirection carDirection, int roundaboutExitNum)
public static Maneuver createManeuver(@NonNull final CarContext context, @NonNull CarDirection carDirection,
int roundaboutExitNum)
{
int maneuverType = switch (carDirection)
{
@@ -63,8 +64,7 @@ public final class RoutingHelpers
case U_TURN_LEFT -> Maneuver.TYPE_U_TURN_LEFT;
case U_TURN_RIGHT -> Maneuver.TYPE_U_TURN_RIGHT;
// TODO (AndrewShkrob): add support for CW (clockwise) directions
case ENTER_ROUND_ABOUT, STAY_ON_ROUND_ABOUT, LEAVE_ROUND_ABOUT ->
Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW;
case ENTER_ROUND_ABOUT, STAY_ON_ROUND_ABOUT, LEAVE_ROUND_ABOUT -> Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW;
case START_AT_THE_END_OF_STREET -> Maneuver.TYPE_DEPART;
case REACHED_YOUR_DESTINATION -> Maneuver.TYPE_DESTINATION;
case EXIT_HIGHWAY_TO_LEFT -> Maneuver.TYPE_OFF_RAMP_SLIGHT_LEFT;

9
android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java
View File

@@ -2,7 +2,6 @@ package app.organicmaps.car.util;
import android.graphics.Bitmap;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.car.app.CarContext;
@@ -13,7 +12,6 @@ import androidx.car.app.navigation.model.Step;
import androidx.car.app.navigation.model.TravelEstimate;
import androidx.car.app.navigation.model.Trip;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.routing.LaneWay;
import app.organicmaps.sdk.routing.RoutingInfo;
@@ -21,7 +19,6 @@ import app.organicmaps.sdk.routing.SingleLaneInfo;
import app.organicmaps.sdk.util.Distance;
import app.organicmaps.util.Graphics;
import app.organicmaps.widget.LanesDrawable;
import java.time.ZonedDateTime;
import java.util.Objects;
@@ -30,7 +27,8 @@ public final class RoutingUtils
private RoutingUtils() {}
@NonNull
public static Trip createTrip(@NonNull final CarContext context, @Nullable final RoutingInfo info, @Nullable MapObject endPoint)
public static Trip createTrip(@NonNull final CarContext context, @Nullable final RoutingInfo info,
@Nullable MapObject endPoint)
{
final Trip.Builder builder = new Trip.Builder();
@@ -52,7 +50,8 @@ public final class RoutingUtils
else
destinationBuilder.setName(" ");
builder.addDestination(destinationBuilder.build(), createTravelEstimate(info.distToTarget, info.totalTimeInSeconds));
builder.addDestination(destinationBuilder.build(),
createTravelEstimate(info.distToTarget, info.totalTimeInSeconds));
// TODO (AndrewShkrob): Use real distance and time estimates
builder.addStep(createCurrentStep(context, info), createTravelEstimate(info.distToTurn, 0));

8
android/app/src/main/java/app/organicmaps/car/util/SuggestionsHelpers.java
View File

@@ -6,10 +6,8 @@ import androidx.car.app.model.CarIcon;
import androidx.car.app.suggestion.SuggestionManager;
import androidx.car.app.suggestion.model.Suggestion;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.sdk.search.SearchRecents;
import java.util.ArrayList;
import java.util.List;
@@ -22,11 +20,13 @@ public final class SuggestionsHelpers
context.getCarService(SuggestionManager.class).updateSuggestions(createSuggestionsList(context));
}
// TODO: Currently utilizing search history entries; potential future addition to include "Home" and "Work" marks once supported.
// TODO: Currently utilizing search history entries; potential future addition to include "Home" and "Work" marks once
// supported.
@NonNull
private static List<Suggestion> createSuggestionsList(@NonNull final CarContext context)
{
final CarIcon iconRecent = new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_search_recent)).build();
final CarIcon iconRecent =
new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_search_recent)).build();
final List<Suggestion> suggestions = new ArrayList<>();
SearchRecents.refresh();

5
android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
View File

@@ -3,12 +3,10 @@ package app.organicmaps.car.util;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.SharedPreferences;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.annotation.UiThread;
import androidx.car.app.CarContext;
import app.organicmaps.R;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.MapStyle;
@@ -58,7 +56,8 @@ public final class ThemeUtils
@UiThread
public static void update(@NonNull CarContext context, @NonNull ThemeMode oldThemeMode)
{
final ThemeMode newThemeMode = oldThemeMode == ThemeMode.AUTO ? (context.isDarkMode() ? ThemeMode.NIGHT : ThemeMode.LIGHT) : oldThemeMode;
final ThemeMode newThemeMode =
oldThemeMode == ThemeMode.AUTO ? (context.isDarkMode() ? ThemeMode.NIGHT : ThemeMode.LIGHT) : oldThemeMode;
MapStyle newMapStyle;
if (newThemeMode == ThemeMode.NIGHT)

15
android/app/src/main/java/app/organicmaps/car/util/Toggle.java
View File

@@ -9,7 +9,6 @@ import androidx.car.app.model.CarIcon;
import androidx.car.app.model.OnClickListener;
import androidx.car.app.model.Row;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
public final class Toggle
@@ -20,7 +19,8 @@ public final class Toggle
private static final int CHECKBOX_CHECKED_ICON = R.drawable.ic_checkbox_checked;
@NonNull
public static Row create(@NonNull final CarContext context, @StringRes int title, @NonNull final OnClickListener onClickListener, boolean checked)
public static Row create(@NonNull final CarContext context, @StringRes int title,
@NonNull final OnClickListener onClickListener, boolean checked)
{
final Row.Builder row = new Row.Builder();
row.setTitle(context.getString(title));
@@ -34,16 +34,19 @@ public final class Toggle
@RequiresCarApi(6)
@NonNull
private static androidx.car.app.model.Toggle createToggle(@NonNull final OnClickListener onClickListener, boolean checked)
private static androidx.car.app.model.Toggle createToggle(@NonNull final OnClickListener onClickListener,
boolean checked)
{
return new androidx.car.app.model.Toggle.Builder((unused) -> onClickListener.onClick()).setChecked(checked).build();
}
private static void createCheckbox(
@NonNull final Row.Builder row, @NonNull final CarContext context, @NonNull final OnClickListener onClickListener, boolean checked)
private static void createCheckbox(@NonNull final Row.Builder row, @NonNull final CarContext context,
@NonNull final OnClickListener onClickListener, boolean checked)
{
row.setOnClickListener(onClickListener);
row.setImage(new CarIcon.Builder(IconCompat.createWithResource(context, checked ? CHECKBOX_CHECKED_ICON : CHECKBOX_ICON)).build());
row.setImage(
new CarIcon.Builder(IconCompat.createWithResource(context, checked ? CHECKBOX_CHECKED_ICON : CHECKBOX_ICON))
.build());
}
private Toggle() {}

43
android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
View File

@@ -13,28 +13,27 @@ import androidx.car.app.model.CarIcon;
import androidx.car.app.model.Row;
import androidx.car.app.navigation.model.MapController;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.sdk.Map;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.screens.settings.SettingsScreen;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.sdk.editor.OpeningHours;
import app.organicmaps.sdk.editor.data.Timetable;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.util.Utils;
import java.util.Calendar;
public final class UiHelpers
{
@NonNull
public static ActionStrip createSettingsActionStrip(@NonNull BaseMapScreen mapScreen, @NonNull SurfaceRenderer surfaceRenderer)
public static ActionStrip createSettingsActionStrip(@NonNull BaseMapScreen mapScreen,
@NonNull SurfaceRenderer surfaceRenderer)
{
return new ActionStrip.Builder().addAction(createSettingsAction(mapScreen, surfaceRenderer)).build();
}
@@ -48,7 +47,8 @@ public final class UiHelpers
final Action panAction = new Action.Builder(Action.PAN).build();
final Action location = createLocationButton(context);
final Action zoomIn = new Action.Builder().setIcon(iconPlus).setOnClickListener(surfaceRenderer::onZoomIn).build();
final Action zoomOut = new Action.Builder().setIcon(iconMinus).setOnClickListener(surfaceRenderer::onZoomOut).build();
final Action zoomOut =
new Action.Builder().setIcon(iconMinus).setOnClickListener(surfaceRenderer::onZoomOut).build();
return new ActionStrip.Builder()
.addAction(panAction)
.addAction(zoomIn)
@@ -70,18 +70,24 @@ public final class UiHelpers
}
@NonNull
public static Action createSettingsActionForResult(@NonNull BaseMapScreen mapScreen, @NonNull SurfaceRenderer surfaceRenderer, @NonNull OnScreenResultListener onScreenResultListener)
public static Action createSettingsActionForResult(@NonNull BaseMapScreen mapScreen,
@NonNull SurfaceRenderer surfaceRenderer,
@NonNull OnScreenResultListener onScreenResultListener)
{
return createSettingsAction(mapScreen, surfaceRenderer, onScreenResultListener);
}
@NonNull
private static Action createSettingsAction(@NonNull BaseMapScreen mapScreen, @NonNull SurfaceRenderer surfaceRenderer, @Nullable OnScreenResultListener onScreenResultListener)
private static Action createSettingsAction(@NonNull BaseMapScreen mapScreen, @NonNull SurfaceRenderer surfaceRenderer,
@Nullable OnScreenResultListener onScreenResultListener)
{
final CarContext context = mapScreen.getCarContext();
final CarIcon iconSettings = new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_settings)).build();
final CarIcon iconSettings =
new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_settings)).build();
return new Action.Builder().setIcon(iconSettings).setOnClickListener(() -> {
return new Action.Builder()
.setIcon(iconSettings)
.setOnClickListener(() -> {
// Action.onClickListener for the Screen A maybe called even if the Screen B is shown now.
// We need to check it
// This may happen when we use PopToRootHack:
@@ -98,7 +104,8 @@ public final class UiHelpers
mapScreen.getScreenManager().pushForResult(settingsScreen, onScreenResultListener);
else
mapScreen.getScreenManager().push(settingsScreen);
}).build();
})
.build();
}
@Nullable
@@ -112,7 +119,8 @@ public final class UiHelpers
return null;
final Row.Builder builder = new Row.Builder();
builder.setImage(new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_operating_hours)).build());
builder.setImage(
new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_operating_hours)).build());
if (isEmptyTT)
builder.setTitle(ohStr);
@@ -159,10 +167,12 @@ public final class UiHelpers
final int locationMode = Map.isEngineCreated() ? LocationState.getMode() : LocationState.NOT_FOLLOW_NO_POSITION;
CarColor tintColor = Colors.DEFAULT;
@DrawableRes int drawableRes;
@DrawableRes
int drawableRes;
switch (locationMode)
{
case LocationState.PENDING_POSITION, LocationState.NOT_FOLLOW_NO_POSITION -> drawableRes = R.drawable.ic_location_off;
case LocationState.PENDING_POSITION, LocationState.NOT_FOLLOW_NO_POSITION ->
drawableRes = R.drawable.ic_location_off;
case LocationState.NOT_FOLLOW -> drawableRes = R.drawable.ic_not_follow;
case LocationState.FOLLOW ->
{
@@ -177,7 +187,8 @@ public final class UiHelpers
default -> throw new IllegalArgumentException("Invalid button mode: " + locationMode);
}
final CarIcon icon = new CarIcon.Builder(IconCompat.createWithResource(context, drawableRes)).setTint(tintColor).build();
final CarIcon icon =
new CarIcon.Builder(IconCompat.createWithResource(context, drawableRes)).setTint(tintColor).build();
builder.setIcon(icon);
builder.setOnClickListener(() -> {
LocationState.nativeSwitchToNextMode();

3
android/app/src/main/java/app/organicmaps/car/util/UserActionRequired.java
View File

@@ -3,5 +3,4 @@ package app.organicmaps.car.util;
/// Marker interface for screens that require user action to proceed.
/// These screens can't be dropped from AA's screen stack.
public interface UserActionRequired
{
}
{}

26
android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
View File

@@ -10,21 +10,19 @@ import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.textfield.TextInputLayout;
import com.google.android.material.textfield.TextInputEditText;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.util.InputUtils;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.util.InputUtils;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textfield.TextInputLayout;
public class EditTextDialogFragment extends BaseMwmDialogFragment
{
@@ -85,8 +83,8 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
args.putString(ARG_HINT, hint);
args.putInt(ARG_TEXT_LENGTH_LIMIT, textLimit);
FragmentManager fragmentManager = parent.getChildFragmentManager();
final EditTextDialogFragment fragment = (EditTextDialogFragment) fragmentManager.getFragmentFactory()
.instantiate(parent.requireActivity().getClassLoader(), EditTextDialogFragment.class.getName());
final EditTextDialogFragment fragment = (EditTextDialogFragment) fragmentManager.getFragmentFactory().instantiate(
parent.requireActivity().getClassLoader(), EditTextDialogFragment.class.getName());
fragment.setArguments(args);
fragment.show(fragmentManager, EditTextDialogFragment.class.getName());
fragment.mInputValidator = inputValidator;
@@ -119,11 +117,13 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
.setView(buildView())
.setNegativeButton(negativeButtonText, null)
.setPositiveButton(positiveButtonText, (dialog, which) -> {
.setPositiveButton(positiveButtonText,
(dialog, which) -> {
final String result = mEtInput.getText().toString();
processInput(result);
dismiss();
}).create();
})
.create();
// Wait till alert is shown to get mPositiveButton.
editTextDialog.setOnShowListener((dialog) -> {
@@ -135,8 +135,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
});
// Setup validation on input edit.
mEtInput.addTextChangedListener(new StringUtils.SimpleTextWatcher()
{
mEtInput.addTextChangedListener(new StringUtils.SimpleTextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count)
{
@@ -173,7 +172,8 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
private View buildView()
{
@SuppressLint("InflateParams") final View root = requireActivity().getLayoutInflater().inflate(R.layout.dialog_edit_text, null);
@SuppressLint("InflateParams")
final View root = requireActivity().getLayoutInflater().inflate(R.layout.dialog_edit_text, null);
mEtInputLayout = root.findViewById(R.id.et__input_layout);
mEtInput = mEtInputLayout.findViewById(R.id.et__input);
mEtInput.setHint(TextUtils.isEmpty(mHint) ? getString(R.string.name) : mHint);

14
android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java
View File

@@ -2,21 +2,18 @@ package app.organicmaps.downloader;
import android.annotation.TargetApi;
import android.content.Context;
import app.organicmaps.R;
import app.organicmaps.sdk.util.log.Logger;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.security.KeyStore;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManagerFactory;
import app.organicmaps.R;
import app.organicmaps.sdk.util.log.Logger;
// Fix missing root certificates for HTTPS connections on Android 7 and below:
// https://community.letsencrypt.org/t/letsencrypt-certificates-fails-on-android-phones-running-android-7-or-older/205686
@TargetApi(24)
@@ -27,7 +24,8 @@ public class Android7RootCertificateWorkaround
@TargetApi(24)
private static SSLSocketFactory mSslSocketFactory;
public static void applyFixIfNeeded(HttpURLConnection connection) {
public static void applyFixIfNeeded(HttpURLConnection connection)
{
// Deliberately not checking for null to have an exception from setSSLSocketFactory.
if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.N
&& connection.getURL().getProtocol().equals("https"))
@@ -39,8 +37,8 @@ public class Android7RootCertificateWorkaround
if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.N)
return;
final int[] certificates = new int[]{
R.raw.isrgrootx1, R.raw.globalsignr4, R.raw.gtsrootr1, R.raw.gtsrootr2, R.raw.gtsrootr3, R.raw.gtsrootr4};
final int[] certificates = new int[] {R.raw.isrgrootx1, R.raw.globalsignr4, R.raw.gtsrootr1,
R.raw.gtsrootr2, R.raw.gtsrootr3, R.raw.gtsrootr4};
try
{

23
android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
View File

@@ -10,18 +10,14 @@ import static app.organicmaps.sdk.downloader.CountryItem.STATUS_PROGRESS;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_UPDATABLE;
import android.view.View;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import app.organicmaps.R;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.downloader.UpdateInfo;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
class BottomPanel
{
@@ -29,8 +25,7 @@ class BottomPanel
private final FloatingActionButton mFab;
private final MaterialButton mButton;
private final View.OnClickListener mDownloadListener = new View.OnClickListener()
{
private final View.OnClickListener mDownloadListener = new View.OnClickListener() {
@Override
public void onClick(View v)
{
@@ -38,8 +33,7 @@ class BottomPanel
}
};
private final View.OnClickListener mUpdateListener = new View.OnClickListener()
{
private final View.OnClickListener mUpdateListener = new View.OnClickListener() {
@Override
public void onClick(View v)
{
@@ -48,8 +42,7 @@ class BottomPanel
}
};
private final View.OnClickListener mCancelListener = new View.OnClickListener()
{
private final View.OnClickListener mCancelListener = new View.OnClickListener() {
@Override
public void onClick(View v)
{
@@ -58,8 +51,7 @@ class BottomPanel
}
};
private final View.OnClickListener mRetryListener = new View.OnClickListener()
{
private final View.OnClickListener mRetryListener = new View.OnClickListener() {
@Override
public void onClick(View v)
{
@@ -83,7 +75,8 @@ class BottomPanel
private void setUpdateAllState(UpdateInfo info)
{
mButton.setText(StringUtils.formatUsingUsLocale("%s (%s)", mFragment.getString(R.string.downloader_update_all_button),
mButton.setText(
StringUtils.formatUsingUsLocale("%s (%s)", mFragment.getString(R.string.downloader_update_all_button),
StringUtils.getFileSizeString(mFragment.requireContext(), info.totalSize)));
mButton.setOnClickListener(mUpdateListener);
}

28
android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
View File

@@ -7,23 +7,19 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.widget.WheelProgressView;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.widget.WheelProgressView;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.textview.MaterialTextView;
import java.util.List;
public class CountrySuggestFragment extends BaseMwmFragment implements View.OnClickListener
@@ -55,8 +51,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
super.onViewCreated(view, savedInstanceState);
initViews(view);
mListenerSlot = MapManager.nativeSubscribe(new MapManager.StorageCallback()
{
mListenerSlot = MapManager.nativeSubscribe(new MapManager.StorageCallback() {
@Override
public void onStatusChanged(List<MapManager.StorageCallbackData> data)
{
@@ -75,13 +70,9 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
switch (item.newStatus)
{
case CountryItem.STATUS_FAILED:
updateViews();
return;
case CountryItem.STATUS_FAILED: updateViews(); return;
case CountryItem.STATUS_DONE:
exitFragment();
return;
case CountryItem.STATUS_DONE: exitFragment(); return;
}
break;
@@ -140,8 +131,8 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
if (mCurrentCountry == null || !isAdded())
return;
mBtnDownloadMap.setText(StringUtils.formatUsingUsLocale("%1$s (%2$s)",
getString(R.string.downloader_download_map),
mBtnDownloadMap.setText(
StringUtils.formatUsingUsLocale("%1$s (%2$s)", getString(R.string.downloader_download_map),
StringUtils.getFileSizeString(requireContext(), mCurrentCountry.totalSize)));
}
@@ -195,7 +186,8 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
private void updateProgress()
{
String text = getString(R.string.downloader_downloading) + " " + StringUtils.formatPercent(mDownloadingCountry.progress / 100);
String text = getString(R.string.downloader_downloading) + " "
+ StringUtils.formatPercent(mDownloadingCountry.progress / 100);
mTvProgress.setText(text);
mWpvDownloadProgress.setProgress(Math.round(mDownloadingCountry.progress));
}

4
android/app/src/main/java/app/organicmaps/downloader/DownloaderActivity.java
View File

@@ -1,7 +1,6 @@
package app.organicmaps.downloader;
import androidx.fragment.app.Fragment;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.base.OnBackPressListener;
@@ -18,7 +17,8 @@ public class DownloaderActivity extends BaseMwmFragmentActivity
@Override
public void onBackPressed()
{
OnBackPressListener fragment = (OnBackPressListener)getSupportFragmentManager().findFragmentById(getFragmentContentResId());
OnBackPressListener fragment =
(OnBackPressListener) getSupportFragmentManager().findFragmentById(getFragmentContentResId());
if (!fragment.onBackPressed())
super.onBackPressed();
}

58
android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
View File

@@ -11,13 +11,11 @@ import android.text.style.StyleSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@@ -30,7 +28,6 @@ import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.textview.MaterialTextView;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -60,7 +57,8 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
// Use List, because we have multiple search results now for a single country.
private final Map<String, List<CountryItem>> mCountryIndex = new HashMap<>();
private final Stack<PathEntry> mPath = new Stack<>(); // Holds navigation history. The last element is the current level.
private final Stack<PathEntry> mPath =
new Stack<>(); // Holds navigation history. The last element is the current level.
private int mListenerSlot;
private CountryItem mSelectedItem;
@@ -157,19 +155,15 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
private record PathEntry(CountryItem item, boolean myMapsMode, int topPosition, int topOffset)
{
@Override
public String toString()
{
return item.id + " (" + item.name + "), " +
"myMapsMode: " + myMapsMode +
", topPosition: " + topPosition +
", topOffset: " + topOffset;
return item.id + " (" + item.name + "), "
+ "myMapsMode: " + myMapsMode + ", topPosition: " + topPosition + ", topOffset: " + topOffset;
}
}
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback()
{
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback() {
private void updateItem(String countryId)
{
List<CountryItem> lst = mCountryIndex.get(countryId);
@@ -226,7 +220,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
return inflate(parent, R.layout.downloader_item);
else
return inflate(parent, R.layout.downloader_item_header);
}
class ViewHolderWrapper extends RecyclerView.ViewHolder
@@ -284,9 +277,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
switch (mSelectedItem.status)
{
case CountryItem.STATUS_DOWNLOADABLE:
items.add(getDownloadMenuItem());
break;
case CountryItem.STATUS_DOWNLOADABLE: items.add(getDownloadMenuItem()); break;
case CountryItem.STATUS_UPDATABLE:
items.add(getUpdateMenuItem());
@@ -325,7 +316,6 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
return items;
}
private MenuBottomSheetItem getDownloadMenuItem()
{
return new MenuBottomSheetItem(R.string.downloader_download_map, R.drawable.ic_download,
@@ -357,8 +347,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
private MenuBottomSheetItem getCancelMenuItem()
{
return new MenuBottomSheetItem(R.string.cancel, R.drawable.ic_cancel,
() -> onCancelActionSelected(mSelectedItem));
return new MenuBottomSheetItem(R.string.cancel, R.drawable.ic_cancel, () -> onCancelActionSelected(mSelectedItem));
}
private class ItemViewHolder extends BaseInnerViewHolder<CountryItem>
@@ -373,7 +362,8 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
{
switch (mItem.status)
{
case CountryItem.STATUS_DONE, CountryItem.STATUS_PROGRESS, CountryItem.STATUS_APPLYING, CountryItem.STATUS_ENQUEUED ->
case CountryItem.STATUS_DONE, CountryItem.STATUS_PROGRESS, CountryItem.STATUS_APPLYING,
CountryItem.STATUS_ENQUEUED ->
processLongClick();
case CountryItem.STATUS_DOWNLOADABLE, CountryItem.STATUS_PARTLY ->
{
@@ -396,15 +386,13 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
ItemViewHolder(View frame)
{
mStatusIcon = new DownloaderStatusIcon(frame.findViewById(R.id.downloader_status_frame))
{
mStatusIcon = new DownloaderStatusIcon(frame.findViewById(R.id.downloader_status_frame)) {
@Override
protected int selectIcon(CountryItem country)
{
if (country.status == CountryItem.STATUS_DOWNLOADABLE || country.status == CountryItem.STATUS_PARTLY)
{
return (country.isExpandable() ? (mMyMapsMode ? R.attr.status_folder_done
: R.attr.status_folder)
return (country.isExpandable() ? (mMyMapsMode ? R.attr.status_folder_done : R.attr.status_folder)
: R.attr.status_downloadable);
}
@@ -475,9 +463,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
if (mItem.isExpandable())
{
UiUtils.setTextAndHideIfEmpty(mSubtitle, String.format("%s: %s", mActivity.getString(R.string.downloader_status_maps),
mActivity.getString(R.string.downloader_of, mItem.childCount,
mItem.totalChildCount)));
UiUtils.setTextAndHideIfEmpty(
mSubtitle,
String.format("%s: %s", mActivity.getString(R.string.downloader_status_maps),
mActivity.getString(R.string.downloader_of, mItem.childCount, mItem.totalChildCount)));
}
UiUtils.showIf(mSearchResultsMode && !TextUtils.isEmpty(found), mFoundName);
@@ -490,14 +479,12 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
private long getMapDisplaySize()
{
long size;
if (mItem.status == CountryItem.STATUS_ENQUEUED ||
mItem.status == CountryItem.STATUS_PROGRESS ||
mItem.status == CountryItem.STATUS_APPLYING)
if (mItem.status == CountryItem.STATUS_ENQUEUED || mItem.status == CountryItem.STATUS_PROGRESS
|| mItem.status == CountryItem.STATUS_APPLYING)
{
size = mItem.enqueuedSize;
}
else if (mItem.status == CountryItem.STATUS_FAILED ||
mItem.status == CountryItem.STATUS_DOWNLOADABLE)
else if (mItem.status == CountryItem.STATUS_FAILED || mItem.status == CountryItem.STATUS_DOWNLOADABLE)
{
size = mItem.totalSize;
}
@@ -625,7 +612,8 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
List<CountryItem> lst = mCountryIndex.get(ci.id);
if (lst != null)
lst.add(ci);
else {
else
{
lst = new ArrayList<>();
lst.add(ci);
mCountryIndex.put(ci.id, lst);
@@ -748,12 +736,14 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
return (canGoUpwards() ? mPath.peek().item : CountryItem.fill(CountryItem.getRootId()));
}
@NonNull String getCurrentRootId()
@NonNull
String getCurrentRootId()
{
return (canGoUpwards() ? getCurrentRootItem().id : CountryItem.getRootId());
}
@Nullable String getCurrentRootName()
@Nullable
String getCurrentRootName()
{
return (canGoUpwards() ? getCurrentRootItem().name : null);
}

25
android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
View File

@@ -4,7 +4,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.view.WindowManager;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.CallSuper;
@@ -13,7 +12,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.base.OnBackPressListener;
@@ -21,16 +19,14 @@ import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.search.MapSearchListener;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.widget.PlaceholderView;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import app.organicmaps.widget.PlaceholderView;
import java.util.ArrayList;
import java.util.List;
public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapter>
implements OnBackPressListener,
MenuBottomSheetFragment.MenuBottomSheetInterface
implements OnBackPressListener, MenuBottomSheetFragment.MenuBottomSheetInterface
{
private DownloaderToolbarController mToolbarController;
@@ -43,7 +39,9 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
private int mSubscriberSlot;
final ActivityResultLauncher<Intent> startVoiceRecognitionForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> mToolbarController.onVoiceRecognitionResult(activityResult));
final ActivityResultLauncher<Intent> startVoiceRecognitionForResult =
registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
activityResult -> mToolbarController.onVoiceRecognitionResult(activityResult));
private final RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
@Override
@@ -54,8 +52,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
}
};
private final MapSearchListener mSearchListener = new MapSearchListener()
{
private final MapSearchListener mSearchListener = new MapSearchListener() {
@Keep
@Override
public void onMapSearchResults(@NonNull Result[] results, long timestamp, boolean isLast)
@@ -133,8 +130,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
ViewCompat.setOnApplyWindowInsetsListener(view, new DownloaderInsetsListener(view));
mSubscriberSlot = MapManager.nativeSubscribe(new MapManager.StorageCallback()
{
mSubscriberSlot = MapManager.nativeSubscribe(new MapManager.StorageCallback() {
@Override
public void onStatusChanged(List<MapManager.StorageCallbackData> data)
{
@@ -143,7 +139,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
}
@Override
public void onProgress(String countryId, long localSize, long remoteSize) {}
public void onProgress(String countryId, long localSize, long remoteSize)
{}
});
SearchEngine.INSTANCE.addMapListener(mSearchListener);
@@ -214,7 +211,6 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
return mAdapter;
}
@NonNull
@Override
public DownloaderAdapter getAdapter()
@@ -237,7 +233,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
if (mAdapter != null && mAdapter.isSearchResultsMode())
placeholder.setContent(R.string.search_not_found, R.string.search_not_found_query);
else
placeholder.setContent(R.string.downloader_no_downloaded_maps_title, R.string.downloader_no_downloaded_maps_message);
placeholder.setContent(R.string.downloader_no_downloaded_maps_title,
R.string.downloader_no_downloaded_maps_message);
}
@Override

9
android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
View File

@@ -3,7 +3,6 @@ package app.organicmaps.downloader;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.core.graphics.Insets;
import androidx.core.view.OnApplyWindowInsetsListener;
@@ -15,7 +14,6 @@ import app.organicmaps.util.WindowInsetUtils;
final class DownloaderInsetsListener implements OnApplyWindowInsetsListener
{
@NonNull
private final Context mContext;
@NonNull
@@ -81,11 +79,8 @@ final class DownloaderInsetsListener implements OnApplyWindowInsetsListener
{
int bottomInset = isAnyButtonVisible ? 0 : insets.bottom;
mRecyclerView.setPadding(
mRecyclerView.getPaddingLeft(),
mRecyclerView.getPaddingTop(),
mRecyclerView.getPaddingRight(),
bottomInset);
mRecyclerView.setPadding(mRecyclerView.getPaddingLeft(), mRecyclerView.getPaddingTop(),
mRecyclerView.getPaddingRight(), bottomInset);
final ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) mRecyclerView.getLayoutParams();
layoutParams.rightMargin = insets.right;

30
android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
View File

@@ -8,7 +8,6 @@ import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
@@ -16,7 +15,6 @@ import androidx.core.app.NotificationChannelCompat;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import app.organicmaps.MwmActivity;
import app.organicmaps.R;
import app.organicmaps.sdk.downloader.MapManager;
@@ -41,8 +39,8 @@ public class DownloaderNotifier
public static void createNotificationChannel(@NonNull Context context)
{
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
final NotificationChannelCompat channel = new NotificationChannelCompat.Builder(CHANNEL_ID,
NotificationManagerCompat.IMPORTANCE_LOW)
final NotificationChannelCompat channel =
new NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManagerCompat.IMPORTANCE_LOW)
.setName(context.getString(R.string.notification_channel_downloader))
.setShowBadge(true)
.setVibrationEnabled(false)
@@ -53,8 +51,8 @@ public class DownloaderNotifier
public void notifyDownloadFailed(@Nullable String countryId)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
ContextCompat.checkSelfPermission(mContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
&& ContextCompat.checkSelfPermission(mContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
{
Logger.w(TAG, "Permission POST_NOTIFICATIONS is not granted, skipping notification");
return;
@@ -85,19 +83,22 @@ public class DownloaderNotifier
notificationManager.notify(NOTIFICATION_ID, notification);
}
public void notifyProgress() {
public void notifyProgress()
{
notifyProgress(null, 0, 0);
}
public void notifyProgress(@Nullable String countryId, int maxProgress, int progress) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
ContextCompat.checkSelfPermission(mContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
public void notifyProgress(@Nullable String countryId, int maxProgress, int progress)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
&& ContextCompat.checkSelfPermission(mContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
{
Logger.w(TAG, "Permission POST_NOTIFICATIONS is not granted, skipping notification");
return;
}
NotificationManagerCompat.from(mContext).notify(NOTIFICATION_ID, buildProgressNotification(countryId, maxProgress, progress));
NotificationManagerCompat.from(mContext).notify(NOTIFICATION_ID,
buildProgressNotification(countryId, maxProgress, progress));
}
@NonNull
@@ -133,7 +134,8 @@ public class DownloaderNotifier
}
@NonNull
private PendingIntent getNotificationPendingIntent(@Nullable String countryId) {
private PendingIntent getNotificationPendingIntent(@Nullable String countryId)
{
final int FLAG_IMMUTABLE = Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? 0 : PendingIntent.FLAG_IMMUTABLE;
final Intent contentIntent = MwmActivity.createShowMapIntent(mContext, countryId);
contentIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -143,8 +145,8 @@ public class DownloaderNotifier
@NonNull
private static CharSequence getTicker(@NonNull Context context, @NonNull String title, @NonNull String content)
{
@StringRes final int templateResId = StringUtils.isRtl() ? R.string.notification_ticker_rtl
: R.string.notification_ticker_ltr;
@StringRes
final int templateResId = StringUtils.isRtl() ? R.string.notification_ticker_rtl : R.string.notification_ticker_ltr;
return context.getString(templateResId, title, content);
}
}

15
android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
View File

@@ -9,17 +9,14 @@ import android.content.Intent;
import android.content.pm.ServiceInfo;
import android.os.Build;
import android.os.IBinder;
import androidx.annotation.Nullable;
import androidx.core.app.ServiceCompat;
import androidx.core.content.ContextCompat;
import java.util.List;
import app.organicmaps.MwmApplication;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.util.log.Logger;
import java.util.List;
public class DownloaderService extends Service implements MapManager.StorageCallback
{
@@ -54,8 +51,7 @@ public class DownloaderService extends Service implements MapManager.StorageCall
}
catch (Exception e)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
e instanceof ForegroundServiceStartNotAllowedException)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && e instanceof ForegroundServiceStartNotAllowedException)
{
// App not in a valid state to start foreground service (e.g started from bg)
Logger.e(TAG, "Not in a valid state to start foreground service", e);
@@ -90,7 +86,8 @@ public class DownloaderService extends Service implements MapManager.StorageCall
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
{
stopForeground(Service.STOP_FOREGROUND_DETACH);
} else
}
else
{
stopForeground(false);
}
@@ -102,8 +99,8 @@ public class DownloaderService extends Service implements MapManager.StorageCall
@Override
public void onProgress(String countryId, long localSize, long remoteSize)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
&& ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
{
Logger.w(TAG, "Permission POST_NOTIFICATIONS is not granted, skipping notification");
return;

19
android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
View File

@@ -2,17 +2,14 @@ package app.organicmaps.downloader;
import android.util.SparseIntArray;
import android.view.View;
import androidx.annotation.AttrRes;
import androidx.annotation.DrawableRes;
import com.google.android.material.imageview.ShapeableImageView;
import app.organicmaps.R;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.widget.WheelProgressView;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.widget.WheelProgressView;
import com.google.android.material.imageview.ShapeableImageView;
public class DownloaderStatusIcon
{
@@ -67,8 +64,10 @@ public class DownloaderStatusIcon
protected void updateIcon(CountryItem country)
{
@AttrRes int iconAttr = selectIcon(country);
@DrawableRes int icon = resolveIcon(iconAttr);
@AttrRes
int iconAttr = selectIcon(country);
@DrawableRes
int icon = resolveIcon(iconAttr);
mIcon.setImageResource(icon);
}
@@ -76,8 +75,8 @@ public class DownloaderStatusIcon
public void update(CountryItem country)
{
boolean pending = (country.status == CountryItem.STATUS_ENQUEUED);
boolean inProgress = (country.status == CountryItem.STATUS_PROGRESS ||
country.status == CountryItem.STATUS_APPLYING || pending);
boolean inProgress =
(country.status == CountryItem.STATUS_PROGRESS || country.status == CountryItem.STATUS_APPLYING || pending);
UiUtils.showIf(inProgress, mProgress);
UiUtils.showIf(!inProgress, mIcon);

3
android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java
View File

@@ -4,10 +4,9 @@ import android.app.Activity;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import app.organicmaps.R;
import app.organicmaps.widget.SearchToolbarController;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.widget.SearchToolbarController;
class DownloaderToolbarController extends SearchToolbarController
{

57
android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
View File

@@ -4,13 +4,8 @@ import android.location.Location;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
@@ -23,7 +18,8 @@ import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
import app.organicmaps.widget.WheelProgressView;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.textview.MaterialTextView;
import java.util.List;
public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
@@ -43,8 +39,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
@Nullable
private CountryItem mCurrentCountry;
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback()
{
private final MapManager.StorageCallback mStorageCallback = new MapManager.StorageCallback() {
@Override
public void onStatusChanged(List<MapManager.StorageCallbackData> data)
{
@@ -80,8 +75,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
}
};
private final MapManager.CurrentCountryChangedListener mCountryChangedListener = new MapManager.CurrentCountryChangedListener()
{
private final MapManager.CurrentCountryChangedListener mCountryChangedListener =
new MapManager.CurrentCountryChangedListener() {
@Override
public void onCurrentCountryChanged(String countryId)
{
@@ -97,7 +92,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
private static boolean isMapDownloading(@Nullable CountryItem country)
{
if (country == null) return false;
if (country == null)
return false;
boolean enqueued = country.status == CountryItem.STATUS_ENQUEUED;
boolean progress = country.status == CountryItem.STATUS_PROGRESS;
@@ -112,18 +108,16 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
private void updateStateInternal(boolean shouldAutoDownload)
{
boolean showFrame = (mCurrentCountry != null &&
!mCurrentCountry.present &&
!RoutingController.get().isNavigating());
boolean showFrame =
(mCurrentCountry != null && !mCurrentCountry.present && !RoutingController.get().isNavigating());
if (showFrame)
{
boolean enqueued = (mCurrentCountry.status == CountryItem.STATUS_ENQUEUED);
boolean progress = (mCurrentCountry.status == CountryItem.STATUS_PROGRESS ||
mCurrentCountry.status == CountryItem.STATUS_APPLYING);
boolean progress = (mCurrentCountry.status == CountryItem.STATUS_PROGRESS
|| mCurrentCountry.status == CountryItem.STATUS_APPLYING);
boolean failed = (mCurrentCountry.status == CountryItem.STATUS_FAILED);
showFrame = (enqueued || progress || failed ||
mCurrentCountry.status == CountryItem.STATUS_DOWNLOADABLE);
showFrame = (enqueued || progress || failed || mCurrentCountry.status == CountryItem.STATUS_DOWNLOADABLE);
if (showFrame)
{
@@ -145,7 +139,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
int roundedProgress = Math.round(mCurrentCountry.progress);
mProgress.setPending(false);
mProgress.setProgress(roundedProgress);
sizeText = mActivity.getString(R.string.downloader_downloading) + " " + StringUtils.formatPercent(roundedProgress / 100.0);
sizeText = mActivity.getString(R.string.downloader_downloading) + " "
+ StringUtils.formatPercent(roundedProgress / 100.0);
}
else
{
@@ -158,26 +153,22 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
{
sizeText = StringUtils.getFileSizeString(mActivity.getApplicationContext(), mCurrentCountry.totalSize);
if (shouldAutoDownload &&
Config.isAutodownloadEnabled() &&
!sAutodownloadLocked &&
!failed &&
ConnectionState.INSTANCE.isWifiConnected())
if (shouldAutoDownload && Config.isAutodownloadEnabled() && !sAutodownloadLocked && !failed
&& ConnectionState.INSTANCE.isWifiConnected())
{
Location loc = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation();
if (loc != null)
{
String country = MapManager.nativeFindCountry(loc.getLatitude(), loc.getLongitude());
if (TextUtils.equals(mCurrentCountry.id, country) &&
MapManager.nativeHasSpaceToDownloadCountry(country))
if (TextUtils.equals(mCurrentCountry.id, country)
&& MapManager.nativeHasSpaceToDownloadCountry(country))
{
MapManager.startDownload(mCurrentCountry.id);
}
}
}
mButton.setText(failed ? R.string.downloader_retry
: R.string.download);
mButton.setText(failed ? R.string.downloader_retry : R.string.download);
}
}
@@ -207,8 +198,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
MapManager.nativeCancel(mCurrentCountry.id);
setAutodownloadLocked(true);
});
mButton.setOnClickListener(v -> MapManager.warnOn3g(mActivity, mCurrentCountry == null ? null :
mCurrentCountry.id, () -> {
mButton.setOnClickListener(
v -> MapManager.warnOn3g(mActivity, mCurrentCountry == null ? null : mCurrentCountry.id, () -> {
if (mCurrentCountry == null)
return;
@@ -228,10 +219,12 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
}
@Override
public void onTrackStarted(boolean collapsed) {}
public void onTrackStarted(boolean collapsed)
{}
@Override
public void onTrackFinished(boolean collapsed) {}
public void onTrackFinished(boolean collapsed)
{}
@Override
public void onTrackLeftAnimation(float offset)

Some files were not shown because too many files have changed in this diff Show More