kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Fixed review notes

Browse source 
https://github.com/mapsme/omim/pull/10314#discussion_r255412857
https://github.com/mapsme/omim/pull/10314#discussion_r255413432
https://github.com/mapsme/omim/pull/10314#discussion_r255415616
This commit is contained in:
Dmitry Donskoy 2019-02-12 13:34:01 +03:00 • committed by Aleksandr Zatsepin
parent b6e1f3aaae
commit e8062de68e
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/res/values/attrs.xml
View file

@ -102,5 +102,4 @@
<attr name="filterPropertyTextColor" format="color"/>
<attr name="adsRemovalOptionsBg" format="reference"/>
<attr name="adsRemovalOptionsDivider" format="color"/>
<attr name="searchPromoLogo" format="reference"/>
</resources>

2
android/res/values/themes-base.xml
View file

@ -144,7 +144,6 @@
<item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
<item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
<item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
<item name="searchPromoLogo">@drawable/ic_category_megafon_night</item>
</style>
<!-- Night theme -->
@ -292,6 +291,5 @@
<item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
<item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
<item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
<item name="searchPromoLogo">@drawable/ic_category_megafon_night</item>
</style>
</resources>

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

@ -135,8 +135,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
break;
case TYPE_PROMO_CATEGORY:
view = mInflater.inflate(R.layout.item_search_promo_category, parent, false);
TextView callToActionView = view.findViewById(R.id.promo_action);
viewHolder = new PromoViewHolder(view, view.findViewById(R.id.promo_title), callToActionView);
viewHolder = new PromoViewHolder(view, view.findViewById(R.id.promo_title));
break;
default:
throw new AssertionError("Unsupported type detected: " + viewType);
@ -167,12 +166,12 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
@NonNull
private final TextView mCallToActionView;
PromoViewHolder(@NonNull View v, @NonNull TextView tv, @NonNull TextView callToActionView)
PromoViewHolder(@NonNull View v, @NonNull TextView tv)
{
super(v, tv);
mIcon = v.findViewById(R.id.promo_icon);
mRemoveAds = v.findViewById(R.id.remove_ads);
mCallToActionView = callToActionView;
mCallToActionView = v.findViewById(R.id.promo_action);
Resources res = v.getResources();
int crossArea = res.getDimensionPixelSize(R.dimen.margin_base);
UiUtils.expandTouchAreaForView(mRemoveAds, crossArea);

4
android/src/com/mapswithme/maps/search/RutaxiPromoProcessor.java → android/src/com/mapswithme/maps/search/MegafonPromoProcessor.java
View file

@ -6,12 +6,12 @@ import android.support.annotation.NonNull;
import com.mapswithme.maps.Framework;
import com.mapswithme.util.Utils;
public class RutaxiPromoProcessor implements PromoCategoryProcessor
public class MegafonPromoProcessor implements PromoCategoryProcessor
{
@NonNull
private final Activity mActivity;
RutaxiPromoProcessor(@NonNull Activity activity)
MegafonPromoProcessor(@NonNull Activity activity)
{
mActivity = activity;
}

2
android/src/com/mapswithme/maps/search/PromoCategory.java
View file

@ -45,7 +45,7 @@ public enum PromoCategory
@Override
PromoCategoryProcessor createProcessor(@NonNull Activity activity)
{
return new RutaxiPromoProcessor(activity);
return new MegafonPromoProcessor(activity);
}
@Override