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

[android, ios, core] Add a single entity for search categories.

Browse source
This commit is contained in:
Yuri Gorshenin 2016-08-23 17:09:26 +03:00
parent 5fde326cfb
commit 5f466cb201
10 changed files with 92 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/jni/Android.mk
View file

@ -72,6 +72,7 @@ LOCAL_HEADER_FILES := \
LOCAL_SRC_FILES := \
com/mapswithme/core/jni_helper.cpp \
com/mapswithme/core/logging.cpp \
com/mapswithme/maps/DisplayedCategories.cpp \
com/mapswithme/maps/Framework.cpp \
com/mapswithme/maps/bookmarks/data/Bookmark.cpp \
com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp \

11
android/jni/com/mapswithme/maps/DisplayedCategories.cpp Normal file
View file

@ -0,0 +1,11 @@
#include "search/displayed_categories.hpp"
#include "../core/jni_helper.hpp"
extern "C" {
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_search_DisplayedCategories_nativeGet(JNIEnv * env, jclass clazz)
{
return jni::ToJavaStringArray(env, search::GetDisplayedCategories());
}
} // extern "C"

58
android/res/values/arrays.xml
View file

@ -1,64 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- IMPORTANT : order of items in 'search_category_icon_ids' and 'search_category_name_ids' should be identical. -->
<array name="search_category_icon_ids">
<item>@drawable/ic_category_food</item>
<item>@drawable/ic_category_hotel</item>
<item>@drawable/ic_category_tourism</item>
<item>@drawable/ic_category_wifi</item>
<item>@drawable/ic_category_transport</item>
<item>@drawable/ic_category_fuel</item>
<item>@drawable/ic_category_parking</item>
<item>@drawable/ic_category_shop</item>
<item>@drawable/ic_category_atm</item>
<item>@drawable/ic_category_bank</item>
<item>@drawable/ic_category_entertainment</item>
<item>@drawable/ic_category_hospital</item>
<item>@drawable/ic_category_pharmacy</item>
<item>@drawable/ic_category_police</item>
<item>@drawable/ic_category_toilet</item>
<item>@drawable/ic_category_post</item>
</array>
<array name="search_category_icon_night_ids">
<item>@drawable/ic_category_food_night</item>
<item>@drawable/ic_category_hotel_night</item>
<item>@drawable/ic_category_tourism_night</item>
<item>@drawable/ic_category_wifi_night</item>
<item>@drawable/ic_category_transport_night</item>
<item>@drawable/ic_category_fuel_night</item>
<item>@drawable/ic_category_parking_night</item>
<item>@drawable/ic_category_shop_night</item>
<item>@drawable/ic_category_atm_night</item>
<item>@drawable/ic_category_bank_night</item>
<item>@drawable/ic_category_entertainment_night</item>
<item>@drawable/ic_category_hospital_night</item>
<item>@drawable/ic_category_pharmacy_night</item>
<item>@drawable/ic_category_police_night</item>
<item>@drawable/ic_category_toilet_night</item>
<item>@drawable/ic_category_post_night</item>
</array>
<array name="search_category_name_ids">
<item>@string/food</item>
<item>@string/hotel</item>
<item>@string/tourism</item>
<item>@string/wifi</item>
<item>@string/transport</item>
<item>@string/fuel</item>
<item>@string/parking</item>
<item>@string/shop</item>
<item>@string/atm</item>
<item>@string/bank</item>
<item>@string/entertainment</item>
<item>@string/hospital</item>
<item>@string/pharmacy</item>
<item>@string/police</item>
<item>@string/toilet</item>
<item>@string/post</item>
</array>
<!-- First start screen -->
<integer-array name="first_start_images">
<item>@drawable/img_first_start_offline</item>

32
android/src/com/mapswithme/maps/search/CategoriesAdapter.java
View file

@ -32,22 +32,32 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
CategoriesAdapter(Fragment fragment)
{
TypedArray categories = fragment.getActivity().getResources().obtainTypedArray(R.array.search_category_name_ids);
TypedArray icons = fragment.getActivity().getResources().obtainTypedArray(ThemeUtils.isNightTheme() ? R.array.search_category_icon_night_ids
: R.array.search_category_icon_ids);
int len = categories.length();
if (icons.length() != len)
throw new IllegalStateException("Categories and icons arrays must have the same length.");
final String packageName = fragment.getActivity().getPackageName();
final boolean isNightTheme = ThemeUtils.isNightTheme();
final Resources resources = fragment.getActivity().getResources();
final String[] categories = DisplayedCategories.get();
final int len = categories.length;
mCategoryResIds = new int[len];
mIconResIds = new int[len];
for (int i = 0; i < len; i++)
{
mCategoryResIds[i] = categories.getResourceId(i, 0);
mIconResIds[i] = icons.getResourceId(i, 0);
mCategoryResIds[i] = resources.getIdentifier(categories[i], "string", packageName);
if (mCategoryResIds[i] == 0)
{
throw new IllegalStateException(
"Can't get string resource id for category:" + categories[i]);
}
String iconId = "ic_category_" + categories[i];
if (isNightTheme)
iconId = iconId + "_night";
mIconResIds[i] = resources.getIdentifier(iconId, "drawable", packageName);
if (mIconResIds[i] == 0)
throw new IllegalStateException("Can't get icon resource id:" + iconId);
}
categories.recycle();
icons.recycle();
if (fragment instanceof OnCategorySelectedListener)
mListener = (OnCategorySelectedListener) fragment;
@ -105,4 +115,4 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
mTitle.setCompoundDrawablesWithIntrinsicBounds(iconResId, 0, 0, 0);
}
}
}
}

8
android/src/com/mapswithme/maps/search/DisplayedCategories.java Normal file
View file

@ -0,0 +1,8 @@
package com.mapswithme.maps.search;
class DisplayedCategories
{
public static String[] get() { return nativeGet(); }
private static native String[] nativeGet();
}

23
iphone/Maps/Classes/CustomViews/MapViewControls/Search/TabbedView/CategoriesTab/MWMSearchCategoriesManager.mm
View file

@ -3,17 +3,26 @@
#import "MWMSearchCategoryCell.h"
#import "Statistics.h"
#include "search/displayed_categories.hpp"
#include "base/macros.hpp"
static NSString * const kCellIdentifier = @"MWMSearchCategoryCell";
static char const * categoriesNames[] = {
"food", "hotel", "tourism", "wifi", "transport", "fuel", "parking", "shop",
"atm", "bank", "entertainment", "hospital", "pharmacy", "police", "toilet", "post"};
static size_t constexpr kCategoriesCount = ARRAY_SIZE(categoriesNames);
@interface MWMSearchCategoriesManager ()
@property(nonatomic) vector<string> kCategories;
@end
@implementation MWMSearchCategoriesManager
- (instancetype)init
{
self = [super init];
if (self)
_kCategories = search::GetDisplayedCategories();
return self;
}
- (void)attachCell:(MWMSearchTabbedCollectionViewCell *)cell
{
cell.noResultsView.hidden = YES;
@ -31,7 +40,7 @@ static size_t constexpr kCategoriesCount = ARRAY_SIZE(categoriesNames);
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return kCategoriesCount;
return self.kCategories.size();
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
@ -49,12 +58,12 @@ static size_t constexpr kCategoriesCount = ARRAY_SIZE(categoriesNames);
- (void)tableView:(UITableView *)tableView willDisplayCell:(MWMSearchCategoryCell *)cell
forRowAtIndexPath:(NSIndexPath *)indexPath
{
[cell setCategory:@(categoriesNames[indexPath.row])];
[cell setCategory:@(self.kCategories[indexPath.row].c_str())];
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
NSString * string = @(categoriesNames[indexPath.row]);
NSString * string = @(self.kCategories[indexPath.row].c_str());
[Statistics logEvent:kStatEventName(kStatSearch, kStatSelectResult)
withParameters:@{kStatValue : string, kStatScreen : kStatCategories}];
[self.delegate searchText:[L(string) stringByAppendingString:@" "] forInputLocale:nil];

13
search/displayed_categories.cpp Normal file
View file

@ -0,0 +1,13 @@
#include "search/displayed_categories.hpp"
namespace
{
vector<string> const kDisplayedCategories = {
"food", "hotel", "tourism", "wifi", "transport", "fuel", "parking", "shop",
"atm", "bank", "entertainment", "hospital", "pharmacy", "police", "toilet", "post"};
} // namespace
namespace search
{
vector<string> const & GetDisplayedCategories() { return kDisplayedCategories; }
} // namespace search

12
search/displayed_categories.hpp Normal file
View file

@ -0,0 +1,12 @@
#pragma once
#include "std/string.hpp"
#include "std/vector.hpp"
namespace search
{
// Returns a list of english names of displayed categories for a
// categories search tab. It's guaranteed that the list is the same
// during the application lifetime.
vector<string> const & GetDisplayedCategories();
} // namespace search

2
search/search.pro
View file

@ -14,6 +14,7 @@ HEADERS += \
cancel_exception.hpp \
cbv.hpp \
common.hpp \
displayed_categories.hpp \
dummy_rank_table.hpp \
engine.hpp \
everywhere_search_params.hpp \
@ -77,6 +78,7 @@ HEADERS += \
SOURCES += \
approximate_string_match.cpp \
cbv.cpp \
displayed_categories.cpp \
dummy_rank_table.cpp \
engine.cpp \
features_filter.cpp \

8
xcode/search/search.xcodeproj/project.pbxproj
View file

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
0810EC361D6D9D2E00ABFEE7 /* displayed_categories.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0810EC341D6D9D2E00ABFEE7 /* displayed_categories.cpp */; };
0810EC371D6D9D2E00ABFEE7 /* displayed_categories.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0810EC351D6D9D2E00ABFEE7 /* displayed_categories.hpp */; };
342D83341D5233B3000D8AEA /* hotels_classifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 342D83301D5233B3000D8AEA /* hotels_classifier.cpp */; };
342D83351D5233B3000D8AEA /* hotels_classifier.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 342D83311D5233B3000D8AEA /* hotels_classifier.hpp */; };
3441CE4F1CFC1D7000CF30D4 /* processor_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */; };
@ -164,6 +166,8 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
0810EC341D6D9D2E00ABFEE7 /* displayed_categories.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = displayed_categories.cpp; sourceTree = "<group>"; };
0810EC351D6D9D2E00ABFEE7 /* displayed_categories.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = displayed_categories.hpp; sourceTree = "<group>"; };
342D83301D5233B3000D8AEA /* hotels_classifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hotels_classifier.cpp; sourceTree = "<group>"; };
342D83311D5233B3000D8AEA /* hotels_classifier.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = hotels_classifier.hpp; sourceTree = "<group>"; };
3441CE4A1CFC1D7000CF30D4 /* processor_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = processor_factory.hpp; sourceTree = "<group>"; };
@ -409,6 +413,8 @@
675346B21A4055CF00A0A8C3 /* search */ = {
isa = PBXGroup;
children = (
0810EC341D6D9D2E00ABFEE7 /* displayed_categories.cpp */,
0810EC351D6D9D2E00ABFEE7 /* displayed_categories.hpp */,
3469FAD01D6C5D9C00F35A88 /* everywhere_search_params.hpp */,
3469FAD11D6C5D9C00F35A88 /* nearby_points_sweeper.cpp */,
3469FAD21D6C5D9C00F35A88 /* nearby_points_sweeper.hpp */,
@ -575,6 +581,7 @@
345C8DB41D2D15A50037E3A6 /* streets_matcher.hpp in Headers */,
345C8DB21D2D15A50037E3A6 /* geocoder_context.hpp in Headers */,
56D5456F1C74A48C00E3719C /* mode.hpp in Headers */,
0810EC371D6D9D2E00ABFEE7 /* displayed_categories.hpp in Headers */,
347F332A1C4540A8009758CC /* search_index_values.hpp in Headers */,
34B1CB791D22905800B59423 /* ranker.hpp in Headers */,
347F33161C4540A8009758CC /* cancel_exception.hpp in Headers */,
@ -749,6 +756,7 @@
345C8DB11D2D15A50037E3A6 /* geocoder_context.cpp in Sources */,
F652D8BF1CFDE1E800FC29A0 /* engine.cpp in Sources */,
675346DD1A40560D00A0A8C3 /* approximate_string_match.cpp in Sources */,
0810EC361D6D9D2E00ABFEE7 /* displayed_categories.cpp in Sources */,
675346E51A40560D00A0A8C3 /* intermediate_result.cpp in Sources */,
F652D9021CFDE21900FC29A0 /* pre_ranking_info.cpp in Sources */,
347F33261C4540A8009758CC /* reverse_geocoder.cpp in Sources */,