From 56af6bf622b8e2f5586447baa7d5b7f2f0f06cc7 Mon Sep 17 00:00:00 2001 From: androiddevkotlin <64539346+androiddevkotlin@users.noreply.github.com> Date: Sat, 6 Mar 2021 01:35:12 +0200 Subject: [PATCH] Fix conflicts --- .../editors/PointEditorFragmentNew.java | 3 +- .../fragments/ProfileAppearanceFragment.java | 54 ++++++++----------- .../src/net/osmand/plus/track/ColorsCard.java | 15 ++---- 3 files changed, 26 insertions(+), 46 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java index 45545468c2..1c59b4508b 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java @@ -50,7 +50,6 @@ import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.base.BaseOsmAndFragment; -import net.osmand.plus.base.BottomSheetDialogFragment; import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.ColorDialogs; import net.osmand.plus.mapcontextmenu.MapContextMenu; @@ -194,7 +193,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment implemen @Override public void onClick(View v) { FragmentManager fragmentManager = getFragmentManager(); - DialogFragment dialogFragment = createSelectCategoryDialog(); + DialogFragment dialogFragment = createSelectCategoryDialog(); if (fragmentManager != null && dialogFragment != null) { dialogFragment.show(fragmentManager, SelectFavoriteCategoryBottomSheet.class.getSimpleName()); } diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java index b21eee0272..7adf43b3be 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java @@ -23,12 +23,24 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; +import androidx.activity.OnBackPressedCallback; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.content.res.AppCompatResources; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + import net.osmand.AndroidUtils; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; -import net.osmand.plus.activities.MapActivity; -import net.osmand.plus.routing.RouteService; -import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities.DialogButtonType; @@ -42,7 +54,7 @@ import net.osmand.plus.profiles.SelectProfileBottomSheet.DialogMode; import net.osmand.plus.profiles.SelectProfileBottomSheet.OnSelectProfileCallback; import net.osmand.plus.routepreparationmenu.cards.BaseCard; import net.osmand.plus.routepreparationmenu.cards.BaseCard.CardListener; -import net.osmand.plus.routing.RouteProvider; +import net.osmand.plus.routing.RouteService; import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.backup.ProfileSettingsItem; import net.osmand.plus.settings.backend.backup.SettingsHelper; @@ -59,21 +71,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import androidx.activity.OnBackPressedCallback; -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.content.res.AppCompatResources; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.RecyclerView; - import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID; import static net.osmand.plus.profiles.SelectProfileBottomSheet.PROFILES_LIST_UPDATED_ARG; import static net.osmand.plus.profiles.SelectProfileBottomSheet.PROFILE_KEY_ARG; @@ -387,7 +384,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O profileName.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override public void onFocusChange(View v, boolean hasFocus) { - if(hasFocus){ + if (hasFocus) { profileName.setSelection(profileName.getText().length()); AndroidUtils.showSoftKeyboard(getMyActivity(), profileName); } @@ -427,14 +424,6 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O colorName = holder.itemView.findViewById(R.id.summary); colorName.setTextColor(ContextCompat.getColor(app, R.color.preference_category_title)); } else if (COLOR_ITEMS.equals(preference.getKey())) { - colorItems = (FlowLayout) holder.findViewById(R.id.color_items); - colorItems.removeAllViews(); - for (ProfileIconColors color : ProfileIconColors.values()) { - View colorItem = createColorItemView(color, colorItems); - colorItems.addView(colorItem, new FlowLayout.LayoutParams(0, 0)); - colorItems.setHorizontalAutoSpacing(true); - } - updateColorSelector(changedProfile.color); createColorsCard(holder); } else if (ICON_ITEMS.equals(preference.getKey())) { iconItems = (FlowLayout) holder.findViewById(R.id.color_items); @@ -520,7 +509,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O ImageView coloredCircle = iconItemView.findViewById(R.id.background); AndroidUtils.setBackground(coloredCircle, UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.circle_background_light), - UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f))); + UiUtilities.getColorWithAlpha(ContextCompat.getColor(app, R.color.icon_color_default_light), 0.1f))); coloredCircle.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -868,11 +857,11 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O } return false; } - + private boolean nameIsEmpty() { return changedProfile.name.trim().isEmpty(); } - + private void disableSaveButtonWithErrorMessage(String errorMessage) { saveButton.setEnabled(false); profileNameOtfb.setError(errorMessage, true); @@ -1048,7 +1037,8 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment implements O if (parent != null ? !parent.equals(that.parent) : that.parent != null) return false; if (name != null ? !name.equals(that.name) : that.name != null) return false; if (color != that.color) return false; - if (customColor != null ? !customColor.equals(that.customColor) : that.customColor != null) return false; + if (customColor != null ? !customColor.equals(that.customColor) : that.customColor != null) + return false; if (routingProfile != null ? !routingProfile.equals(that.routingProfile) : that.routingProfile != null) return false; if (routeService != that.routeService) return false; diff --git a/OsmAnd/src/net/osmand/plus/track/ColorsCard.java b/OsmAnd/src/net/osmand/plus/track/ColorsCard.java index 2edeff39ba..b3970b5a7b 100644 --- a/OsmAnd/src/net/osmand/plus/track/ColorsCard.java +++ b/OsmAnd/src/net/osmand/plus/track/ColorsCard.java @@ -6,14 +6,10 @@ import android.view.View; import android.widget.ImageView; import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; import androidx.fragment.app.Fragment; -import com.google.android.material.internal.FlowLayout; - -import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; @@ -32,11 +28,6 @@ import org.apache.commons.logging.Log; import java.util.ArrayList; import java.util.List; -import androidx.annotation.ColorInt; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.ColorUtils; -import androidx.fragment.app.Fragment; - public class ColorsCard extends BaseCard implements ColorPickerListener { public static final int MAX_CUSTOM_COLORS = 6; @@ -46,13 +37,13 @@ public class ColorsCard extends BaseCard implements ColorPickerListener { public static final int INVALID_VALUE = -1; - private Fragment targetFragment; + private final Fragment targetFragment; private ApplicationMode appMode; private ListStringPreference colorsListPreference; - private List colors; - private List customColors; + private final List colors; + private final List customColors; private int selectedColor;