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

[android] Fixed android build after string merge

Browse source
This commit is contained in:
Александр Зацепин 2017-07-31 20:02:12 +03:00 • committed by Roman Kuznetsov
parent ef2b582807
commit 78fb602033
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout/card_loading.xml
View file

@ -44,6 +44,6 @@
android:fontFamily="@string/robotoMedium"
android:gravity="center"
android:background="?windowBackgroundForced"
android:text="@string/details"
android:text="@string/preloader_cian_button"
tools:targetApi="jelly_bean"/>
</LinearLayout>

2
android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java
View file

@ -36,7 +36,7 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon
private static final int MARGING_QUARTER = UiUtils.dimen(MwmApplication.get(),
R.dimen.margin_quarter);
private static final String ERROR_SUBTITLE = MwmApplication
.get().getString(R.string.error_load_information);
.get().getString(R.string.preloader_cian_message);
@Retention(RetentionPolicy.SOURCE)
@IntDef({ TYPE_PRODUCT, TYPE_MORE, TYPE_LOADING })

4
android/src/com/mapswithme/maps/cian/CianAdapter.java
View file

@ -21,9 +21,9 @@ import java.util.List;
public final class CianAdapter extends BaseSponsoredAdapter
{
private static final String LOADING_TITLE = MwmApplication
.get().getString(R.string.title_cian_load_information);
.get().getString(R.string.preloader_cian_title);
private static final String LOADING_SUBTITLE = MwmApplication
.get().getString(R.string.subtitle_cian_load_information);
.get().getString(R.string.preloader_cian_message);
public CianAdapter(@NonNull String url, boolean hasError, @Nullable ItemSelectedListener listener)
{