From 9f2cf033ad9436121f575e447c973e097621e670 Mon Sep 17 00:00:00 2001 From: Andrey Novikov Date: Fri, 2 Feb 2024 13:32:46 +0300 Subject: [PATCH] Refactor names --- .../mobi/maptrek/IntroductionActivity.java | 18 +++---- .../main/java/mobi/maptrek/MainActivity.java | 50 +++++++++---------- .../AmenitySetup.java} | 8 +-- .../BaseMapDownload.java | 2 +- .../CoordinatesInput.java} | 8 +-- .../{fragments => dialogs}/DataExport.java | 2 +- .../LocationShare.java} | 4 +- .../TrackProperties.java | 2 +- .../WaypointProperties.java} | 8 +-- .../WhatsNew.java} | 12 ++--- .../java/mobi/maptrek/fragments/DataList.java | 9 ++-- ...ductionFragment.java => Introduction.java} | 6 +-- ...extSearchFragment.java => TextSearch.java} | 6 +-- .../res/layout/dialog_coordinates_input.xml | 2 +- app/src/main/res/layout/dialog_list.xml | 2 +- .../res/layout/dialog_track_properties.xml | 2 +- .../res/layout/fragment_basemap_download.xml | 2 +- .../main/res/layout/fragment_search_list.xml | 2 +- 18 files changed, 73 insertions(+), 72 deletions(-) rename app/src/main/java/mobi/maptrek/{fragments/AmenitySetupDialog.java => dialogs/AmenitySetup.java} (96%) rename app/src/main/java/mobi/maptrek/{fragments => dialogs}/BaseMapDownload.java (98%) rename app/src/main/java/mobi/maptrek/{fragments/CoordinatesInputDialog.java => dialogs/CoordinatesInput.java} (96%) rename app/src/main/java/mobi/maptrek/{fragments => dialogs}/DataExport.java (99%) rename app/src/main/java/mobi/maptrek/{fragments/LocationShareDialog.java => dialogs/LocationShare.java} (98%) rename app/src/main/java/mobi/maptrek/{fragments => dialogs}/TrackProperties.java (99%) rename app/src/main/java/mobi/maptrek/{fragments/WaypointPropertiesDialog.java => dialogs/WaypointProperties.java} (96%) rename app/src/main/java/mobi/maptrek/{fragments/WhatsNewDialog.java => dialogs/WhatsNew.java} (95%) rename app/src/main/java/mobi/maptrek/fragments/{IntroductionFragment.java => Introduction.java} (95%) rename app/src/main/java/mobi/maptrek/fragments/{TextSearchFragment.java => TextSearch.java} (99%) diff --git a/app/src/main/java/mobi/maptrek/IntroductionActivity.java b/app/src/main/java/mobi/maptrek/IntroductionActivity.java index 5a64cd9a..83f31e6b 100644 --- a/app/src/main/java/mobi/maptrek/IntroductionActivity.java +++ b/app/src/main/java/mobi/maptrek/IntroductionActivity.java @@ -24,7 +24,7 @@ import com.github.appintro.AppIntro; import com.github.appintro.model.SliderPage; -import mobi.maptrek.fragments.IntroductionFragment; +import mobi.maptrek.fragments.Introduction; public class IntroductionActivity extends AppIntro { public static final int CURRENT_INTRODUCTION = 6; @@ -48,22 +48,22 @@ protected void onCreate(Bundle savedInstanceState) { sliderPage.setTitle(getString(R.string.introOfflineMapsTitle)); sliderPage.setDescription(getString(R.string.introOfflineMaps)); sliderPage.setImageDrawable(R.mipmap.maps); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); sliderPage.setTitle(getString(R.string.introPlacesTitle)); sliderPage.setDescription(getString(R.string.introPlaces)); sliderPage.setImageDrawable(R.mipmap.places); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); sliderPage.setTitle(getString(R.string.introTracksTitle)); sliderPage.setDescription(getString(R.string.introTracks)); sliderPage.setImageDrawable(R.mipmap.tracking); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); sliderPage.setTitle(getString(R.string.introOffroadTitle)); sliderPage.setDescription(getString(R.string.introOffroad)); sliderPage.setImageDrawable(R.mipmap.offroad); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); } if (lastSeenIntroduction < 3) { @@ -71,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) { sliderPage.setTitle(getString(R.string.introHikingTitle)); sliderPage.setDescription(getString(R.string.introHiking)); sliderPage.setImageDrawable(R.mipmap.hiking); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); } if (lastSeenIntroduction < 6) { @@ -79,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) { sliderPage.setTitle(getString(R.string.introCyclingTitle)); sliderPage.setDescription(getString(R.string.introCycling)); sliderPage.setImageDrawable(R.mipmap.cycling); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); } if (lastSeenIntroduction < 3) { @@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) { sliderPage.setTitle(getString(R.string.introSkiingTitle)); sliderPage.setDescription(getString(R.string.introSkiing)); sliderPage.setImageDrawable(R.mipmap.skiing); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); } if (lastSeenIntroduction < 5) { @@ -95,7 +95,7 @@ protected void onCreate(Bundle savedInstanceState) { sliderPage.setTitle(getString(R.string.introNightModeTitle)); sliderPage.setDescription(getString(R.string.introNightMode)); sliderPage.setImageDrawable(R.mipmap.night); - addSlide(IntroductionFragment.newInstance(sliderPage)); + addSlide(Introduction.newInstance(sliderPage)); } // TODO Do not show more then N slides at once diff --git a/app/src/main/java/mobi/maptrek/MainActivity.java b/app/src/main/java/mobi/maptrek/MainActivity.java index 49c77654..949ed45e 100644 --- a/app/src/main/java/mobi/maptrek/MainActivity.java +++ b/app/src/main/java/mobi/maptrek/MainActivity.java @@ -192,16 +192,16 @@ import mobi.maptrek.data.style.TrackStyle; import mobi.maptrek.databinding.ActivityMainBinding; import mobi.maptrek.fragments.AmenityInformation; -import mobi.maptrek.fragments.AmenitySetupDialog; -import mobi.maptrek.fragments.BaseMapDownload; +import mobi.maptrek.dialogs.AmenitySetup; +import mobi.maptrek.dialogs.BaseMapDownload; import mobi.maptrek.fragments.CrashReport; -import mobi.maptrek.fragments.DataExport; +import mobi.maptrek.dialogs.DataExport; import mobi.maptrek.fragments.DataList; import mobi.maptrek.fragments.DataSourceList; import mobi.maptrek.fragments.FragmentHolder; import mobi.maptrek.fragments.Legend; import mobi.maptrek.fragments.LocationInformation; -import mobi.maptrek.fragments.LocationShareDialog; +import mobi.maptrek.dialogs.LocationShare; import mobi.maptrek.fragments.MapList; import mobi.maptrek.fragments.MapSelection; import mobi.maptrek.fragments.MarkerInformation; @@ -215,12 +215,12 @@ import mobi.maptrek.fragments.PanelMenuItem; import mobi.maptrek.fragments.RouteInformation; import mobi.maptrek.fragments.Ruler; -import mobi.maptrek.fragments.TextSearchFragment; +import mobi.maptrek.fragments.TextSearch; import mobi.maptrek.fragments.TrackInformation; -import mobi.maptrek.fragments.TrackProperties; +import mobi.maptrek.dialogs.TrackProperties; import mobi.maptrek.fragments.WaypointInformation; -import mobi.maptrek.fragments.WaypointPropertiesDialog; -import mobi.maptrek.fragments.WhatsNewDialog; +import mobi.maptrek.dialogs.WaypointProperties; +import mobi.maptrek.dialogs.WhatsNew; import mobi.maptrek.fragments.preferences.BasePreferences; import mobi.maptrek.io.Manager; import mobi.maptrek.io.TrackManager; @@ -283,7 +283,7 @@ public class MainActivity extends AppCompatActivity implements ILocationListener Map.UpdateListener, GestureListener, FragmentHolder, - WaypointPropertiesDialog.OnWaypointPropertiesChangedListener, + WaypointProperties.OnWaypointPropertiesChangedListener, TrackProperties.OnTrackPropertiesChangedListener, OnLocationListener, OnWaypointActionListener, @@ -295,7 +295,7 @@ public class MainActivity extends AppCompatActivity implements ILocationListener MapTrekTileLayer.OnAmenityGestureListener, PopupMenu.OnMenuItemClickListener, LoaderManager.LoaderCallbacks>, - AmenitySetupDialog.AmenitySetupDialogCallback, SafeResultReceiver.Callback { + AmenitySetup.AmenitySetupDialogCallback, SafeResultReceiver.Callback { private static final Logger logger = LoggerFactory.getLogger(MainActivity.class); private static final int PERMISSIONS_REQUEST_FINE_LOCATION = 1; @@ -1030,8 +1030,8 @@ public void onAnimationEnd(Animator animation) { BaseMapDownload dialogFragment = new BaseMapDownload(); dialogFragment.show(mFragmentManager, "baseMapDownload"); mBaseMapWarningShown = true; - } else if (WhatsNewDialog.shouldShow()) { - WhatsNewDialog dialogFragment = new WhatsNewDialog(); + } else if (WhatsNew.shouldShow()) { + WhatsNew dialogFragment = new WhatsNew(); dialogFragment.show(mFragmentManager, "whatsNew"); } @@ -1292,8 +1292,8 @@ public boolean onMenuItemClick(MenuItem item) { dialog.show(); return true; } else if (action == R.id.actionAmenityZooms) { - AmenitySetupDialog.Builder builder = new AmenitySetupDialog.Builder(); - AmenitySetupDialog dialog = builder.setCallback(this).create(); + AmenitySetup.Builder builder = new AmenitySetup.Builder(); + AmenitySetup dialog = builder.setCallback(this).create(); dialog.show(mFragmentManager, "amenitySetup"); return true; } else if (action == R.id.actionOtherFeatures) { @@ -1430,18 +1430,18 @@ public boolean onMenuItemClick(MenuItem item) { Bundle args = new Bundle(2); if (mLocationState != LocationState.DISABLED && mLocationService != null) { Location location = mLocationService.getLocation(); - args.putDouble(TextSearchFragment.ARG_LATITUDE, location.getLatitude()); - args.putDouble(TextSearchFragment.ARG_LONGITUDE, location.getLongitude()); + args.putDouble(TextSearch.ARG_LATITUDE, location.getLatitude()); + args.putDouble(TextSearch.ARG_LONGITUDE, location.getLongitude()); } else { MapPosition position = mMap.getMapPosition(); - args.putDouble(TextSearchFragment.ARG_LATITUDE, position.getLatitude()); - args.putDouble(TextSearchFragment.ARG_LONGITUDE, position.getLongitude()); + args.putDouble(TextSearch.ARG_LATITUDE, position.getLatitude()); + args.putDouble(TextSearch.ARG_LONGITUDE, position.getLongitude()); } if (mFragmentManager.getBackStackEntryCount() > 0) { popAll(); } FragmentFactory factory = mFragmentManager.getFragmentFactory(); - Fragment fragment = factory.instantiate(getClassLoader(), TextSearchFragment.class.getName()); + Fragment fragment = factory.instantiate(getClassLoader(), TextSearch.class.getName()); fragment.setArguments(args); showExtendPanel(PANEL_STATE.MORE, "search", fragment); return true; @@ -2509,7 +2509,7 @@ public void showMarkerInformation(@NonNull GeoPoint point, @Nullable String name private void onWaypointProperties(Waypoint waypoint) { mEditedWaypoint = waypoint; - WaypointPropertiesDialog dialogFragment = new WaypointPropertiesDialog(waypoint); + WaypointProperties dialogFragment = new WaypointProperties(waypoint); dialogFragment.show(mFragmentManager, "waypointProperties"); } @@ -3031,13 +3031,13 @@ public void onFeatureDetails(long id, boolean fromList) { @Override public void shareLocation(@NonNull GeoPoint coordinates, @Nullable String name) { - LocationShareDialog dialogFragment = new LocationShareDialog(); + LocationShare dialogFragment = new LocationShare(); Bundle args = new Bundle(); - args.putDouble(LocationShareDialog.ARG_LATITUDE, coordinates.getLatitude()); - args.putDouble(LocationShareDialog.ARG_LONGITUDE, coordinates.getLongitude()); - args.putInt(LocationShareDialog.ARG_ZOOM, mMap.getMapPosition().getZoomLevel()); + args.putDouble(LocationShare.ARG_LATITUDE, coordinates.getLatitude()); + args.putDouble(LocationShare.ARG_LONGITUDE, coordinates.getLongitude()); + args.putInt(LocationShare.ARG_ZOOM, mMap.getMapPosition().getZoomLevel()); if (name != null) - args.putString(LocationShareDialog.ARG_NAME, name); + args.putString(LocationShare.ARG_NAME, name); dialogFragment.setArguments(args); dialogFragment.show(mFragmentManager, "locationShare"); } diff --git a/app/src/main/java/mobi/maptrek/fragments/AmenitySetupDialog.java b/app/src/main/java/mobi/maptrek/dialogs/AmenitySetup.java similarity index 96% rename from app/src/main/java/mobi/maptrek/fragments/AmenitySetupDialog.java rename to app/src/main/java/mobi/maptrek/dialogs/AmenitySetup.java index faf2f1a7..681b13e8 100644 --- a/app/src/main/java/mobi/maptrek/fragments/AmenitySetupDialog.java +++ b/app/src/main/java/mobi/maptrek/dialogs/AmenitySetup.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.annotation.SuppressLint; import android.app.AlertDialog; @@ -44,7 +44,7 @@ import mobi.maptrek.util.ResUtils; import mobi.maptrek.view.DiscreteSlider; -public class AmenitySetupDialog extends DialogFragment { +public class AmenitySetup extends DialogFragment { private AmenitySetupDialogCallback mCallback; public interface AmenitySetupDialogCallback { @@ -105,8 +105,8 @@ public Builder setCallback(AmenitySetupDialogCallback callback) { return this; } - public AmenitySetupDialog create() { - AmenitySetupDialog dialogFragment = new AmenitySetupDialog(); + public AmenitySetup create() { + AmenitySetup dialogFragment = new AmenitySetup(); Bundle args = new Bundle(); if (mTitle != null) diff --git a/app/src/main/java/mobi/maptrek/fragments/BaseMapDownload.java b/app/src/main/java/mobi/maptrek/dialogs/BaseMapDownload.java similarity index 98% rename from app/src/main/java/mobi/maptrek/fragments/BaseMapDownload.java rename to app/src/main/java/mobi/maptrek/dialogs/BaseMapDownload.java index e4270103..483c96e6 100644 --- a/app/src/main/java/mobi/maptrek/fragments/BaseMapDownload.java +++ b/app/src/main/java/mobi/maptrek/dialogs/BaseMapDownload.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/mobi/maptrek/fragments/CoordinatesInputDialog.java b/app/src/main/java/mobi/maptrek/dialogs/CoordinatesInput.java similarity index 96% rename from app/src/main/java/mobi/maptrek/fragments/CoordinatesInputDialog.java rename to app/src/main/java/mobi/maptrek/dialogs/CoordinatesInput.java index 01063327..820392d8 100644 --- a/app/src/main/java/mobi/maptrek/fragments/CoordinatesInputDialog.java +++ b/app/src/main/java/mobi/maptrek/dialogs/CoordinatesInput.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.annotation.SuppressLint; import android.app.Activity; @@ -39,7 +39,7 @@ import mobi.maptrek.R; import mobi.maptrek.util.JosmCoordinatesParser; -public class CoordinatesInputDialog extends DialogFragment { +public class CoordinatesInput extends DialogFragment { private int mColorTextPrimary; private int mColorDarkBlue; private int mColorRed; @@ -172,8 +172,8 @@ public Builder setCallbacks(CoordinatesInputDialogCallback callbacks) { return this; } - public CoordinatesInputDialog create() { - CoordinatesInputDialog dialogFragment = new CoordinatesInputDialog(); + public CoordinatesInput create() { + CoordinatesInput dialogFragment = new CoordinatesInput(); Bundle args = new Bundle(); if (mTitle != null) diff --git a/app/src/main/java/mobi/maptrek/fragments/DataExport.java b/app/src/main/java/mobi/maptrek/dialogs/DataExport.java similarity index 99% rename from app/src/main/java/mobi/maptrek/fragments/DataExport.java rename to app/src/main/java/mobi/maptrek/dialogs/DataExport.java index 5d7859c2..20322484 100644 --- a/app/src/main/java/mobi/maptrek/fragments/DataExport.java +++ b/app/src/main/java/mobi/maptrek/dialogs/DataExport.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/app/src/main/java/mobi/maptrek/fragments/LocationShareDialog.java b/app/src/main/java/mobi/maptrek/dialogs/LocationShare.java similarity index 98% rename from app/src/main/java/mobi/maptrek/fragments/LocationShareDialog.java rename to app/src/main/java/mobi/maptrek/dialogs/LocationShare.java index 4bd4db64..40d9adf2 100644 --- a/app/src/main/java/mobi/maptrek/fragments/LocationShareDialog.java +++ b/app/src/main/java/mobi/maptrek/dialogs/LocationShare.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.app.Activity; import android.app.AlertDialog; @@ -49,7 +49,7 @@ import mobi.maptrek.util.Osm; import mobi.maptrek.util.StringFormatter; -public class LocationShareDialog extends DialogFragment implements DialogInterface.OnClickListener { +public class LocationShare extends DialogFragment implements DialogInterface.OnClickListener { public static final String ARG_LATITUDE = "latitude"; public static final String ARG_LONGITUDE = "longitude"; diff --git a/app/src/main/java/mobi/maptrek/fragments/TrackProperties.java b/app/src/main/java/mobi/maptrek/dialogs/TrackProperties.java similarity index 99% rename from app/src/main/java/mobi/maptrek/fragments/TrackProperties.java rename to app/src/main/java/mobi/maptrek/dialogs/TrackProperties.java index aac5cf17..b06a753c 100644 --- a/app/src/main/java/mobi/maptrek/fragments/TrackProperties.java +++ b/app/src/main/java/mobi/maptrek/dialogs/TrackProperties.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.app.AlertDialog; import android.app.Dialog; diff --git a/app/src/main/java/mobi/maptrek/fragments/WaypointPropertiesDialog.java b/app/src/main/java/mobi/maptrek/dialogs/WaypointProperties.java similarity index 96% rename from app/src/main/java/mobi/maptrek/fragments/WaypointPropertiesDialog.java rename to app/src/main/java/mobi/maptrek/dialogs/WaypointProperties.java index 79823389..72b274e5 100644 --- a/app/src/main/java/mobi/maptrek/fragments/WaypointPropertiesDialog.java +++ b/app/src/main/java/mobi/maptrek/dialogs/WaypointProperties.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.app.AlertDialog; import android.app.Dialog; @@ -36,7 +36,7 @@ import mobi.maptrek.data.Waypoint; import mobi.maptrek.data.style.MarkerStyle; -public class WaypointPropertiesDialog extends DialogFragment { +public class WaypointProperties extends DialogFragment { private EditText mNameEdit; private ColorPickerSwatch mColorSwatch; private String mName; @@ -44,11 +44,11 @@ public class WaypointPropertiesDialog extends DialogFragment { private OnWaypointPropertiesChangedListener mListener; - public WaypointPropertiesDialog() { + public WaypointProperties() { super(); } - public WaypointPropertiesDialog(Waypoint waypoint) { + public WaypointProperties(Waypoint waypoint) { super(); mName = waypoint.name; mColor = waypoint.style.color; diff --git a/app/src/main/java/mobi/maptrek/fragments/WhatsNewDialog.java b/app/src/main/java/mobi/maptrek/dialogs/WhatsNew.java similarity index 95% rename from app/src/main/java/mobi/maptrek/fragments/WhatsNewDialog.java rename to app/src/main/java/mobi/maptrek/dialogs/WhatsNew.java index a7904c18..33914ab3 100644 --- a/app/src/main/java/mobi/maptrek/fragments/WhatsNewDialog.java +++ b/app/src/main/java/mobi/maptrek/dialogs/WhatsNew.java @@ -14,7 +14,7 @@ * */ -package mobi.maptrek.fragments; +package mobi.maptrek.dialogs; import android.app.AlertDialog; import android.app.Dialog; @@ -46,7 +46,7 @@ import mobi.maptrek.MapTrek; import mobi.maptrek.R; -public class WhatsNewDialog extends DialogFragment { +public class WhatsNew extends DialogFragment { private static final String TAG_CHANGELOG = "changelog"; private static final String TAG_RELEASE = "release"; private static final String TAG_CHANGE = "change"; @@ -62,7 +62,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { final View dialogView = getLayoutInflater().inflate(R.layout.dialog_list, null); final ListView listView = dialogView.findViewById(android.R.id.list); - WhatsNewDialog.ChangeListAdapter listAdapter = new WhatsNewDialog.ChangeListAdapter(); + WhatsNew.ChangeListAdapter listAdapter = new WhatsNew.ChangeListAdapter(); listView.setAdapter(listAdapter); AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); @@ -204,11 +204,11 @@ public boolean isEnabled(int position) { @Override public View getView(final int position, View convertView, ViewGroup parent) { - WhatsNewDialog.ChangeListItemHolder itemHolder; + WhatsNew.ChangeListItemHolder itemHolder; final ChangeListItem item = getItem(position); if (convertView == null) { - itemHolder = new WhatsNewDialog.ChangeListItemHolder(); + itemHolder = new WhatsNew.ChangeListItemHolder(); if (item.version != null) { convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_change_title, parent, false); itemHolder.divider = convertView.findViewById(R.id.group_divider); @@ -220,7 +220,7 @@ public View getView(final int position, View convertView, ViewGroup parent) { } convertView.setTag(itemHolder); } else { - itemHolder = (WhatsNewDialog.ChangeListItemHolder) convertView.getTag(); + itemHolder = (WhatsNew.ChangeListItemHolder) convertView.getTag(); } if (item.version != null) { diff --git a/app/src/main/java/mobi/maptrek/fragments/DataList.java b/app/src/main/java/mobi/maptrek/fragments/DataList.java index 241dd2ff..73e94a59 100644 --- a/app/src/main/java/mobi/maptrek/fragments/DataList.java +++ b/app/src/main/java/mobi/maptrek/fragments/DataList.java @@ -74,13 +74,14 @@ import mobi.maptrek.data.source.WaypointDataSource; import mobi.maptrek.data.source.WaypointDbDataSource; import mobi.maptrek.databinding.ListWithEmptyViewBinding; +import mobi.maptrek.dialogs.CoordinatesInput; import mobi.maptrek.util.HelperUtils; import mobi.maptrek.util.JosmCoordinatesParser; import mobi.maptrek.util.StringFormatter; import mobi.maptrek.viewmodels.DataSourceViewModel; import mobi.maptrek.viewmodels.MapViewModel; -public class DataList extends Fragment implements CoordinatesInputDialog.CoordinatesInputDialogCallback { +public class DataList extends Fragment implements CoordinatesInput.CoordinatesInputDialogCallback { private static final Logger logger = LoggerFactory.getLogger(DataList.class); private static final String lineSeparator = System.getProperty("line.separator", "\n"); @@ -115,8 +116,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat setDataSource(dataSourceState.dataSource, savedInstanceState); if (dataSourceState.dataSource instanceof WaypointDbDataSource) { mFloatingButton = mFragmentHolder.enableListActionButton(R.drawable.ic_add_location, v -> { - CoordinatesInputDialog.Builder builder = new CoordinatesInputDialog.Builder(); - CoordinatesInputDialog coordinatesInput = builder.setCallbacks(DataList.this) + CoordinatesInput.Builder builder = new CoordinatesInput.Builder(); + CoordinatesInput coordinatesInput = builder.setCallbacks(DataList.this) .setTitle(getString(R.string.titleCoordinatesInput)) .create(); coordinatesInput.show(getParentFragmentManager(), "pointCoordinatesInput"); @@ -264,7 +265,7 @@ public void onDestroyView() { @Override public void onResume() { super.onResume(); - CoordinatesInputDialog coordinatesInput = (CoordinatesInputDialog) getParentFragmentManager().findFragmentByTag("pointCoordinatesInput"); + CoordinatesInput coordinatesInput = (CoordinatesInput) getParentFragmentManager().findFragmentByTag("pointCoordinatesInput"); if (coordinatesInput != null) { coordinatesInput.setCallback(this); } diff --git a/app/src/main/java/mobi/maptrek/fragments/IntroductionFragment.java b/app/src/main/java/mobi/maptrek/fragments/Introduction.java similarity index 95% rename from app/src/main/java/mobi/maptrek/fragments/IntroductionFragment.java rename to app/src/main/java/mobi/maptrek/fragments/Introduction.java index 43a5a6aa..0142822a 100644 --- a/app/src/main/java/mobi/maptrek/fragments/IntroductionFragment.java +++ b/app/src/main/java/mobi/maptrek/fragments/Introduction.java @@ -34,12 +34,12 @@ import de.hdodenhof.circleimageview.CircleImageView; import mobi.maptrek.R; -public class IntroductionFragment extends AppIntroBaseFragment { +public class Introduction extends AppIntroBaseFragment { private static final String ARG_DRAWABLE = "drawable"; private CircleImageView mImageView; - public static IntroductionFragment newInstance(SliderPage sliderPage) { - IntroductionFragment slide = new IntroductionFragment(); + public static Introduction newInstance(SliderPage sliderPage) { + Introduction slide = new Introduction(); slide.setArguments(sliderPage.toBundle()); return slide; } diff --git a/app/src/main/java/mobi/maptrek/fragments/TextSearchFragment.java b/app/src/main/java/mobi/maptrek/fragments/TextSearch.java similarity index 99% rename from app/src/main/java/mobi/maptrek/fragments/TextSearchFragment.java rename to app/src/main/java/mobi/maptrek/fragments/TextSearch.java index 6fbbf3fa..81b749ba 100644 --- a/app/src/main/java/mobi/maptrek/fragments/TextSearchFragment.java +++ b/app/src/main/java/mobi/maptrek/fragments/TextSearch.java @@ -80,8 +80,8 @@ import mobi.maptrek.util.StringFormatter; import mobi.maptrek.viewmodels.MapViewModel; -public class TextSearchFragment extends ListFragment implements View.OnClickListener { - private static final Logger logger = LoggerFactory.getLogger(TextSearchFragment.class); +public class TextSearch extends ListFragment implements View.OnClickListener { + private static final Logger logger = LoggerFactory.getLogger(TextSearch.class); public static final String ARG_LATITUDE = "lat"; public static final String ARG_LONGITUDE = "lon"; @@ -382,7 +382,7 @@ private void search() { mAdapter.changeCursor(resultCursor); mViews.filterButton.setImageResource(R.drawable.ic_filter); mViews.filterButton.setColorFilter(activity.getColor(mSelectedKind > 0 ? R.color.colorAccent : R.color.colorPrimaryDark)); - mViews.filterButton.setOnClickListener(TextSearchFragment.this); + mViews.filterButton.setOnClickListener(TextSearch.this); updateListHeight(); }); }); diff --git a/app/src/main/res/layout/dialog_coordinates_input.xml b/app/src/main/res/layout/dialog_coordinates_input.xml index f804e813..27d4cf53 100644 --- a/app/src/main/res/layout/dialog_coordinates_input.xml +++ b/app/src/main/res/layout/dialog_coordinates_input.xml @@ -6,7 +6,7 @@ android:orientation="vertical" android:paddingStart="@dimen/dialogContentMargin" android:paddingEnd="@dimen/dialogContentMargin" - tools:context=".fragments.CoordinatesInputDialog"> + tools:context=".dialogs.CoordinatesInput"> + tools:context=".dialogs.AmenitySetup"> + tools:context=".dialogs.TrackProperties"> + tools:context=".dialogs.BaseMapDownload"> + tools:context=".fragments.TextSearch">