diff --git a/android/src/com/mapswithme/HotelUtils.java b/android/src/com/mapswithme/HotelUtils.java index 1f04228161..7314c76c86 100644 --- a/android/src/com/mapswithme/HotelUtils.java +++ b/android/src/com/mapswithme/HotelUtils.java @@ -1,11 +1,12 @@ package com.mapswithme; import android.content.res.Resources; -import androidx.annotation.NonNull; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; +import androidx.annotation.NonNull; + import com.mapswithme.maps.R; public class HotelUtils diff --git a/android/src/com/mapswithme/maps/ChartController.java b/android/src/com/mapswithme/maps/ChartController.java index cd66edd764..18c5d70eaf 100644 --- a/android/src/com/mapswithme/maps/ChartController.java +++ b/android/src/com/mapswithme/maps/ChartController.java @@ -8,6 +8,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.github.mikephil.charting.charts.LineChart; import com.github.mikephil.charting.components.Legend; import com.github.mikephil.charting.components.MarkerView; diff --git a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java index 9df3693bfe..f4af1af11d 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java @@ -1,7 +1,6 @@ package com.mapswithme.maps; import android.annotation.SuppressLint; -import android.content.Context; import android.content.Intent; import android.location.Location; import android.net.Uri; @@ -17,6 +16,7 @@ import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; + import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.dialog.AlertDialog; import com.mapswithme.maps.dialog.AlertDialogCallback; @@ -28,7 +28,6 @@ import com.mapswithme.maps.intent.MapTask; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.location.LocationListener; import com.mapswithme.util.ConnectionState; -import com.mapswithme.util.Constants; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index d89a7c3892..e2c8ae845f 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -1,7 +1,6 @@ package com.mapswithme.maps; import android.graphics.Bitmap; -import android.location.Location; import android.text.TextUtils; import androidx.annotation.IntDef; @@ -10,15 +9,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Size; import androidx.annotation.UiThread; + import com.mapswithme.maps.api.ParsedRoutingData; import com.mapswithme.maps.api.ParsedSearchRequest; -import com.mapswithme.maps.api.ParsedUrlMwmRequest; import com.mapswithme.maps.api.ParsingResult; import com.mapswithme.maps.auth.AuthorizationListener; import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut; import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.bookmarks.data.MapObject; -import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.routing.RouteMarkData; import com.mapswithme.maps.routing.RoutePointInfo; import com.mapswithme.maps.routing.RoutingInfo; diff --git a/android/src/com/mapswithme/maps/MapFragment.java b/android/src/com/mapswithme/maps/MapFragment.java index 7677a33d62..d939630ef6 100644 --- a/android/src/com/mapswithme/maps/MapFragment.java +++ b/android/src/com/mapswithme/maps/MapFragment.java @@ -16,6 +16,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; + import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.util.Config; diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 85fe26c65b..6860db73ed 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -19,6 +19,7 @@ import android.view.View.OnClickListener; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.widget.ImageButton; + import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -139,6 +140,7 @@ import com.mapswithme.util.Utils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; import com.mapswithme.util.permissions.PermissionsResult; + import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; import java.util.List; diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index eb80b5c4cd..400db0d133 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -9,6 +9,7 @@ import android.webkit.WebView; import androidx.annotation.NonNull; import androidx.multidex.MultiDex; + import com.mapswithme.maps.background.AppBackgroundTracker; import com.mapswithme.maps.background.NotificationChannelFactory; import com.mapswithme.maps.background.NotificationChannelProvider; diff --git a/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java b/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java index 26a04f535e..10fd316ab8 100644 --- a/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java +++ b/android/src/com/mapswithme/maps/MwmBroadcastReceiver.java @@ -3,6 +3,7 @@ package com.mapswithme.maps; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java b/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java index eb2e394007..e2679ceeee 100644 --- a/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java +++ b/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java @@ -1,9 +1,10 @@ package com.mapswithme.maps; import android.content.res.Resources; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.view.View; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.location.LocationState; diff --git a/android/src/com/mapswithme/maps/PanelAnimator.java b/android/src/com/mapswithme/maps/PanelAnimator.java index 29d4119b63..a2fa494632 100644 --- a/android/src/com/mapswithme/maps/PanelAnimator.java +++ b/android/src/com/mapswithme/maps/PanelAnimator.java @@ -3,13 +3,13 @@ package com.mapswithme.maps; import android.animation.Animator; 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 android.view.View; -import android.view.animation.AccelerateInterpolator; import com.mapswithme.util.Listeners; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/PurchaseOperationObservable.java b/android/src/com/mapswithme/maps/PurchaseOperationObservable.java index 816f3b2be6..ad2945b777 100644 --- a/android/src/com/mapswithme/maps/PurchaseOperationObservable.java +++ b/android/src/com/mapswithme/maps/PurchaseOperationObservable.java @@ -5,6 +5,7 @@ import android.util.Base64; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.purchase.CoreStartTransactionObserver; import com.mapswithme.maps.purchase.CoreValidationObserver; diff --git a/android/src/com/mapswithme/maps/SplashActivity.java b/android/src/com/mapswithme/maps/SplashActivity.java index b9cf740be6..ccc60f3fd2 100644 --- a/android/src/com/mapswithme/maps/SplashActivity.java +++ b/android/src/com/mapswithme/maps/SplashActivity.java @@ -12,6 +12,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.FragmentManager; + import com.mapswithme.maps.base.BaseActivity; import com.mapswithme.maps.base.BaseActivityDelegate; import com.mapswithme.maps.location.LocationHelper; diff --git a/android/src/com/mapswithme/maps/WebContainerDelegate.java b/android/src/com/mapswithme/maps/WebContainerDelegate.java index 636b4c3bb9..35813cdc5a 100644 --- a/android/src/com/mapswithme/maps/WebContainerDelegate.java +++ b/android/src/com/mapswithme/maps/WebContainerDelegate.java @@ -4,10 +4,12 @@ import android.annotation.SuppressLint; import android.content.Intent; import android.net.MailTo; import android.net.Uri; -import androidx.annotation.NonNull; import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; + +import androidx.annotation.NonNull; + import com.mapswithme.maps.base.OnBackPressListener; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java b/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java index 268c4bc7b7..3e0db6ce91 100644 --- a/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java +++ b/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java @@ -1,8 +1,9 @@ package com.mapswithme.maps.adapter; -import androidx.annotation.NonNull; import android.view.View; +import androidx.annotation.NonNull; + public interface OnItemClickListener { void onItemClick(@NonNull View v, @NonNull T item); diff --git a/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java b/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java index 9a0cb0e768..e2ff63ca73 100644 --- a/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java @@ -1,8 +1,9 @@ package com.mapswithme.maps.adapter; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.ViewGroup; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java b/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java index 16dc1c0f97..359f119bda 100644 --- a/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java +++ b/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java @@ -1,8 +1,9 @@ package com.mapswithme.maps.adapter; +import android.util.Pair; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.util.Pair; import java.util.ArrayList; import java.util.List; diff --git a/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java b/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java index edd8a956c7..a96564fc31 100644 --- a/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.adapter; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.CatalogTagsGroup; diff --git a/android/src/com/mapswithme/maps/adapter/TagsAdapter.java b/android/src/com/mapswithme/maps/adapter/TagsAdapter.java index 62ddb70e91..23b42d4363 100644 --- a/android/src/com/mapswithme/maps/adapter/TagsAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/TagsAdapter.java @@ -3,14 +3,15 @@ package com.mapswithme.maps.adapter; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.StateListDrawable; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.CatalogTag; import com.mapswithme.maps.bookmarks.data.CatalogTagsGroup; diff --git a/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java b/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java index f55f03cd14..15a6f42f25 100644 --- a/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java @@ -3,13 +3,14 @@ package com.mapswithme.maps.adapter; import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; 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.flexbox.FlexboxLayoutManager; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.CatalogTag; diff --git a/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java b/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java index 5dd8be4253..a25eea7fc7 100644 --- a/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java +++ b/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java @@ -1,10 +1,5 @@ package com.mapswithme.maps.api; -import androidx.annotation.IntDef; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - public class ParsedUrlMwmRequest { public final RoutePoint[] mRoutePoints; diff --git a/android/src/com/mapswithme/maps/auth/Authorizer.java b/android/src/com/mapswithme/maps/auth/Authorizer.java index 2f90a785ca..ca346e0e7a 100644 --- a/android/src/com/mapswithme/maps/auth/Authorizer.java +++ b/android/src/com/mapswithme/maps/auth/Authorizer.java @@ -2,14 +2,13 @@ package com.mapswithme.maps.auth; import android.app.Activity; import android.content.Intent; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; -import android.os.Bundle; -import android.text.TextUtils; - import com.mapswithme.maps.Framework; /** diff --git a/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java b/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java index 44fcb38f6f..1bc5d1a65e 100644 --- a/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java +++ b/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.auth; -import androidx.annotation.IdRes; import android.view.View; import android.webkit.WebView; +import androidx.annotation.IdRes; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java b/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java index 5a91f5e209..875b9699b1 100644 --- a/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java +++ b/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.auth; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java b/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java index 9f8ab89972..42df84aa2a 100644 --- a/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java +++ b/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.auth; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java b/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java index 59ac2973e5..2b7652698f 100644 --- a/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java +++ b/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java @@ -4,8 +4,6 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -13,6 +11,9 @@ import android.view.ViewGroup; import android.webkit.WebView; import android.webkit.WebViewClient; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java b/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java index 58631dfe22..5b31448d85 100644 --- a/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java +++ b/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.auth; import android.content.Intent; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.text.TextUtils; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java b/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java index 299b82085e..38010b83c5 100644 --- a/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java +++ b/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java @@ -25,7 +25,6 @@ import com.mapswithme.util.log.LoggerFactory; import java.util.Arrays; import java.util.List; -import java.util.Objects; public class SocialAuthDialogFragment extends BaseMwmDialogFragment { diff --git a/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java b/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java index 08ec7fc7c7..364868f05f 100644 --- a/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java +++ b/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.auth; import android.content.Intent; + import androidx.annotation.Nullable; public interface TargetFragmentCallback diff --git a/android/src/com/mapswithme/maps/auth/TokenHandler.java b/android/src/com/mapswithme/maps/auth/TokenHandler.java index 8b9acf54a5..bc8ddf20ee 100644 --- a/android/src/com/mapswithme/maps/auth/TokenHandler.java +++ b/android/src/com/mapswithme/maps/auth/TokenHandler.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.auth; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java b/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java index 7ed48c9c3c..a8bb0b7a6f 100644 --- a/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java +++ b/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java @@ -1,19 +1,19 @@ package com.mapswithme.maps.background; +import static com.mapswithme.maps.MwmApplication.backgroundTracker; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import androidx.annotation.NonNull; - import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; + import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import static com.mapswithme.maps.MwmApplication.backgroundTracker; - public abstract class AbstractLogBroadcastReceiver extends BroadcastReceiver { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); diff --git a/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java b/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java index 6620e710f8..a03a0776d2 100644 --- a/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java +++ b/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java @@ -6,15 +6,16 @@ import android.content.Context; import android.os.Bundle; import android.util.SparseArray; -import java.lang.ref.WeakReference; - import androidx.annotation.NonNull; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.Listeners; import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; +import java.lang.ref.WeakReference; + /** * Helper class that detects when the application goes to background and back to foreground. *
Must be created as early as possible, i.e. in Application.onCreate(). diff --git a/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java b/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java index defbb56834..3f1ce9fea1 100644 --- a/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java +++ b/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.background; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; + import androidx.annotation.NonNull; public class ConnectivityChangedReceiver extends AbstractLogBroadcastReceiver diff --git a/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java b/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java index 697fad3faa..097eecf6e9 100644 --- a/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java +++ b/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.background; import android.app.Application; + import androidx.annotation.NonNull; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/background/NotificationService.java b/android/src/com/mapswithme/maps/background/NotificationService.java index ca46ccb1f2..0ac6bd0cf4 100644 --- a/android/src/com/mapswithme/maps/background/NotificationService.java +++ b/android/src/com/mapswithme/maps/background/NotificationService.java @@ -1,8 +1,12 @@ package com.mapswithme.maps.background; +import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; +import static com.mapswithme.maps.MwmApplication.prefs; + import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; + import androidx.annotation.NonNull; import androidx.core.app.JobIntentService; @@ -13,11 +17,6 @@ import com.mapswithme.util.PermissionsUtils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import java.util.concurrent.TimeUnit; - -import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; -import static com.mapswithme.maps.MwmApplication.prefs; - public class NotificationService extends JobIntentService { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); diff --git a/android/src/com/mapswithme/maps/background/Notifier.java b/android/src/com/mapswithme/maps/background/Notifier.java index 796b4225e7..084497c517 100644 --- a/android/src/com/mapswithme/maps/background/Notifier.java +++ b/android/src/com/mapswithme/maps/background/Notifier.java @@ -6,6 +6,7 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; + import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java b/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java index 371bb76d5a..e262e3c310 100644 --- a/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java +++ b/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java @@ -5,6 +5,7 @@ import android.app.Application; import android.app.NotificationChannel; import android.app.NotificationManager; import android.os.Build; + import androidx.annotation.NonNull; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java b/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java index 79a3f4b826..e0a2d64b8c 100644 --- a/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java +++ b/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.background; import android.app.Application; + import androidx.annotation.NonNull; public class StubNotificationChannelProvider implements NotificationChannelProvider diff --git a/android/src/com/mapswithme/maps/background/UpgradeReceiver.java b/android/src/com/mapswithme/maps/background/UpgradeReceiver.java index 01c93d49f0..cc86098e95 100644 --- a/android/src/com/mapswithme/maps/background/UpgradeReceiver.java +++ b/android/src/com/mapswithme/maps/background/UpgradeReceiver.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.background; +import static com.mapswithme.maps.MwmApplication.backgroundTracker; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -10,8 +12,6 @@ import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import static com.mapswithme.maps.MwmApplication.backgroundTracker; - public class UpgradeReceiver extends BroadcastReceiver { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); diff --git a/android/src/com/mapswithme/maps/background/WorkerService.java b/android/src/com/mapswithme/maps/background/WorkerService.java index cf227c71d0..96c835366b 100644 --- a/android/src/com/mapswithme/maps/background/WorkerService.java +++ b/android/src/com/mapswithme/maps/background/WorkerService.java @@ -2,15 +2,15 @@ package com.mapswithme.maps.background; import android.content.Context; import android.content.Intent; -import androidx.annotation.NonNull; -import androidx.core.app.JobIntentService; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.editor.Editor; import com.mapswithme.maps.scheduling.JobIdMap; -import com.mapswithme.maps.ugc.UGC; import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/base/BaseActivity.java b/android/src/com/mapswithme/maps/base/BaseActivity.java index bc6dfcc38b..310486492f 100644 --- a/android/src/com/mapswithme/maps/base/BaseActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseActivity.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.base; import android.app.Activity; + import androidx.annotation.NonNull; import androidx.annotation.StyleRes; diff --git a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java index 9842596898..19faff6f88 100644 --- a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java +++ b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java @@ -1,14 +1,14 @@ package com.mapswithme.maps.base; import android.content.Intent; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.util.Config; import com.mapswithme.util.CrashlyticsUtils; -import com.mapswithme.util.UiUtils; import com.mapswithme.util.ViewServer; import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/maps/base/BaseAuthFragment.java b/android/src/com/mapswithme/maps/base/BaseAuthFragment.java index 4bcbbae7d3..a0126bfa4f 100644 --- a/android/src/com/mapswithme/maps/base/BaseAuthFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseAuthFragment.java @@ -1,7 +1,6 @@ package com.mapswithme.maps.base; import android.content.Intent; -import android.os.Bundle; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java index 854c61fd5c..aa232a6097 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java @@ -3,11 +3,12 @@ package com.mapswithme.maps.base; import android.app.Application; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StyleRes; import androidx.fragment.app.DialogFragment; -import android.view.View; import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java index 6c5a9d96bf..3cf030febe 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.base; import android.os.Bundle; + import androidx.annotation.CallSuper; import androidx.appcompat.widget.Toolbar; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java index 262960f87c..314f366305 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.base; import android.content.Context; +import android.view.View; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import android.view.View; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java index 1d1dfc6efe..d51ae6e125 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java @@ -5,16 +5,17 @@ import android.content.Context; import android.content.Intent; import android.media.AudioManager; import android.os.Bundle; +import android.view.MenuItem; + import androidx.annotation.CallSuper; import androidx.annotation.ColorRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StyleRes; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; -import android.view.MenuItem; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java index 3fb4f94a10..00d43c5fc1 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java @@ -6,6 +6,7 @@ import android.view.View; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.ListFragment; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java index a6e764ce54..8e29557002 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java @@ -14,6 +14,7 @@ import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.PlaceholderView; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java index 7046dcd5cf..498d6b5c00 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.base; import android.os.Bundle; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.view.View; import com.mapswithme.maps.widget.ToolbarController; diff --git a/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java b/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java index 064c7f18ac..fa0e1b009a 100644 --- a/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.base; import android.os.Bundle; + import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; -import androidx.fragment.app.Fragment; import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java b/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java index 016f0999bc..1fd9e8044a 100644 --- a/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java @@ -1,7 +1,6 @@ package com.mapswithme.maps.base; import android.content.Intent; -import android.os.Bundle; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; diff --git a/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java b/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java index ca6f907b6b..c75286359b 100644 --- a/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java +++ b/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.base; import android.app.Activity; -import androidx.annotation.NonNull; import android.view.View; +import androidx.annotation.NonNull; + import com.mapswithme.maps.widget.ToolbarController; public class FinishActivityToolbarController extends ToolbarController diff --git a/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java b/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java index 82f051a4f8..5b2146f1f5 100644 --- a/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java +++ b/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java @@ -4,6 +4,7 @@ import android.app.Application; import android.content.Context; import android.media.MediaPlayer; import android.os.AsyncTask; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RawRes; diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java index aeaf98b8db..02b5010d39 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java @@ -13,6 +13,7 @@ import androidx.annotation.MenuRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + import com.cocosw.bottomsheet.BottomSheet; import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.OnItemClickListener; diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java index 5ec367efe0..b9545f1c62 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java index 7fc26f7a7f..87b0a37d8a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java @@ -1,31 +1,5 @@ package com.mapswithme.maps.bookmarks; -import android.app.ProgressDialog; -import android.content.DialogInterface; -import android.content.Intent; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.FragmentActivity; -import android.view.View; -import android.widget.Button; - -import com.mapswithme.maps.Framework; -import com.mapswithme.maps.R; -import com.mapswithme.maps.auth.Authorizer; -import com.mapswithme.maps.background.Notifier; -import com.mapswithme.maps.bookmarks.data.BookmarkManager; -import com.mapswithme.maps.widget.BookmarkBackupView; -import com.mapswithme.util.ConnectionState; -import com.mapswithme.util.DateUtils; -import com.mapswithme.maps.dialog.DialogUtils; -import com.mapswithme.util.NetworkPolicy; -import com.mapswithme.util.SharedPropertiesUtils; -import com.mapswithme.util.Utils; -import com.mapswithme.util.log.Logger; -import com.mapswithme.util.log.LoggerFactory; - -import java.util.Date; - import static com.mapswithme.maps.bookmarks.data.BookmarkManager.CLOUD_AUTH_ERROR; import static com.mapswithme.maps.bookmarks.data.BookmarkManager.CLOUD_BACKUP; import static com.mapswithme.maps.bookmarks.data.BookmarkManager.CLOUD_BACKUP_EXISTS; @@ -38,6 +12,33 @@ import static com.mapswithme.maps.bookmarks.data.BookmarkManager.CLOUD_RESTORE; import static com.mapswithme.maps.bookmarks.data.BookmarkManager.CLOUD_SUCCESS; import static com.mapswithme.maps.bookmarks.data.BookmarkManager.CLOUD_USER_INTERRUPTED; +import android.app.ProgressDialog; +import android.content.DialogInterface; +import android.content.Intent; +import android.view.View; +import android.widget.Button; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; + +import com.mapswithme.maps.Framework; +import com.mapswithme.maps.R; +import com.mapswithme.maps.auth.Authorizer; +import com.mapswithme.maps.background.Notifier; +import com.mapswithme.maps.bookmarks.data.BookmarkManager; +import com.mapswithme.maps.dialog.DialogUtils; +import com.mapswithme.maps.widget.BookmarkBackupView; +import com.mapswithme.util.ConnectionState; +import com.mapswithme.util.DateUtils; +import com.mapswithme.util.NetworkPolicy; +import com.mapswithme.util.SharedPropertiesUtils; +import com.mapswithme.util.Utils; +import com.mapswithme.util.log.Logger; +import com.mapswithme.util.log.LoggerFactory; + +import java.util.Date; + public class BookmarkBackupController implements Authorizer.Callback, BookmarkManager.BookmarksCloudListener { diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java index 2eb6f2a678..992b3df27f 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java @@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StyleRes; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseToolbarActivity; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java index 6ef9d68acf..8d42305e95 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java @@ -1,5 +1,9 @@ package com.mapswithme.maps.bookmarks; +import static com.mapswithme.maps.bookmarks.Holders.CategoryViewHolder; +import static com.mapswithme.maps.bookmarks.Holders.HeaderViewHolder; +import static com.mapswithme.util.UiUtils.PHRASE_SEPARATOR; + import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -8,6 +12,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.OnItemClickListener; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; @@ -16,10 +21,6 @@ import com.mapswithme.util.UiUtils; import java.util.List; -import static com.mapswithme.maps.bookmarks.Holders.CategoryViewHolder; -import static com.mapswithme.maps.bookmarks.Holders.HeaderViewHolder; -import static com.mapswithme.util.UiUtils.PHRASE_SEPARATOR; - public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter { private final static int TYPE_CATEGORY_ITEM = 0; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java index 56e2d4fe29..f3d6ff52e0 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java @@ -1,10 +1,11 @@ package com.mapswithme.maps.bookmarks; import android.content.Intent; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.FragmentManager; -import android.view.View; import com.cocosw.bottomsheet.BottomSheet; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java index b29a2cf886..9ac3b15da3 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java @@ -12,6 +12,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.viewpager.widget.ViewPager; + import com.google.android.material.tabs.TabLayout; import com.mapswithme.maps.R; import com.mapswithme.maps.auth.TargetFragmentCallback; @@ -23,7 +24,6 @@ import com.mapswithme.maps.purchase.PurchaseUtils; import com.mapswithme.util.SharedPropertiesUtils; import java.util.Arrays; -import java.util.Collections; import java.util.List; public class BookmarkCategoriesPagerFragment extends BaseMwmFragment diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java index 67ad6153b7..7c47763869 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java @@ -9,6 +9,7 @@ import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.OnItemClickListener; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkDescriptionAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkDescriptionAdapter.java index 5075b8b33d..139cb85954 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkDescriptionAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkDescriptionAdapter.java @@ -5,6 +5,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java index 30ceb95245..7d07024a23 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.bookmarks; import android.os.Bundle; + import androidx.annotation.NonNull; import com.mapswithme.maps.base.Detachable; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java index 419b74ea83..aab7829c14 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java @@ -4,10 +4,11 @@ import android.app.Application; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import android.text.TextUtils; import com.mapswithme.maps.background.AbstractLogBroadcastReceiver; import com.mapswithme.maps.base.Detachable; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java index 2908b6bcf5..cf392c8950 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java @@ -10,6 +10,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java index 2d4743bec4..a4a7ce22fc 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.bookmarks; +import static com.mapswithme.maps.bookmarks.BookmarksListFragment.EXTRA_BUNDLE; + import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -9,14 +11,13 @@ import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.StyleRes; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseToolbarActivity; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.util.ThemeUtils; -import static com.mapswithme.maps.bookmarks.BookmarksListFragment.EXTRA_BUNDLE; - public class BookmarkListActivity extends BaseToolbarActivity { @CallSuper diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java index 11f2b6553a..3d80d57adb 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java @@ -1,14 +1,15 @@ package com.mapswithme.maps.bookmarks; import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; import com.mapswithme.maps.bookmarks.data.BookmarkInfo; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java index c17069722a..c29c306d2a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java @@ -3,11 +3,11 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.os.Bundle; import androidx.annotation.NonNull; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.base.BaseToolbarActivity; public class BookmarksCatalogActivity extends BaseToolbarActivity diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java index ee2dcf8a78..625351ef06 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java @@ -21,6 +21,7 @@ import android.webkit.WebResourceRequest; import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java index c1f48e142f..60d9c75b64 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java @@ -11,6 +11,7 @@ import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; + import com.mapswithme.maps.R; import com.mapswithme.maps.auth.AuthorizationListener; import com.mapswithme.maps.auth.Authorizer; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java index f74f9845fc..d6df90c190 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java @@ -8,6 +8,7 @@ import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.util.HttpClient; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java index 0c700f5f09..9b70c41094 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java @@ -11,6 +11,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; + import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -19,9 +20,9 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.MergeAdapter; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; + import com.cocosw.bottomsheet.BottomSheet; import com.google.android.material.floatingactionbutton.FloatingActionButton; - import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java index 4f81a21879..aef4cb8437 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.bookmarks; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + import com.mapswithme.maps.R; public enum BookmarksPageFactory diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java index c89b474524..ac896d76fa 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksSharingHelper.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksSharingHelper.java index 5ad9f9e21c..95556a66bb 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksSharingHelper.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksSharingHelper.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.app.ProgressDialog; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java index 712207637f..690e726329 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; -import androidx.annotation.NonNull; import android.view.View; +import androidx.annotation.NonNull; + import com.mapswithme.maps.widget.SearchToolbarController; public class BookmarksToolbarController extends SearchToolbarController diff --git a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java index 86843ccb69..8ec982b11c 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java @@ -3,13 +3,14 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.cocosw.bottomsheet.BottomSheet; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java b/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java index f26ae7a57d..a2d462e534 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java +++ b/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java @@ -1,14 +1,15 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.text.TextUtils; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkManager; -import com.mapswithme.maps.dialog.EditTextDialogFragment; import com.mapswithme.maps.dialog.DialogUtils; +import com.mapswithme.maps.dialog.EditTextDialogFragment; class CategoryValidator implements EditTextDialogFragment.Validator { diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java index 601b3b5942..3710dc3851 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java @@ -9,6 +9,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java index b7392f7b56..0cf9d5285e 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java @@ -2,14 +2,15 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; 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 android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java index 6575a6dcd3..bc47278feb 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java @@ -2,15 +2,16 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; import android.os.Bundle; +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.Fragment; import androidx.fragment.app.FragmentManager; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.RadioGroup; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; diff --git a/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java b/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java index ce44793b94..0cee1f30f1 100644 --- a/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java +++ b/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java @@ -3,9 +3,10 @@ package com.mapswithme.maps.bookmarks; import android.app.Application; import android.content.Context; import android.os.Bundle; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.text.TextUtils; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.bookmarks.data.PaymentData; diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java index 75b6de2b89..92fa9bfe60 100644 --- a/android/src/com/mapswithme/maps/bookmarks/Holders.java +++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java @@ -17,6 +17,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.PluralsRes; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.OnItemClickListener; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/IconsAdapter.java b/android/src/com/mapswithme/maps/bookmarks/IconsAdapter.java index 8e2cc96963..cc034a6d97 100644 --- a/android/src/com/mapswithme/maps/bookmarks/IconsAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/IconsAdapter.java @@ -8,12 +8,12 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.ImageView; -import java.util.List; - import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.Icon; import com.mapswithme.util.Graphics; +import java.util.List; + public class IconsAdapter extends ArrayAdapter { private int mCheckedIconColor; diff --git a/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java b/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java index fdbfb09ee3..9e149d76fd 100644 --- a/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java +++ b/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.dialog.AlertDialogCallback; import com.mapswithme.maps.purchase.BookmarksAllSubscriptionActivity; diff --git a/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java b/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java index eb3bf2c1e5..578fcc18e9 100644 --- a/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java +++ b/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.app.ProgressDialog; import android.content.DialogInterface; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java b/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java index 67b07fe69d..39c136a79f 100644 --- a/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java +++ b/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java @@ -1,8 +1,9 @@ package com.mapswithme.maps.bookmarks; -import androidx.annotation.NonNull; import android.view.View; +import androidx.annotation.NonNull; + public interface OnItemLongClickListener { void onItemLongClick(@NonNull View v, @NonNull T item); diff --git a/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java b/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java index 59070a6dfe..2ff2658e74 100644 --- a/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java +++ b/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.Nullable; import com.mapswithme.maps.bookmarks.data.Error; diff --git a/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java b/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java index 581f604639..10ab8c3fe4 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java @@ -3,13 +3,14 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; + import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java index b1a839dd0c..5d4591d284 100644 --- a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java +++ b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.bookmarks; import android.app.DownloadManager; import android.content.Context; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.core.app.JobIntentService; diff --git a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java index 14f9ae4f33..ee91f00897 100644 --- a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java +++ b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java @@ -12,6 +12,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.JobIntentService; import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.bookmarks.data.Error; import com.mapswithme.maps.bookmarks.data.Result; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java index 8e5515e33f..9362e3bb99 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.annotation.SuppressLint; import android.os.Parcel; + import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java index b109d0a24c..7293597e11 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java @@ -4,12 +4,13 @@ import android.content.Context; import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; +import android.text.TextUtils; + import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.PluralsRes; import androidx.annotation.StringRes; -import android.text.TextUtils; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.BookmarksPageFactory; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java index e87ecd86b5..839c902395 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java @@ -7,7 +7,7 @@ import androidx.annotation.IntRange; import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapswithme.maps.PrivateVariables; + import com.mapswithme.maps.base.DataChangedListener; import com.mapswithme.maps.base.Observable; import com.mapswithme.util.KeyValue; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java index a5ef6c4e43..426a273ae1 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java index 186a2f2314..fc2866ec9e 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; public class CatalogCustomPropertyOption implements Parcelable diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java index 5d64eba702..ed877fb6bc 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; public class CatalogPropertyOptionAndKey implements Parcelable diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java index e44e7114f6..fa9e41aa79 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.bookmarks.data; import android.graphics.Color; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; public class CatalogTag implements Parcelable diff --git a/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java b/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java index 70b2b44342..0a4b32a9ee 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/ElevationInfo.java @@ -5,6 +5,7 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.widget.placepage.PlacePageData; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Error.java b/android/src/com/mapswithme/maps/bookmarks/data/Error.java index 6f98bd6102..84ef9d78ec 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Error.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Error.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.Nullable; import java.net.HttpURLConnection; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java b/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java index 4d894e1126..cd383fbbea 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java @@ -2,9 +2,10 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.NonNull; import android.text.TextUtils; +import androidx.annotation.NonNull; + public class FeatureId implements Parcelable { public static final Creator CREATOR = new Creator() diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Icon.java b/android/src/com/mapswithme/maps/bookmarks/data/Icon.java index c4e237f841..04fd39312c 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Icon.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Icon.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.DrawableRes; import androidx.annotation.IntDef; import androidx.annotation.NonNull; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java index d952d6af1a..b0bde3ed74 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.text.TextUtils; + import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java index 90d3e40a90..ddb2d70064 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Result.java b/android/src/com/mapswithme/maps/bookmarks/data/Result.java index fbdeb3a0b7..20bbca1da3 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Result.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Result.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.Nullable; public class Result implements Parcelable diff --git a/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionActivity.java b/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionActivity.java index 2a2214e63f..1ca4038b77 100644 --- a/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.base.BaseToolbarActivity; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionFragment.java b/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionFragment.java index 8f3939c0e3..e1c01a6c95 100644 --- a/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionFragment.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.bookmarks.description; +import static com.mapswithme.maps.bookmarks.description.BookmarksDescriptionActivity.EXTRA_CATEGORY; + import android.os.Bundle; import android.util.Base64; import android.view.LayoutInflater; @@ -12,6 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.bookmarks.BookmarkHeaderView; @@ -21,8 +24,6 @@ import com.mapswithme.util.Utils; import java.util.Objects; -import static com.mapswithme.maps.bookmarks.description.BookmarksDescriptionActivity.EXTRA_CATEGORY; - public class BookmarksDescriptionFragment extends BaseMwmFragment { @NonNull diff --git a/android/src/com/mapswithme/maps/dialog/AlertDialog.java b/android/src/com/mapswithme/maps/dialog/AlertDialog.java index 86c24f7292..4d02a7f5bd 100644 --- a/android/src/com/mapswithme/maps/dialog/AlertDialog.java +++ b/android/src/com/mapswithme/maps/dialog/AlertDialog.java @@ -4,20 +4,21 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + import androidx.annotation.DrawableRes; import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; +import androidx.appcompat.app.AppCompatDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import androidx.appcompat.app.AppCompatDialog; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; diff --git a/android/src/com/mapswithme/maps/dialog/DialogUtils.java b/android/src/com/mapswithme/maps/dialog/DialogUtils.java index 59331e21be..b3b8aac17c 100644 --- a/android/src/com/mapswithme/maps/dialog/DialogUtils.java +++ b/android/src/com/mapswithme/maps/dialog/DialogUtils.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; diff --git a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java index 807310f7aa..b17736f30a 100644 --- a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java +++ b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java @@ -4,17 +4,18 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.textfield.TextInputLayout; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.AlertDialog; import android.text.InputFilter; import android.text.TextUtils; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + +import com.google.android.material.textfield.TextInputLayout; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; import com.mapswithme.util.InputUtils; diff --git a/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java b/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java index 40dc384877..1fbd735daa 100644 --- a/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java +++ b/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java @@ -4,15 +4,16 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; + import com.mapswithme.maps.R; import java.util.Objects; diff --git a/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java b/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java index bc0f435cdd..f83f623295 100644 --- a/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java +++ b/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.dialog; import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; public interface ResolveDialogViewStrategy diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java b/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java index 89b1060952..d667004eef 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java @@ -2,12 +2,12 @@ package com.mapswithme.maps.discovery; import android.app.Activity; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; -import com.mapswithme.maps.R; -import com.mapswithme.maps.base.CustomNavigateUpListener; import com.mapswithme.maps.base.BaseMwmFragmentActivity; +import com.mapswithme.maps.base.CustomNavigateUpListener; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.gallery.Items; diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java index 7c0767544e..050492ba85 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java @@ -1,12 +1,16 @@ package com.mapswithme.maps.discovery; -import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.os.Bundle; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + import androidx.annotation.CallSuper; import androidx.annotation.IdRes; import androidx.annotation.MainThread; @@ -14,27 +18,23 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import com.mapswithme.maps.R; -import com.mapswithme.maps.base.CustomNavigateUpListener; import com.mapswithme.maps.base.BaseMwmToolbarFragment; +import com.mapswithme.maps.base.CustomNavigateUpListener; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.gallery.GalleryAdapter; import com.mapswithme.maps.gallery.ItemSelectedListener; import com.mapswithme.maps.gallery.Items; import com.mapswithme.maps.gallery.impl.BaseItemSelectedListener; import com.mapswithme.maps.gallery.impl.Factory; +import com.mapswithme.maps.gallery.impl.RegularCatalogPromoListener; import com.mapswithme.maps.promo.PromoCityGallery; import com.mapswithme.maps.promo.PromoEntity; import com.mapswithme.maps.search.SearchResult; import com.mapswithme.maps.widget.PlaceholderView; import com.mapswithme.maps.widget.ToolbarController; import com.mapswithme.maps.widget.placepage.ErrorCatalogPromoListener; -import com.mapswithme.maps.gallery.impl.RegularCatalogPromoListener; import com.mapswithme.maps.widget.recycler.ItemDecoratorFactory; import com.mapswithme.util.ConnectionState; import com.mapswithme.util.Language; diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java b/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java index 232c8077f8..f47a064fb3 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.discovery; import android.annotation.SuppressLint; + import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/downloader/BottomPanel.java b/android/src/com/mapswithme/maps/downloader/BottomPanel.java index 0cc687a3bd..9413551aa2 100644 --- a/android/src/com/mapswithme/maps/downloader/BottomPanel.java +++ b/android/src/com/mapswithme/maps/downloader/BottomPanel.java @@ -1,15 +1,15 @@ package com.mapswithme.maps.downloader; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.view.View; import android.widget.Button; -import java.util.Locale; - +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.mapswithme.maps.R; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; +import java.util.Locale; + class BottomPanel { private final DownloaderFragment mFragment; diff --git a/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java b/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java index d9d4d47a3a..532e6d0b30 100644 --- a/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java +++ b/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java @@ -2,7 +2,6 @@ package com.mapswithme.maps.downloader; import android.location.Location; import android.os.Bundle; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -11,8 +10,7 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; -import java.util.List; -import java.util.Locale; +import androidx.annotation.Nullable; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; @@ -21,6 +19,9 @@ import com.mapswithme.maps.widget.WheelProgressView; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; +import java.util.List; +import java.util.Locale; + public class CountrySuggestFragment extends BaseMwmFragment implements View.OnClickListener { private LinearLayout mLlWithLocation; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java index 48f3856270..1372591fda 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java @@ -23,6 +23,7 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.cocosw.bottomsheet.BottomSheet; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java index 1589740c54..c37634d448 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java @@ -2,12 +2,13 @@ package com.mapswithme.maps.downloader; import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; + import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; -import android.view.WindowManager; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java b/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java index 750d941445..82330fd47d 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java @@ -1,11 +1,12 @@ package com.mapswithme.maps.downloader; -import androidx.annotation.AttrRes; -import androidx.annotation.DrawableRes; import android.util.SparseIntArray; import android.view.View; import android.widget.ImageView; +import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.WheelProgressView; import com.mapswithme.util.ThemeUtils; diff --git a/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java b/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java index 36aae9dcd0..39e4fe544a 100644 --- a/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java +++ b/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.downloader; import android.app.Application; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/downloader/MapManager.java b/android/src/com/mapswithme/maps/downloader/MapManager.java index 0fcb215ac3..64f18188d3 100644 --- a/android/src/com/mapswithme/maps/downloader/MapManager.java +++ b/android/src/com/mapswithme/maps/downloader/MapManager.java @@ -3,12 +3,13 @@ package com.mapswithme.maps.downloader; import android.app.Activity; import android.app.Application; import android.content.DialogInterface; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.UiThread; import androidx.appcompat.app.AlertDialog; -import android.text.TextUtils; import com.mapswithme.maps.R; import com.mapswithme.util.ConnectionState; diff --git a/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java b/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java index 12ec5ec394..b12c608bad 100644 --- a/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java +++ b/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.downloader; import android.app.Application; + import androidx.annotation.NonNull; import com.mapswithme.maps.background.Notifier; diff --git a/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java b/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java index 9e015e2d0a..0fa390187b 100644 --- a/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java +++ b/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java @@ -1,9 +1,6 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; @@ -13,6 +10,10 @@ import android.webkit.WebView; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.util.Constants; diff --git a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java index 9b0188e882..5345420bff 100644 --- a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java +++ b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java @@ -1,21 +1,16 @@ package com.mapswithme.maps.editor; -import android.app.Dialog; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; -import java.util.Objects; - public class AuthDialogFragment extends BaseMwmDialogFragment { @Nullable diff --git a/android/src/com/mapswithme/maps/editor/AuthFragment.java b/android/src/com/mapswithme/maps/editor/AuthFragment.java index 90a7f9a653..fd469c967a 100644 --- a/android/src/com/mapswithme/maps/editor/AuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/AuthFragment.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.base.BaseMwmToolbarFragment; diff --git a/android/src/com/mapswithme/maps/editor/CuisineAdapter.java b/android/src/com/mapswithme/maps/editor/CuisineAdapter.java index 69fcff7dec..497fdebe50 100644 --- a/android/src/com/mapswithme/maps/editor/CuisineAdapter.java +++ b/android/src/com/mapswithme/maps/editor/CuisineAdapter.java @@ -1,7 +1,5 @@ package com.mapswithme.maps.editor; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -9,15 +7,18 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.mapswithme.maps.R; +import com.mapswithme.util.StringUtils; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import com.mapswithme.maps.R; -import com.mapswithme.util.StringUtils; - public class CuisineAdapter extends RecyclerView.Adapter { private static class Item implements Comparable diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java index ed59f3ea99..9ad1ad6ae0 100644 --- a/android/src/com/mapswithme/maps/editor/Editor.java +++ b/android/src/com/mapswithme/maps/editor/Editor.java @@ -1,14 +1,12 @@ package com.mapswithme.maps.editor; import android.content.Context; + import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Size; import androidx.annotation.WorkerThread; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; @@ -20,6 +18,9 @@ import com.mapswithme.maps.editor.data.LocalizedName; import com.mapswithme.maps.editor.data.LocalizedStreet; import com.mapswithme.maps.editor.data.NamesDataSource; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** * Edits active(selected on the map) feature, which is represented as osm::EditableFeature in the core. diff --git a/android/src/com/mapswithme/maps/editor/EditorActivity.java b/android/src/com/mapswithme/maps/editor/EditorActivity.java index 5913c37882..6e0972b84f 100644 --- a/android/src/com/mapswithme/maps/editor/EditorActivity.java +++ b/android/src/com/mapswithme/maps/editor/EditorActivity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.editor; import android.app.Activity; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index cd2f4d925d..554fab46d1 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -4,16 +4,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.CallSuper; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.LinearLayoutManager; -import com.google.android.material.textfield.TextInputLayout; -import androidx.appcompat.app.AlertDialog; -import androidx.recyclerview.widget.RecyclerView; -import androidx.appcompat.widget.SwitchCompat; import android.text.InputType; import android.text.TextUtils; import android.util.SparseArray; @@ -25,6 +15,17 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.CallSuper; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.SwitchCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.textfield.TextInputLayout; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index 6c467a6cc2..49863f7948 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -16,6 +16,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; @@ -30,7 +31,6 @@ import com.mapswithme.maps.intent.Factory; import com.mapswithme.maps.widget.SearchToolbarController; import com.mapswithme.maps.widget.ToolbarController; import com.mapswithme.util.ConnectionState; -import com.mapswithme.util.KeyValue; import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java b/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java index 6fffcb6ea6..22887d4f35 100644 --- a/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java +++ b/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.editor; import android.content.Intent; + import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java b/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java index 9e0d46c67f..b19dbe407a 100644 --- a/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java +++ b/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.editor; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.editor.data.FeatureCategory; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java b/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java index 480a873baf..6560046a90 100644 --- a/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java +++ b/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import androidx.annotation.CallSuper; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; import com.mapswithme.maps.editor.data.FeatureCategory; diff --git a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java index 4f9cf2a71e..3177ba6002 100644 --- a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java +++ b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java @@ -5,13 +5,6 @@ import android.app.Dialog; import android.content.Context; import android.content.res.ColorStateList; import android.os.Bundle; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.StyleRes; -import com.google.android.material.tabs.TabLayout; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.appcompat.app.AlertDialog; import android.text.format.DateFormat; import android.view.LayoutInflater; import android.view.View; @@ -19,6 +12,14 @@ import android.widget.Button; import android.widget.TextView; import android.widget.TimePicker; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + +import com.google.android.material.tabs.TabLayout; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; import com.mapswithme.maps.editor.data.HoursMinutes; diff --git a/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java b/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java index a5d7fc2960..0c06cadee2 100644 --- a/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java +++ b/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.editor; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.editor.data.Language; diff --git a/android/src/com/mapswithme/maps/editor/LanguagesFragment.java b/android/src/com/mapswithme/maps/editor/LanguagesFragment.java index f3ef40d903..ccde706004 100644 --- a/android/src/com/mapswithme/maps/editor/LanguagesFragment.java +++ b/android/src/com/mapswithme/maps/editor/LanguagesFragment.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.editor; import android.os.Bundle; + import androidx.annotation.NonNull; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; diff --git a/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java b/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java index 462dde28f0..bd18c49496 100644 --- a/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java +++ b/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java @@ -1,21 +1,22 @@ package com.mapswithme.maps.editor; -import androidx.annotation.NonNull; -import com.google.android.material.textfield.TextInputLayout; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; -import java.util.List; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.textfield.TextInputLayout; import com.mapswithme.maps.R; import com.mapswithme.maps.editor.data.LocalizedName; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; +import java.util.List; + public class MultilanguageAdapter extends RecyclerView.Adapter { private final List mNames; diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java index 842f5988ef..81f635bf53 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java @@ -5,8 +5,6 @@ import android.content.Intent; import android.graphics.LightingColorFilter; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,6 +12,9 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.base.BaseMwmToolbarFragment; diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java index 73682cb583..43d157d487 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java @@ -3,12 +3,13 @@ package com.mapswithme.maps.editor; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.view.View; + import androidx.annotation.IdRes; import androidx.annotation.Nullable; import androidx.annotation.Size; -import androidx.fragment.app.Fragment; import androidx.appcompat.app.AlertDialog; -import android.view.View; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.R; import com.mapswithme.util.Constants; diff --git a/android/src/com/mapswithme/maps/editor/OsmOAuth.java b/android/src/com/mapswithme/maps/editor/OsmOAuth.java index cc4da55723..9ddb75887b 100644 --- a/android/src/com/mapswithme/maps/editor/OsmOAuth.java +++ b/android/src/com/mapswithme/maps/editor/OsmOAuth.java @@ -8,11 +8,11 @@ import androidx.annotation.Nullable; import androidx.annotation.Size; import androidx.annotation.WorkerThread; -import java.lang.ref.WeakReference; - import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.editor.data.UserStats; +import java.lang.ref.WeakReference; + public final class OsmOAuth { private OsmOAuth() {} diff --git a/android/src/com/mapswithme/maps/editor/ProfileFragment.java b/android/src/com/mapswithme/maps/editor/ProfileFragment.java index 324749eb9f..254613d297 100644 --- a/android/src/com/mapswithme/maps/editor/ProfileFragment.java +++ b/android/src/com/mapswithme/maps/editor/ProfileFragment.java @@ -1,21 +1,18 @@ package com.mapswithme.maps.editor; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.text.format.DateUtils; +import android.view.View; +import android.widget.TextView; + import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; -import android.text.format.DateUtils; -import android.view.View; -import android.widget.TextView; - -import java.util.ArrayList; -import java.util.List; import com.cocosw.bottomsheet.BottomSheet; import com.mapswithme.maps.R; @@ -24,6 +21,9 @@ import com.mapswithme.util.BottomSheetHelper; import com.mapswithme.util.Constants; import com.mapswithme.util.UiUtils; +import java.util.ArrayList; +import java.util.List; + public class ProfileFragment extends AuthFragment implements View.OnClickListener, OsmOAuth.OnUserStatsChanged { private View mSentBlock; diff --git a/android/src/com/mapswithme/maps/editor/ReportFragment.java b/android/src/com/mapswithme/maps/editor/ReportFragment.java index 9ebc7c2e40..3741579271 100644 --- a/android/src/com/mapswithme/maps/editor/ReportFragment.java +++ b/android/src/com/mapswithme/maps/editor/ReportFragment.java @@ -1,15 +1,16 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import androidx.annotation.IntRange; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java b/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java index df22a0b293..516857e53b 100644 --- a/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java +++ b/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java @@ -1,11 +1,5 @@ package com.mapswithme.maps.editor; -import androidx.annotation.IdRes; -import androidx.annotation.IntRange; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.RecyclerView; -import androidx.appcompat.widget.SwitchCompat; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; @@ -16,6 +10,13 @@ import android.widget.CompoundButton; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.IdRes; +import androidx.annotation.IntRange; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SwitchCompat; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.editor.data.HoursMinutes; import com.mapswithme.maps.editor.data.TimeFormatUtils; diff --git a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java index 91c896524f..2676670502 100644 --- a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java +++ b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; import com.mapswithme.maps.editor.data.HoursMinutes; diff --git a/android/src/com/mapswithme/maps/editor/StreetAdapter.java b/android/src/com/mapswithme/maps/editor/StreetAdapter.java index a74f66f139..d0e0d33473 100644 --- a/android/src/com/mapswithme/maps/editor/StreetAdapter.java +++ b/android/src/com/mapswithme/maps/editor/StreetAdapter.java @@ -1,14 +1,15 @@ package com.mapswithme.maps.editor; import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.maps.dialog.EditTextDialogFragment; diff --git a/android/src/com/mapswithme/maps/editor/StreetFragment.java b/android/src/com/mapswithme/maps/editor/StreetFragment.java index 23a7754629..ee660a346f 100644 --- a/android/src/com/mapswithme/maps/editor/StreetFragment.java +++ b/android/src/com/mapswithme/maps/editor/StreetFragment.java @@ -1,15 +1,15 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import androidx.annotation.CallSuper; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.base.BaseMwmRecyclerFragment; import com.mapswithme.maps.dialog.EditTextDialogFragment; import com.mapswithme.maps.editor.data.LocalizedStreet; diff --git a/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java b/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java index ad4637be48..0886657279 100644 --- a/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java +++ b/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java @@ -2,12 +2,6 @@ package com.mapswithme.maps.editor; import android.app.Activity; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -15,6 +9,13 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.base.OnBackPressListener; diff --git a/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java b/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java index cc642ffd9f..dcf2bfb6a6 100644 --- a/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java +++ b/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.editor.data; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; public class FeatureCategory implements Parcelable diff --git a/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java b/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java index a28f57e7ee..7f22ff248f 100644 --- a/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java +++ b/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java @@ -2,16 +2,17 @@ package com.mapswithme.maps.editor.data; import android.content.Context; import android.content.res.Resources; + import androidx.annotation.IntRange; import androidx.annotation.NonNull; -import java.text.DateFormatSymbols; -import java.util.Locale; - import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.util.Utils; +import java.text.DateFormatSymbols; +import java.util.Locale; + public class TimeFormatUtils { private TimeFormatUtils() {} diff --git a/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java index 960add4537..4d212c7ae8 100644 --- a/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java @@ -1,8 +1,9 @@ package com.mapswithme.maps.gallery; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.view.ViewGroup; import java.util.ArrayList; import java.util.List; diff --git a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java index 827ef317cd..dd1fff7448 100644 --- a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java +++ b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java @@ -4,12 +4,6 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.StyleRes; -import androidx.core.graphics.drawable.RoundedBitmapDrawable; -import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.View; @@ -18,6 +12,13 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.appcompat.widget.Toolbar; +import androidx.core.graphics.drawable.RoundedBitmapDrawable; +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; +import androidx.viewpager.widget.ViewPager; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.BitmapImageViewTarget; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java index 34520f99c6..eb4fc7bb8b 100644 --- a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java +++ b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.gallery; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; diff --git a/android/src/com/mapswithme/maps/gallery/GalleryActivity.java b/android/src/com/mapswithme/maps/gallery/GalleryActivity.java index 5f1ddcf661..cb6ca243a4 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryActivity.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryActivity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.gallery; import android.content.Context; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java b/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java index 2da702ee26..2220c68194 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java @@ -1,8 +1,9 @@ package com.mapswithme.maps.gallery; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.ViewGroup; public class GalleryAdapter, I extends Items.Item> extends RecyclerView.Adapter diff --git a/android/src/com/mapswithme/maps/gallery/GalleryFragment.java b/android/src/com/mapswithme/maps/gallery/GalleryFragment.java index 86eabbd8d5..28435645ed 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryFragment.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryFragment.java @@ -2,13 +2,14 @@ package com.mapswithme.maps.gallery; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; diff --git a/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java b/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java index 78572e8e57..ced838a8b8 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.gallery; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; diff --git a/android/src/com/mapswithme/maps/gallery/Holders.java b/android/src/com/mapswithme/maps/gallery/Holders.java index 5c34fd8ceb..51ad4d008c 100644 --- a/android/src/com/mapswithme/maps/gallery/Holders.java +++ b/android/src/com/mapswithme/maps/gallery/Holders.java @@ -22,6 +22,7 @@ import androidx.annotation.Nullable; import androidx.core.graphics.drawable.RoundedBitmapDrawable; import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; import androidx.recyclerview.widget.RecyclerView; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.BitmapImageViewTarget; import com.mapswithme.HotelUtils; diff --git a/android/src/com/mapswithme/maps/gallery/Image.java b/android/src/com/mapswithme/maps/gallery/Image.java index 1b89cb7838..773466aa2f 100644 --- a/android/src/com/mapswithme/maps/gallery/Image.java +++ b/android/src/com/mapswithme/maps/gallery/Image.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.gallery; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/gallery/ImageAdapter.java b/android/src/com/mapswithme/maps/gallery/ImageAdapter.java index f5fd9cd11c..958178f44a 100644 --- a/android/src/com/mapswithme/maps/gallery/ImageAdapter.java +++ b/android/src/com/mapswithme/maps/gallery/ImageAdapter.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.gallery; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.bumptech.glide.Glide; import com.mapswithme.maps.R; import com.mapswithme.maps.widget.recycler.RecyclerClickListener; diff --git a/android/src/com/mapswithme/maps/gallery/Items.java b/android/src/com/mapswithme/maps/gallery/Items.java index 7fb19913df..cc31178bf4 100644 --- a/android/src/com/mapswithme/maps/gallery/Items.java +++ b/android/src/com/mapswithme/maps/gallery/Items.java @@ -1,24 +1,23 @@ package com.mapswithme.maps.gallery; +import static com.mapswithme.maps.gallery.Constants.TYPE_MORE; +import static com.mapswithme.maps.gallery.Constants.TYPE_PRODUCT; +import static com.mapswithme.util.Constants.Rating.RATING_INCORRECT_VALUE; + import android.content.Context; import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; - import androidx.annotation.StringRes; -import com.mapswithme.maps.MwmApplication; + import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.search.Popularity; import com.mapswithme.maps.search.SearchResult; import com.mapswithme.util.UiUtils; -import static com.mapswithme.maps.gallery.Constants.TYPE_MORE; -import static com.mapswithme.maps.gallery.Constants.TYPE_PRODUCT; -import static com.mapswithme.util.Constants.Rating.RATING_INCORRECT_VALUE; - public class Items { public static class LocalExpertItem extends RegularAdapterStrategy.Item diff --git a/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java index dd00e61d16..6dc3111111 100644 --- a/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java @@ -1,18 +1,17 @@ package com.mapswithme.maps.gallery; +import static com.mapswithme.maps.gallery.Constants.TYPE_MORE; +import static com.mapswithme.maps.gallery.Constants.TYPE_PRODUCT; + +import android.os.Parcel; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; -import android.os.Parcel; -import android.os.Parcelable; -import android.view.ViewGroup; - import java.util.List; -import static com.mapswithme.maps.gallery.Constants.TYPE_MORE; -import static com.mapswithme.maps.gallery.Constants.TYPE_PRODUCT; - public abstract class RegularAdapterStrategy extends AdapterStrategy, T> { diff --git a/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java index 1476072d41..8086780ec0 100644 --- a/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java @@ -2,12 +2,13 @@ package com.mapswithme.maps.gallery; import android.content.Context; import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.MwmApplication; public abstract class SimpleSingleItemAdapterStrategy> diff --git a/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java index b3c8a16c4b..f020e1aea7 100644 --- a/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java @@ -2,14 +2,15 @@ package com.mapswithme.maps.gallery; import android.content.Context; import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java b/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java index 3525ce8f5b..bb3ba3cbd2 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java +++ b/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.gallery.impl; import android.app.Activity; + import androidx.annotation.NonNull; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java index 25f00338b5..e2fc610e3e 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java @@ -1,11 +1,12 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java index 19f8440d35..93bcb4d367 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - 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 com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java index 66bf51a2f7..88c192eeb1 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - 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 com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/Factory.java b/android/src/com/mapswithme/maps/gallery/impl/Factory.java index f064bd39ee..3ef9aa6764 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/Factory.java +++ b/android/src/com/mapswithme/maps/gallery/impl/Factory.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.gallery.impl; import android.content.Context; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/gallery/impl/GuidesAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/GuidesAdapterStrategy.java index f752a8c6fd..0a514efaf1 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/GuidesAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/GuidesAdapterStrategy.java @@ -6,6 +6,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java index 2e2558d69b..3e34e857f8 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - 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 com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java index 1cd929266f..284d4356d2 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java @@ -1,11 +1,14 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import static com.mapswithme.maps.gallery.Constants.TYPE_PRODUCT; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.discovery.LocalExpert; import com.mapswithme.maps.gallery.Holders; @@ -16,8 +19,6 @@ import com.mapswithme.maps.gallery.RegularAdapterStrategy; import java.util.ArrayList; import java.util.List; -import static com.mapswithme.maps.gallery.Constants.TYPE_PRODUCT; - public class LocalExpertsAdapterStrategy extends RegularAdapterStrategy { LocalExpertsAdapterStrategy(@NonNull LocalExpert[] experts, @Nullable String moreUrl, diff --git a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java index ea24e5381d..db988957fb 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - 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 com.mapswithme.maps.R; import com.mapswithme.maps.gallery.ItemSelectedListener; import com.mapswithme.maps.gallery.Items; diff --git a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java index 5cdd3e0cf7..8eb85f3621 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - 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 com.mapswithme.maps.R; import com.mapswithme.maps.gallery.ItemSelectedListener; import com.mapswithme.maps.gallery.Items; diff --git a/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java b/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java index 2be67b4cbe..821d52935c 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java +++ b/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.gallery.impl; import android.app.Activity; -import androidx.annotation.NonNull; import android.text.TextUtils; +import androidx.annotation.NonNull; + import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity; import com.mapswithme.maps.bookmarks.data.BookmarkManager; diff --git a/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java index fdd13d15b9..ca5cfb9c1c 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java @@ -1,11 +1,12 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java index 62de05c7d4..7fac491693 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - 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 com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java index 47d142a59b..212de81915 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.gallery.impl; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - 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 com.mapswithme.maps.R; import com.mapswithme.maps.gallery.Holders; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/guides/GuidesGallery.java b/android/src/com/mapswithme/maps/guides/GuidesGallery.java index 62d9530403..3c45bbc17a 100644 --- a/android/src/com/mapswithme/maps/guides/GuidesGallery.java +++ b/android/src/com/mapswithme/maps/guides/GuidesGallery.java @@ -5,6 +5,7 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.gallery.Constants; import com.mapswithme.maps.gallery.RegularAdapterStrategy; import com.mapswithme.maps.widget.placepage.PlacePageData; diff --git a/android/src/com/mapswithme/maps/intent/BackUrlMapTaskWrapper.java b/android/src/com/mapswithme/maps/intent/BackUrlMapTaskWrapper.java index 7aa174346e..0dce8ecd7f 100644 --- a/android/src/com/mapswithme/maps/intent/BackUrlMapTaskWrapper.java +++ b/android/src/com/mapswithme/maps/intent/BackUrlMapTaskWrapper.java @@ -5,6 +5,7 @@ import android.net.Uri; import android.text.TextUtils; import androidx.annotation.NonNull; + import com.mapswithme.maps.MwmActivity; public class BackUrlMapTaskWrapper implements MapTask diff --git a/android/src/com/mapswithme/maps/intent/Factory.java b/android/src/com/mapswithme/maps/intent/Factory.java index 9ee72b18cf..d17df47370 100644 --- a/android/src/com/mapswithme/maps/intent/Factory.java +++ b/android/src/com/mapswithme/maps/intent/Factory.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.DownloadResourcesLegacyActivity; import com.mapswithme.maps.Framework; import com.mapswithme.maps.MapFragment; diff --git a/android/src/com/mapswithme/maps/intent/IntentProcessor.java b/android/src/com/mapswithme/maps/intent/IntentProcessor.java index 3f38ab3b44..2ffdadf090 100644 --- a/android/src/com/mapswithme/maps/intent/IntentProcessor.java +++ b/android/src/com/mapswithme/maps/intent/IntentProcessor.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.intent; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java index 1a32f2ad59..06b0ec7431 100644 --- a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java +++ b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java @@ -7,6 +7,7 @@ import android.location.LocationManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.MwmApplication; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/location/BaseLocationListener.java b/android/src/com/mapswithme/maps/location/BaseLocationListener.java index f014ef447b..f982929b9d 100644 --- a/android/src/com/mapswithme/maps/location/BaseLocationListener.java +++ b/android/src/com/mapswithme/maps/location/BaseLocationListener.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.location; import android.location.Location; import android.location.LocationListener; import android.os.Bundle; + import androidx.annotation.NonNull; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/maps/location/CompassData.java b/android/src/com/mapswithme/maps/location/CompassData.java index 4a90d16d6f..7d992316e2 100644 --- a/android/src/com/mapswithme/maps/location/CompassData.java +++ b/android/src/com/mapswithme/maps/location/CompassData.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.content.Context; import androidx.annotation.NonNull; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.LocationUtils; diff --git a/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java b/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java index 0685dfa03e..b60e25d6fc 100644 --- a/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java +++ b/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.location; import android.location.Location; + import androidx.annotation.NonNull; import com.mapswithme.util.LocationUtils; diff --git a/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java b/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java index c21ae5fa35..d80ae85b5a 100644 --- a/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java +++ b/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.location; import android.location.Location; + import androidx.annotation.NonNull; class FusedLocationFixChecker extends DefaultLocationFixChecker diff --git a/android/src/com/mapswithme/maps/location/GPSCheck.java b/android/src/com/mapswithme/maps/location/GPSCheck.java index cae881fb3d..e7b0b673e2 100644 --- a/android/src/com/mapswithme/maps/location/GPSCheck.java +++ b/android/src/com/mapswithme/maps/location/GPSCheck.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.location; +import static com.mapswithme.maps.MwmApplication.backgroundTracker; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -8,8 +10,6 @@ import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import static com.mapswithme.maps.MwmApplication.backgroundTracker; - public class GPSCheck extends BroadcastReceiver { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.LOCATION); diff --git a/android/src/com/mapswithme/maps/location/LocationFixChecker.java b/android/src/com/mapswithme/maps/location/LocationFixChecker.java index f7365e6c57..4eb2342240 100644 --- a/android/src/com/mapswithme/maps/location/LocationFixChecker.java +++ b/android/src/com/mapswithme/maps/location/LocationFixChecker.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.location; import android.location.Location; + import androidx.annotation.NonNull; interface LocationFixChecker diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java index 8f2bf38cab..31f361f98a 100644 --- a/android/src/com/mapswithme/maps/location/LocationHelper.java +++ b/android/src/com/mapswithme/maps/location/LocationHelper.java @@ -7,14 +7,13 @@ import android.location.Location; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.routing.RoutingController; -import com.mapswithme.maps.routing.RoutingInfo; -import com.mapswithme.util.Config; import com.mapswithme.util.Listeners; import com.mapswithme.util.LocationUtils; import com.mapswithme.util.PermissionsUtils; diff --git a/android/src/com/mapswithme/maps/location/PlatformSocket.java b/android/src/com/mapswithme/maps/location/PlatformSocket.java index 47c3a32a44..0b001a0f58 100644 --- a/android/src/com/mapswithme/maps/location/PlatformSocket.java +++ b/android/src/com/mapswithme/maps/location/PlatformSocket.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.location; import android.annotation.SuppressLint; import android.net.SSLCertificateSocketFactory; import android.os.SystemClock; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -10,8 +11,6 @@ import com.mapswithme.maps.BuildConfig; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import javax.net.SocketFactory; -import javax.net.ssl.SSLSocketFactory; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -19,6 +18,9 @@ import java.net.Socket; import java.net.SocketException; import java.net.SocketTimeoutException; +import javax.net.SocketFactory; +import javax.net.ssl.SSLSocketFactory; + /** * Implements interface that will be used by the core for * sending/receiving the raw data trough platform socket interface. diff --git a/android/src/com/mapswithme/maps/location/SensorHelper.java b/android/src/com/mapswithme/maps/location/SensorHelper.java index e6efdfe7d9..5b6f97a010 100644 --- a/android/src/com/mapswithme/maps/location/SensorHelper.java +++ b/android/src/com/mapswithme/maps/location/SensorHelper.java @@ -8,6 +8,7 @@ import android.hardware.SensorManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.MwmApplication; class SensorHelper implements SensorEventListener diff --git a/android/src/com/mapswithme/maps/location/TrackRecorder.java b/android/src/com/mapswithme/maps/location/TrackRecorder.java index 6d5798c529..e1f25aa6c1 100644 --- a/android/src/com/mapswithme/maps/location/TrackRecorder.java +++ b/android/src/com/mapswithme/maps/location/TrackRecorder.java @@ -6,9 +6,10 @@ import android.content.Context; import android.content.Intent; import android.location.Location; import android.os.SystemClock; -import androidx.annotation.NonNull; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.base.Initializable; import com.mapswithme.util.concurrency.UiThread; diff --git a/android/src/com/mapswithme/maps/location/TrackRecorderWakeReceiver.java b/android/src/com/mapswithme/maps/location/TrackRecorderWakeReceiver.java index bd16bda533..4896b7f6a8 100644 --- a/android/src/com/mapswithme/maps/location/TrackRecorderWakeReceiver.java +++ b/android/src/com/mapswithme/maps/location/TrackRecorderWakeReceiver.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.location; +import static com.mapswithme.maps.MwmApplication.backgroundTracker; + import android.content.Context; import android.content.Intent; import android.util.Log; @@ -12,8 +14,6 @@ import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import static com.mapswithme.maps.MwmApplication.backgroundTracker; - public class TrackRecorderWakeReceiver extends MwmBroadcastReceiver { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); diff --git a/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java b/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java index f68877c261..8be9ca5ebd 100644 --- a/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java +++ b/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.location; -import androidx.annotation.NonNull; -import androidx.core.app.JobIntentService; import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.Context; import android.content.Intent; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.scheduling.JobIdMap; import com.mapswithme.util.CrashlyticsUtils; diff --git a/android/src/com/mapswithme/maps/location/TransitionListener.java b/android/src/com/mapswithme/maps/location/TransitionListener.java index 3957b44b93..57415b2799 100644 --- a/android/src/com/mapswithme/maps/location/TransitionListener.java +++ b/android/src/com/mapswithme/maps/location/TransitionListener.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.location.LocationManager; + import androidx.annotation.NonNull; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/maplayer/AbstractIsoLinesClickListener.java b/android/src/com/mapswithme/maps/maplayer/AbstractIsoLinesClickListener.java index 62f23c438e..2887e842ee 100644 --- a/android/src/com/mapswithme/maps/maplayer/AbstractIsoLinesClickListener.java +++ b/android/src/com/mapswithme/maps/maplayer/AbstractIsoLinesClickListener.java @@ -5,12 +5,11 @@ import android.view.View; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; + import com.mapswithme.maps.R; import com.mapswithme.maps.maplayer.isolines.IsolinesManager; import com.mapswithme.util.Utils; -import java.util.Collections; - public abstract class AbstractIsoLinesClickListener extends DefaultClickListener { diff --git a/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java b/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java index d991485a35..ecb8738f2d 100644 --- a/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java +++ b/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.maplayer; import android.content.Context; + import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; diff --git a/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java b/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java index a3a58a31a9..1af983b49b 100644 --- a/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java +++ b/android/src/com/mapswithme/maps/maplayer/DefaultClickListener.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.maplayer; import android.view.View; import androidx.annotation.NonNull; + import com.mapswithme.maps.adapter.OnItemClickListener; import com.mapswithme.util.SharedPropertiesUtils; diff --git a/android/src/com/mapswithme/maps/maplayer/LayerHolder.java b/android/src/com/mapswithme/maps/maplayer/LayerHolder.java index b4897a0db0..99618b5c6b 100644 --- a/android/src/com/mapswithme/maps/maplayer/LayerHolder.java +++ b/android/src/com/mapswithme/maps/maplayer/LayerHolder.java @@ -7,6 +7,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.OnItemClickListener; diff --git a/android/src/com/mapswithme/maps/maplayer/LayersAdapter.java b/android/src/com/mapswithme/maps/maplayer/LayersAdapter.java index ab674e7f62..f209e17324 100644 --- a/android/src/com/mapswithme/maps/maplayer/LayersAdapter.java +++ b/android/src/com/mapswithme/maps/maplayer/LayersAdapter.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.OnItemClickListener; import com.mapswithme.util.SharedPropertiesUtils; diff --git a/android/src/com/mapswithme/maps/maplayer/LayersUtils.java b/android/src/com/mapswithme/maps/maplayer/LayersUtils.java index 7229071afb..8a8100ccdd 100644 --- a/android/src/com/mapswithme/maps/maplayer/LayersUtils.java +++ b/android/src/com/mapswithme/maps/maplayer/LayersUtils.java @@ -4,6 +4,7 @@ import android.content.Context; import android.util.Pair; import androidx.annotation.NonNull; + import com.mapswithme.maps.adapter.OnItemClickListener; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java index 97734a0189..15152ca89e 100644 --- a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java +++ b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java @@ -6,6 +6,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; + import com.mapswithme.maps.maplayer.subway.DefaultMapLayerController; import com.mapswithme.maps.maplayer.traffic.widget.TrafficButton; import com.mapswithme.maps.maplayer.traffic.widget.TrafficButtonController; diff --git a/android/src/com/mapswithme/maps/maplayer/Mode.java b/android/src/com/mapswithme/maps/maplayer/Mode.java index 4d30f4dc1d..7f597f6c36 100644 --- a/android/src/com/mapswithme/maps/maplayer/Mode.java +++ b/android/src/com/mapswithme/maps/maplayer/Mode.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.maplayer; import android.content.Context; import androidx.annotation.NonNull; + import com.mapswithme.maps.maplayer.guides.GuidesManager; import com.mapswithme.maps.maplayer.isolines.IsolinesManager; import com.mapswithme.maps.maplayer.subway.SubwayManager; diff --git a/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java b/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java index 0572313db3..5cf3eaf0b0 100644 --- a/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java +++ b/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java @@ -14,13 +14,14 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.mapswithme.maps.R; +import com.mapswithme.maps.base.NoConnectionListener; +import com.mapswithme.maps.maplayer.guides.AbstractGuidesClickListener; import com.mapswithme.maps.maplayer.subway.OnSubwayLayerToggleListener; import com.mapswithme.maps.maplayer.traffic.OnTrafficLayerToggleListener; -import com.mapswithme.maps.maplayer.guides.AbstractGuidesClickListener; -import com.mapswithme.maps.base.NoConnectionListener; import com.mapswithme.maps.widget.recycler.SpanningLinearLayoutManager; import java.util.Objects; diff --git a/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java b/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java index 2dbb24e0d8..db2e87976f 100644 --- a/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java +++ b/android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.maplayer.guides; import android.view.View; import androidx.annotation.NonNull; + import com.mapswithme.maps.base.NoConnectionListener; import com.mapswithme.maps.maplayer.BottomSheetItem; import com.mapswithme.maps.maplayer.DefaultClickListener; diff --git a/android/src/com/mapswithme/maps/maplayer/guides/GuidesErrorDialogListener.java b/android/src/com/mapswithme/maps/maplayer/guides/GuidesErrorDialogListener.java index 6eaf901564..f66932643a 100644 --- a/android/src/com/mapswithme/maps/maplayer/guides/GuidesErrorDialogListener.java +++ b/android/src/com/mapswithme/maps/maplayer/guides/GuidesErrorDialogListener.java @@ -1,7 +1,6 @@ package com.mapswithme.maps.maplayer.guides; import androidx.annotation.NonNull; -import com.mapswithme.maps.maplayer.isolines.IsolinesState; public interface GuidesErrorDialogListener { diff --git a/android/src/com/mapswithme/maps/maplayer/guides/GuidesManager.java b/android/src/com/mapswithme/maps/maplayer/guides/GuidesManager.java index 7239ec0184..acc6ea6fa0 100644 --- a/android/src/com/mapswithme/maps/maplayer/guides/GuidesManager.java +++ b/android/src/com/mapswithme/maps/maplayer/guides/GuidesManager.java @@ -5,6 +5,7 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.base.Detachable; diff --git a/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java b/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java index fe91cf6341..5730fb75fe 100644 --- a/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java +++ b/android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java @@ -6,6 +6,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.util.SharedPropertiesUtils; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesManager.java b/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesManager.java index fdb45465b7..d5737311c0 100644 --- a/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesManager.java +++ b/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesManager.java @@ -5,6 +5,7 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.base.Detachable; diff --git a/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesState.java b/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesState.java index 81b95f66c3..a46714a480 100644 --- a/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesState.java +++ b/android/src/com/mapswithme/maps/maplayer/isolines/IsolinesState.java @@ -6,6 +6,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/maplayer/isolines/OnIsolinesChangedListenerImpl.java b/android/src/com/mapswithme/maps/maplayer/isolines/OnIsolinesChangedListenerImpl.java index adfa943fb5..23b2dcedf7 100644 --- a/android/src/com/mapswithme/maps/maplayer/isolines/OnIsolinesChangedListenerImpl.java +++ b/android/src/com/mapswithme/maps/maplayer/isolines/OnIsolinesChangedListenerImpl.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.maplayer.isolines; import android.app.Application; import androidx.annotation.NonNull; + import com.mapswithme.maps.base.Detachable; class OnIsolinesChangedListenerImpl implements OnIsolinesChangedListener, Detachable diff --git a/android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java b/android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java index 570f7933cc..1d8d96c4c6 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/DefaultMapLayerController.java @@ -4,6 +4,7 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; + import com.mapswithme.maps.maplayer.MapLayerController; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java b/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java index d5a7158276..0fbc9745a3 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.maplayer.subway; import android.app.Application; -import android.content.Context; + import androidx.annotation.MainThread; import androidx.annotation.NonNull; diff --git a/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java b/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java index 376289d0b1..8d2d600227 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java @@ -5,6 +5,7 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.base.Initializable; diff --git a/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java b/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java index 21efdeb8f6..fc3e726324 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java @@ -4,6 +4,7 @@ import android.content.Context; import android.widget.Toast; import androidx.annotation.NonNull; + import com.mapswithme.maps.R; enum TransitSchemeState diff --git a/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java b/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java index 542283a49f..3b6d5721d6 100644 --- a/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java +++ b/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.maplayer.traffic; import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.base.Initializable; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java index 91e6b3ad5d..bb380e4a33 100644 --- a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java +++ b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java @@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable; import android.view.View; import android.widget.ImageButton; import android.widget.RelativeLayout; + import androidx.annotation.NonNull; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java index 01e1a5d476..5f98c65153 100644 --- a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java +++ b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java @@ -3,11 +3,11 @@ package com.mapswithme.maps.maplayer.traffic.widget; import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.widget.Toast; - import androidx.appcompat.app.AlertDialog; + import com.mapswithme.maps.R; import com.mapswithme.maps.maplayer.MapLayerController; import com.mapswithme.maps.maplayer.traffic.TrafficManager; diff --git a/android/src/com/mapswithme/maps/promo/CatalogPromoController.java b/android/src/com/mapswithme/maps/promo/CatalogPromoController.java index 2335a667f9..4a8c506192 100644 --- a/android/src/com/mapswithme/maps/promo/CatalogPromoController.java +++ b/android/src/com/mapswithme/maps/promo/CatalogPromoController.java @@ -13,6 +13,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.Detachable; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; diff --git a/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java b/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java index c212ffb97f..c10bff9998 100644 --- a/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java +++ b/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java @@ -1,6 +1,5 @@ package com.mapswithme.maps.promo; -import android.content.DialogInterface; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -10,6 +9,7 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.bumptech.glide.Glide; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; diff --git a/android/src/com/mapswithme/maps/promo/PromoCityGallery.java b/android/src/com/mapswithme/maps/promo/PromoCityGallery.java index 9110408844..6a26662af6 100644 --- a/android/src/com/mapswithme/maps/promo/PromoCityGallery.java +++ b/android/src/com/mapswithme/maps/promo/PromoCityGallery.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.promo; import android.graphics.Color; + import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java index ef8975e49f..e8527041dd 100644 --- a/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java +++ b/android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; + import com.android.billingclient.api.SkuDetails; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java b/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java index 3649cb65eb..2963d9e1d3 100644 --- a/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java @@ -5,6 +5,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.Purchase; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/BillingManager.java b/android/src/com/mapswithme/maps/purchase/BillingManager.java index 44713fd872..7d2a1e605e 100644 --- a/android/src/com/mapswithme/maps/purchase/BillingManager.java +++ b/android/src/com/mapswithme/maps/purchase/BillingManager.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.purchase; import android.app.Activity; + import androidx.annotation.NonNull; import java.util.List; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java index 9c90866053..a75a007577 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.purchase; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentDataParser.java b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentDataParser.java index 02c9a14e85..6176524515 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentDataParser.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentDataParser.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.bookmarks.data.PaymentData; import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java index 95548a953e..fd95015950 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java @@ -12,6 +12,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.android.billingclient.api.SkuDetails; import com.bumptech.glide.Glide; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java index 65d6495b0f..5db959f493 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.purchase; import android.app.Activity; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java index 5380ff8bb0..9529d66f72 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.purchase; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java index acd678543a..eafd3ea8bf 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java @@ -7,6 +7,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; public class BookmarkSubscriptionFragment extends AbstractBookmarkSubscriptionFragment diff --git a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionActivity.java b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionActivity.java index 3e76255991..82662d3845 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionActivity.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionActivity.java @@ -1,18 +1,19 @@ package com.mapswithme.maps.purchase; +import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.BOOKMARKS; +import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.ELEVATION; +import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.GUIDES; +import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.LONELY; + import android.content.Intent; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragmentActivity; -import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.GUIDES; -import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.LONELY; -import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.BOOKMARKS; -import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionPage.ELEVATION; - public class BookmarksAllSubscriptionActivity extends BaseMwmFragmentActivity { public static void startForResult(@NonNull FragmentActivity activity) diff --git a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionFragment.java index bca73bbe68..be5eb26388 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionFragment.java @@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.ParallaxBackgroundPageListener; import com.mapswithme.maps.widget.ParallaxBackgroundViewPager; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPage.java b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPage.java index cb321b07d5..e58e1d539a 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPage.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPage.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.purchase; import androidx.annotation.StringRes; + import com.mapswithme.maps.R; public enum BookmarksAllSubscriptionPage diff --git a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPageFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPageFragment.java index ed9b2e3159..929a20b581 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPageFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPageFragment.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.purchase; +import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionFragment.BUNDLE_DATA; + import android.os.Bundle; import android.text.Html; import android.view.LayoutInflater; @@ -10,13 +12,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.databinding.DataBindingUtil; import androidx.fragment.app.Fragment; + import com.mapswithme.maps.R; import com.mapswithme.maps.databinding.FragmentBookmarksAllSubscriptionBinding; import java.util.Objects; -import static com.mapswithme.maps.purchase.BookmarksAllSubscriptionFragment.BUNDLE_DATA; - public class BookmarksAllSubscriptionPageFragment extends Fragment { @Nullable diff --git a/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionActivity.java b/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionActivity.java index f8b17ccf9b..ad917aac2e 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionActivity.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionFragment.java index aed7050e3f..c20cf1016e 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionFragment.java @@ -7,6 +7,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; @SuppressWarnings("WeakerAccess") diff --git a/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java b/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java index 0a6554cdfe..d410779210 100644 --- a/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java +++ b/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.purchase; +import static com.mapswithme.maps.purchase.PlayStoreBillingManager.LOGGER; +import static com.mapswithme.maps.purchase.PlayStoreBillingManager.TAG; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; -import static com.mapswithme.maps.purchase.PlayStoreBillingManager.LOGGER; -import static com.mapswithme.maps.purchase.PlayStoreBillingManager.TAG; - public class ConsumePurchaseRequest extends PlayStoreBillingRequest { @NonNull diff --git a/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java b/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java index 93e0b57fd5..de7d76aeb6 100644 --- a/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java +++ b/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java @@ -1,11 +1,12 @@ package com.mapswithme.maps.purchase; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Base64; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.PurchaseOperationObservable; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java b/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java index 09df267b54..08250cab23 100644 --- a/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java @@ -5,6 +5,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.android.billingclient.api.Purchase; import com.android.billingclient.api.SkuDetails; import com.mapswithme.maps.PrivateVariables; diff --git a/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java b/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java index c2c148abd7..30fc26539f 100644 --- a/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java +++ b/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java @@ -1,14 +1,15 @@ package com.mapswithme.maps.purchase; +import static com.mapswithme.maps.purchase.PlayStoreBillingManager.LOGGER; +import static com.mapswithme.maps.purchase.PlayStoreBillingManager.TAG; + import android.app.Activity; + import androidx.annotation.NonNull; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingFlowParams; -import static com.mapswithme.maps.purchase.PlayStoreBillingManager.LOGGER; -import static com.mapswithme.maps.purchase.PlayStoreBillingManager.TAG; - class LaunchBillingFlowRequest extends PlayStoreBillingRequest { @NonNull diff --git a/android/src/com/mapswithme/maps/purchase/PaymentDataParser.java b/android/src/com/mapswithme/maps/purchase/PaymentDataParser.java index a836a97ce2..a053bfbf4d 100644 --- a/android/src/com/mapswithme/maps/purchase/PaymentDataParser.java +++ b/android/src/com/mapswithme/maps/purchase/PaymentDataParser.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.purchase; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.bookmarks.data.PaymentData; public interface PaymentDataParser diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java index b6932e9004..5fcd64d44b 100644 --- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java +++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.purchase; import android.app.Activity; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseController.java b/android/src/com/mapswithme/maps/purchase/PurchaseController.java index 3e84ea7c0d..5a602c5415 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseController.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.os.Bundle; import androidx.annotation.NonNull; + import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.base.Savable; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java b/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java index c2cfa64fe6..c1561eacd0 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java @@ -4,6 +4,7 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.android.billingclient.api.BillingClient; import com.mapswithme.maps.PurchaseOperationObservable; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java b/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java index 3485481b00..a0614f857b 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java @@ -6,6 +6,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; + import com.android.billingclient.api.Purchase; import com.android.billingclient.api.SkuDetails; import com.mapswithme.maps.R; @@ -15,6 +16,7 @@ import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.Utils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; + import org.json.JSONException; import org.json.JSONObject; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java b/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java index 8e6d98897d..d78f07ddef 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.purchase; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java index dce2d7ef82..43cc8f1c2c 100644 --- a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java +++ b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java @@ -1,5 +1,8 @@ package com.mapswithme.maps.purchase; +import static com.mapswithme.maps.purchase.PlayStoreBillingManager.LOGGER; +import static com.mapswithme.maps.purchase.PlayStoreBillingManager.TAG; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -10,9 +13,6 @@ import com.android.billingclient.api.SkuDetailsParams; import java.util.Collections; import java.util.List; -import static com.mapswithme.maps.purchase.PlayStoreBillingManager.LOGGER; -import static com.mapswithme.maps.purchase.PlayStoreBillingManager.TAG; - class QueryProductDetailsRequest extends PlayStoreBillingRequest { @NonNull diff --git a/android/src/com/mapswithme/maps/purchase/SubscriptionFragmentDelegate.java b/android/src/com/mapswithme/maps/purchase/SubscriptionFragmentDelegate.java index 45cca69bbf..1359f96172 100644 --- a/android/src/com/mapswithme/maps/purchase/SubscriptionFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/purchase/SubscriptionFragmentDelegate.java @@ -4,6 +4,7 @@ import android.view.View; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java b/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java index 0b23a895ff..5b634899a3 100644 --- a/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.text.TextUtils; import androidx.annotation.NonNull; + import com.android.billingclient.api.Purchase; import com.mapswithme.maps.Framework; import com.mapswithme.util.ConnectionState; diff --git a/android/src/com/mapswithme/maps/purchase/SubscriptionType.java b/android/src/com/mapswithme/maps/purchase/SubscriptionType.java index 5ac06bd0ed..193317515d 100644 --- a/android/src/com/mapswithme/maps/purchase/SubscriptionType.java +++ b/android/src/com/mapswithme/maps/purchase/SubscriptionType.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.purchase; import androidx.annotation.NonNull; + import com.mapswithme.maps.PrivateVariables; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java b/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java index 3a4459b002..41ecb5df35 100644 --- a/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java @@ -7,6 +7,7 @@ import android.widget.TextView; import androidx.annotation.CallSuper; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.SubscriptionButton; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/purchase/TwoCardsSubscriptionFragmentDelegate.java b/android/src/com/mapswithme/maps/purchase/TwoCardsSubscriptionFragmentDelegate.java index cd112f3a3e..7bac7f9ab9 100644 --- a/android/src/com/mapswithme/maps/purchase/TwoCardsSubscriptionFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/purchase/TwoCardsSubscriptionFragmentDelegate.java @@ -5,6 +5,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.cardview.widget.CardView; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/review/Review.java b/android/src/com/mapswithme/maps/review/Review.java index 9a9cbfec25..60e317f2dc 100644 --- a/android/src/com/mapswithme/maps/review/Review.java +++ b/android/src/com/mapswithme/maps/review/Review.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.review; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/review/ReviewActivity.java b/android/src/com/mapswithme/maps/review/ReviewActivity.java index 528ee73ad4..6b089c65d7 100644 --- a/android/src/com/mapswithme/maps/review/ReviewActivity.java +++ b/android/src/com/mapswithme/maps/review/ReviewActivity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.review; import android.content.Context; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/review/ReviewAdapter.java b/android/src/com/mapswithme/maps/review/ReviewAdapter.java index 604affad2a..0debcd8f55 100644 --- a/android/src/com/mapswithme/maps/review/ReviewAdapter.java +++ b/android/src/com/mapswithme/maps/review/ReviewAdapter.java @@ -1,9 +1,5 @@ package com.mapswithme.maps.review; -import androidx.annotation.CallSuper; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.LayoutInflater; @@ -11,6 +7,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.recycler.RecyclerClickListener; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/review/ReviewFragment.java b/android/src/com/mapswithme/maps/review/ReviewFragment.java index 375d16c18e..67202aa7c3 100644 --- a/android/src/com/mapswithme/maps/review/ReviewFragment.java +++ b/android/src/com/mapswithme/maps/review/ReviewFragment.java @@ -3,13 +3,14 @@ package com.mapswithme.maps.review; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.widget.recycler.RecyclerClickListener; diff --git a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java index 3e78e7afb1..e23f26c42c 100644 --- a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java @@ -6,8 +6,6 @@ import android.content.DialogInterface; import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; @@ -15,19 +13,21 @@ import android.widget.ExpandableListAdapter; import android.widget.ExpandableListView; import android.widget.TextView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.DisabledChildSimpleExpandableListAdapter; import com.mapswithme.maps.base.BaseMwmDialogFragment; import com.mapswithme.maps.downloader.CountryItem; -import com.mapswithme.maps.downloader.MapManager; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment { static final String EXTRA_MISSING_MAPS = "MissingMaps"; diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java index c01b9163d6..91ed856626 100644 --- a/android/src/com/mapswithme/maps/routing/NavigationController.java +++ b/android/src/com/mapswithme/maps/routing/NavigationController.java @@ -20,6 +20,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/routing/NavigationService.java b/android/src/com/mapswithme/maps/routing/NavigationService.java index 275fe04043..d8391269e5 100644 --- a/android/src/com/mapswithme/maps/routing/NavigationService.java +++ b/android/src/com/mapswithme/maps/routing/NavigationService.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.routing; +import static androidx.core.app.NotificationCompat.Builder; + import android.app.ActivityManager; import android.app.Notification; import android.app.NotificationChannel; @@ -17,6 +19,7 @@ import android.widget.RemoteViews; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.app.NotificationCompat; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; @@ -27,8 +30,6 @@ import com.mapswithme.util.Utils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import static androidx.core.app.NotificationCompat.*; - public class NavigationService extends Service { private static final String TAG = NavigationService.class.getSimpleName(); diff --git a/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java b/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java index 8c0f522404..6e53127ced 100644 --- a/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java +++ b/android/src/com/mapswithme/maps/routing/ResultCodesHelper.java @@ -6,6 +6,7 @@ import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.StringRes; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.maps.location.LocationHelper; diff --git a/android/src/com/mapswithme/maps/routing/RoutePointInfo.java b/android/src/com/mapswithme/maps/routing/RoutePointInfo.java index 0ab104ff24..6848830726 100644 --- a/android/src/com/mapswithme/maps/routing/RoutePointInfo.java +++ b/android/src/com/mapswithme/maps/routing/RoutePointInfo.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.routing; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.IntDef; import java.lang.annotation.Retention; diff --git a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java index 443a0a6f5a..75597b48f5 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java @@ -8,14 +8,6 @@ import android.graphics.Bitmap; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.IdRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.core.content.ContextCompat; -import androidx.viewpager.widget.PagerAdapter; -import androidx.viewpager.widget.ViewPager; -import androidx.recyclerview.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -25,11 +17,18 @@ import android.text.style.ForegroundColorSpan; import android.text.style.StyleSpan; import android.text.style.TypefaceSpan; import android.view.View; -import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager.widget.PagerAdapter; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.MapObject; diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java index f8f57e9d23..5534ce59dd 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingController.java @@ -14,8 +14,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.core.util.Pair; -import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java index 15f06fc125..a441ec2f87 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java @@ -3,17 +3,15 @@ package com.mapswithme.maps.routing; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.AlertDialog; import android.util.Pair; import android.view.View; import android.widget.Button; -import android.widget.TextView; -import com.mapswithme.maps.MwmApplication; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.mapswithme.maps.R; import com.mapswithme.maps.downloader.CountryItem; import com.mapswithme.maps.downloader.MapManager; diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java index 46c66c24bf..b12649f192 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java +++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.routing; +import android.widget.ImageView; + import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; -import android.widget.ImageView; - import com.mapswithme.maps.R; public class RoutingInfo diff --git a/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java b/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java index 5bf7780690..f583cb4c66 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java @@ -3,24 +3,23 @@ package com.mapswithme.maps.routing; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.AlertDialog; import android.view.View; import android.view.ViewGroup; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; -import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.maps.downloader.CountryItem; import com.mapswithme.maps.downloader.MapManager; import com.mapswithme.maps.widget.WheelProgressView; import com.mapswithme.util.UiUtils; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public class RoutingMapsDownloadFragment extends BaseRoutingErrorDialogFragment { private ViewGroup mItemsFrame; diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java index fb6b4d742b..0a5d6ec933 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java @@ -2,17 +2,18 @@ package com.mapswithme.maps.routing; import android.app.Activity; import android.os.Bundle; -import androidx.annotation.DrawableRes; -import androidx.annotation.IdRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import android.view.View; import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java index ae7701b4b3..28d670caea 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.routing; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java index 09541d6ff3..32b1f235ff 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java @@ -3,6 +3,7 @@ package com.mapswithme.maps.routing; import android.animation.Animator; import android.animation.ValueAnimator; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/routing/SearchWheel.java b/android/src/com/mapswithme/maps/routing/SearchWheel.java index 2f87790b42..e5600382ae 100644 --- a/android/src/com/mapswithme/maps/routing/SearchWheel.java +++ b/android/src/com/mapswithme/maps/routing/SearchWheel.java @@ -4,16 +4,16 @@ import android.animation.Animator; import android.animation.AnimatorInflater; import android.content.Context; import android.os.Bundle; +import android.text.TextUtils; +import android.view.ContextThemeWrapper; +import android.view.View; +import android.widget.ImageView; + import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; -import android.text.TextUtils; -import android.view.ContextThemeWrapper; -import android.view.View; -import android.view.ViewTreeObserver; -import android.widget.ImageView; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java b/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java index ecf139d2e9..f9845c8b9d 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java @@ -1,11 +1,12 @@ package com.mapswithme.maps.routing; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/routing/TransitStepView.java b/android/src/com/mapswithme/maps/routing/TransitStepView.java index cd9c3a0c4d..7f39723c75 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepView.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepView.java @@ -9,6 +9,11 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.os.Build; +import android.text.TextPaint; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.view.View; + import androidx.annotation.ColorInt; import androidx.annotation.Dimension; import androidx.annotation.DrawableRes; @@ -16,10 +21,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.core.graphics.drawable.DrawableCompat; -import android.text.TextPaint; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.View; import com.mapswithme.maps.R; import com.mapswithme.maps.widget.recycler.MultilineLayoutManager; diff --git a/android/src/com/mapswithme/maps/search/BookingFilterParams.java b/android/src/com/mapswithme/maps/search/BookingFilterParams.java index c259fbc9c1..517c28b320 100644 --- a/android/src/com/mapswithme/maps/search/BookingFilterParams.java +++ b/android/src/com/mapswithme/maps/search/BookingFilterParams.java @@ -5,6 +5,7 @@ import android.os.Parcelable; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.util.ConnectionState; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java index 8103541ce5..3ac1a1dd9b 100644 --- a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java +++ b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java @@ -3,6 +3,11 @@ package com.mapswithme.maps.search; import android.app.Activity; import android.content.Context; import android.content.res.Resources; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + import androidx.annotation.DrawableRes; import androidx.annotation.IntDef; import androidx.annotation.NonNull; @@ -10,10 +15,6 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; diff --git a/android/src/com/mapswithme/maps/search/FilterActivity.java b/android/src/com/mapswithme/maps/search/FilterActivity.java index 2da13f71ef..e1fc03e86b 100644 --- a/android/src/com/mapswithme/maps/search/FilterActivity.java +++ b/android/src/com/mapswithme/maps/search/FilterActivity.java @@ -7,8 +7,9 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.mapswithme.maps.base.CustomNavigateUpListener; + import com.mapswithme.maps.base.BaseMwmFragmentActivity; +import com.mapswithme.maps.base.CustomNavigateUpListener; import com.mapswithme.util.ThemeUtils; public class FilterActivity extends BaseMwmFragmentActivity diff --git a/android/src/com/mapswithme/maps/search/FilterFragment.java b/android/src/com/mapswithme/maps/search/FilterFragment.java index 25792bbf45..a5917edda6 100644 --- a/android/src/com/mapswithme/maps/search/FilterFragment.java +++ b/android/src/com/mapswithme/maps/search/FilterFragment.java @@ -1,5 +1,11 @@ package com.mapswithme.maps.search; +import static com.mapswithme.maps.search.FilterUtils.combineFilters; +import static com.mapswithme.maps.search.FilterUtils.findPriceFilter; +import static com.mapswithme.maps.search.FilterUtils.findRatingFilter; +import static com.mapswithme.maps.search.FilterUtils.findTypeFilter; +import static com.mapswithme.maps.search.FilterUtils.makeOneOf; + import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -11,6 +17,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.base.CustomNavigateUpListener; @@ -22,12 +29,6 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import static com.mapswithme.maps.search.FilterUtils.combineFilters; -import static com.mapswithme.maps.search.FilterUtils.findPriceFilter; -import static com.mapswithme.maps.search.FilterUtils.findRatingFilter; -import static com.mapswithme.maps.search.FilterUtils.findTypeFilter; -import static com.mapswithme.maps.search.FilterUtils.makeOneOf; - public class FilterFragment extends BaseMwmToolbarFragment implements HotelsTypeAdapter.OnTypeSelectedListener { diff --git a/android/src/com/mapswithme/maps/search/FilterUtils.java b/android/src/com/mapswithme/maps/search/FilterUtils.java index 297e3ca407..7c2a53bec6 100644 --- a/android/src/com/mapswithme/maps/search/FilterUtils.java +++ b/android/src/com/mapswithme/maps/search/FilterUtils.java @@ -1,5 +1,7 @@ package com.mapswithme.maps.search; +import static com.mapswithme.maps.search.BookingFilterParams.Room; + import android.content.Context; import androidx.annotation.IntDef; @@ -7,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; + import com.google.android.material.datepicker.CalendarConstraints; import com.google.android.material.datepicker.CompositeDateValidator; import com.google.android.material.datepicker.DateValidatorPointBackward; @@ -23,16 +26,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; -import static com.mapswithme.maps.search.BookingFilterParams.Room; - public class FilterUtils { public static final int REQ_CODE_NO_NETWORK_CONNECTION_DIALOG = 301; diff --git a/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java b/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java index ca72585366..06e26a1c3c 100644 --- a/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java +++ b/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java @@ -2,8 +2,10 @@ package com.mapswithme.maps.search; import android.app.Activity; import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.widget.SearchToolbarController; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/search/HotelsFilter.java b/android/src/com/mapswithme/maps/search/HotelsFilter.java index ccacfe8ca9..203c5751cc 100644 --- a/android/src/com/mapswithme/maps/search/HotelsFilter.java +++ b/android/src/com/mapswithme/maps/search/HotelsFilter.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.search; +import static com.mapswithme.maps.search.HotelsFilter.Op.FIELD_RATING; + import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import static com.mapswithme.maps.search.HotelsFilter.Op.FIELD_RATING; - public class HotelsFilter implements Parcelable { // *NOTE* keep this in sync with JNI counterpart. diff --git a/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java b/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java index 2eca969fe7..6a6bbf251b 100644 --- a/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java +++ b/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java @@ -10,9 +10,9 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/maps/search/Popularity.java b/android/src/com/mapswithme/maps/search/Popularity.java index 82549a6bab..cfca5d4791 100644 --- a/android/src/com/mapswithme/maps/search/Popularity.java +++ b/android/src/com/mapswithme/maps/search/Popularity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.search; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; public class Popularity implements Parcelable diff --git a/android/src/com/mapswithme/maps/search/PriceFilterView.java b/android/src/com/mapswithme/maps/search/PriceFilterView.java index eb0816e015..597fbe6bf8 100644 --- a/android/src/com/mapswithme/maps/search/PriceFilterView.java +++ b/android/src/com/mapswithme/maps/search/PriceFilterView.java @@ -1,8 +1,17 @@ package com.mapswithme.maps.search; +import static com.mapswithme.maps.search.HotelsFilter.Op.OP_EQ; + import android.annotation.TargetApi; import android.content.Context; import android.os.Build; +import android.util.AttributeSet; +import android.util.SparseArray; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + import androidx.annotation.ColorRes; import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; @@ -10,13 +19,6 @@ import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import android.util.AttributeSet; -import android.util.Pair; -import android.util.SparseArray; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.TextView; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; @@ -26,8 +28,6 @@ import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.List; -import static com.mapswithme.maps.search.HotelsFilter.Op.OP_EQ; - public class PriceFilterView extends LinearLayout implements View.OnClickListener { public static final int UNDEFINED = -1; diff --git a/android/src/com/mapswithme/maps/search/RatingFilterView.java b/android/src/com/mapswithme/maps/search/RatingFilterView.java index 6fbfb317fd..65c7fafba6 100644 --- a/android/src/com/mapswithme/maps/search/RatingFilterView.java +++ b/android/src/com/mapswithme/maps/search/RatingFilterView.java @@ -1,26 +1,26 @@ package com.mapswithme.maps.search; +import static com.mapswithme.maps.search.HotelsFilter.Op.OP_GE; + import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import android.util.AttributeSet; -import android.util.Pair; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; -import static com.mapswithme.maps.search.HotelsFilter.Op.OP_GE; - public class RatingFilterView extends LinearLayout implements View.OnClickListener { static final float GOOD = 7.0f; diff --git a/android/src/com/mapswithme/maps/search/SearchActivity.java b/android/src/com/mapswithme/maps/search/SearchActivity.java index 66c88ee2c9..ecd5887504 100644 --- a/android/src/com/mapswithme/maps/search/SearchActivity.java +++ b/android/src/com/mapswithme/maps/search/SearchActivity.java @@ -4,13 +4,13 @@ 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.core.app.NavUtils; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.base.CustomNavigateUpListener; diff --git a/android/src/com/mapswithme/maps/search/SearchAdapter.java b/android/src/com/mapswithme/maps/search/SearchAdapter.java index 16b4298778..dd0c22eb5b 100644 --- a/android/src/com/mapswithme/maps/search/SearchAdapter.java +++ b/android/src/com/mapswithme/maps/search/SearchAdapter.java @@ -1,5 +1,9 @@ package com.mapswithme.maps.search; +import static com.mapswithme.maps.search.SearchResult.TYPE_RESULT; +import static com.mapswithme.maps.search.SearchResult.TYPE_SUGGEST; +import static com.mapswithme.util.Constants.Rating.RATING_INCORRECT_VALUE; + import android.content.Context; import android.content.res.Resources; import android.graphics.Typeface; @@ -21,10 +25,10 @@ import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.HotelUtils; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.FeatureId; -import com.mapswithme.maps.routing.RoutingController; import com.mapswithme.maps.ugc.UGC; import com.mapswithme.util.Graphics; import com.mapswithme.util.ThemeUtils; @@ -35,10 +39,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import static com.mapswithme.maps.search.SearchResult.TYPE_RESULT; -import static com.mapswithme.maps.search.SearchResult.TYPE_SUGGEST; -import static com.mapswithme.util.Constants.Rating.RATING_INCORRECT_VALUE; - class SearchAdapter extends RecyclerView.Adapter { private final SearchFragment mSearchFragment; diff --git a/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java b/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java index 3090733293..60b62a615e 100644 --- a/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.search; import android.os.Bundle; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.view.View; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; diff --git a/android/src/com/mapswithme/maps/search/SearchEngine.java b/android/src/com/mapswithme/maps/search/SearchEngine.java index 37df07dd74..6ed93704ac 100644 --- a/android/src/com/mapswithme/maps/search/SearchEngine.java +++ b/android/src/com/mapswithme/maps/search/SearchEngine.java @@ -5,6 +5,7 @@ import android.content.Context; import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.base.Initializable; @@ -15,7 +16,6 @@ import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; public enum SearchEngine implements NativeSearchListener, diff --git a/android/src/com/mapswithme/maps/search/SearchFilterController.java b/android/src/com/mapswithme/maps/search/SearchFilterController.java index 025578b462..70e029d75d 100644 --- a/android/src/com/mapswithme/maps/search/SearchFilterController.java +++ b/android/src/com/mapswithme/maps/search/SearchFilterController.java @@ -9,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.core.content.ContextCompat; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.SearchToolbarController; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index d483f1c0ca..161b9630b2 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -19,6 +19,7 @@ import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; + import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.tabs.TabLayout; import com.mapswithme.maps.Framework; @@ -39,8 +40,6 @@ import com.mapswithme.maps.widget.SearchToolbarController; import com.mapswithme.util.SharedPropertiesUtils; import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; -import com.mapswithme.util.log.Logger; -import com.mapswithme.util.log.LoggerFactory; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java b/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java index c62fad0060..e54ca499a5 100644 --- a/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java +++ b/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java @@ -1,11 +1,12 @@ package com.mapswithme.maps.search; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.routing.RoutingController; diff --git a/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java b/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java index 1386f5716e..5225e5a115 100644 --- a/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java @@ -1,13 +1,15 @@ package com.mapswithme.maps.search; import android.os.Bundle; +import android.view.View; + import androidx.annotation.CallSuper; import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; import com.mapswithme.maps.widget.PlaceholderView; diff --git a/android/src/com/mapswithme/maps/search/SearchRecents.java b/android/src/com/mapswithme/maps/search/SearchRecents.java index f9c4df911d..d4fb000606 100644 --- a/android/src/com/mapswithme/maps/search/SearchRecents.java +++ b/android/src/com/mapswithme/maps/search/SearchRecents.java @@ -1,10 +1,11 @@ package com.mapswithme.maps.search; -import androidx.annotation.NonNull; - import android.content.Context; import android.text.TextUtils; import android.util.Pair; + +import androidx.annotation.NonNull; + import com.mapswithme.util.Language; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/search/TabAdapter.java b/android/src/com/mapswithme/maps/search/TabAdapter.java index 618d9034f6..f2e9e9194c 100644 --- a/android/src/com/mapswithme/maps/search/TabAdapter.java +++ b/android/src/com/mapswithme/maps/search/TabAdapter.java @@ -1,18 +1,17 @@ package com.mapswithme.maps.search; import android.content.Context; -import android.content.res.ColorStateList; +import android.util.SparseArray; + import androidx.annotation.NonNull; -import com.google.android.material.tabs.TabLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; -import android.util.SparseArray; +import com.google.android.material.tabs.TabLayout; import com.mapswithme.maps.R; import com.mapswithme.util.Graphics; -import com.mapswithme.util.ThemeUtils; import java.util.ArrayList; import java.util.List; diff --git a/android/src/com/mapswithme/maps/settings/AboutFragment.java b/android/src/com/mapswithme/maps/settings/AboutFragment.java index b1b5de73d3..44a3e4ee80 100644 --- a/android/src/com/mapswithme/maps/settings/AboutFragment.java +++ b/android/src/com/mapswithme/maps/settings/AboutFragment.java @@ -9,6 +9,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java b/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java index a6fa961bea..babe521d3c 100644 --- a/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java +++ b/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java @@ -2,11 +2,13 @@ package com.mapswithme.maps.settings; import android.graphics.Rect; import android.os.Bundle; -import androidx.annotation.LayoutRes; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; + import com.mapswithme.maps.base.BaseMwmFragment; abstract class BaseSettingsFragment extends BaseMwmFragment diff --git a/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java b/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java index 7720f010a6..b7a443e8da 100644 --- a/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java +++ b/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java @@ -2,16 +2,15 @@ package com.mapswithme.maps.settings; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.annotation.Nullable; import androidx.annotation.XmlRes; import androidx.core.content.ContextCompat; import androidx.preference.PreferenceFragmentCompat; -import android.view.View; import com.mapswithme.maps.R; -import com.mapswithme.util.Config; import com.mapswithme.util.ThemeUtils; -import com.mapswithme.util.UiUtils; import com.mapswithme.util.Utils; abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat diff --git a/android/src/com/mapswithme/maps/settings/CopyrightFragment.java b/android/src/com/mapswithme/maps/settings/CopyrightFragment.java index b3f6cb500e..4e0fbf7d09 100644 --- a/android/src/com/mapswithme/maps/settings/CopyrightFragment.java +++ b/android/src/com/mapswithme/maps/settings/CopyrightFragment.java @@ -2,10 +2,12 @@ package com.mapswithme.maps.settings; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; + +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.WebContainerDelegate; import com.mapswithme.maps.base.OnBackPressListener; diff --git a/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java b/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java index 0685a3aefd..180c1781ab 100644 --- a/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java +++ b/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.settings; import android.app.Activity; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java index 589067c80f..9bdc251b5a 100644 --- a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java +++ b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java @@ -2,14 +2,15 @@ package com.mapswithme.maps.settings; import android.app.Activity; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; import android.widget.Switch; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.routing.RoutingOptions; diff --git a/android/src/com/mapswithme/maps/settings/HelpFragment.java b/android/src/com/mapswithme/maps/settings/HelpFragment.java index 5d49d7c6cb..83f9988d32 100644 --- a/android/src/com/mapswithme/maps/settings/HelpFragment.java +++ b/android/src/com/mapswithme/maps/settings/HelpFragment.java @@ -11,6 +11,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; + import com.mapswithme.maps.R; import com.mapswithme.maps.WebContainerDelegate; import com.mapswithme.util.Constants; diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java index cc8fdde886..c9f63d1600 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java +++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java @@ -1,14 +1,15 @@ package com.mapswithme.maps.settings; import android.os.Bundle; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; -import androidx.appcompat.widget.Toolbar; -import android.text.TextUtils; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseToolbarActivity; diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java index 9a733c3c67..ff7b98862d 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java +++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java @@ -6,23 +6,22 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.speech.tts.TextToSpeech; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.style.ForegroundColorSpan; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.style.ForegroundColorSpan; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; @@ -33,9 +32,6 @@ import com.mapswithme.maps.editor.ProfileActivity; import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.maps.location.LocationProviderFactory; import com.mapswithme.maps.location.TrackRecorder; -import com.mapswithme.maps.purchase.PurchaseCallback; -import com.mapswithme.maps.purchase.PurchaseController; -import com.mapswithme.maps.purchase.PurchaseFactory; import com.mapswithme.maps.sound.LanguageData; import com.mapswithme.maps.sound.TtsPlayer; import com.mapswithme.util.Config; diff --git a/android/src/com/mapswithme/maps/settings/StoragePathAdapter.java b/android/src/com/mapswithme/maps/settings/StoragePathAdapter.java index 1bb341a949..1fc4f209f9 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathAdapter.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathAdapter.java @@ -7,11 +7,11 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.CheckedTextView; +import com.mapswithme.maps.R; + import java.util.ArrayList; import java.util.List; -import com.mapswithme.maps.R; - class StoragePathAdapter extends BaseAdapter { private final StoragePathManager mStoragePathManager; diff --git a/android/src/com/mapswithme/maps/settings/StoragePathFragment.java b/android/src/com/mapswithme/maps/settings/StoragePathFragment.java index e7729f9cd3..59a43a1674 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathFragment.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathFragment.java @@ -2,7 +2,6 @@ package com.mapswithme.maps.settings; import android.app.Activity; import android.os.Bundle; -import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,6 +9,8 @@ import android.widget.AdapterView; import android.widget.ListView; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.OnBackPressListener; import com.mapswithme.util.Constants; diff --git a/android/src/com/mapswithme/maps/settings/StoragePathManager.java b/android/src/com/mapswithme/maps/settings/StoragePathManager.java index 4cad04d960..9397f2985b 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathManager.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathManager.java @@ -19,9 +19,9 @@ import androidx.appcompat.app.AlertDialog; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; +import com.mapswithme.maps.dialog.DialogUtils; import com.mapswithme.maps.downloader.MapManager; import com.mapswithme.util.Config; -import com.mapswithme.maps.dialog.DialogUtils; import com.mapswithme.util.concurrency.ThreadPool; import com.mapswithme.util.concurrency.UiThread; import com.mapswithme.util.log.Logger; @@ -30,11 +30,9 @@ import com.mapswithme.util.log.LoggerFactory; import java.io.File; import java.io.FileFilter; import java.io.FilenameFilter; -import java.io.IOError; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; diff --git a/android/src/com/mapswithme/maps/settings/StorageUtils.java b/android/src/com/mapswithme/maps/settings/StorageUtils.java index fc36f0c0d8..6d00ad9c05 100644 --- a/android/src/com/mapswithme/maps/settings/StorageUtils.java +++ b/android/src/com/mapswithme/maps/settings/StorageUtils.java @@ -1,28 +1,19 @@ package com.mapswithme.maps.settings; -import android.annotation.TargetApi; -import android.os.Build; -import android.text.TextUtils; - import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; -import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.Constants; import com.mapswithme.util.Utils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FilenameFilter; import java.io.IOException; import java.nio.channels.FileChannel; import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; final class StorageUtils { diff --git a/android/src/com/mapswithme/maps/sound/TtsPlayer.java b/android/src/com/mapswithme/maps/sound/TtsPlayer.java index 8fe005be05..cc1be0d04e 100644 --- a/android/src/com/mapswithme/maps/sound/TtsPlayer.java +++ b/android/src/com/mapswithme/maps/sound/TtsPlayer.java @@ -7,6 +7,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java b/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java index 3c1be050eb..26dabd9f2a 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.taxi; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.PagerAdapter; + import com.mapswithme.maps.R; import com.mapswithme.maps.routing.RoutingController; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiInfo.java b/android/src/com/mapswithme/maps/taxi/TaxiInfo.java index 64945e3f9f..65806aa3da 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiInfo.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiInfo.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.taxi; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.NonNull; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiManager.java b/android/src/com/mapswithme/maps/taxi/TaxiManager.java index 8c79eee3ff..a1db713c56 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiManager.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiManager.java @@ -1,14 +1,12 @@ package com.mapswithme.maps.taxi; import android.content.Context; -import android.location.Location; + import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.mapswithme.maps.bookmarks.data.MapObject; -import com.mapswithme.maps.location.LocationHelper; -import com.mapswithme.maps.routing.RoutingController; import com.mapswithme.util.NetworkPolicy; import com.mapswithme.util.SponsoredLinks; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java b/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java index 8839dd6ae8..ee7a686674 100644 --- a/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java +++ b/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.tips; import androidx.annotation.NonNull; + import com.mapswithme.maps.MwmActivity; -import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; import com.mapswithme.maps.bookmarks.BookmarksCatalogActivity; import com.mapswithme.maps.bookmarks.data.BookmarkManager; diff --git a/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java b/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java index e046676bc9..b276a52932 100644 --- a/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java +++ b/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java @@ -10,6 +10,7 @@ import android.graphics.RectF; import android.os.Build; import android.util.DisplayMetrics; import android.view.WindowManager; + import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/android/src/com/mapswithme/maps/tips/Tutorial.java b/android/src/com/mapswithme/maps/tips/Tutorial.java index 457ef2de51..414a67db21 100644 --- a/android/src/com/mapswithme/maps/tips/Tutorial.java +++ b/android/src/com/mapswithme/maps/tips/Tutorial.java @@ -9,7 +9,7 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; -import com.mapswithme.maps.Framework; + import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; @@ -18,6 +18,7 @@ import com.mapswithme.util.ThemeUtils; import com.mapswithme.util.UiUtils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; + import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/tips/TutorialClickListener.java b/android/src/com/mapswithme/maps/tips/TutorialClickListener.java index 09571531c4..0055abfaa7 100644 --- a/android/src/com/mapswithme/maps/tips/TutorialClickListener.java +++ b/android/src/com/mapswithme/maps/tips/TutorialClickListener.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.view.View; import androidx.annotation.NonNull; + import com.mapswithme.maps.MwmActivity; public abstract class TutorialClickListener implements View.OnClickListener diff --git a/android/src/com/mapswithme/maps/ugc/Impress.java b/android/src/com/mapswithme/maps/ugc/Impress.java index f3de5f4ec7..96ef7ed26d 100644 --- a/android/src/com/mapswithme/maps/ugc/Impress.java +++ b/android/src/com/mapswithme/maps/ugc/Impress.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.ugc; import androidx.annotation.ColorRes; import androidx.annotation.DrawableRes; - import androidx.annotation.StringRes; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/ugc/UGC.java b/android/src/com/mapswithme/maps/ugc/UGC.java index eae05478cf..167a7fe529 100644 --- a/android/src/com/mapswithme/maps/ugc/UGC.java +++ b/android/src/com/mapswithme/maps/ugc/UGC.java @@ -1,17 +1,12 @@ package com.mapswithme.maps.ugc; -import android.content.Context; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapswithme.maps.MwmApplication; -import com.mapswithme.maps.background.AppBackgroundTracker; -import com.mapswithme.maps.background.WorkerService; -import com.mapswithme.maps.bookmarks.data.FeatureId; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java b/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java index 67dc9d2b23..0d1067201c 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java +++ b/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java @@ -1,14 +1,15 @@ package com.mapswithme.maps.ugc; -import androidx.annotation.NonNull; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RatingBar; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java b/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java index 02dfb5d275..4f6b63e619 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java +++ b/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java @@ -1,14 +1,15 @@ package com.mapswithme.maps.ugc; -import androidx.annotation.NonNull; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RatingBar; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java b/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java index 5a1ea36b32..3ed4a46acd 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java +++ b/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.ugc; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.RecyclerView.Adapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.RatingView; import com.mapswithme.util.DateUtils; diff --git a/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java b/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java index 7202f5bfdf..d339eccfed 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java @@ -3,10 +3,6 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.text.InputFilter; import android.text.TextWatcher; @@ -19,6 +15,11 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + +import com.google.android.material.textfield.TextInputLayout; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java b/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java index 0387531da2..8b9dedf50c 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; + import androidx.annotation.NonNull; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java index 5602386f8f..533c9b9fe1 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.ugc.routes; import android.content.Intent; + import androidx.annotation.NonNull; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java index ddbfd6e6c5..932914e414 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.ugc.routes; import android.content.Intent; + import androidx.annotation.NonNull; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java b/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java index 7428e45b5d..633644469f 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java @@ -4,6 +4,7 @@ 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.core.app.ShareCompat; diff --git a/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java b/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java index 3af59e5588..c9e75e8ed8 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java +++ b/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java @@ -11,6 +11,7 @@ import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.StateListDrawable; import android.graphics.drawable.shapes.RectShape; + import androidx.annotation.NonNull; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java index fed6921e2e..661ff9ab8a 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java index bc510ede9d..f326a8952e 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java @@ -2,8 +2,6 @@ package com.mapswithme.maps.ugc.routes; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.InputFilter; import android.text.TextUtils; import android.view.LayoutInflater; @@ -15,6 +13,9 @@ import android.view.ViewGroup; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmToolbarFragment; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java index a7a03c93cf..78344188fb 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java @@ -3,13 +3,14 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.maps.bookmarks.data.BookmarkManager; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java index a63a977e80..b0fecd08d5 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java index 3d1faee025..da370e2419 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java @@ -3,12 +3,6 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.ActivityCompat; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import android.view.LayoutInflater; import android.view.Menu; @@ -18,6 +12,13 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.AdapterPositionConverter; import com.mapswithme.maps.adapter.OnItemClickListener; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java index d39de95ba3..f106375ae4 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java @@ -10,6 +10,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; diff --git a/android/src/com/mapswithme/maps/widget/ArrowView.java b/android/src/com/mapswithme/maps/widget/ArrowView.java index 579c710819..1ece9bc1bb 100644 --- a/android/src/com/mapswithme/maps/widget/ArrowView.java +++ b/android/src/com/mapswithme/maps/widget/ArrowView.java @@ -2,10 +2,11 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.graphics.Canvas; -import androidx.annotation.NonNull; import android.util.AttributeSet; import android.widget.ImageView; +import androidx.annotation.NonNull; + public class ArrowView extends ImageView { private float mWidth; diff --git a/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java b/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java index b00e3d91b5..7a6a432139 100644 --- a/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java +++ b/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java @@ -5,14 +5,15 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.util.Graphics; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java b/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java index bdf6200fe9..15e8321bd9 100644 --- a/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java +++ b/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java @@ -2,12 +2,14 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.graphics.Canvas; -import androidx.annotation.Nullable; -import com.google.android.material.textfield.TextInputLayout; -import androidx.core.view.ViewCompat; import android.text.TextUtils; import android.util.AttributeSet; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; + +import com.google.android.material.textfield.TextInputLayout; + /** * Fixes bug mentioned here https://code.google.com/p/android/issues/detail?id=175228 */ diff --git a/android/src/com/mapswithme/maps/widget/DotPager.java b/android/src/com/mapswithme/maps/widget/DotPager.java index b6d0a28058..1df9c64bc0 100644 --- a/android/src/com/mapswithme/maps/widget/DotPager.java +++ b/android/src/com/mapswithme/maps/widget/DotPager.java @@ -11,6 +11,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; + import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/FadeView.java b/android/src/com/mapswithme/maps/widget/FadeView.java index 66d2c11e7d..5faf48e4c8 100644 --- a/android/src/com/mapswithme/maps/widget/FadeView.java +++ b/android/src/com/mapswithme/maps/widget/FadeView.java @@ -8,6 +8,7 @@ import android.widget.FrameLayout; import androidx.annotation.IntegerRes; import androidx.annotation.NonNull; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java b/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java index 1f9dce4622..2ab11f59e8 100644 --- a/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java +++ b/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.widget; +import android.view.View; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; -import android.view.View; import java.util.NoSuchElementException; diff --git a/android/src/com/mapswithme/maps/widget/InteractiveCounterView.java b/android/src/com/mapswithme/maps/widget/InteractiveCounterView.java index c2eba195e7..2f7cc27dd5 100644 --- a/android/src/com/mapswithme/maps/widget/InteractiveCounterView.java +++ b/android/src/com/mapswithme/maps/widget/InteractiveCounterView.java @@ -13,6 +13,7 @@ import android.widget.TextView; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/NestedScrollViewClickFixed.java b/android/src/com/mapswithme/maps/widget/NestedScrollViewClickFixed.java index 1350d695a8..de5af57d86 100644 --- a/android/src/com/mapswithme/maps/widget/NestedScrollViewClickFixed.java +++ b/android/src/com/mapswithme/maps/widget/NestedScrollViewClickFixed.java @@ -17,6 +17,8 @@ package androidx.core.widget; +import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -59,8 +61,6 @@ import androidx.core.view.accessibility.AccessibilityRecordCompat; import java.util.List; -import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP; - /** * NestedScrollViewClickFixed is just like {@link android.widget.ScrollView}, but it supports acting * as both a nested scrolling parent and child on both new and old versions of Android. diff --git a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java index 469ae13f43..c4266f8fd6 100755 --- a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java +++ b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java @@ -1,18 +1,19 @@ package com.mapswithme.maps.widget; +import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_DRAGGING; +import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE; +import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_SETTLING; + import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.viewpager.widget.ViewPager; + import com.mapswithme.maps.purchase.BookmarksAllSubscriptionPageData; import java.util.Collections; import java.util.List; -import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_DRAGGING; -import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE; -import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_SETTLING; - public class ParallaxBackgroundPageListener implements ViewPager.OnPageChangeListener { private static final float ALPHA_TRANSPARENT = 0; diff --git a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java index 17fe277821..14f4c8243f 100755 --- a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java +++ b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java @@ -3,12 +3,13 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.content.res.TypedArray; import android.os.Handler; +import android.util.AttributeSet; +import android.view.MotionEvent; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; -import android.util.AttributeSet; -import android.view.MotionEvent; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/PlaceholderView.java b/android/src/com/mapswithme/maps/widget/PlaceholderView.java index 006d492bf9..8a6d5829b0 100644 --- a/android/src/com/mapswithme/maps/widget/PlaceholderView.java +++ b/android/src/com/mapswithme/maps/widget/PlaceholderView.java @@ -5,10 +5,6 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Build; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -16,6 +12,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/RatingView.java b/android/src/com/mapswithme/maps/widget/RatingView.java index 50e6e3e2b7..a107928ba4 100644 --- a/android/src/com/mapswithme/maps/widget/RatingView.java +++ b/android/src/com/mapswithme/maps/widget/RatingView.java @@ -9,15 +9,16 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.graphics.drawable.DrawableCompat; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.DrawableCompat; + import com.mapswithme.maps.R; import com.mapswithme.maps.ugc.Impress; diff --git a/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java b/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java index 63acddb1d7..56ffbef05c 100644 --- a/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java +++ b/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java @@ -5,6 +5,7 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; + import androidx.annotation.AttrRes; import androidx.annotation.DrawableRes; diff --git a/android/src/com/mapswithme/maps/widget/RotateDrawable.java b/android/src/com/mapswithme/maps/widget/RotateDrawable.java index 73562de06f..6075fad2ce 100644 --- a/android/src/com/mapswithme/maps/widget/RotateDrawable.java +++ b/android/src/com/mapswithme/maps/widget/RotateDrawable.java @@ -4,11 +4,8 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; -import com.mapswithme.maps.MwmApplication; +import androidx.annotation.NonNull; public class RotateDrawable extends Drawable { diff --git a/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java b/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java index 6bb2584180..7cadb5ae78 100644 --- a/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java +++ b/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java @@ -2,10 +2,11 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.os.Build; +import android.util.AttributeSet; + import androidx.annotation.ColorRes; import androidx.annotation.DrawableRes; import androidx.appcompat.widget.AppCompatRadioButton; -import android.util.AttributeSet; import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; diff --git a/android/src/com/mapswithme/maps/widget/SearchToolbarController.java b/android/src/com/mapswithme/maps/widget/SearchToolbarController.java index 6835618d89..128d95faad 100644 --- a/android/src/com/mapswithme/maps/widget/SearchToolbarController.java +++ b/android/src/com/mapswithme/maps/widget/SearchToolbarController.java @@ -15,6 +15,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatActivity; import androidx.core.util.Pair; + import com.google.android.material.chip.Chip; import com.google.android.material.datepicker.CalendarConstraints; import com.google.android.material.datepicker.MaterialDatePicker; diff --git a/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java b/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java index d55cbc664b..572e388861 100644 --- a/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java +++ b/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.widget; import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; diff --git a/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java b/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java index 0980d99be1..a51e95f71c 100644 --- a/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java +++ b/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java @@ -3,12 +3,13 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import android.view.View; +import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatDialog; -import android.view.View; -import android.widget.TextView; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/SubscriptionButton.java b/android/src/com/mapswithme/maps/widget/SubscriptionButton.java index 4fa0655b0f..22145bba8e 100644 --- a/android/src/com/mapswithme/maps/widget/SubscriptionButton.java +++ b/android/src/com/mapswithme/maps/widget/SubscriptionButton.java @@ -12,14 +12,14 @@ import android.widget.FrameLayout; import android.widget.ProgressBar; import android.widget.TextView; -import com.mapswithme.maps.R; -import com.mapswithme.util.UiUtils; - import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; +import com.mapswithme.maps.R; +import com.mapswithme.util.UiUtils; + public class SubscriptionButton extends FrameLayout { @Nullable diff --git a/android/src/com/mapswithme/maps/widget/ToolbarController.java b/android/src/com/mapswithme/maps/widget/ToolbarController.java index 2fefedd96e..976e6ee4aa 100644 --- a/android/src/com/mapswithme/maps/widget/ToolbarController.java +++ b/android/src/com/mapswithme/maps/widget/ToolbarController.java @@ -10,6 +10,7 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.Detachable; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/WheelProgressView.java b/android/src/com/mapswithme/maps/widget/WheelProgressView.java index 21a521fd13..0d61579d9d 100644 --- a/android/src/com/mapswithme/maps/widget/WheelProgressView.java +++ b/android/src/com/mapswithme/maps/widget/WheelProgressView.java @@ -11,11 +11,12 @@ import android.graphics.RectF; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; +import android.util.AttributeSet; + import androidx.annotation.NonNull; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.appcompat.graphics.drawable.DrawableWrapper; import androidx.appcompat.widget.AppCompatImageView; -import android.util.AttributeSet; +import androidx.core.graphics.drawable.DrawableCompat; import com.mapswithme.maps.R; import com.mapswithme.util.Graphics; diff --git a/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java b/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java index 8300566a7a..9858a2d769 100644 --- a/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java @@ -6,7 +6,7 @@ import androidx.annotation.DimenRes; import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapswithme.maps.MwmApplication; + import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuController.java b/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuController.java index 5a6075e631..fab66608cf 100644 --- a/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuController.java +++ b/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuController.java @@ -7,6 +7,7 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.GestureDetectorCompat; + import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuGestureListener.java b/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuGestureListener.java index 471aff6cf9..14700cea82 100644 --- a/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuGestureListener.java +++ b/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuGestureListener.java @@ -5,6 +5,7 @@ import android.view.MotionEvent; import android.view.View; import androidx.annotation.NonNull; + import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior; diff --git a/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuUtils.java b/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuUtils.java index 43fa4e0fb1..fa916bef87 100644 --- a/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuUtils.java +++ b/android/src/com/mapswithme/maps/widget/menu/BottomSheetMenuUtils.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.widget.menu; import androidx.annotation.NonNull; + import com.google.android.material.bottomsheet.BottomSheetBehavior; class BottomSheetMenuUtils diff --git a/android/src/com/mapswithme/maps/widget/menu/GuestsRoomsMenuRenderer.java b/android/src/com/mapswithme/maps/widget/menu/GuestsRoomsMenuRenderer.java index 06f5c7b64f..1aca5086f7 100644 --- a/android/src/com/mapswithme/maps/widget/menu/GuestsRoomsMenuRenderer.java +++ b/android/src/com/mapswithme/maps/widget/menu/GuestsRoomsMenuRenderer.java @@ -4,6 +4,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.search.FilterUtils; import com.mapswithme.maps.widget.InteractiveCounterView; diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java index 4e9824d6a6..72489c6062 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java @@ -4,6 +4,7 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.ClickMenuDelegate; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java b/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java index b2aef91958..5479f84d4d 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java +++ b/android/src/com/mapswithme/maps/widget/menu/MainMenuRenderer.java @@ -8,6 +8,7 @@ import androidx.annotation.Nullable; import androidx.core.widget.NestedScrollView; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.NoConnectionListener; import com.mapswithme.maps.downloader.MapManager; diff --git a/android/src/com/mapswithme/maps/widget/menu/MenuControllerFactory.java b/android/src/com/mapswithme/maps/widget/menu/MenuControllerFactory.java index 5e51ca518c..e22b79b751 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MenuControllerFactory.java +++ b/android/src/com/mapswithme/maps/widget/menu/MenuControllerFactory.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.widget.menu; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.NoConnectionListener; import com.mapswithme.maps.search.FilterUtils; diff --git a/android/src/com/mapswithme/maps/widget/menu/MenuRoomsGuestsListener.java b/android/src/com/mapswithme/maps/widget/menu/MenuRoomsGuestsListener.java index 22c97f46eb..eb87ceb98c 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MenuRoomsGuestsListener.java +++ b/android/src/com/mapswithme/maps/widget/menu/MenuRoomsGuestsListener.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.widget.menu; import androidx.annotation.NonNull; + import com.mapswithme.maps.search.FilterUtils; public interface MenuRoomsGuestsListener diff --git a/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java b/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java index 7f8b38d09b..55c5716eb9 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java +++ b/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java @@ -4,13 +4,13 @@ import android.content.Context; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.TransitionDrawable; -import androidx.annotation.DimenRes; -import androidx.annotation.DrawableRes; import android.view.View; import android.widget.ImageView; +import androidx.annotation.DimenRes; +import androidx.annotation.DrawableRes; import androidx.annotation.IntegerRes; -import com.mapswithme.maps.MwmApplication; + import com.mapswithme.maps.R; import com.mapswithme.maps.widget.RotateByAlphaDrawable; import com.mapswithme.maps.widget.TrackedTransitionDrawable; diff --git a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java index 9f32200736..81fb156719 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java +++ b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java @@ -2,12 +2,12 @@ package com.mapswithme.maps.widget.menu; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; - -import androidx.annotation.NonNull; import android.util.SparseArray; import android.view.View; import android.widget.ImageView; +import androidx.annotation.NonNull; + import com.mapswithme.maps.R; import com.mapswithme.maps.location.LocationState; import com.mapswithme.maps.routing.RoutingController; diff --git a/android/src/com/mapswithme/maps/widget/menu/NavMenu.java b/android/src/com/mapswithme/maps/widget/menu/NavMenu.java index 39307ec4fd..489cc37ecb 100644 --- a/android/src/com/mapswithme/maps/widget/menu/NavMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/NavMenu.java @@ -10,6 +10,7 @@ import android.widget.ImageView; import androidx.annotation.IntegerRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/placepage/AxisValueFormatter.java b/android/src/com/mapswithme/maps/widget/placepage/AxisValueFormatter.java index 8a4a53ef7a..93fc7771e3 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/AxisValueFormatter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/AxisValueFormatter.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.widget.placepage; import androidx.annotation.NonNull; + import com.github.mikephil.charting.charts.BarLineChartBase; import com.github.mikephil.charting.formatter.DefaultValueFormatter; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java b/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java index 20e6fe6088..9c4fdc04db 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java @@ -2,14 +2,13 @@ package com.mapswithme.maps.widget.placepage; import android.app.Dialog; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.AdapterView; import android.widget.GridView; -import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; @@ -17,6 +16,8 @@ import com.mapswithme.maps.bookmarks.IconsAdapter; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.bookmarks.data.Icon; +import java.util.List; + public class BookmarkColorDialogFragment extends BaseMwmDialogFragment { public static final String ICON_TYPE = "ExtraIconType"; diff --git a/android/src/com/mapswithme/maps/widget/placepage/CurrentLocationMarkerView.java b/android/src/com/mapswithme/maps/widget/placepage/CurrentLocationMarkerView.java index 4893dbabe5..a736a2fa99 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/CurrentLocationMarkerView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/CurrentLocationMarkerView.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import androidx.annotation.NonNull; + import com.github.mikephil.charting.components.MarkerView; import com.github.mikephil.charting.utils.MPPointF; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java b/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java index 07bca12803..f5205f1fd1 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java +++ b/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java @@ -1,15 +1,16 @@ package com.mapswithme.maps.widget.placepage; +import static com.mapswithme.maps.widget.placepage.PlacePageUtils.isAnchoredState; +import static com.mapswithme.maps.widget.placepage.PlacePageUtils.isExpandedState; + import android.view.View; import androidx.annotation.NonNull; + import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; import com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior; -import static com.mapswithme.maps.widget.placepage.PlacePageUtils.isAnchoredState; -import static com.mapswithme.maps.widget.placepage.PlacePageUtils.isExpandedState; - public class DefaultBottomSheetCallback extends AnchorBottomSheetBehavior.BottomSheetCallback { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC); diff --git a/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java b/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java index 88b5b03e6a..c76baf2350 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java @@ -2,14 +2,14 @@ package com.mapswithme.maps.widget.placepage; import android.location.Location; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.widget.TextView; +import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; diff --git a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java index 48e0b8e868..1e3d8ed30a 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java @@ -3,11 +3,6 @@ package com.mapswithme.maps.widget.placepage; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -16,6 +11,12 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; import com.mapswithme.maps.bookmarks.ChooseBookmarkCategoryFragment; diff --git a/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java b/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java index 072f889a78..395dce3542 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java @@ -1,9 +1,6 @@ package com.mapswithme.maps.widget.placepage; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.view.LayoutInflater; import android.view.View; @@ -12,7 +9,9 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.TextView; -import java.lang.ref.WeakReference; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmDialogFragment; @@ -20,6 +19,8 @@ import com.mapswithme.maps.bookmarks.data.Bookmark; import com.mapswithme.util.StringUtils; import com.mapswithme.util.UiUtils; +import java.lang.ref.WeakReference; + public class EditDescriptionFragment extends BaseMwmDialogFragment { public static final String EXTRA_BOOKMARK = "bookmark"; diff --git a/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java b/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java index c692bc87e0..6466b57d90 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java +++ b/android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java @@ -8,6 +8,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.widget.NestedScrollView; + import com.mapswithme.maps.ChartController; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java index 7e9e0242db..e4b1809e4d 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java @@ -1,12 +1,13 @@ package com.mapswithme.maps.widget.placepage; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/widget/placepage/FloatingMarkerView.java b/android/src/com/mapswithme/maps/widget/placepage/FloatingMarkerView.java index 3c0af370d5..a76509b142 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/FloatingMarkerView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/FloatingMarkerView.java @@ -14,6 +14,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; + import com.github.mikephil.charting.charts.Chart; import com.github.mikephil.charting.components.IMarker; import com.github.mikephil.charting.data.Entry; diff --git a/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java index e1cff9ed24..c3e7c4f8cb 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java @@ -2,14 +2,15 @@ package com.mapswithme.maps.widget.placepage; import android.content.Context; import android.graphics.Bitmap; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; + import com.bumptech.glide.Glide; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; diff --git a/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java b/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java index d7b723ed59..b9563ba977 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java +++ b/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearSnapHelper; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView.OnScrollListener; import androidx.recyclerview.widget.SnapHelper; + import com.mapswithme.maps.R; import com.mapswithme.maps.gallery.GalleryAdapter; import com.mapswithme.maps.gallery.ItemSelectedListener; diff --git a/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java index 1120dee574..bb00d9e2b2 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java @@ -1,8 +1,6 @@ package com.mapswithme.maps.widget.placepage; import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,6 +8,9 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java index 5baf4cfbb3..99217ef837 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.widget.placepage; import android.content.Context; import android.content.Intent; + import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java index 6159dac2aa..3184ea6e8b 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.widget.placepage; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.webkit.WebView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java index 785eff9d84..f3da063202 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java @@ -1,9 +1,5 @@ package com.mapswithme.maps.widget.placepage; -import androidx.annotation.DrawableRes; -import androidx.annotation.NonNull; -import androidx.annotation.StringRes; - import android.content.Context; import android.view.LayoutInflater; import android.view.MenuItem; @@ -12,6 +8,10 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; + import com.cocosw.bottomsheet.BottomSheet; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java index 4fb8bc99e6..d54e86b9a2 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java @@ -5,6 +5,7 @@ import android.app.Application; import android.os.Bundle; import androidx.annotation.NonNull; + import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.base.Savable; import com.mapswithme.maps.base.Supportable; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java index 8f4c9df126..12ce5333ce 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java @@ -5,6 +5,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.guides.GuidesGalleryListener; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java index 318714dff4..de74c899f0 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java @@ -2,6 +2,7 @@ package com.mapswithme.maps.widget.placepage; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.R; import com.mapswithme.maps.guides.GuidesGalleryListener; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageGestureListener.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageGestureListener.java index f76ebdf618..8a729a70be 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageGestureListener.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageGestureListener.java @@ -5,6 +5,7 @@ import android.view.MotionEvent; import android.view.View; import androidx.annotation.NonNull; + import com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior; class PlacePageGestureListener extends GestureDetector.SimpleOnGestureListener diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java index 78f6844c37..d52e7d870e 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageUtils.java @@ -9,6 +9,7 @@ import android.widget.ImageView; import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; import androidx.annotation.NonNull; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.util.Graphics; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 1c589199e5..ddbd4d418a 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -1,5 +1,8 @@ package com.mapswithme.maps.widget.placepage; +import static com.mapswithme.maps.bookmarks.BookmarkHeaderView.AUTHOR_LONELY_PLANET_ID; +import static com.mapswithme.maps.widget.placepage.PlacePageButtons.Item.BOOKING; + import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Context; @@ -29,6 +32,7 @@ import android.widget.LinearLayout; import android.widget.PopupMenu; import android.widget.RelativeLayout; import android.widget.TextView; + import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -98,9 +102,6 @@ import java.util.List; import java.util.Locale; import java.util.Objects; -import static com.mapswithme.maps.bookmarks.BookmarkHeaderView.AUTHOR_LONELY_PLANET_ID; -import static com.mapswithme.maps.widget.placepage.PlacePageButtons.Item.BOOKING; - public class PlacePageView extends NestedScrollViewClickFixed implements View.OnClickListener, View.OnLongClickListener, diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageViewRenderer.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageViewRenderer.java index 840893904e..5d578a1b9c 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageViewRenderer.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageViewRenderer.java @@ -4,6 +4,7 @@ import android.os.Bundle; import android.view.View; import androidx.annotation.NonNull; + import com.mapswithme.maps.base.Hideable; import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.base.Savable; diff --git a/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java index 822bd18148..f1c7f18c4d 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java @@ -1,7 +1,5 @@ package com.mapswithme.maps.widget.placepage; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.LayoutInflater; @@ -9,6 +7,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.R; import com.mapswithme.maps.review.Review; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java index dd9538817e..799afbbcbe 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java @@ -15,6 +15,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.core.view.GestureDetectorCompat; + import com.google.android.material.appbar.AppBarLayout; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java index 64eb17188c..36e075baa6 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java @@ -11,6 +11,7 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.GestureDetectorCompat; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java b/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java index b2a92535c8..f4126d2eb0 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java +++ b/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java @@ -1,10 +1,11 @@ package com.mapswithme.maps.widget.placepage; +import android.text.TextUtils; + import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import android.text.TextUtils; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.bookmarks.data.Metadata; diff --git a/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java b/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java index 75f1c86113..d3ae5d6760 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java +++ b/android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java @@ -7,6 +7,7 @@ import android.view.View; import androidx.annotation.Dimension; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; + import com.mapswithme.maps.bookmarks.Holders; public class DividerItemDecorationWithPadding extends RecyclerView.ItemDecoration diff --git a/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java index e9eaf94900..17721d6a59 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java @@ -3,10 +3,11 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.view.View; + import androidx.annotation.Dimension; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; public class DotDividerItemDecoration extends RecyclerView.ItemDecoration { diff --git a/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java index 214d8059b9..b8c40a2bac 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java @@ -3,9 +3,10 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.view.View; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; /** * Adds interior dividers to a RecyclerView with a GridLayoutManager. diff --git a/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java index fd921c6fbb..1d21eb6b6a 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java @@ -2,9 +2,10 @@ package com.mapswithme.maps.widget.recycler; import android.content.Context; import android.graphics.Rect; +import android.view.View; + import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; class HotelDividerItemDecoration extends DividerItemDecoration diff --git a/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java b/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java index 456aaecbaa..cfdbe9081c 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java +++ b/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.widget.recycler; +import android.view.View; + import androidx.annotation.Dimension; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; public class MultilineLayoutManager extends RecyclerView.LayoutManager { diff --git a/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java b/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java index 04d3843d06..86d6ad3008 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java +++ b/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java @@ -1,13 +1,14 @@ package com.mapswithme.maps.widget.recycler; +import android.view.View; +import android.view.ViewGroup; + import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.core.view.ViewPropertyAnimatorCompat; import androidx.core.view.ViewPropertyAnimatorListener; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; -import android.view.View; -import android.view.ViewGroup; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java b/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java index ffa420b6f4..f450b38759 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java +++ b/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java @@ -1,11 +1,12 @@ package com.mapswithme.maps.widget.recycler; import android.content.Context; +import android.util.AttributeSet; +import android.view.ViewGroup; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.util.AttributeSet; -import android.view.ViewGroup; public class SpanningLinearLayoutManager extends LinearLayoutManager { diff --git a/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java index 8af8f4ae79..6eeeea18aa 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java @@ -3,10 +3,9 @@ package com.mapswithme.maps.widget.recycler; import android.content.Context; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import androidx.annotation.NonNull; -import androidx.appcompat.widget.*; import android.view.View; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; diff --git a/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java index 761c9657ca..7e58330597 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java @@ -3,9 +3,10 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.view.View; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; /** * Adds interior dividers to a RecyclerView with a TagLayoutManager or its diff --git a/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java b/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java index 24ec958aee..e137a1ebb9 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java +++ b/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java @@ -1,8 +1,9 @@ package com.mapswithme.maps.widget.recycler; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + /** * This LayoutManager designed only for use with RecyclerView.setNestedScrollingEnabled(false) * and recycle item must be wrap_content or fixed size diff --git a/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java b/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java index 29b5bc6a86..2ef788523f 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java +++ b/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java @@ -2,9 +2,10 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Rect; import android.graphics.drawable.Drawable; +import android.view.View; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.google.android.flexbox.FlexLine; import com.google.android.flexbox.FlexboxLayoutManager; diff --git a/android/src/com/mapswithme/util/BatteryState.java b/android/src/com/mapswithme/util/BatteryState.java index 64be40c1d6..4c077c5dc9 100644 --- a/android/src/com/mapswithme/util/BatteryState.java +++ b/android/src/com/mapswithme/util/BatteryState.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; + import androidx.annotation.IntDef; import androidx.annotation.IntRange; import androidx.annotation.NonNull; diff --git a/android/src/com/mapswithme/util/BottomSheetHelper.java b/android/src/com/mapswithme/util/BottomSheetHelper.java index c66b921cfc..63b90f161e 100644 --- a/android/src/com/mapswithme/util/BottomSheetHelper.java +++ b/android/src/com/mapswithme/util/BottomSheetHelper.java @@ -3,16 +3,15 @@ package com.mapswithme.util; import android.app.Activity; import android.content.DialogInterface; import android.graphics.drawable.Drawable; +import android.view.MenuItem; + import androidx.annotation.DrawableRes; import androidx.annotation.IdRes; import androidx.annotation.MenuRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; -import androidx.core.content.ContextCompat; -import android.view.MenuItem; import com.cocosw.bottomsheet.BottomSheet; -import com.mapswithme.maps.MwmApplication; public final class BottomSheetHelper { diff --git a/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java b/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java index a78db9ce16..b6201ab845 100644 --- a/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java +++ b/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java @@ -3,14 +3,15 @@ package com.mapswithme.util; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.security.KeyStore; import java.security.SecureRandom; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocketFactory; + public class ClientCertTLSSocketFactory { private static final String PROTOCOL = "TLS"; diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java index 245599c3c9..a7d5ebf991 100644 --- a/android/src/com/mapswithme/util/Config.java +++ b/android/src/com/mapswithme/util/Config.java @@ -1,13 +1,5 @@ package com.mapswithme.util; -import android.content.Context; - -import androidx.annotation.NonNull; - -import com.mapswithme.maps.BuildConfig; -import com.mapswithme.maps.MwmApplication; -import com.mapswithme.maps.R; - import static com.mapswithme.util.Counters.KEY_APP_FIRST_INSTALL_FLAVOR; import static com.mapswithme.util.Counters.KEY_APP_FIRST_INSTALL_VERSION; import static com.mapswithme.util.Counters.KEY_APP_LAST_SESSION_TIMESTAMP; @@ -17,6 +9,14 @@ import static com.mapswithme.util.Counters.KEY_LIKES_LAST_RATED_SESSION; import static com.mapswithme.util.Counters.KEY_MISC_FIRST_START_DIALOG_SEEN; import static com.mapswithme.util.Counters.KEY_MISC_NEWS_LAST_VERSION; +import android.content.Context; + +import androidx.annotation.NonNull; + +import com.mapswithme.maps.BuildConfig; +import com.mapswithme.maps.MwmApplication; +import com.mapswithme.maps.R; + public final class Config { private static final String KEY_APP_STORAGE = "StoragePath"; diff --git a/android/src/com/mapswithme/util/ConnectionState.java b/android/src/com/mapswithme/util/ConnectionState.java index 1f14bdeedb..d61af90f9f 100644 --- a/android/src/com/mapswithme/util/ConnectionState.java +++ b/android/src/com/mapswithme/util/ConnectionState.java @@ -1,5 +1,7 @@ package com.mapswithme.util; +import static com.mapswithme.util.ConnectionState.Type.NONE; + import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; @@ -7,11 +9,10 @@ import android.telephony.TelephonyManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.base.Initializable; -import static com.mapswithme.util.ConnectionState.Type.NONE; - public enum ConnectionState implements Initializable { INSTANCE; diff --git a/android/src/com/mapswithme/util/Counters.java b/android/src/com/mapswithme/util/Counters.java index f0d1dbd66c..cd0809711f 100644 --- a/android/src/com/mapswithme/util/Counters.java +++ b/android/src/com/mapswithme/util/Counters.java @@ -1,11 +1,12 @@ package com.mapswithme.util; import android.content.Context; +import android.text.TextUtils; +import android.text.format.DateUtils; + import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import androidx.preference.PreferenceManager; -import android.text.TextUtils; -import android.text.format.DateUtils; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/util/FileUploadWorker.java b/android/src/com/mapswithme/util/FileUploadWorker.java index fbd7872d5f..02a21336d6 100644 --- a/android/src/com/mapswithme/util/FileUploadWorker.java +++ b/android/src/com/mapswithme/util/FileUploadWorker.java @@ -5,6 +5,7 @@ import android.content.Context; import androidx.annotation.NonNull; import androidx.work.Worker; import androidx.work.WorkerParameters; + import com.google.gson.Gson; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/util/Graphics.java b/android/src/com/mapswithme/util/Graphics.java index 68bd10d3a3..bae8968b1a 100644 --- a/android/src/com/mapswithme/util/Graphics.java +++ b/android/src/com/mapswithme/util/Graphics.java @@ -10,13 +10,14 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; +import android.widget.TextView; + import androidx.annotation.AttrRes; import androidx.annotation.ColorInt; import androidx.annotation.DimenRes; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.core.graphics.drawable.DrawableCompat; -import android.widget.TextView; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/HttpBackgroundUploader.java b/android/src/com/mapswithme/util/HttpBackgroundUploader.java index a69b4686e8..7ad4fa6ee4 100644 --- a/android/src/com/mapswithme/util/HttpBackgroundUploader.java +++ b/android/src/com/mapswithme/util/HttpBackgroundUploader.java @@ -6,6 +6,7 @@ import androidx.work.Data; import androidx.work.NetworkType; import androidx.work.OneTimeWorkRequest; import androidx.work.WorkManager; + import com.google.gson.Gson; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/util/HttpClient.java b/android/src/com/mapswithme/util/HttpClient.java index e5063fa8af..f493dee67e 100644 --- a/android/src/com/mapswithme/util/HttpClient.java +++ b/android/src/com/mapswithme/util/HttpClient.java @@ -28,11 +28,10 @@ import android.os.Build; import android.text.TextUtils; import androidx.annotation.NonNull; + import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLSocketFactory; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; @@ -51,6 +50,9 @@ import java.util.Map; import java.util.zip.GZIPInputStream; import java.util.zip.InflaterInputStream; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLSocketFactory; + public final class HttpClient { public static final String HEADER_USER_AGENT = "User-Agent"; diff --git a/android/src/com/mapswithme/util/HttpPayload.java b/android/src/com/mapswithme/util/HttpPayload.java index f5888843ac..5e94bc6d51 100644 --- a/android/src/com/mapswithme/util/HttpPayload.java +++ b/android/src/com/mapswithme/util/HttpPayload.java @@ -1,6 +1,7 @@ package com.mapswithme.util; import androidx.annotation.NonNull; + import com.google.gson.annotations.SerializedName; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/util/HttpUploader.java b/android/src/com/mapswithme/util/HttpUploader.java index 5878e88783..3f39fd2d71 100644 --- a/android/src/com/mapswithme/util/HttpUploader.java +++ b/android/src/com/mapswithme/util/HttpUploader.java @@ -6,13 +6,12 @@ import android.util.Base64; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLSocketFactory; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -27,6 +26,9 @@ import java.net.URL; import java.net.URLConnection; import java.util.List; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLSocketFactory; + public final class HttpUploader extends AbstractHttpUploader { private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.NETWORK); diff --git a/android/src/com/mapswithme/util/KeyValue.java b/android/src/com/mapswithme/util/KeyValue.java index 81e7426e7f..fae0c8dff8 100644 --- a/android/src/com/mapswithme/util/KeyValue.java +++ b/android/src/com/mapswithme/util/KeyValue.java @@ -1,6 +1,7 @@ package com.mapswithme.util; import androidx.annotation.NonNull; + import com.google.gson.annotations.SerializedName; import java.io.Serializable; diff --git a/android/src/com/mapswithme/util/LocationUtils.java b/android/src/com/mapswithme/util/LocationUtils.java index 831d97c276..e9adeafbfb 100644 --- a/android/src/com/mapswithme/util/LocationUtils.java +++ b/android/src/com/mapswithme/util/LocationUtils.java @@ -1,7 +1,6 @@ package com.mapswithme.util; import android.annotation.SuppressLint; -import android.app.Application; import android.content.ContentResolver; import android.content.Context; import android.location.Location; @@ -9,11 +8,10 @@ import android.location.LocationManager; import android.os.Build; import android.os.SystemClock; import android.provider.Settings; -import androidx.annotation.NonNull; -import android.text.TextUtils; import android.view.Surface; -import com.mapswithme.maps.MwmApplication; +import androidx.annotation.NonNull; + import com.mapswithme.maps.location.LocationHelper; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java index abac78bdd2..77fe8c0d86 100644 --- a/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java +++ b/android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java @@ -1,5 +1,7 @@ package com.mapswithme.util; +import static com.mapswithme.maps.MwmApplication.backgroundTracker; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -8,8 +10,6 @@ import android.util.Log; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import static com.mapswithme.maps.MwmApplication.backgroundTracker; - /** */ public class MultipleTrackerReferrerReceiver extends BroadcastReceiver diff --git a/android/src/com/mapswithme/util/PermissionsUtils.java b/android/src/com/mapswithme/util/PermissionsUtils.java index 4de278ab7d..47d8a9b043 100644 --- a/android/src/com/mapswithme/util/PermissionsUtils.java +++ b/android/src/com/mapswithme/util/PermissionsUtils.java @@ -1,22 +1,21 @@ package com.mapswithme.util; +import static android.Manifest.permission.ACCESS_COARSE_LOCATION; +import static android.Manifest.permission.ACCESS_FINE_LOCATION; + import android.app.Activity; import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; + import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; -import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.permissions.PermissionsResult; import java.util.HashMap; import java.util.Map; -import static android.Manifest.permission.ACCESS_COARSE_LOCATION; -import static android.Manifest.permission.ACCESS_FINE_LOCATION; -import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; - public final class PermissionsUtils { private static final String[] PERMISSIONS = new String[] diff --git a/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java b/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java index 207d276280..cb2d9f498f 100644 --- a/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java +++ b/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java @@ -2,12 +2,13 @@ package com.mapswithme.util; import androidx.annotation.NonNull; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; import java.io.IOException; import java.net.InetAddress; import java.net.Socket; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; + class PreLollipopSSLSocketFactory extends SSLSocketFactory { diff --git a/android/src/com/mapswithme/util/SecureStorage.java b/android/src/com/mapswithme/util/SecureStorage.java index 125d665bd9..7e67956df6 100644 --- a/android/src/com/mapswithme/util/SecureStorage.java +++ b/android/src/com/mapswithme/util/SecureStorage.java @@ -2,10 +2,10 @@ package com.mapswithme.util; import android.content.Context; import android.content.SharedPreferences; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/util/SharedPropertiesUtils.java b/android/src/com/mapswithme/util/SharedPropertiesUtils.java index 8073d47603..6a271f345e 100644 --- a/android/src/com/mapswithme/util/SharedPropertiesUtils.java +++ b/android/src/com/mapswithme/util/SharedPropertiesUtils.java @@ -1,11 +1,15 @@ package com.mapswithme.util; +import static com.mapswithme.util.Config.KEY_PREF_CRASHLYTICS; +import static com.mapswithme.util.Config.KEY_PREF_STATISTICS; + import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.BookmarksPageFactory; @@ -13,9 +17,6 @@ import com.mapswithme.maps.maplayer.Mode; import java.util.Locale; -import static com.mapswithme.util.Config.KEY_PREF_STATISTICS; -import static com.mapswithme.util.Config.KEY_PREF_CRASHLYTICS; - public final class SharedPropertiesUtils { private static final String USER_AGREEMENT_TERM_OF_USE = "user_agreement_term_of_use"; diff --git a/android/src/com/mapswithme/util/SharingUtils.java b/android/src/com/mapswithme/util/SharingUtils.java index 28cb04b54b..7aabf78274 100644 --- a/android/src/com/mapswithme/util/SharingUtils.java +++ b/android/src/com/mapswithme/util/SharingUtils.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.location.Location; import android.net.Uri; import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/src/com/mapswithme/util/StorageUtils.java b/android/src/com/mapswithme/util/StorageUtils.java index bc9e7dfd9d..fc9843dfc6 100644 --- a/android/src/com/mapswithme/util/StorageUtils.java +++ b/android/src/com/mapswithme/util/StorageUtils.java @@ -5,14 +5,14 @@ import android.content.Context; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Environment; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.FileProvider; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.FileProvider; + import com.mapswithme.maps.BuildConfig; -import com.mapswithme.maps.settings.StoragePathManager; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/util/StringUtils.java b/android/src/com/mapswithme/util/StringUtils.java index 112cf8d20b..40d05c9696 100644 --- a/android/src/com/mapswithme/util/StringUtils.java +++ b/android/src/com/mapswithme/util/StringUtils.java @@ -6,6 +6,7 @@ import android.text.TextWatcher; import android.util.Pair; import androidx.annotation.NonNull; + import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/ThemeSwitcher.java b/android/src/com/mapswithme/util/ThemeSwitcher.java index fd2563e41e..096de0b4fb 100644 --- a/android/src/com/mapswithme/util/ThemeSwitcher.java +++ b/android/src/com/mapswithme/util/ThemeSwitcher.java @@ -3,9 +3,10 @@ package com.mapswithme.util; import android.app.Activity; import android.content.Context; import android.location.Location; -import androidx.annotation.NonNull; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/ThemeUtils.java b/android/src/com/mapswithme/util/ThemeUtils.java index d1765c7bfc..ed9109622c 100644 --- a/android/src/com/mapswithme/util/ThemeUtils.java +++ b/android/src/com/mapswithme/util/ThemeUtils.java @@ -2,11 +2,12 @@ package com.mapswithme.util; import android.content.Context; import android.content.res.TypedArray; +import android.util.TypedValue; + import androidx.annotation.AttrRes; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.StyleRes; -import android.util.TypedValue; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/UTM.java b/android/src/com/mapswithme/util/UTM.java index d6ff7ae58a..f8db678e16 100644 --- a/android/src/com/mapswithme/util/UTM.java +++ b/android/src/com/mapswithme/util/UTM.java @@ -1,6 +1,7 @@ package com.mapswithme.util; import androidx.annotation.IntDef; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index 23e911fd23..547b56fd9b 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -27,6 +27,7 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.TextView; import android.widget.Toast; + import androidx.annotation.AnyRes; import androidx.annotation.AttrRes; import androidx.annotation.ColorInt; diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java index 06b0bf1efa..c35c0d9a31 100644 --- a/android/src/com/mapswithme/util/Utils.java +++ b/android/src/com/mapswithme/util/Utils.java @@ -19,6 +19,7 @@ import android.util.AndroidRuntimeException; import android.view.View; import android.view.Window; import android.widget.Toast; + import androidx.annotation.DimenRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -27,8 +28,8 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.app.NavUtils; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; -import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.snackbar.Snackbar; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/ViewServer.java b/android/src/com/mapswithme/util/ViewServer.java index d7970596b8..eeb266a588 100644 --- a/android/src/com/mapswithme/util/ViewServer.java +++ b/android/src/com/mapswithme/util/ViewServer.java @@ -16,6 +16,15 @@ package com.mapswithme.util; +import android.app.Activity; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.os.Build; +import android.text.TextUtils; +import android.util.Log; +import android.view.View; +import android.view.ViewDebug; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -34,15 +43,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.locks.ReentrantReadWriteLock; -import android.app.Activity; -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.os.Build; -import android.text.TextUtils; -import android.util.Log; -import android.view.View; -import android.view.ViewDebug; - /** *

This class can be used to enable the use of HierarchyViewer inside an * application. HierarchyViewer is an Android SDK tool that can be used diff --git a/android/src/com/mapswithme/util/log/FileLoggerStrategy.java b/android/src/com/mapswithme/util/log/FileLoggerStrategy.java index 494df9d46b..219fdb9001 100644 --- a/android/src/com/mapswithme/util/log/FileLoggerStrategy.java +++ b/android/src/com/mapswithme/util/log/FileLoggerStrategy.java @@ -6,12 +6,14 @@ import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; -import androidx.annotation.NonNull; import android.util.Log; +import androidx.annotation.NonNull; + import com.mapswithme.maps.BuildConfig; import com.mapswithme.util.StorageUtils; import com.mapswithme.util.Utils; + import net.jcip.annotations.Immutable; import java.io.File; diff --git a/android/src/com/mapswithme/util/log/LogCatStrategy.java b/android/src/com/mapswithme/util/log/LogCatStrategy.java index b34d9173cc..235f7d15bb 100644 --- a/android/src/com/mapswithme/util/log/LogCatStrategy.java +++ b/android/src/com/mapswithme/util/log/LogCatStrategy.java @@ -3,6 +3,7 @@ package com.mapswithme.util.log; import android.util.Log; import com.mapswithme.maps.BuildConfig; + import net.jcip.annotations.Immutable; @Immutable diff --git a/android/src/com/mapswithme/util/log/LoggerFactory.java b/android/src/com/mapswithme/util/log/LoggerFactory.java index 8352a7de0e..3d12158d61 100644 --- a/android/src/com/mapswithme/util/log/LoggerFactory.java +++ b/android/src/com/mapswithme/util/log/LoggerFactory.java @@ -7,11 +7,13 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; + import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; import com.mapswithme.util.CrashlyticsUtils; import com.mapswithme.util.StorageUtils; + import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; diff --git a/android/src/com/mapswithme/util/log/MemLogging.java b/android/src/com/mapswithme/util/log/MemLogging.java index 28e028ced5..5fe16a94c6 100644 --- a/android/src/com/mapswithme/util/log/MemLogging.java +++ b/android/src/com/mapswithme/util/log/MemLogging.java @@ -2,11 +2,10 @@ package com.mapswithme.util.log; import android.app.ActivityManager; import android.content.Context; -import android.os.Debug; import android.os.Build; +import android.os.Debug; import androidx.annotation.NonNull; -import com.mapswithme.maps.MwmApplication; @SuppressWarnings("unused") public class MemLogging diff --git a/android/src/com/mapswithme/util/log/ZipLogsTask.java b/android/src/com/mapswithme/util/log/ZipLogsTask.java index bdc78a901c..6f33463733 100644 --- a/android/src/com/mapswithme/util/log/ZipLogsTask.java +++ b/android/src/com/mapswithme/util/log/ZipLogsTask.java @@ -1,9 +1,10 @@ package com.mapswithme.util.log; import android.app.Application; +import android.util.Log; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import android.util.Log; import com.mapswithme.util.StorageUtils; import com.mapswithme.util.Utils; diff --git a/tools/android/formatter/MapsWithMeAndroidStudio.xml b/tools/android/formatter/MapsWithMeAndroidStudio.xml index 01971b569d..6ddd8003b7 100644 --- a/tools/android/formatter/MapsWithMeAndroidStudio.xml +++ b/tools/android/formatter/MapsWithMeAndroidStudio.xml @@ -18,10 +18,15 @@ +