pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Moved booking params constant to filter utils, since it's not used in FilterActivity directly

Browse source
This commit is contained in:
alexzatsepin 2020-08-31 20:20:29 +03:00 • committed by Maksim Andrianov
parent 7402101a94
commit ea4ec794a3
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -437,7 +437,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
HotelsFilter filter = data.getParcelableExtra(FilterActivity.EXTRA_FILTER);
mFilterController.setFilter(filter);
BookingFilterParams params = data.getParcelableExtra(FilterActivity.EXTRA_FILTER_PARAMS);
BookingFilterParams params = data.getParcelableExtra(FilterUtils.EXTRA_FILTER_PARAMS);
mFilterController.setFilterParams(params);
showSearch(query);
@ -1163,7 +1163,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
setupSearchQuery(data);
mFilterController.setFilter(data.getParcelableExtra(FilterActivity.EXTRA_FILTER));
BookingFilterParams params = data.getParcelableExtra(FilterActivity.EXTRA_FILTER_PARAMS);
BookingFilterParams params = data.getParcelableExtra(FilterUtils.EXTRA_FILTER_PARAMS);
mFilterController.setFilterParams(params);
mFilterController.updateFilterButtonsVisibility(mFilterController.isSatisfiedForSearch());
runSearch();
@ -1369,7 +1369,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
HotelsFilter filter = intent.getParcelableExtra(FilterActivity.EXTRA_FILTER);
BookingFilterParams params = intent.getParcelableExtra(FilterActivity.EXTRA_FILTER_PARAMS);
BookingFilterParams params = intent.getParcelableExtra(FilterUtils.EXTRA_FILTER_PARAMS);
if (mFilterController != null && (filter != null || params != null))
{
mFilterController.updateFilterButtonsVisibility(true);

1
android/src/com/mapswithme/maps/search/FilterActivity.java
View file

@ -17,7 +17,6 @@ public class FilterActivity extends BaseMwmFragmentActivity
{
public static final int REQ_CODE_FILTER = 101;
public static final String EXTRA_FILTER = "extra_filter";
public static final String EXTRA_FILTER_PARAMS = "extra_filter_params";
public static final String ACTION_FILTER_APPLY = "action_filter_apply";
public static void startForResult(@NonNull Activity activity, @Nullable HotelsFilter filter,

1
android/src/com/mapswithme/maps/search/FilterUtils.java
View file

@ -37,6 +37,7 @@ import static com.mapswithme.maps.search.BookingFilterParams.Room;
public class FilterUtils
{
public static final int REQ_CODE_NO_NETWORK_CONNECTION_DIALOG = 301;
public static final String EXTRA_FILTER_PARAMS = "extra_filter_params";
private static final int MAX_STAYING_DAYS = 30;
private static final int MAX_CHECKIN_WINDOW_IN_DAYS = 365;
private static final String DAY_OF_MONTH_PATTERN = "MMM d";

4
android/src/com/mapswithme/maps/search/SearchActivity.java
View file

@ -51,7 +51,7 @@ public class SearchActivity extends BaseMwmFragmentActivity
args.putString(EXTRA_LOCALE, locale);
args.putBoolean(EXTRA_SEARCH_ON_MAP, isSearchOnMap);
args.putParcelable(FilterActivity.EXTRA_FILTER, filter);
args.putParcelable(FilterActivity.EXTRA_FILTER_PARAMS, params);
args.putParcelable(FilterUtils.EXTRA_FILTER_PARAMS, params);
i.putExtras(args);
activity.startActivity(i);
activity.overridePendingTransition(R.anim.search_fade_in, R.anim.search_fade_out);
@ -116,7 +116,7 @@ public class SearchActivity extends BaseMwmFragmentActivity
{
Intent intent = NavUtils.getParentActivityIntent(this);
intent.putExtra(FilterActivity.EXTRA_FILTER, filter);
intent.putExtra(FilterActivity.EXTRA_FILTER_PARAMS, params);
intent.putExtra(FilterUtils.EXTRA_FILTER_PARAMS, params);
NavUtils.navigateUpTo(this, intent);
return;
}

4
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -482,7 +482,7 @@ public class SearchFragment extends BaseMwmFragment
mInitialLocale = arguments.getString(SearchActivity.EXTRA_LOCALE);
mInitialSearchOnMap = arguments.getBoolean(SearchActivity.EXTRA_SEARCH_ON_MAP);
mInitialHotelsFilter = arguments.getParcelable(FilterActivity.EXTRA_FILTER);
mInitialFilterParams = arguments.getParcelable(FilterActivity.EXTRA_FILTER_PARAMS);
mInitialFilterParams = arguments.getParcelable(FilterUtils.EXTRA_FILTER_PARAMS);
}
private boolean tryRecognizeHiddenCommand(@NonNull String query)
@ -719,7 +719,7 @@ public class SearchFragment extends BaseMwmFragment
return;
mFilterController.setFilter(data.getParcelableExtra(FilterActivity.EXTRA_FILTER));
mFilterController.setFilterParams(data.getParcelableExtra(FilterActivity.EXTRA_FILTER_PARAMS));
mFilterController.setFilterParams(data.getParcelableExtra(FilterUtils.EXTRA_FILTER_PARAMS));
runSearch();
break;
}