mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 13:03:36 +00:00
[android] Reformat code with clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -287,7 +287,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
|
|||||||
return validateNames();
|
return validateNames();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean beforeSavingValidation() {
|
private boolean beforeSavingValidation()
|
||||||
|
{
|
||||||
// Validation to make sure address features have a house number
|
// Validation to make sure address features have a house number
|
||||||
if (!Editor.nativeCheckHouseNumberWhenIsAddress())
|
if (!Editor.nativeCheckHouseNumberWhenIsAddress())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -13,10 +13,6 @@ import androidx.annotation.IdRes;
|
|||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import androidx.core.view.ViewCompat;
|
import androidx.core.view.ViewCompat;
|
||||||
|
|
||||||
import com.google.android.material.button.MaterialButton;
|
|
||||||
import com.google.android.material.textview.MaterialTextView;
|
|
||||||
|
|
||||||
import app.organicmaps.BuildConfig;
|
import app.organicmaps.BuildConfig;
|
||||||
import app.organicmaps.R;
|
import app.organicmaps.R;
|
||||||
import app.organicmaps.base.BaseMwmFragment;
|
import app.organicmaps.base.BaseMwmFragment;
|
||||||
@@ -28,6 +24,8 @@ import app.organicmaps.util.Graphics;
|
|||||||
import app.organicmaps.util.SharingUtils;
|
import app.organicmaps.util.SharingUtils;
|
||||||
import app.organicmaps.util.Utils;
|
import app.organicmaps.util.Utils;
|
||||||
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
|
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
|
||||||
|
import com.google.android.material.button.MaterialButton;
|
||||||
|
import com.google.android.material.textview.MaterialTextView;
|
||||||
|
|
||||||
public class HelpFragment extends BaseMwmFragment implements View.OnClickListener
|
public class HelpFragment extends BaseMwmFragment implements View.OnClickListener
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import android.widget.ExpandableListView;
|
|||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.appcompat.app.AlertDialog;
|
import androidx.appcompat.app.AlertDialog;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
import app.organicmaps.R;
|
import app.organicmaps.R;
|
||||||
import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
|
import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
|
||||||
import app.organicmaps.base.BaseMwmDialogFragment;
|
import app.organicmaps.base.BaseMwmDialogFragment;
|
||||||
|
|||||||
@@ -141,7 +141,8 @@ public class RoutingPlanController extends ToolbarController
|
|||||||
setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected);
|
setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected);
|
||||||
setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected);
|
setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected);
|
||||||
// setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
|
// setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
|
||||||
setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px, this::onTransitModeSelected);
|
setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px,
|
||||||
|
this::onTransitModeSelected);
|
||||||
setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
|
setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
|
||||||
setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
|
setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -493,8 +493,8 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseV
|
|||||||
return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
|
return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT jboolean JNICALL
|
JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env,
|
||||||
Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env, jclass clazz)
|
jclass clazz)
|
||||||
{
|
{
|
||||||
return g_editableMapObject.CheckHouseNumberWhenIsAddress();
|
return g_editableMapObject.CheckHouseNumberWhenIsAddress();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,10 +68,7 @@ public final class OsmOAuth
|
|||||||
|
|
||||||
public static void clearAuthorization()
|
public static void clearAuthorization()
|
||||||
{
|
{
|
||||||
mPrefs.edit()
|
mPrefs.edit().remove(PREF_OSM_USERNAME).remove(PREF_OSM_OAUTH2_TOKEN).apply();
|
||||||
.remove(PREF_OSM_USERNAME)
|
|
||||||
.remove(PREF_OSM_OAUTH2_TOKEN)
|
|
||||||
.apply();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
|
|||||||
@@ -96,7 +96,8 @@ public class LocationHelper implements BaseLocationProvider.Listener
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper, @NonNull LocationProviderFactory locationProviderFactory)
|
public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper,
|
||||||
|
@NonNull LocationProviderFactory locationProviderFactory)
|
||||||
{
|
{
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mSensorHelper = sensorHelper;
|
mSensorHelper = sensorHelper;
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ package app.organicmaps.sdk.maplayer;
|
|||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import app.organicmaps.sdk.R;
|
|
||||||
import app.organicmaps.sdk.Framework;
|
import app.organicmaps.sdk.Framework;
|
||||||
|
import app.organicmaps.sdk.R;
|
||||||
import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
|
import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
|
||||||
import app.organicmaps.sdk.maplayer.subway.SubwayManager;
|
import app.organicmaps.sdk.maplayer.subway.SubwayManager;
|
||||||
import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
|
import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ import android.os.storage.StorageVolume;
|
|||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import app.organicmaps.sdk.R;
|
|
||||||
import app.organicmaps.sdk.Framework;
|
import app.organicmaps.sdk.Framework;
|
||||||
|
import app.organicmaps.sdk.R;
|
||||||
import app.organicmaps.sdk.downloader.MapManager;
|
import app.organicmaps.sdk.downloader.MapManager;
|
||||||
import app.organicmaps.sdk.util.Config;
|
import app.organicmaps.sdk.util.Config;
|
||||||
import app.organicmaps.sdk.util.StorageUtils;
|
import app.organicmaps.sdk.util.StorageUtils;
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ import androidx.annotation.Keep;
|
|||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import app.organicmaps.sdk.R;
|
|
||||||
import app.organicmaps.sdk.BuildConfig;
|
import app.organicmaps.sdk.BuildConfig;
|
||||||
|
import app.organicmaps.sdk.R;
|
||||||
import app.organicmaps.sdk.util.Config;
|
import app.organicmaps.sdk.util.Config;
|
||||||
import app.organicmaps.sdk.util.ROMUtils;
|
import app.organicmaps.sdk.util.ROMUtils;
|
||||||
import app.organicmaps.sdk.util.StringUtils;
|
import app.organicmaps.sdk.util.StringUtils;
|
||||||
|
|||||||
Reference in New Issue
Block a user